shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity
1,268,126 Commits 55 Branches 2,486 Tags
a2fc5c4bd58451123ad0cc844de55f484be3e924
Commit Graph

1268126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sandy Huang
a2fc5c4bd5 drm/rockchip: vop: update vop afbc format define 
1. update vop afbc format define according to vop2;
2. add afbc modifiers format support for px30 win1.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I54a878a01188466fa94b30468d163c6a31385809
 2024-01-25 15:06:58 +08:00
Tao Huang
c1ccd0e065 Merge commit '21cc4fd00cd2cb5e19ce6fe626a07351dcbffc34' 
* commit '21cc4fd00cd2cb5e19ce6fe626a07351dcbffc34': (30 commits)
  media: i2c: imx415: adjusting the power on timing
  media: i2c: rk628: set default timings when query timing if hdmi unplug
  drm/rockchip: dw-dp: support more color format
  media: i2c: rk628: add CSI error interrupts to haldle csi errors
  media: i2c: rk628: fix get capture when capture mode is 0
  arm64: dts: rockchip: px30-evb-ddr3-v10: reduce power consumption by reducing voltage
  media: i2c: maxim: driver version v3.01.00
  arm64: dts: rockchip: rk3588-evb7-imx415: remove cam_ircut0
  media: i2c: sc450ai adapt sleep_wakeup
  media: i2c: rk628: fix CTS HF2-23 test fail
  media: i2c: rk628: fix CTS HF2-86 test fail
  media: i2c: rk628: fix CTS test fail
  media: i2c: rk628: add hdmirx cec support
  media: i2c: rk628: disable character error detection
  media: i2c: rk628: fix resolution change but not recognized
  ARM: dts: rockchip: rv1106g-evb2-v12-wakeup: fix false wakeup issue
  drm/rockchip: vop: add csc_mode regs for PX30/RK3366/RV1126
  arm64: dts: rockchip: rk3588-vehicle-evb-v22.dts: fix max96712 dphy3 lock gpio error
  input: sensor: fix compile errors on kernel-6.1
  Revert "ARM: dts: rockchip: Add dtsi file for rk628"
  ...

Change-Id: I93c1f3c95752a236a6d742d2a6232a183169edee
 2024-01-24 11:08:54 +08:00
Tao Huang
0004502fda Merge commit 'e6cc02852f60a1ad3a9d8061e0fbdf23125ff148' 
* commit 'e6cc02852f60a1ad3a9d8061e0fbdf23125ff148':
  Revert "mfd: Add rk628 mfd driver"
  Revert "drm/rockchip: Add rk628 display driver"
  Revert "drm/rockchip: rk628: Add hdmi driver"
  Revert "drm/rockchip/rk628: Add GVI driver"
  Revert "drm: rockchip: rk628: Add rk628 combrx-phy driver"
  Revert "drm: rockchip: rk628: Add rk628 hdmirx driver"
  Revert "pinctrl: rk628: add rk628 pinctrl driver"
  Revert "nvmem: rk628-efuse: add rk628 efuse driver"

Change-Id: I11874bb11345600b610ac9e5422fd238297993aa
 2024-01-24 11:08:33 +08:00
Lan Honglin
21cc4fd00c media: i2c: imx415: adjusting the power on timing 
Fixes: 920198cd6c ("media: i2c: imx415 adapt sleep_wakeup")
Change-Id: I184eff8ca204ae09abe86e31d4b70f9876fcfaf8
Signed-off-by: Lan Honglin <helin.lan@rock-chips.com>
 2024-01-24 10:55:24 +08:00
Jason Song
011a716f40 arm64: configs: add rk3588_vehicle.config 
Change-Id: Iba5bb17d37de8b8b863e5e949f616cecaf6ef378
Signed-off-by: Jason Song <sxj@rock-chips.com>
 2024-01-24 10:30:37 +08:00
Jianwei Fan
a02a6dc93e media: i2c: rk628: set default timings when query timing if hdmi unplug 
Change-Id: Ia88eb29b8f628ad141a256e9cb9229d9b6491851
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
 2024-01-23 12:19:46 +00:00
Zhang Yubing
2cc56db2d2 drm/rockchip: dw-dp: support more color format 
Change-Id: Ibd302071c92c60abacfc1b7ecafcfefce76af0f2
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
 2024-01-23 20:13:33 +08:00
Jianwei Fan
46b3999952 media: i2c: rk628: add CSI error interrupts to haldle csi errors 
Change-Id: Iafbb6da9f1aa13c4e47c502182ce994f8c665995
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
 2024-01-23 20:05:04 +08:00
Jianwei Fan
524b8b81fa media: i2c: rk628: fix get capture when capture mode is 0 
Change-Id: Ieb87f83699f55ebd89a069b8888e554b0329c93f
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
 2024-01-23 20:03:52 +08:00
Lin Jianhua
01f8cd7521 arm64: dts: rockchip: px30-evb-ddr3-v10: reduce power consumption by reducing voltage 
Partly revert commit 70a514ab14 ("arm64: dts: rockchip: px30-evb:
move some configs to common board dtsi files").

Change-Id: I2b6fb6e0ee84244bc97d328fefe6457e7e432434
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
 2024-01-23 20:03:28 +08:00
Yiqing Zeng
f9d3663176 media: i2c: maxim: driver version v3.01.00 
Compatible with kernel v4.19/v5.10/v6.1

Change-Id: I8b0d9b8fac4e2868db1e1b5c70a63462d29c78a4
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
 2024-01-23 19:57:41 +08:00
Wu Liangqing
ce77391d7f arm64: dts: rockchip: rk3588-evb7-imx415: remove cam_ircut0 
cam_ircut0 ircut-open-gpios reused by typec

Change-Id: I2403e595215e0ada2aed7f9339ab5d83affb27e9
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
 2024-01-23 19:56:42 +08:00
Lan Honglin
c1b160e3fa media: i2c: sc450ai adapt sleep_wakeup 
Change-Id: Ib4f2b921e3c312acfbe856559182c6dc7417ddf4
Signed-off-by: Lan Honglin <helin.lan@rock-chips.com>
 2024-01-23 19:56:08 +08:00
Chen Shunqing
ce0762a9f6 media: i2c: rk628: fix CTS HF2-23 test fail 
Type: Fix
Redmine ID: N/A
Associated modifications: N/A
Test: CTS HF2-23, clk jitter + 0.5%

Change-Id: Iae2c79f368ceeb1a4284dd40de79e235b119b6aa
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
 2024-01-23 19:30:34 +08:00
Chen Shunqing
04406cbc20 media: i2c: rk628: fix CTS HF2-86 test fail 
If sample_flat field is set to 1, there can't be any sound.

Type: Function
Redmine ID: N/A
Associated modifications: N/A
Test: CTS test HF2-86

Change-Id: I8f2ddfa3c5a7578a28c062817c10de2ea43ad164
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
 2024-01-23 19:30:25 +08:00
Chen Shunqing
76acb9e640 media: i2c: rk628: fix CTS test fail 
1. disable RR_Capable in EDID.
2. HDCP 2C-01/2C-02 fail, HPD hpd drawdown time extended to 1.1s.

Type: Fix
Redmine ID: N/A
Associated modifications: N/A
Test: CTS test

Change-Id: I7f80372e30d6d6ec40df5c1f289bcfb9937171b2
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
 2024-01-23 19:30:18 +08:00
Chen Shunqing
c9c123690f media: i2c: rk628: add hdmirx cec support 
Type: Function
Redmine ID: N/A
Associated modifications: N/A
Test: N/A

Change-Id: I975770e7d32fe3d3bcb2123a3b7aa5bda7b05cd7
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
 2024-01-23 19:30:04 +08:00
Chen Shunqing
90a1194138 media: i2c: rk628: disable character error detection 
Type: Fix
Redmine ID: N/A
Associated N/A
Test: Some sources have high bit error rate,
      resulting in a black screen.

Change-Id: Ibf928d96bb853cf45dc7d49827de2649c2263526
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
 2024-01-23 19:29:51 +08:00
Chen Shunqing
042b0700bd media: i2c: rk628: fix resolution change but not recognized 
Type: Fix
Redmine ID: #456052
Associated modifications: N/A
Test: Use some laptops to change resolution

Change-Id: I671eecb719ef619850fddb93bdda669046060f9d
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
 2024-01-23 19:29:37 +08:00
Jkand Huang
06e95d2c43 ARM: dts: rockchip: rv1106g-evb2-v12-wakeup: fix false wakeup issue 
The wake-up button status must be consistent with the configuration in
'rockchip,pm-config'.

Change-Id: I518e1f148225cd7adc07408d54138f5d4cb3f603
Signed-off-by: Jkand Huang <jkand.huang@rock-chips.com>
 2024-01-23 19:02:35 +08:00
Damon Ding
1358e462d7 drm/rockchip: vop: add csc_mode regs for PX30/RK3366/RV1126 
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Iffa1b5ea9dfcc5a0a1d2aa7e023c80ae8c174510
 2024-01-23 18:54:17 +08:00
Cai Wenzhong
246072cd36 arm64: dts: rockchip: rk3588-vehicle-evb-v22.dts: fix max96712 dphy3 lock gpio error 
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: I614a97c0a0ddefc87653eccffc870b009638a673
 2024-01-23 18:01:27 +08:00
Luo Wei
051ed63b17 input: sensor: fix compile errors on kernel-6.1 
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I6f0536ffd077eee484d0cd79042556a6d71e1b5b
 2024-01-23 14:07:33 +08:00
Algea Cao
a17b4cd08a Revert "ARM: dts: rockchip: Add dtsi file for rk628" 
This reverts commit d6feca9685.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I6891e479f1ae03100d4c179628a80ff0b3756561
 2024-01-23 12:11:16 +08:00
Tao Huang
4405c8a880 Revert "ARM: dts: rockchip: Add support for rk3288-evb-rk628 board" 
This reverts commit 3631fa6e38.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I45fd5d1a631c22183f7492b091d0361310ab4844
 2024-01-23 12:09:13 +08:00
Tao Huang
4180c71466 Revert "ARM: dts: rockchip: add rk3288-evb-rk628-hdmi2csi-avb.dts" 
This reverts commit 951a29b370.

Change-Id: Iabcefcfe3246ca17299648af32a13dc5452afa1d
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2024-01-23 12:08:06 +08:00
Tao Huang
87d0a07ea1 Revert "arm64: dts: rockchip: rk3568-evb6: add rk628 rgb2dsi/lvds" 
This reverts commit d6f73e172c.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I72dab2b21a7ea32dd8dccdd4ae4f800129cf05ab
 2024-01-23 11:35:38 +08:00
Tao Huang
734920ed1e Revert "arm64: dts: rockchip: rk3568-evb6: add rk628 bt1120 to hdmi" 
This reverts commit 6254fc65c9.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I90eaa6720bcf28b4c370f9c5c4c87c79e57ad41d
 2024-01-23 11:33:46 +08:00
Tao Huang
71e6d08400 Revert "arm64: dts: rockchip: rk3568-evb6: add rk628 rgb2hdmi" 
This reverts commit 8dcec60e5c.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I8e840a3b194e49afb3ae9cad656b73e1ab3ea998
 2024-01-23 11:31:48 +08:00
Algea Cao
dcb71dc445 misc: rk628: Fix compile warning 
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I29a6252b85c603dc6427595698fef071ef04e8df
 2024-01-22 19:39:13 +08:00
Algea Cao
b77168d7b3 misc: rk628: Disable gpio test function as default 
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ib952ac0edba083c57db949fcab4235a0b8bccd89
 2024-01-22 19:39:13 +08:00
Jianwei Fan
e337ce6951 media: i2c: rk628: fix compile warnings 
Change-Id: I29d9b1b5a64352e84046c3f3fffc8f3ab217dd3f
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
 2024-01-22 19:36:28 +08:00
Sandy Huang
e5e00177f3 arm64: dts: rockchip: rk3588-nvr: fix hdptxphy_hdmi1 ref error 
Fixes: 80601d55ba ("arm64: dts: rockchip: rk3588-nvr: update hdmi phy clk")

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I1a7b1a9f4060cd3fcbfc954082cd36e1a00f9afc
 2024-01-22 18:01:59 +08:00
Cai Wenzhong
3d19f49d33 media: i2c: maxim: local: fixed remote camera s_stream and s_power api return error. 
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: Iaf53ce1d8bbadce04c5aebb2675c8e0349000c6e
 2024-01-22 11:23:19 +08:00
Tao Huang
e6cc02852f Revert "mfd: Add rk628 mfd driver" 
This reverts commit c4586725c3.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4db854aba469d30d19ec79aa84e830745ca9a53e
 2024-01-21 14:48:48 +08:00
Tao Huang
edd2bd729a Revert "clk/rockchip/regmap: Add rk628 cru driver" 
This reverts commit a416ee3e3a.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Idabb47fae0858cb0a08d5287f10afbb7df36fdaf
 2024-01-21 14:48:48 +08:00
Tao Huang
584b0a507c Revert "drm/rockchip: Add rk628 display driver" 
This reverts commit e285c9b20e.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2191d5af2103a5edd37f0d9a23ec02e0d81d6d77
 2024-01-21 14:48:48 +08:00
Tao Huang
af15978793 Revert "drm/rockchip: rk628: Add hdmi driver" 
This reverts commit 8c58b4696e.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If76a4a40241ce47e3ac1e7eb53dcd9168073903f
 2024-01-21 14:48:48 +08:00
Tao Huang
88f9a01d8d Revert "drm/rockchip/rk628: Add GVI driver" 
This reverts commit fe736116ba.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I3381fffc5992c55e20c7d9dd7db999ca7b234f44
 2024-01-21 14:48:48 +08:00
Tao Huang
3506b5e5dd Revert "drm: rockchip: rk628: Add rk628 combrx-phy driver" 
This reverts commit 92ae0beb2b.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I3ac211f4b6359a6e875fb97626938e8d6a0876ad
 2024-01-21 14:48:48 +08:00
Tao Huang
79ea8d176f Revert "drm: rockchip: rk628: Add rk628 hdmirx driver" 
This reverts commit c0a543e874.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I93343d1b4d9110b30c9b9e7010e41bedad6a597a
 2024-01-21 14:48:47 +08:00
Tao Huang
404c9aa46e Revert "pinctrl: rk628: add rk628 pinctrl driver" 
This reverts commit 136c56731b.
This reverts commit 4a70b21012.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If2a96546cefa1453af4229d06563235d447fd8e6
 2024-01-21 14:48:34 +08:00
Tao Huang
f15ea98e91 Revert "nvmem: rk628-efuse: add rk628 efuse driver" 
This reverts commit a939cdfe9d.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I6b44046b6f8999c84d4380710c9751efd0c14daf
 2024-01-21 14:34:25 +08:00
Tao Huang
972ef7bb84 Merge commit 'c10152d3e7dd7eea6c9e65cdc8fc97d46692fec1' 
* commit 'c10152d3e7dd7eea6c9e65cdc8fc97d46692fec1':
  media: i2c: sc450ai: add 1344X760 config
  drm/rockchip: vop2: force to disable cluster-win1 when cluster-win0 is disabled
  ARM: dts: rockchip: rv1106: add dvbm node to isp
  media: rockchip: isp: frame start to check and config next buf
  arm64: dts: rockchip: rk3588-vehicle-evb: set 40ms delay for display
  mfd: display-serdes: rohm gpio0 support 1MHZ used for pwm
  mfd: display-serdes: change default pinctrl to init

Change-Id: I9d5e4ab36103192d4657c8d4c4bf4e316396700f
 2024-01-19 21:14:17 +08:00
Tao Huang
f302276d4e Merge commit 'e3f7d79af1b514a182765d6d95e65d88aba6f94f' 
* commit 'e3f7d79af1b514a182765d6d95e65d88aba6f94f': (84 commits)
  media: i2c: rk628: Compatible with both kernel-5.10 and kernel-6.1
  media: i2c: rk628: fix audio fs in large offset
  media: i2c: rk628: check for overflow when i2c operation
  media: i2c: rk628: add register debugfs node
  media: i2c: rk628: Auto derepeat
  media: i2c: rk628: allows the PHY to lock to a low control period
  media: i2c: rk628: update driver for dsi mode
  media: i2c: rk628: fix hdmi1.4 change format not recognized
  media: i2c: rk628: fix i2c timeout
  media: i2c: rk628: fix display error
  media: i2c: rk628: fix combtxphy mipi lp-tx output slew-rate
  media: i2c: rk628: set default timing when driver probe
  media: i2c: rk628: add support for rk628f hdmirx audio
  media: i2c: rk628: cru: add hdmirx aud apll support
  media: i2c: rk628: add apll regmap_range
  media: i2c: rk628: cru: Add rk628f APLL
  media: i2c: rk628: read raw state must delay some time when clear interrupt
  media: i2c: rk628: move some function to rk628_mipi_dphy.c
  media: i2c: rk628: add csc matrix support
  media: i2c: rk628: add csi1 support and dual mipi mode for rk628f
  ...

Change-Id: If91f3e03071c93d46cdff8afbf9e45da420bb9f2

Conflicts:
	drivers/media/i2c/rk628/rk628_bt1120_v4l2.c
	drivers/media/i2c/rk628/rk628_csi_v4l2.c
 2024-01-19 21:10:47 +08:00
Tao Huang
f7bab29ae0 Merge commit '3710e830ff41bf4f9cae6752427d1c82768ba36c' 
Merge made by the 'ours' strategy.

* commit '3710e830ff41bf4f9cae6752427d1c82768ba36c':
  drm/bridge: dw-hdmi-qp: Support hdmi force output
  dt-bindings: display: rockchip: dw_hdmi-rockchip: Add force output property
  drm/bridge: synopsys: Support hdmi force output

Change-Id: I319d5d72b2e99fa6a94448c1776f020a7494404e
 2024-01-19 21:04:41 +08:00
Lan Honglin
c10152d3e7 media: i2c: sc450ai: add 1344X760 config 
fix i2c communication error when fastae convergence too slow

Change-Id: Id5f522f139aa1f2982877efac45179830478d4c1
Signed-off-by: Lan Honglin <helin.lan@rock-chips.com>
 2024-01-19 21:02:38 +08:00
Algea Cao
ed5631fa51 drm/bridge: dw-hdmi-qp: Support hdmi force output 
Support hdmi output specific resolution and color format
regardless of whether hdmi is connected.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I3f18aeb04427846e06b6a4397a4c6df77bbbcab2
 2024-01-19 20:59:47 +08:00
Algea Cao
b318f17508 drm/bridge: synopsys: Support hdmi force output 
Support hdmi output specific resolution and color format
regardless of whether hdmi is connected.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I228a74d128aa818166f589798897729473d97610
 2024-01-19 20:57:27 +08:00
Tao Huang
048df626ea Merge commit '334c7192e6a968d1d6272fec5c956ae35a02a3db' 
* commit '334c7192e6a968d1d6272fec5c956ae35a02a3db':
  drm/rockchip: drv: display logo when specify force output mode
  arm64: dts: rockchip: rk3588-vehicle-maxim-cameras-s66.dtsi: camera module and lens name using default
  arm64: dts: rockchip: rk3588-vehicle-evb-maxim-max9671(/2)2-d(c)phy0(/3).dtsi: camera module and lens name using default
  arm64: dts: rockchip: rk3588-vehicle-evb: move port dts to bridge node for evb20

Change-Id: I13e8ae92a8f8f9143e2ac5c0cc86b07770354a8d
 2024-01-19 20:52:25 +08:00