Commit Graph

1080740 Commits

Author SHA1 Message Date
Yu Qiaowei
ce094aa86b video: rockchip: rga3: changing to close acquire_fence_fd in user-space
Since GKI disables closing fd in the kernel, the acquire fence fd should be
closed in user-space.

Update driver version to 1.3.0

Change-Id: I9bf85d6a39b3564332fc00dc9fce01678dc1ce3b
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2023-09-13 18:16:22 +08:00
Yu Qiaowei
9e5cbd33fc video: rockchip: rga3: add check_csc
Change-Id: I178d07038e233b9cf8943f57660e61bf7e64bcd2
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2023-09-13 18:16:22 +08:00
Yu Qiaowei
4beff868e2 video: rockchip: rga3: add full_csc clip config
Change-Id: I197b68977ab7be01837967b2b85596e897cd4d99
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2023-09-13 18:16:22 +08:00
Yu Qiaowei
de4171ded6 video: rockchip: rga3: add full_csc enable
Change-Id: Ie0374d89676ef828bd1980fc9524f58cba2bfd15
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2023-09-13 18:16:22 +08:00
Yu Qiaowei
7291693b01 video: rockchip: rga3: compatible with legacy global alpha config
Change-Id: I8dcccad5638f1fa7f16dcd9945562596cae047bc
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2023-09-13 18:16:22 +08:00
Yu Qiaowei
9550ca04e8 video: rockchip: rga3: replace magic numbers with enum
Change-Id: I3b46be2e17e07e165bb0ef4c7603038defefea88
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2023-09-13 18:16:22 +08:00
Yu Qiaowei
9312cd2335 video: rockchip: rga3: support fg/bg global alpha
Change-Id: I64d2446d494e179e9e2024c14bc768c2ed0dca47
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2023-09-13 18:16:22 +08:00
Luo Wei
563845b474 mfd: display-serdes: add serdes display driver support base on mfd arch
* i2c register initialization with dts sequence from serdes chip vendor.
* pinctrl and gpio interface to operate the different serdes chips.
* bridge interface to transmit data for different ser chips.
* panel interface to drive lcds for different des chips.
* one ser chip to connect two des chips in order to costdown.
* support different serdes display chip such as maxim, rohm and rockchip.

Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: Ic8f3558b8ea8ee3d5297bdf2551308e82925304a
2023-09-13 15:19:23 +08:00
Jianwei Zheng
22d153d2eb phy: rockchip-inno-usb2: fix USB OTG not working in HOST mode for RK3328
On current code, We check the iddig status to make sure that the id
status is indeed in low level, and then send HOST notification and
power on phy based on this state. But On some Rockchip platforms like
RK3328, the ID Detector pin is not cited, the default state of ID pin
is floating, so the iddig status is always 1 which means in device mode.

To resolve this problem, We need to further check whether usb2phy_reg
structure of utmi_iddig has been initialized or not. If not, We can't
use the iddig status as a judgment condition.

Signed-off-by: Jianwei Zheng <jianwei.zheng@rock-chips.com>
Change-Id: Ia16365d79015b81fa8aff2fd7a1c61256b38aa3d
2023-09-12 17:24:35 +08:00
Algea Cao
1e49b6a722 arm64: dts: rockchip: rk3528: Remove ddc gpio control during hotplug
The ddc control is designed to be compatible with the leakage
problem of a Konka TV. However, in actual use, it will lead
to the phenomenon of abnormally low hpd in many TVS.

Fixes: 836989af54a6 ("arm64: dts: rockchip: rk3528: Add hdmi ddc io idle state")
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ia5c3fe53a702d5b209d5170d0aceb5a559d40e39
2023-09-12 15:08:13 +08:00
Shunhua Lan
75810f87c9 media: i2c: it6616: create hdmirx_class devices
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I9e2cf3c8330504124931f79d111bfa3fb54462db
2023-09-12 14:32:10 +08:00
Shunhua Lan
6e85806bc9 media: i2c: lt6911uxc: create hdmirx_class devices
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I61c840d812b88554aa154bfc7c1435e1345d287e
2023-09-12 14:32:10 +08:00
Shunhua Lan
d40268f32a media: i2c: rk628: add hdmirx device attribute
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: If4a57926e6aaf85e9c636bf5af481249ef4720fa
2023-09-12 14:32:10 +08:00
Shunhua Lan
2f31555896 media: rockchip: hdmirx: do not create hdmirx_class
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I9f0cee966c89c0251ff1b1faa65208681329f014
2023-09-12 14:32:10 +08:00
Shunhua Lan
3b5e5eae97 media: rockchip: hdmirx: create hdmirx class
There will be many hdmirx devices in Rockchip SOCs
Here create a hdmirx class for those hdmirx devices

Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: Id47af8a01b94c37e2bc40c5671f64cf9f3deebee
2023-09-12 14:32:10 +08:00
Xu Xuehui
5f0df65cbb arm64: dts: rockchip: rk3588-vehicle-evb enable uart7 for GNSS
Change-Id: I110f2bb428f349c5555de6df0e39a17acd8dbea4
Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
2023-09-12 10:42:49 +08:00
Li Hangyu
768fa27106 ARM: dts: rv1106g-trailcam: Add Tracking camera configuration
Change-Id: I0ea587ca2abe5ffa4baf20f295e38632332d5bea
Signed-off-by: Li Hangyu <hangyu.li@rock-chips.com>
2023-09-12 10:12:11 +08:00
Cai YiWei
443f730910 media: rockchip: isp: version v2.3.0
Change-Id: Ib8bf141ca7deba063b00c97618ad9384427c4b35
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-09-12 10:01:27 +08:00
Li Hangyu
6487813a9b ARM: configs: rv1106-trailcam: Tracking camera configuration
Update by:

make ARCH=arm rv1106_defconfig rv1106-tb.config
cp .config rv1106.config
make ARCH=arm rv1106_defconfig rv1106-tb.config rv1106-trailcam.config
make ARCH=arm menuconfig
./scripts/diffconfig -m rv1106.config .config > arch/arm/configs/rv1106-trailcam.config

Change-Id: I9909876862cac0e819640d5c9627b39b4712740f
Signed-off-by: Li Hangyu <hangyu.li@rock-chips.com>
2023-09-12 09:46:16 +08:00
William Wu
b5b456cf9a usb: dwc3: rockchip-inno: add Kconfig and Makefile
Change-Id: I123cea9cd3535b7fe112bc36767377ba796e036c
Signed-off-by: William Wu <william.wu@rock-chips.com>
Signed-off-by: Jianwei Zheng <jianwei.zheng@rock-chips.com>
2023-09-09 09:45:15 +08:00
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