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

arm64: dts: rockchip: rk3588: modify hdmirx pinctrl

Browse Source 
add hdmim1_rx pinctrl group, set hdmirx detect pin to pull up.

Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I637d5d432d5879ed69077f00907667102e83153d
This commit is contained in:
Dingxian Wen
2022-06-20 10:29:27 +08:00
committed by Tao Huang
parent e1489b2e38
commit 1ee5d90938
6 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi
View File

@@ -378,7 +378,9 @@
/* Effective level used to trigger HPD: 0-low, 1-high */
hpd-trigger-level = <1>;
hdmirx-det-gpios = <&gpio2 13 GPIO_ACTIVE_LOW>;
hdmirx-det-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&hdmim1_rx &hdmirx_det>;
};
&hdptxphy_hdmi0 {
@@ -577,6 +579,12 @@
};
};
hdmi {
hdmirx_det: hdmirx-det {
rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
headphone {
hp_det: hp-det {
rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;

4
arch/arm64/boot/dts/rockchip/rk3588-evb7-lp4.dtsi
View File

@@ -408,7 +408,7 @@
hpd-trigger-level = <1>;
hdmirx-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&hdmim1_rx_cec &hdmim1_rx_hpdin &hdmim1_rx_scl &hdmim1_rx_sda &hdmirx_det>;
pinctrl-0 = <&hdmim1_rx &hdmirx_det>;
};
&hdptxphy_hdmi0 {
@@ -647,7 +647,7 @@
};
};
hdmirx {
hdmi {
hdmirx_det: hdmirx-det {
rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
};

10
arch/arm64/boot/dts/rockchip/rk3588-toybrick-edp-x0.dtsi
View File

@@ -541,7 +541,9 @@
&hdmirx_ctrler {
status = "okay";
hdmirx-det-gpios = <&gpio2 13 GPIO_ACTIVE_LOW>;
hdmirx-det-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&hdmim1_rx &hdmirx_det>;
};
&i2s5_8ch {
@@ -611,6 +613,12 @@
};
};
hdmi {
hdmirx_det: hdmirx-det {
rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
headphone {
hp_det: hp-det {
rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;

9
arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dtsi
View File

@@ -345,7 +345,9 @@
/* Effective level used to trigger HPD: 0-low, 1-high */
hpd-trigger-level = <1>;
hdmirx-det-gpios = <&gpio2 13 GPIO_ACTIVE_LOW>;
hdmirx-det-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&hdmim1_rx &hdmirx_det>;
};
&hdptxphy_hdmi0 {
@@ -577,6 +579,11 @@
};
&pinctrl {
hdmi {
hdmirx_det: hdmirx-det {
rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
headphone {
hp_det: hp-det {

2
arch/arm64/boot/dts/rockchip/rk3588.dtsi
View File

@@ -542,7 +542,7 @@
resets = <&cru SRST_A_HDMIRX>, <&cru SRST_P_HDMIRX>,
<&cru SRST_HDMIRX_REF>, <&cru SRST_A_HDMIRX_BIU>;
reset-names = "rst_a", "rst_p", "rst_ref", "rst_biu";
pinctrl-0 = <&hdmim1_rx_cec &hdmim1_rx_hpdin &hdmim1_rx_scl &hdmim1_rx_sda>;
pinctrl-0 = <&hdmim1_rx>;
pinctrl-names = "default";
status = "disabled";
};

14
arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi
View File

@@ -594,6 +594,20 @@
/* hdmim0_tx1_hpd */
<1 RK_PA6 5 &pcfg_pull_none>;
};
/omit-if-no-ref/
hdmim1_rx: hdmim1-rx {
rockchip,pins =
/* hdmim1_rx_cec */
<3 RK_PD1 5 &pcfg_pull_none>,
/* hdmim1_rx_scl */
<3 RK_PD2 5 &pcfg_pull_none>,
/* hdmim1_rx_sda */
<3 RK_PD3 5 &pcfg_pull_none>,
/* hdmim1_rx_hpdin */
<3 RK_PD4 5 &pcfg_pull_none>;
};
/omit-if-no-ref/
hdmim1_rx_cec: hdmim1-rx-cec {
rockchip,pins =