Commit Graph

1255813 Commits

Author SHA1 Message Date
Tao Huang
0c2db36e3b Merge commit '95f83adcf6c2988e8fe9ee1f7a5fb43404aa1f54'
* commit '95f83adcf6c2988e8fe9ee1f7a5fb43404aa1f54':
  mfd: Add rockchip rkx110/x120 serdes support

Ignore:
commit 95f83adcf6 ("mfd: Add rockchip rkx110/x120 serdes support")

Change-Id: I63f708821159c2556537bf47375c576eb0880687
2023-09-11 15:37:17 +08:00
Andy Yan
9d62b3eb9f mfd: Add rockchip rkx110/x120 serdes support
support display topologys as follow:
1 video source input, 1 channel, 1 lane, 1 remote, 1 video output:
+-------+          +---------+            +---------+         +--------+
|       | disp in  |         |   cable0   |         | disp out|        |
|  soc  |--------->|  RK110  +----------->|  RK120  +-------->| screen |
|       |          |         |            |         |         |        |
+-------+          +---------+            +---------+         +--------+

1 video source input, 1 channel, 2 lane, 1 remote, 1 video output:
+-------+          +---------+   cable0   +---------+         +--------+
|       | disp in  |         +----------->|         | disp out|        |
|  soc  |--------->|  RK110  |   cable1   |  RK120  +-------->| screen |
|       |          |         +----------->|         |         |        |
+-------+          +---------+            +---------+         +--------+

1 video source input, 2 channel, 2 lane, 2 remote, 2 video output:
                                          +---------+         +--------+
                                  cable0  |         |disp0 out|        |
                                 +------->|  RK120  +-------->| screen |
                                 |        |         |         |        |
+-------+          +---------+   |        +---------+         +--------+
|       | disp in  |         +---+
|  soc  |--------->|  RK110  |
|       |          |         +---+
+-------+          +---------+   |        +---------+         +--------+
                                 |cable1  |         |disp1 out|        |
                                 +------->|  RK120  +-------->| screen |
                                          |         |         |        |
                                          +---------+         +--------+

1 video source input, 2 channel, 1 lane, 1 remote, 2 video output:
                                                              +--------+
                                                     lvds0_tx |        |
                                                         +--->| screen |
+-------+          +---------+            +---------+    |    |        |
|       | disp in  |         |   cable0   |         |----+    +--------+
|  soc  |--------->|  RK110  +----------->|  RK120  |
|       |          |         |            |         |----+    +--------+
+-------+          +---------+            +---------+    |    |        |
                                                         +--->| screen |
                                                     lvds1_tx |        |
                                                              +--------+

2 video source input, 2 channel, 1 lane, 1 remote, 2 video output:
                                                              +--------+
                                                     lvds0_tx |        |
                                                         +--->| screen |
+-------+ disp0_rx +---------+            +---------+    |    |        |
|       |--------->|         |   cable0   |         |----+    +--------+
|  soc  | disp1_rx |  RK110  +----------->|  RK120  |
|       |--------->|         |            |         |----+    +--------+
+-------+          +---------+            +---------+    |    |        |
                                                         +--->| screen |
                                                     lvds1_tx |        |
                                                              +--------+

2 video source input, 2 channel, 2 lane, 1 remote, 2 video output:
                                                              +--------+
                                                     lvds0_tx |        |
                                                         +--->| screen |
+-------+ disp0_rx +---------+   cable0   +---------+    |    |        |
|       |--------->|         +----------->|         |----+    +--------+
|  soc  | disp1_rx |  RK110  |   cable1   |  RK120  |
|       |--------->|         +----------->|         |----+    +--------+
+-------+          +---------+            +---------+    |    |        |
                                                         +--->| screen |
                                                     lvds1_tx |        |
                                                              +--------+

2 video source input, 2 channel, 2 lane, 2 remote, 2 video output:
                                          +---------+         +--------+
                                  cable0  |         |disp0 out|        |
                                 +------->|  RK120  +-------->| screen |
                                 |        |         |         |        |
+-------+ disp0_rx +---------+   |        +---------+         +--------+
|       |--------->|         +---+
|  soc  | disp1_rx |  RK110  |
|       |--------->|         +---+
+-------+          +---------+   |        +---------+         +--------+
                                 |cable1  |         |disp1 out|        |
                                 +------->|  RK120  +-------->| screen |
                                          |         |         |        |
                                          +---------+         +--------+

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Ifbf44ff7d5dcab668b50cf101d8dbff10dc71467
2023-09-11 11:38:21 +08:00
Tao Huang
6730282994 Merge commit '6904d47493f4ae8f3a8981a7c1e4017e093c2fea'
* commit '6904d47493f4ae8f3a8981a7c1e4017e093c2fea':
  arm64: dts: rockchip: add rk3568m serdes evb support
  arm64/configs: rockchip_linux_defconfig: enable CONFIG_MFD_RKX110_X120
  arm64: configs: rockchip_defconfig: enable CONFIG_MFD_RKX110_X120
  dt-bindings: mfd: add rkx110_x120 document
  ASoC: rockchip: rk817-codec: always enable mclk
  arm64: dts: rockchip: rk3562-amp: support ap core for amp

Change-Id: I66f301c6ce16f8ba4b3f2b8d91ea24597ee708df
2023-09-11 11:33:20 +08:00
Tao Huang
f17a90bc8b Merge commit '7921dda22e1730a2ee3cf48d8dd5bdd2befee70f'
* commit '7921dda22e1730a2ee3cf48d8dd5bdd2befee70f':
  arm64: configs: rockchip_linux_defconfig: enable rockchip edac
  arm64: configs: rockchip_defconfig: enable rockchip edac
  arm64: dts: rockchip: rk3568: add edac device

Conflicts:
	arch/arm64/boot/dts/rockchip/rk3568.dtsi
	arch/arm64/configs/rockchip_linux_defconfig

Ignore:
commit fbd623f51a ("arm64: dts: rockchip: rk3568: add edac device")
commit 7921dda22e ("arm64: configs: rockchip_linux_defconfig: enable rockchip edac")

Change-Id: Iad480060d2465b9743fb50801e1d0a29eddaca67
2023-09-11 11:30:32 +08:00
Zhihuan He
a66971406e arm64: configs: rockchip_linux_defconfig: enable rockchip edac
The EDAC depends on RAS config

Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
Change-Id: Ie3c9b6150e792cb1bca395f630bf35da82168f2b
2023-09-11 11:21:18 +08:00
Zhihuan He
de8e6d9889 arm64: dts: rockchip: rk3568: add edac device
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
Change-Id: If8f65c9a15ebd89b46e480f9f7517c62d4921e3b
2023-09-11 10:48:30 +08:00
Tao Huang
dead21504e Merge commit 'abd61db9d69e17126436259705e58fd6cc74a8f5'
* commit 'abd61db9d69e17126436259705e58fd6cc74a8f5':
  edac: rockchip: add edac driver
  arm64: dts: rockchip: rk3562: Add arm_pmu label
  media: rockchip: vicap: fixes rv1126/rk3568 bt1120/bt656 buffer timestamp
  ARM: configs: rockchip: Update rv1106-tb-nofastae.config
  media: rockchip: isp: support unite mode for isp32
  PCI: rockchip: dw: Save and restore PCIE_CLIENT_INTR_MASK_LEGACY in PM
  ARM: dts: rockchip: rv1106-thunder-boot: set rkvenc clock to 410000000
  rpmsg: rockchip_test: add new device id for mcu
  arm64: dts: rockchip: rk3562-amp: change rpmsg shared memory address
  arm64: dts: rockchip: rk3562-amp: set mailbox txpoll to 1 ms
  ARM: dts: rockchip: add rv1106g-evb2-v12-nofastae-spi-nor
  ARM: dts: rockchip: add rv1106g-evb2-v12-nofastae-emmc
  ARM: dts: rockchip: Add rv1106 nofastae dtsi
  ARM: configs: rockchip: Add rv1106-tb-nofastae.config
  ASoC: codecs: Add tda7803 amplifier driver support
  clk: rockchip: rk3568: Add protect clocks
  drm/bridge: dw-hdmi-qp: Don't read edid again if edid is exist

Change-Id: I2db1ef5fd1c89b634bf2500e25f479568cf1c60e
2023-09-11 10:39:48 +08:00
Tao Huang
7bbab4044b Merge commit 'd772f406a5977e912d64e1fbadab79dc9491dcba'
* commit 'd772f406a5977e912d64e1fbadab79dc9491dcba':
  drm/bridge: dw-hdmi-qp: Add hdcp driver

Ignore:
commit d772f406a5 ("drm/bridge: dw-hdmi-qp: Add hdcp driver")

Change-Id: I39f4c73d8b82495dd081c418219f41eba5a940a4
2023-09-11 10:38:51 +08:00
Algea Cao
1856ef00c4 drm/bridge: dw-hdmi-qp: Add hdcp driver
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ic71fc6c8345c9e2987e9f2507d7ba4e0eaf90a1e
2023-09-11 10:22:34 +08:00
Tao Huang
49ce5dfb59 Merge commit 'ce2a8c86e69728b10c3464ca78f5cee2f0f4d5a8'
* commit 'ce2a8c86e69728b10c3464ca78f5cee2f0f4d5a8':
  arm64: dts: rockchip: rk3588: Add hdmitx hdcp14 ext memory
  arm64: configs: rockchip_linux_defconfig: enable CONFIG_DTC_SYMBOLS
  arm64: dts: rockchip: rk3568: add rk3568-evb8-lp4-v10 support
  ARM: dts: rockchip: rv1106-evb-cam: add sc3338
  ARM: configs: rv1106-smart-door: enable SC230AI and SC301IOT
  arm64: dts: rockchip: fix timing configs of panel k350c4516t for rk3308/rk3562 evb
  media: rockchip: vicap fixes error of buffer state while start stream failed
  media: i2c: nvp6158: add g_frame_interval ops
  clk: rockchip: rk3328: set ddr clk with sip call

Change-Id: I231375375df56506d8014984e64b8460fc5bc0a0
2023-09-11 10:06:51 +08:00
Tao Huang
a1e2fc94a2 Merge commit '1d8465b558b4e7c938cf1fb4f91f74aa2d96f943'
* commit '1d8465b558b4e7c938cf1fb4f91f74aa2d96f943':
  Revert "dt-bindings: regulator: Document Rockchip RK860X regulators"

Ignore:
commit 1d8465b558 ("Revert "dt-bindings: regulator: Document Rockchip RK860X regulators"")

Change-Id: I9dda147a7e85193580f542f47bd11e55f3415ffc
2023-09-11 09:52:10 +08:00
Tao Huang
f1c8b07190 Merge commit '57abe4bda2a81ca20c5ca15784d31b91adad1f3d'
* commit '57abe4bda2a81ca20c5ca15784d31b91adad1f3d':
  arm64: dts: rockchip: rk3568-evb: assign DCLK_VOP2 to PLL_GPLL
  ARM: dts: rockchip: update rk5640 and hdmi sound for rk3288 evb boards
  media: rockchip: isp: fix underperformance for frame two-run
  arm64: dts: rockchip: rk3528-demo6-ddr3-v10: fix typo
  media: i2c: lt6911uxe/lt7911uxc: remove vendor limit of get dcphy param
  ARM: dts: rockchip: rv1106g-smart-door: increase ramdisk from 5/10 to 7/15
  media: i2c: gc2093 fastboot support hdr
  media: rockchip: isp: fix image effect for frame two-run
  drm/rockchip: vop2: enable cluster frame reset for rk3588
  video: rockchip: rga3: fix the cache sync issue with physically contiguous virt_addr
  arm64: configs: rockchip_defconfig: disabled rk_nand

Change-Id: I9b2b71da560bc827fbbb63ff843ac64aca41f0cd
2023-09-11 09:49:49 +08:00
Tao Huang
8cb29dc13d Merge commit 'd96b0b6b9c60be63316e5d893596cad7ae9e5d56'
* commit 'd96b0b6b9c60be63316e5d893596cad7ae9e5d56':
  arm64: dts: rockchip: rk3568: set remark info for specification_serial_number

Ignore:
commit d96b0b6b9c ("arm64: dts: rockchip: rk3568: set remark info for specification_serial_number")

Change-Id: Iebe501685e2e11086ac2680ac887adf652f5dda8
2023-09-11 09:48:08 +08:00
Liang Chen
6cf673a9fc arm64: dts: rockchip: rk3568: set remark info for specification_serial_number
Change-Id: I576d265f7707389c36e2d4927856c66fc7be61b5
Signed-off-by: Liang Chen <cl@rock-chips.com>
2023-09-11 09:44:54 +08:00
Tao Huang
897e2b4c53 Merge commit '9a5b27ee9a553a873bc6f8a77416c6b1dc2b677b'
* commit '9a5b27ee9a553a873bc6f8a77416c6b1dc2b677b':
  soc: rockchip: opp_select: support remark specification_serial_number
  media: i2c: otp_eeprom: add pd_offset in pdaf part
  ARM: configs: rk3308bs_aarch32_mipi_display enable CONFIG_DRM_IGNORE_IOTCL_PERMIT

Change-Id: I5e6a2ac01a62ad5ad5676b468c0867df2333ce95
2023-09-11 09:36:21 +08:00
Andy Yan
95f83adcf6 mfd: Add rockchip rkx110/x120 serdes support
support display topologys as follow:
1 video source input, 1 channel, 1 lane, 1 remote, 1 video output:
+-------+          +---------+            +---------+         +--------+
|       | disp in  |         |   cable0   |         | disp out|        |
|  soc  |--------->|  RK110  +----------->|  RK120  +-------->| screen |
|       |          |         |            |         |         |        |
+-------+          +---------+            +---------+         +--------+

1 video source input, 1 channel, 2 lane, 1 remote, 1 video output:
+-------+          +---------+   cable0   +---------+         +--------+
|       | disp in  |         +----------->|         | disp out|        |
|  soc  |--------->|  RK110  |   cable1   |  RK120  +-------->| screen |
|       |          |         +----------->|         |         |        |
+-------+          +---------+            +---------+         +--------+

1 video source input, 2 channel, 2 lane, 2 remote, 2 video output:
                                          +---------+         +--------+
                                  cable0  |         |disp0 out|        |
                                 +------->|  RK120  +-------->| screen |
                                 |        |         |         |        |
+-------+          +---------+   |        +---------+         +--------+
|       | disp in  |         +---+
|  soc  |--------->|  RK110  |
|       |          |         +---+
+-------+          +---------+   |        +---------+         +--------+
                                 |cable1  |         |disp1 out|        |
                                 +------->|  RK120  +-------->| screen |
                                          |         |         |        |
                                          +---------+         +--------+

1 video source input, 2 channel, 1 lane, 1 remote, 2 video output:
                                                              +--------+
                                                     lvds0_tx |        |
                                                         +--->| screen |
+-------+          +---------+            +---------+    |    |        |
|       | disp in  |         |   cable0   |         |----+    +--------+
|  soc  |--------->|  RK110  +----------->|  RK120  |
|       |          |         |            |         |----+    +--------+
+-------+          +---------+            +---------+    |    |        |
                                                         +--->| screen |
                                                     lvds1_tx |        |
                                                              +--------+

2 video source input, 2 channel, 1 lane, 1 remote, 2 video output:
                                                              +--------+
                                                     lvds0_tx |        |
                                                         +--->| screen |
+-------+ disp0_rx +---------+            +---------+    |    |        |
|       |--------->|         |   cable0   |         |----+    +--------+
|  soc  | disp1_rx |  RK110  +----------->|  RK120  |
|       |--------->|         |            |         |----+    +--------+
+-------+          +---------+            +---------+    |    |        |
                                                         +--->| screen |
                                                     lvds1_tx |        |
                                                              +--------+

2 video source input, 2 channel, 2 lane, 1 remote, 2 video output:
                                                              +--------+
                                                     lvds0_tx |        |
                                                         +--->| screen |
+-------+ disp0_rx +---------+   cable0   +---------+    |    |        |
|       |--------->|         +----------->|         |----+    +--------+
|  soc  | disp1_rx |  RK110  |   cable1   |  RK120  |
|       |--------->|         +----------->|         |----+    +--------+
+-------+          +---------+            +---------+    |    |        |
                                                         +--->| screen |
                                                     lvds1_tx |        |
                                                              +--------+

2 video source input, 2 channel, 2 lane, 2 remote, 2 video output:
                                          +---------+         +--------+
                                  cable0  |         |disp0 out|        |
                                 +------->|  RK120  +-------->| screen |
                                 |        |         |         |        |
+-------+ disp0_rx +---------+   |        +---------+         +--------+
|       |--------->|         +---+
|  soc  | disp1_rx |  RK110  |
|       |--------->|         +---+
+-------+          +---------+   |        +---------+         +--------+
                                 |cable1  |         |disp1 out|        |
                                 +------->|  RK120  +-------->| screen |
                                          |         |         |        |
                                          +---------+         +--------+

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Ifbf44ff7d5dcab668b50cf101d8dbff10dc71467
2023-09-08 16:17:18 +08:00
Guochun Huang
6904d47493 arm64: dts: rockchip: add rk3568m serdes evb support
Change-Id: Ia9e6580fa591076741f9e33ff2142df71f503b89
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
2023-09-08 16:13:28 +08:00
Caesar Wang
997dc09f43 arm64/configs: rockchip_linux_defconfig: enable CONFIG_MFD_RKX110_X120
Change-Id: I46b6b7c4941b9809c267f6efc4a504bc62ddea33
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2023-09-08 16:13:28 +08:00
Guochun Huang
86a4b8b789 arm64: configs: rockchip_defconfig: enable CONFIG_MFD_RKX110_X120
enable the rkx110/rkx120 serdes driver use on rk3568m-serdes-evb

Change-Id: I5f7f8df6a4b9e4c7d95916b22e7db846d4bd0bc1
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-09-08 16:13:28 +08:00
Zhang Yubing
933f963be6 dt-bindings: mfd: add rkx110_x120 document
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: I3bc8ec325b05b743ddc73e2f7a2786c3836dfce0
2023-09-08 16:13:28 +08:00
Binyuan Lan
51da9567aa ASoC: rockchip: rk817-codec: always enable mclk
Change-Id: Id2a87aaf665c8f1030b425e7e7fa4727401ac70b
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2023-09-08 16:00:43 +08:00
Wang Panzhenzhuan
4607f7fefc media: i2c: nvp6158: fix compile error
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Id36fe8c5cb3476292f4634e410e1699198e5181e
2023-09-08 15:59:00 +08:00
Steven Liu
02e897ae7c arm64: dts: rockchip: rk3562-amp: support ap core for amp
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I5b70c643884ff236ab27a918d03fc278b9b1b377
2023-09-08 11:00:26 +08:00
Zhihuan He
7921dda22e arm64: configs: rockchip_linux_defconfig: enable rockchip edac
The EDAC depends on RAS config

Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
Change-Id: Ie3c9b6150e792cb1bca395f630bf35da82168f2b
2023-09-08 10:45:05 +08:00
Zhihuan He
abd61db9d6 edac: rockchip: add edac driver
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
Change-Id: I56a568718e47f86f7f152ec38f66e0ccbe99c6c1
2023-09-08 10:45:05 +08:00
Zhihuan He
5350178c98 arm64: configs: rockchip_defconfig: enable rockchip edac
The EDAC depends on RAS config

Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
Change-Id: Ib2b6fa9fa6f631a3d1e49af4ce96000a3bcaad79
2023-09-08 10:45:05 +08:00
Zhihuan He
fbd623f51a arm64: dts: rockchip: rk3568: add edac device
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
Change-Id: If8f65c9a15ebd89b46e480f9f7517c62d4921e3b
2023-09-08 10:45:05 +08:00
Steven Liu
3f737cad2d arm64: dts: rockchip: rk3562: Add arm_pmu label
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Idd6448f7121c021848f6b848bd27bd0c520ae9b1
2023-09-08 10:43:53 +08:00
Zhang Yubing
ba59aea9c5 drm/rockchip: cdn-dp: fix aux register failed issue
when register dp aux, the aux's drm_dev will be verified first.
if it is null, a issue will happen as follow:
[    3.155605][   T58] WARNING: CPU: 1 PID: 58 at drivers/gpu/drm/display/drm_dp_helper.c:2097 drm_dp_aux_register+0x104/0x114
[    3.155676][   T58] Modules linked in:
[    3.155720][   T58] CPU: 1 PID: 58 Comm: kworker/u12:2 Not tainted 6.1.25 #301
[    3.155763][   T58] Hardware name: Rockchip RK3399 EVB IND LPDDR4 Board edp (Android) (DT)
[    3.155799][   T58] Workqueue: events_unbound deferred_probe_work_func
[    3.155856][   T58] pstate: 80400005 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
[    3.155900][   T58] pc : drm_dp_aux_register+0x104/0x114
[    3.155946][   T58] lr : cdn_dp_bind+0x268/0x3d0
[    3.155991][   T58] sp : ffffffc00a7e3980
[    3.156020][   T58] x29: ffffffc00a7e3980 x28: ffffff800334b3d0 x27: ffffff800334b3c8
[    3.156082][   T58] x26: 0000000000000001 x25: 0000000000000003 x24: ffffff8002c48040
[    3.156141][   T58] x23: ffffff8003348ac0 x22: ffffff8003348080 x21: ffffff8002e9d410
[    3.156201][   T58] x20: ffffff8005923000 x19: ffffff8002c48968 x18: ffffffc00a7650b0
[    3.156260][   T58] x17: 706968636b636f72 x16: 00000000000000a4 x15: ffffffc00c000000
[    3.156319][   T58] x14: 0000000000000000 x13: 0000000000000030 x12: 000000000000014a
[    3.156378][   T58] x11: 0000000000000000 x10: 0000000000000001 x9 : ffffffc00996b8a1
[    3.156437][   T58] x8 : 0000000000000000 x7 : 0000000000000000 x6 : 0000008062743635
[    3.156495][   T58] x5 : 0000000000000008 x4 : ffffffc0098e1c5d x3 : ffffff8002e9d718
[    3.156554][   T58] x2 : ffffff8002e9d718 x1 : 0000000000000000 x0 : ffffff8002c48968
[    3.156614][   T58] Call trace:
[    3.156643][   T58]  drm_dp_aux_register+0x104/0x114
[    3.156693][   T58]  cdn_dp_bind+0x268/0x3d0
[    3.156738][   T58]  component_bind_all+0x130/0x25c
[    3.156786][   T58]  rockchip_drm_bind+0x164/0x298
[    3.156832][   T58]  try_to_bring_up_aggregate_device+0x168/0x1b4
[    3.156880][   T58]  __component_add+0xd0/0x17c
[    3.156925][   T58]  component_add+0x14/0x20
[    3.156969][   T58]  rockchip_dp_probe+0x36c/0x3d4
[    3.157013][   T58]  platform_probe+0xa8/0xd0
[    3.157062][   T58]  call_driver_probe+0x38/0xa8
[    3.157107][   T58]  really_probe+0x148/0x28c
[    3.157151][   T58]  __driver_probe_device+0xb4/0xe0
[    3.157195][   T58]  driver_probe_device+0x44/0x210
[    3.157239][   T58]  __device_attach_driver+0x12c/0x154
[    3.157284][   T58]  bus_for_each_drv+0x84/0xd0
[    3.157325][   T58]  __device_attach+0xf0/0x170
[    3.157368][   T58]  device_initial_probe+0x14/0x20
[    3.157412][   T58]  bus_probe_device+0x34/0x98
[    3.157454][   T58]  deferred_probe_work_func+0x7c/0xd8
[    3.157499][   T58]  process_one_work+0x1a8/0x3b8
[    3.157552][   T58]  worker_thread+0x300/0x430
[    3.157601][   T58]  kthread+0xec/0x1b8
[    3.157646][   T58]  ret_from_fork+0x10/0x20

To avoid this issue, assignment the drm_dev before register dp aux.

Fixes: aa310d2a5e ("FROMLIST: drm/rockchip: add transfer function for cdn-dp")
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ibc78b0ec26a0caa32d17bd87d9cb6e134a4aadc6
2023-09-08 10:20:00 +08:00
Zefa Chen
f3c467eca0 media: rockchip: vicap: fixes rv1126/rk3568 bt1120/bt656 buffer timestamp
due to rv1126/rk3566 dvp only support one channel of frame start interrupt,
unable to obtain accurate timestamp for each channel,
change it to use frame end time

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I564a9235e684f5558d7cc8a1e2665952b750a9c0
2023-09-08 09:22:39 +08:00
Weiwen Chen
09647ffee6 ARM: configs: rockchip: Update rv1106-tb-nofastae.config
Updated by:
    make ARCH=arm rv1106_defconfig
    cp .config rv1106.config
    make ARCH=arm rv1106_defconfig rv1106-tb.config rv1106-battery-ipc.config rv1106-tb-nofastae.config
    make ARCH=arm menuconfig
    ./scripts/diffconfig -m rv1106.config .config > arch/arm/configs/rv1106-tb-nofastae.config

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Id29b5d03d011497f7e7e479cae4edc77e04e0902
2023-09-07 16:11:47 +08:00
Cai YiWei
35d463f900 media: rockchip: isp: support unite mode for isp32
Change-Id: Iae10911ee0f199210c7913d3e99dd85ec4642f81
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-09-07 15:08:33 +08:00
Shawn Lin
ce7600d754 PCI: rockchip: dw: Save and restore PCIE_CLIENT_INTR_MASK_LEGACY in PM
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I35ca5baeb233827ba9b494fb0fddaa807e464fb2
2023-09-07 14:49:59 +08:00
Weiwen Chen
b91450d8c7 ARM: dts: rockchip: rv1106-thunder-boot: set rkvenc clock to 410000000
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I912f05b66d546197e748da1274f25461979eea61
2023-09-07 14:43:11 +08:00
Jiahang Zheng
85d050d65d rpmsg: rockchip_test: add new device id for mcu
Change-Id: I3c05237bac273ee6475678dd1cb7c9a3af0a268e
Signed-off-by: Jiahang Zheng <jiahang.zheng@rock-chips.com>
2023-09-07 14:38:21 +08:00
Jiahang Zheng
92bb1f717a arm64: dts: rockchip: rk3562-amp: change rpmsg shared memory address
Change-Id: Id50d36134fd0ded06a594dd6cf163e1f1bf97e4a
Signed-off-by: Jiahang Zheng <jiahang.zheng@rock-chips.com>
2023-09-07 14:35:57 +08:00
Jiahang Zheng
ce082f50d6 arm64: dts: rockchip: rk3562-amp: set mailbox txpoll to 1 ms
Change-Id: I5809679e016072e19334a3336f4c8b572672892a
Signed-off-by: Jiahang Zheng <jiahang.zheng@rock-chips.com>
2023-09-07 14:34:14 +08:00
Weiwen Chen
270c1dfde4 ARM: dts: rockchip: add rv1106g-evb2-v12-nofastae-spi-nor
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I28c8e65ac1b3c997140f9aed6efe2d3857f78c3b
2023-09-07 09:49:26 +08:00
Weiwen Chen
061e9815fd ARM: dts: rockchip: add rv1106g-evb2-v12-nofastae-emmc
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Iff6518bd618b1a747f38500291cc666bbeb080e0
2023-09-07 09:49:16 +08:00
Weiwen Chen
188bdeb461 ARM: dts: rockchip: Add rv1106 nofastae dtsi
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Id240c4238410a18dff6c14c129063ffbd10b7e37
2023-09-07 09:48:51 +08:00
Weiwen Chen
0fc248ba82 ARM: configs: rockchip: Add rv1106-tb-nofastae.config
Updated by:
    make ARCH=arm rv1106_defconfig rv1106-tb.config rv1106-battery-ipc.config
    cp .config rv1106.config
    make ARCH=arm rv1106_defconfig rv1106-tb.config rv1106-battery-ipc.config rv1106-tb-nofastae.config
    make ARCH=arm menuconfig
    ./scripts/diffconfig -m rv1106.config .config > arch/arm/configs/rv1106-tb-nofastae.config

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I12373396d5e06dae95da691a7a0889d23b3f263e
2023-09-07 09:47:28 +08:00
Jun Zeng
d0ad961087 ASoC: codecs: Add tda7803 amplifier driver support
Add driver to support TDA7803 amplifier devices.

Change-Id: Iceb83a801d7a9f4a7faa7b7617be63f93c57be76
Signed-off-by: Jun Zeng <jun.zeng@rock-chips.com>
2023-09-07 09:21:22 +08:00
Elaine Zhang
f731199376 clk: rockchip: rk3568: Add protect clocks
Change-Id: I21571988341288f98444719694c2cc195cb2f313
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2023-09-07 09:12:18 +08:00
Algea Cao
d772f406a5 drm/bridge: dw-hdmi-qp: Add hdcp driver
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ic71fc6c8345c9e2987e9f2507d7ba4e0eaf90a1e
2023-09-05 19:03:14 +08:00
Algea Cao
ce2a8c86e6 arm64: dts: rockchip: rk3588: Add hdmitx hdcp14 ext memory
KSV list/M0/B-STATUS are saved in hdcp1.4 external memory.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I4670260dc4b82563e9396d641fafb579ef130fca
2023-09-05 19:03:14 +08:00
Algea Cao
7168fdec08 drm/bridge: dw-hdmi-qp: Don't read edid again if edid is exist
Reading edid only after plug in or resume.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I0b69a26d9caeebf81f360bc8674aeacf964fd807
2023-09-05 19:03:14 +08:00
Nickey Yang
8492cfd48c arm64: configs: rockchip_linux_defconfig: enable CONFIG_DTC_SYMBOLS
dtb overlays is used to support px30s.

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: I47a20ec36d22148d4264bd4cefd810585acc184b
2023-09-05 17:14:09 +08:00
Jianlong Wang
46c9ff0e79 arm64: dts: rockchip: rk3568: add rk3568-evb8-lp4-v10 support
Change-Id: I64676ce9bb9c4adf366d48d275ccb13ae96e6bd0
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
2023-09-05 14:15:05 +08:00
Weiwen Chen
d50c2bcc38 ARM: dts: rockchip: rv1106-evb-cam: add sc3338
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: If5d01edf6b811638e7a77e89089afc796efa4d0a
2023-09-04 19:42:21 +08:00
Tao Huang
e2f3daffbb arm64: rk3308_linux_defconfig: Enable CONFIG_WERROR
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If381ffd1242d56c1e7d3219728ab4769a75f6553
2023-09-04 19:17:08 +08:00