arm64: dts: rockchip: move rk3399-sapphire sdio to excavator baseboard

The sdio signals are routed through the connector to the baseboard,
where the wifi module is also located. So move the sdio node to
the excavator as well.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Tested-by: Vicente Bergas <vicencb@gmail.com>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
index b7bd88fb3ae3bff4287f0df1d47593d4cfac316f..68416fae4feafa37ea20273c8ab3c47fd1ea5106 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
@@ -232,6 +232,22 @@
        };
 };
 
+&sdio0 {
+       bus-width = <4>;
+       cap-sd-highspeed;
+       cap-sdio-irq;
+       clock-frequency = <50000000>;
+       disable-wp;
+       keep-power-in-suspend;
+       max-frequency = <50000000>;
+       mmc-pwrseq = <&sdio_pwrseq>;
+       non-removable;
+       pinctrl-names = "default";
+       pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
+       sd-uhs-sdr104;
+       status = "okay";
+};
+
 &spdif {
        i2c-scl-rising-time-ns = <450>;
        i2c-scl-falling-time-ns = <15>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
index 46c95ccfd5cb4174fd1b8b2467b9a4514f8c5c23..31568b4e8aa1cc6a2399dad41337decdfe70f499 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
@@ -520,22 +520,6 @@
        status = "okay";
 };
 
-&sdio0 {
-       bus-width = <4>;
-       cap-sd-highspeed;
-       cap-sdio-irq;
-       clock-frequency = <50000000>;
-       disable-wp;
-       keep-power-in-suspend;
-       max-frequency = <50000000>;
-       mmc-pwrseq = <&sdio_pwrseq>;
-       non-removable;
-       pinctrl-names = "default";
-       pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
-       sd-uhs-sdr104;
-       status = "okay";
-};
-
 &sdmmc {
        bus-width = <4>;
        cap-mmc-highspeed;