From d5bd8e4a7b32c07855f147885a1597a838ea5542 Mon Sep 17 00:00:00 2001 From: William Qiu Date: Fri, 9 Sep 2022 12:37:56 +0800 Subject: [PATCH] dts:starfive:modify SDIO config modify SDIO config Signed-off-by: William Qiu --- arch/riscv/boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts | 5 ++--- arch/riscv/boot/dts/starfive/jh7110-evb.dts | 10 ++++++++-- arch/riscv/boot/dts/starfive/jh7110.dtsi | 5 +++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts index 3ea9c0e..46846c8 100755 --- a/arch/riscv/boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts @@ -27,13 +27,12 @@ }; &sdio0 { - clock-frequency = <102400000>; max-frequency = <100000000>; card-detect-delay = <300>; bus-width = <8>; cap-mmc-highspeed; - mmc-hs400-1_8v; - mmc-hs400-enhanced-strobe; + mmc-ddr-1_8v; + mmc-hs200-1_8v; non-removable; cap-mmc-hw-reset; post-power-on-delay-ms = <200>; diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb.dts b/arch/riscv/boot/dts/starfive/jh7110-evb.dts index 73cecdc..d110913 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-evb.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-evb.dts @@ -14,11 +14,17 @@ /* default sd card */ &sdio0 { - clock-frequency = <102400000>; - max-frequency = <200000000>; + max-frequency = <100000000>; card-detect-delay = <300>; bus-width = <4>; + no-sdio; + no-mmc; broken-cd; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr50; + sd-uhs-sdr104; + sd-uhs-ddr50; cap-sd-highspeed; post-power-on-delay-ms = <200>; status = "okay"; diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi index 2519b04..ed099ec 100644 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -842,7 +842,7 @@ /* unremovable emmc as mmcblk0 */ sdio0: sdio0@16010000 { - compatible = "starfive,jh7110-sdio", "snps,dw-mshc"; + compatible = "starfive,jh7110-sdio"; reg = <0x0 0x16010000 0x0 0x10000>; clocks = <&clkgen JH7110_SDIO0_CLK_AHB>, <&clkgen JH7110_SDIO0_CLK_SDCARD>; @@ -853,11 +853,12 @@ fifo-depth = <32>; fifo-watermark-aligned; data-addr = <0>; + starfive,sys-syscon = <&sys_syscon 0x14 0x1a 0x7c000000>; status = "disabled"; }; sdio1: sdio1@16020000 { - compatible = "starfive,jh7110-sdio", "snps,dw-mshc"; + compatible = "starfive,jh7110-sdio"; reg = <0x0 0x16020000 0x0 0x10000>; clocks = <&clkgen JH7110_SDIO1_CLK_AHB>, <&clkgen JH7110_SDIO1_CLK_SDCARD>; -- 2.7.4