From: Jianlong Huang Date: Thu, 30 Jun 2022 07:03:27 +0000 (+0800) Subject: dts: starfive: Fix sdio1 config X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=49aca1e7374d8c4359f268bcb00891cf0b1eb018;p=platform%2Fkernel%2Flinux-starfive.git dts: starfive: Fix sdio1 config Signed-off-by: Jianlong Huang --- 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 --- 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 --- 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 --- 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>;