dts: starfive: Fix sdio1 config

Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com>

diff --git a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-rgb2hdmi.dts b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-rgb2hdmi.dts
index 1593bc2..0397240 100644 (file)
--- a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-rgb2hdmi.dts
+++ b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-rgb2hdmi.dts
@@ -6,7 +6,7 @@
        compatible = "starfive,jh7110";
 
        //hdmi_output
-       fragment@2 {
+       fragment@0 {
                target-path = "/soc/tda988x_pin";
                __overlay__ {
                        status = "okay";
@@ -14,7 +14,7 @@
        };
 
        //uart1
-       fragment@3 {
+       fragment@1 {
                target-path = "/soc/serial@10010000";
                __overlay__ {
                        status = "okay";

diff --git a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-sdio.dts b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-sdio.dts
index 80b7256..b2ad0b1 100644 (file)
--- a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-sdio.dts
+++ b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-sdio.dts
@@ -82,16 +82,8 @@
                };
        };
 
-       //usbdrd30
-       fragment@4 {
-               target-path = "/soc/usbdrd";
-               __overlay__ {
-                       status = "disabled";
-               };
-       };
-
        //sdio1
-       fragment@5 {
+       fragment@3 {
                target-path = "/soc/sdio1@16020000";
                __overlay__ {
                        clock-frequency = <102400000>;

diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-pcie-i2s-sd.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-pcie-i2s-sd.dts
index 1aef330..0ac88af 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110-evb-pcie-i2s-sd.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-pcie-i2s-sd.dts
@@ -32,17 +32,12 @@
 };
 
 &sdio1 {
-       clock-frequency = <4000000>;
-       max-frequency = <1000000>;
+       clock-frequency = <102400000>;
+       max-frequency = <100000000>;
        card-detect-delay = <300>;
        bus-width = <4>;
+       broken-cd;
        cap-sd-highspeed;
-       cap-sdio-irq;
-       cap-mmc-hw-reset;
-       non-removable;
-       enable-sdio-wakeup;
-       keep-power-in-suspend;
-       cap-mmc-highspeed;
        post-power-on-delay-ms = <200>;
        pinctrl-names = "default";
        pinctrl-0 = <&sdcard1_pins>;