Commit Graph

37 Commits

Author SHA1 Message Date
Tao Huang
d4ae9d6ea7 Merge commit '40fac1a66ccf61bdf3afb70c18a5db7791410b22'
* commit '40fac1a66ccf61bdf3afb70c18a5db7791410b22': (220 commits)
  Revert "tee: optee: interrupt an RPC when supplicant has been killed"
  Revert "tee: optee: interrupt an RPC depend on shutdown flag"
  arm64: dts: rockchip: rv1126bp-evb-v14: Adjust the matching voltage
  media: rockchip: aiisp: delete one temp buffer to reduce memory
  media: rockchip: isp: mp output buf notice to aiisp
  media: rockchip: aiisp: modify for aiynr algo
  rtc: rockchip: add ready flag for rtc setting time
  soc: rockchip: cpuinfo: export chip unique id to userspace
  media: rockchip: vpss: offline mode support auto unite output
  drm/rockchip: vop2: Add "DIMMING_DATA" property for local dimming
  media: rockchip: isp: aiisp switch for offline mode
  media: rockchip: isp: aiisp switch for isp35
  media: rockchip: isp: support aiisp yuv mode
  input: touchscreen: gt1x: prefix global variables and functions with "gt1x_"
  MALI: valhall: add gpu mem sysfs entry
  drm/rockchip: Make the DRM panel as part of Rockchip DRM sub devices for panel loader protect
  drm/rockchip: Pass struct rockchip_drm_sub_dev for &rockchip_drm_sub_dev.loader_protect()
  pwm: rockchip: Add &rockchip_pwm_chip.oneshot_valid to indicate validity of configurations
  pwm: rockchip: Add comments for why to add delay before disabling the dclk for PWM v4
  input: touchscreen: hyn: reduce logs
  ...

Change-Id: I1b562efca0842173010b2506231d7200a5116e5a
2025-07-29 17:16:09 +08:00
Tao Huang
4f8f563fd2 arm64: dts: rockchip: rockchip_headset: switch to using gpiod API
sed -i \
-e 's/headset_gpio/headset-gpios/' \
-e 's/hook_gpio/hook-gpios/' \
$(git grep --name-only '"rockchip_headset"' arch/arm64/boot/dts/rockchip/)

Change-Id: Iacd6ab1252ab17b2248688cdbe6090877f897800
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2025-07-25 17:16:18 +08:00
Tao Huang
96ba0fabb7 arm64: dts: rockchip: rfkill switch to use gpiod
sed -i \
-e 's/uart_rts_gpios/uart_rts-gpios/' \
-e 's/BT,power_gpio/BT,power-gpios/' \
-e 's/BT,reset_gpio/BT,reset-gpios/' \
-e 's/BT,wake_gpio/BT,wake-gpios/' \
-e 's/BT,wake_host_irq/BT,wake_host-gpios/' \
-e 's/WIFI,poweren_gpio/WIFI,poweren-gpios/' \
-e 's/WIFI,vbat_gpio/WIFI,vbat-gpios/' \
-e 's/WIFI,reset_gpio/WIFI,reset-gpios/' \
-e 's/WIFI,host_wake_irq/WIFI,host_wake-gpios/' \
(git ls-files arch/arm64/boot/dts/rockchip/)

Change-Id: I8d5b76f4a666ecbeaacd5d3257521bcc4860e81c
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2025-07-25 12:22:53 +08:00
Zhibin Huang
4f3c5c6bc7 arm64: dts: rockchip: Add hyn touchscreen support
Type: Function
Redmine ID: #N/A
Associated modifications: I649a447919003574d907b83b10ba3fd7496ad492
Test: N/A

Signed-off-by: Zhibin Huang <zhibin.huang@rock-chips.com>
Change-Id: I310e7bf9f743accd3bc9b1f26c30a6b4fc3cd3c7
2025-06-27 01:26:16 +00:00
Wang Panzhenzhuan
7c8198aa9a arm64: dts: rockchip: rk356x evb boards: add vcm config
add vcm config for ov5695 & gc8034 module

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I904cfbf90b5b2aa9ece56df2832a5ef382bfa308
2024-11-28 11:35:47 +08:00
Caesar Wang
f148c41378 arm64: dts: rockchip: rk3566/rk3568 boards: Fix pinctrl configuration for wireless-bluetooth
The Linux OS uses the device tree to detect the wifibt module,
particularly the Bluetooth module's UART, identified via
`/sys/firmware/devicetree/base/pinctrl/wireless-bluetooth`.

Some RK3566/RK3568 board configurations redundantly register the pinctrl
for wireless-bluetooth, causing script failures in UART identification.

This commit removes the redundant node to resolve conflicts and ensure
correct UART identification for Bluetooth communication.

Change-Id: Id55c48bda38275c04a365b0ede1f740baf767da2
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2024-07-23 18:37:05 +08:00
Jon Lin
2586765a7c arm64: dts: rockchip: rk356x boards: Fix to regulator to unique name
Change-Id: I113c8f14c8386bd16d81775459b9ca4b51e47f68
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2024-02-29 17:10:41 +08:00
Zou Dengming
0d1ab9be85 arm64: dts: rockchip: rk356x boards: prepare bt sco settings
we don't directly enable all evb board to support bt-sco cards
because it may take some i2s/pcm, which may use dma,
but dmas may limit.

so we just prepare this settings, then if any one who want to
support bt-sco, he/she can just add dts in board-level dts.

now, we just enable rk3568-evb1 and rk3566-evb1 just for example.
Diff in "rk3568-evb1-ddr4-v10.dts" is like this:

+&bt_sco {
+	status = "okay";
+};
+
+&bt_sound {
+	status = "okay";
+};
+
+&i2s3_2ch {
+	status = "okay";
+};

The default pcm/i2s setting is:
Format: PCM, dsp_a, MSB first, short sync, rising edge and delay 1 bclk.
rockchip soc: master; Bt controller: slave

Change-Id: I6668bfbb87e4b0ea71a661bbcf8248cbde77974e
Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
2023-06-19 10:41:30 +08:00
Alex Zhao
997fef6bf4 arm64: dts: rockchip: rk356x-evb/tablet: add WIFI,poweren_gpio for wifi
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I24277480324db1a29db398bee0b003b163cb417a
2022-11-10 14:59:47 +08:00
Jianqun Xu
17e9559f67 arm64: dts: rockchip: rk356x-evb: fix pcie supply to regulator-fixed
The pcie supply design is (rk3566 evb2 example)
DC12V
  -> VCC12V_PCIE(controlled by GPIO0_C2_H)
  -> VCC3V3_PCIE(controlled by GPIO0_C2_H)
  -> VCC5V0_SYS
       -> VCC3V3_PI6C(controlled by GPIO0_C2_H)

The pci phy driver only want to enable or disable the VCC3V3_PCIE power.

Suggested from pcie owner to ignore the VCC12V_PCIE and VCC3V3_PI6C, so
the dts only need to add regulator node for VCC3V3_PCIE.

Most of time we keep the regulator name same as the hardware design, so
the dts node is
    vcc3v3_pcie: gpio-regulator {
        compatible = "regulator-fixed";
        regulator-name = "vcc3v3_pcie";
        regulator-min-microvolt = <3300000>;
        regulator-max-microvolt = <3300000>;
        enable-active-high;
        gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
        vin-supply = <&dc_12v>;
    };

The regulator type is "regulator-fixed" since its voltage always be
3.3v, min and max should be 3300000 make the regulator has a voltage
value.

The regulator can be enabled or disabled by regulator_enable or
regulator_disable function, so make the GPIO0_B7 as "ena_pin" for the
regulator.

The regulator is supplied by DCIN_12V, so add the vin-supply.

Some boards need a delay before enabling trainning for power to be
stable from the measurement.

By measurement, 5ms is enough for power and refclk to be stable.

Change-Id: Iaf70abe9c9e06504af067dc0e3d60b775557c026
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-11-02 14:43:52 +08:00
YouMin Chen
d1e5d1a895 arm64: dts: rockchip: rk356x: dmc: Replace system-status-freq by system-status-level
"system-status-level" property define only frequency level, not the
actual frequency. In dmc driver, it will switch from frequency level
to actual frequency base on available frequencies table which get
from ATF.

Change-Id: I489b671da5e56912d4f970d32174bdc8b1f86a08
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2021-07-27 18:48:07 +08:00
Guochun Huang
0f20a27adc arm64: dts: rockchip: rk3568: rename mipi_dphy to video_phy
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: Ie019c9d27e06328d45920d41c0a065f8bc47588f
2021-07-06 16:53:47 +08:00
Shawn Lin
78f9ac0daa treewide: Migrate rockchip dts file to use new host type tags
supports-* stuff were used for rockchip platforms to speed up booting
if we know what exactly the host was used for. As we have upstreamed all
these with some very similar ways, now it's the time we migrate our dts
files to use new properties.

They were converted by:

sed -i "s/supports-emmc;/no-sdio;\n\tno-sd;/g" `grep supports-emmc -rl arch/*`
sed -i "s/supports-sd;/no-sdio;\n\tno-mmc;/g" `grep supports-sd -rl arch/*`
sed -i "s/supports-sdio;/no-sd;\n\tno-mmc;/g" `grep supports-sdio -rl arch/*`

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I33e5317ee5c7305803cf18ff4a370658abf555b0
2021-04-13 14:40:36 +08:00
Shawn Lin
3677e0f619 arm64: dts: rockchip: rk356x: correct gpio regulator usage
Should not be zero ahead, otherwise the min voltage is interpreted
as a wrong value by regulator code.

Change-Id: Ia141583f411a54bf26cb88b3992687539f29fec8
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2021-03-15 17:10:59 +08:00
David Wu
ab1d0ca056 arm64: dts: rockchip: rk356x: Add parent of gmac sclk for the compatible
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ia1600504594968df427fb3908697aaaeefb75822
2021-03-03 09:57:15 +08:00
Guochun Huang
4c48b468d0 arm64: dts: rockchip: rk356x evb: dsi0 is mounted on vp1 by default
Change-Id: I4a1d2c8842dcd4880380962c952a6ba13ad8919d
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2021-02-17 19:57:03 +08:00
Allon Huang
66605ab268 arm64: dts: rockchip: rk356x evb: enable csi2 dphy hw
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Ia5afe5729e09273123f35c36429f0aef498304cd
2021-01-28 19:12:38 +08:00
Allon Huang
26e6c34da6 arm64: dts: rockchip: rk3568: add csi2 dphy for dual mode
replace csi_dphy with csi2_dphy0, csi2_dphy1 and csi2_dphy2
for rk356x csi2 dphy dual mode

Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I53f5edcf36bcf3cdf84174d44cb6c99703940ea3
2021-01-28 10:40:54 +08:00
ZiHan Huang
dceeebfdbb arm64: dts: rockchip: rk3568-evb6-ddr3-v10: support os04a10 ov5695 gc8034
Change-Id: I4904b1179293b90952ae6634903943e00ec1c400
Signed-off-by: ZiHan Huang <zack.huang@rock-chips.com>
2021-01-22 20:12:59 +08:00
Jianhui Wang
259ea199e5 arm64: rockchip: dts: enable pcie for rk356x evb
Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
Change-Id: I31906f667315e67f633e2cd98d832731540e8131
2021-01-22 20:12:59 +08:00
Alex Zhao
a6107c8add Revert "arm64: dts: rockchip: change the wifi power-on method for rk356x evb"
This reverts commit e37604f00f.

Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I90a96482445710b6089acd5b6ad19264462b35f7
2021-01-05 17:53:47 +08:00
Ren Jianing
0035a1a225 arm64: dts: rockchip: add maximum-speed at DWC3 host for rk3568-evb6
Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: I7f70a40e633b2ec1549334954fefdc5ef11e3b4e
2021-01-05 14:36:44 +08:00
Wu Liangqing
b81652bce8 arm64: dts: rockchip: rk356x ddr3 set dmc max-freq 1056Mhz
Change-Id: I33191a9b62a5b6fec8d88de79119898033b63616
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-12-29 10:22:58 +08:00
David Wu
2524d8dfa7 arm64: dts: rockchip: Change the driver strength for rk356x gmac tx pins
Change-Id: Iebe1e0dce56cd3a115f9bc16dd3238d8c955bbe3
Signed-off-by: David Wu <david.wu@rock-chips.com>
2020-12-28 09:52:17 +08:00
Wu Liangqing
f33ac42bfe arm64: dts: rockchip: enable dsi uboot logo display for rk356x evb
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: Iac2bc0eef65262798dd3c6b61ffc9711bee58597
2020-12-24 14:59:26 +08:00
Alex Zhao
e37604f00f arm64: dts: rockchip: change the wifi power-on method for rk356x evb
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I2859c7e701ae7f023894e19a2e9fd96f6f5df9db
2020-12-18 10:31:57 +08:00
Binyuan Lan
a991b554a3 arm64: dts: rockchip: Fixed SPDIF configuration for rk356x evb
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
Change-Id: Ic1f1bba75ba8ae0b033d9a9e7a3933dd4a7af5ae
2020-12-08 14:07:21 +08:00
Liang Chen
caeb5624bb arm64: dts: rockchip: adjust include file for rk356x board
Change-Id: I74ff7ae2017bd8e016cbbaec2a51d50412d3090c
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-12-05 14:36:55 +08:00
Jianqun Xu
1c085731f3 arm64: dts: rockchip: re-generate rk3568-pinctrl.dtsi by tool
This patch to generate the rk3568-pinctrl.dtsi again by pin2dts tool
which has been updated with some bugs fixed, such as lack of comment
for some nodes.

Now the pin2dts can generate the auto part of pinctrl file absolutely,
changes including:

* file header

/SPDX-License head
/#include <something>
&pinctrl {

};

* full rules

make the auto part can be generated by rules without any handly modify
special case: pwm4 which may be matched as pw-m4, that means the module
is pw and its mux mode is m4.

Change-Id: Ia92668ab938c1c05dfe430cf67b6f73bafaa31c3
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-11-26 15:32:07 +08:00
William Wu
0e28bc0c1f arm64: dts: rockchip: rk3568-evb6-ddr3-v10: disable u3 port for otg1
Change-Id: I95020ace6f2af7ee73797192e5b6eb09e265417e
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-11-25 14:14:03 +08:00
Weixin Zhou
5bd3725c9a arm64: dts: rockchip: rk3568-evb6-ddr3-v10: add mxc6655xa
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I9d0039fe8b9b0648d346e5fa0edf904257248722
2020-11-20 18:06:09 +08:00
William Wu
2495fa0c05 arm64: dts: rockchip: fix usb nodes for rk356x boards
This patch adds phy property for usb on various rk356x boards.
3566 EVB1 1 x USB2.0 OTG(Micro USB2.0) + 1 x USB3.0 HOST + 2 x USB2.0 HOST
3566 EVB2 1 x USB2.0 OTG(Micro USB2.0) + 1 x USB3.0 HOST + 2 x USB2.0 HOST
3566 EVB3 1 x USB2.0 OTG(Micro USB2.0) + 1 x USB3.0 HOST(mux with SATA, default for SATA) + 2 x USB2.0 HOST
3568 EVB1 1 x USB3.0 OTG(Type-A USB3.0 + Micro USB2.0)+ 1 x USB3.0 HOST + 2 x USB2.0 HOST
3568 EVB6 1 x USB3.0 OTG(Type-A USB3.0 + Micro USB2.0)+ 3 x USB2.0 HOST

Change-Id: If1e2cdb03e50e770337648f59f0375034b7062cd
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-11-19 20:50:25 +08:00
William Wu
08ef2dd998 arm64: dts: rockchip: remove unused vcc5v0_usb node for rk3568 evbs
Change-Id: Ia12fb290e50f30738400fb55fe7731bfc4679386
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-11-19 17:22:41 +08:00
Alex Zhao
21f1cad159 arm64: dts: rockchip: rk3568-evb6-ddr3-v10: update wifi/bt configs
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I6af7a3a551c9a9ca4e43c1563efd24591b26d650
2020-11-19 10:54:54 +08:00
David Wu
66d48911ac arm64: dts: rockchip: Change the gmac1m0 rgmii delayline for rk3568-evb6
Change-Id: I65d6122bd0a3cc5976333c844ed6fad61e0e6627
Signed-off-by: David Wu <david.wu@rock-chips.com>
2020-11-18 17:57:56 +08:00
Shawn Lin
4ddf7f23ca arm64: dts: rockchip: Add PCIe20 and PCIe30 bifurcation node
Change-Id: Ie59f6b0b46bef80c4c14fa2d9564e324dd3b8e6b
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-11-13 19:55:03 +08:00
Caesar Wang
41c9c34159 arm64: dts: rockchip: adapter boards configuration for rk3568
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I6dc5d3051003aa753f16079266838532532a21f5
2020-11-12 15:47:58 +08:00