shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity
1,080,520 Commits 55 Branches 2,486 Tags
2ceea71ac327b53dd05e042c26ace94ef26f8a0c
Commit Graph

1080520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Algea Cao
2ceea71ac3 drm: bridge: dw-hdmi: Don't print hdr error log when switch resolution 
RK3288 isn't support hdr, there is not need to print an error
log when switch resolution.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I28c0abcbb421c1c868302f960591e56c015dc77d
 2023-09-08 17:08:03 +08:00
Algea Cao
78ece52290 drm/rockchip: dw_hdmi: Fix *ERROR* Unknown property [PROP:157:allm_enable] 
After the property is set, 0 should be returned;

Change-Id: I0908356164942e0a3fb48f0db3675a859d8a69f2
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
 2023-09-08 16:55:44 +08:00
Algea Cao
cb7ae97935 ARM: dts: rockchip: rk3288-evb-rk808-linux: Fix hdmi switch resolution error 
When hdmi is bound to vopb and vopl at the same time,
the resolution that hdmi does not support is not filtered properly.
When the resolution is set, the drm will return an error, resulting
in a failure to switch the resolution.

Change-Id: Ie2d1723a35ba92414edd472bd3cc92aab84b4ec2
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
 2023-09-08 16:55:26 +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
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
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
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
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
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
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
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
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
Elon Zhang
3aaeb74c45 ARM: configs: rv1106-smart-door: enable SC230AI and SC301IOT 
Signed-off-by: Elon Zhang <zhangzj@rock-chips.com>
Change-Id: I61b85f02aae234fadb32912a9886823f0ce89076
 2023-09-04 18:40:52 +08:00
Damon Ding
b6480bb345 arm64: dts: rockchip: fix timing configs of panel k350c4516t for rk3308/rk3562 evb 
1. Modify mcu-timing configs according to panel datasheet.
2. Modify clock-frequency config sync with mcu-timing
   configs.
3. Add more comments for panel initialization sequence.
4. Add 10ms delay before sending initialization sequence
   to make sure the reset gpio output a low pulse.
5. Remove unused parameter reset-value.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I76b0aa6d1a7fba432f500cacb9ce7ff74989c0f1
 2023-09-04 18:40:35 +08:00
Zefa Chen
bbf279ef2a media: rockchip: vicap fixes error of buffer state while start stream failed 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I8f96607529c703fcc4c8c1f5eea6df08fec319c3
 2023-09-04 18:27:56 +08:00
Wang Panzhenzhuan
458aa0791e media: i2c: nvp6158: add g_frame_interval ops 
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I93423521b22916d1be9bb93d56777ee586b0823b
 2023-09-04 06:31:33 +00:00
Liang Chen
4a3fcb9e1b clk: rockchip: rk3328: set ddr clk with sip call 
We need use sip call to change ddr frequency.

Change-Id: I6ad4516306f0cb7c3e0a7124c21ee9fedfd9d055
Signed-off-by: Liang Chen <cl@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
 2023-09-04 11:12:30 +08:00
Tao Huang
1d8465b558 Revert "dt-bindings: regulator: Document Rockchip RK860X regulators" 
This reverts commit ba3959aef3.
After commit 58461615ac ("regulator: rk860x: fix the chip id error"),
rk8603/rk8604 support is moved to rk860x-regulator.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1229b2f859ae7123f3b1897f999c13ba5e5cf7d8
 2023-09-04 09:49:06 +08:00
Damon Ding
57abe4bda2 arm64: dts: rockchip: rk3568-evb: assign DCLK_VOP2 to PLL_GPLL 
If not assigned, the clock parent of DCLK_VOP2 will be
PLL_HPLL in uboot, which affects HDMI display.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Ife948de756281ed197413301ce1b05ddb80fe3d9
 2023-09-01 20:52:32 +08:00
Caesar Wang
14827047b4 ARM: dts: rockchip: update rk5640 and hdmi sound for rk3288 evb boards 
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I2eae296460ee94430e18f5036d26b89c78ea1f8f
 2023-09-01 20:48:02 +08:00
Cai YiWei
4fddb54054 media: rockchip: isp: fix underperformance for frame two-run 
Change-Id: I525ecbbbb56e9851f4b5f970663f54a5c95a3fcd
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-09-01 18:18:16 +08:00
Qiqi Zhang
c173b6c0c1 arm64: dts: rockchip: rk3528-demo6-ddr3-v10: fix typo 
rk805,system-power-controoler -> rockchip,system-power-controller

Change-Id: I8c39fb00ce5cb22d6fafc46d506725d7557c6c49
Signed-off-by: Qiqi Zhang <eddy.zhang@rock-chips.com>
 2023-09-01 15:26:20 +08:00
Jianwei Fan
a9d77893d9 media: i2c: lt6911uxe/lt7911uxc: remove vendor limit of get dcphy param 
Change-Id: I09028fcbba05f4bec3647c68ad1dbb48d4e113dd
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
 2023-09-01 15:25:34 +08:00
Wang Xiaobin
a11451d158 ARM: dts: rockchip: rv1106g-smart-door: increase ramdisk from 5/10 to 7/15 
Because of the size increase in librkaiq, librockit, librockchip_mpp
and face models, and cause the ramdisk size increase:
    ramdisk_r + 1408KB
    ramdisk_c + 547KB
The increase of ramdisk_c cause the startup speed increase: + 7ms
(test in SPI NOR flash).

Signed-off-by: Wang Xiaobin <xb.wang@rock-chips.com>
Change-Id: I40bd2cbc93021c56359fd625f029747b36e2f414
 2023-09-01 15:24:58 +08:00
Sisyphean Zhou
97aa45b328 media: i2c: gc2093 fastboot support hdr 
Signed-off-by: Sisyphean Zhou <sisyphean.zhou@rock-chips.com>
Change-Id: I42233a5c897534ad89f3318186404836aafcc92c
 2023-09-01 09:21:34 +08:00
Cai YiWei
da9d34f7cf media: rockchip: isp: fix image effect for frame two-run 
Change-Id: Ic1a35142204b6edfb579e0f8c255841f24cfec06
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-09-01 09:10:44 +08:00
Sandy Huang
6ac6f5a7b3 drm/rockchip: vop2: enable cluster frame reset for rk3588 
without this commit, the cluster maybe display splash screen in some scenarios
at low logic voltage.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I8dc7c77df4431ee8d6695d626cd1f139b7d0a5c8
 2023-08-31 20:46:24 +08:00