arm64: dts: rockchip: Move RK3399 eDP pinctrl to boards

The EDP_HOTPLUG pin is optional, and muxed with other functions (notably
HDMI CEC), so move its selection from the SoC DTSI to the boards which
apparently want it, namely those which enable eDP without "force-hpd".
By the same token we drop it from Pinebook Pro, which already uses
"force-hpd", and according to the schematics does not have the pin wired
at all.

Reviewed-by: Dragan Simic <dsimic@manjaro.org>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://patch.msgid.link/c7d972d07875241805db8659305b26bd694867d4.1769191673.git.robin.murphy@arm.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
index 4dcceb9136b7f29873e97b6309c8ae797b6875f7..49c68fe65de66e33fa90e3881a8f38b914b7b7fc 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
@@ -2145,8 +2145,6 @@
                interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH 0>;
                clocks = <&cru PCLK_EDP>, <&cru PCLK_EDP_CTRL>, <&cru PCLK_VIO_GRF>;
                clock-names = "dp", "pclk", "grf";
-               pinctrl-names = "default";
-               pinctrl-0 = <&edp_hpd>;
                power-domains = <&power RK3399_PD_EDP>;
                resets = <&cru SRST_P_EDP_CTRL>;
                reset-names = "dp";
@@ -2384,6 +2382,7 @@
                };
 
                edp {
+                       /omit-if-no-ref/
                        edp_hpd: edp-hpd {
                                rockchip,pins =
                                        <4 RK_PC7 2 &pcfg_pull_none>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
index 9d07353df52c899252f34964d972859f3f2c0e25..3f3cb0eb58096eb6fef26fb421a674ca0b2d76f4 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
@@ -241,6 +241,8 @@
 };
 
 &edp {
+       pinctrl-names = "default";
+       pinctrl-0 = <&edp_hpd>;
        status = "okay";
 
        /*

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
index 753d513449540f31dce73d688f098362c150532d..8350e51c1305be3948f8cfd1552a467d33b9cf04 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
@@ -401,8 +401,6 @@
 
 &edp {
        force-hpd;
-       pinctrl-names = "default";
-       pinctrl-0 = <&edp_hpd>;
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
index a4ceafe6dd7a873206ccc9b3f2b12ad95513417e..80d6ea0eda8451ada7a0aa85551e4759c1603b70 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
@@ -141,6 +141,8 @@
 };
 
 &edp {
+       pinctrl-names = "default";
+       pinctrl-0 = <&edp_hpd>;
        status = "okay";
 };