aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2018-02-19 02:59:37 -0500
committerHeiko Stuebner <heiko@sntech.de>2018-02-20 04:33:55 -0500
commit64ca41a8ff9dcc524e228e654f8bdf2dcd45c559 (patch)
treed5f4331e1810515ab3eeb89da67f0ac92721e702
parentd95ed4308e2f5709193c612c4c06021afdb58975 (diff)
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>
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts16
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi16
2 files changed, 16 insertions, 16 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
index b7bd88fb3ae3..68416fae4fea 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
@@ -232,6 +232,22 @@
232 }; 232 };
233}; 233};
234 234
235&sdio0 {
236 bus-width = <4>;
237 cap-sd-highspeed;
238 cap-sdio-irq;
239 clock-frequency = <50000000>;
240 disable-wp;
241 keep-power-in-suspend;
242 max-frequency = <50000000>;
243 mmc-pwrseq = <&sdio_pwrseq>;
244 non-removable;
245 pinctrl-names = "default";
246 pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
247 sd-uhs-sdr104;
248 status = "okay";
249};
250
235&spdif { 251&spdif {
236 i2c-scl-rising-time-ns = <450>; 252 i2c-scl-rising-time-ns = <450>;
237 i2c-scl-falling-time-ns = <15>; 253 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 46c95ccfd5cb..31568b4e8aa1 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
@@ -520,22 +520,6 @@
520 status = "okay"; 520 status = "okay";
521}; 521};
522 522
523&sdio0 {
524 bus-width = <4>;
525 cap-sd-highspeed;
526 cap-sdio-irq;
527 clock-frequency = <50000000>;
528 disable-wp;
529 keep-power-in-suspend;
530 max-frequency = <50000000>;
531 mmc-pwrseq = <&sdio_pwrseq>;
532 non-removable;
533 pinctrl-names = "default";
534 pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
535 sd-uhs-sdr104;
536 status = "okay";
537};
538
539&sdmmc { 523&sdmmc {
540 bus-width = <4>; 524 bus-width = <4>;
541 cap-mmc-highspeed; 525 cap-mmc-highspeed;