From 702e999f8a607f434be852b76aec5d6825a1fc4c Mon Sep 17 00:00:00 2001 From: William Qiu Date: Fri, 6 Jan 2023 12:26:45 +0800 Subject: [PATCH] riscv: starfive: sdio: modify and add sd card config modify and add sd card config, sush as 'max-frequency' 'pinctrl-names'. Signed-off-by: William Qiu --- .../boot/dts/starfive/jh7110-evb-can-pdm-pwmdac.dts | 5 +---- .../boot/dts/starfive/jh7110-evb-dvp-rgb2hdmi.dts | 11 +++++++++++ arch/riscv/boot/dts/starfive/jh7110-evb-i2s-ac108.dts | 10 ++++++++++ .../boot/dts/starfive/jh7110-evb-pcie-i2s-sd.dts | 5 +---- arch/riscv/boot/dts/starfive/jh7110-evb-spi-uart2.dts | 2 -- .../boot/dts/starfive/jh7110-evb-uart1-rgb2hdmi.dts | 5 +---- .../boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts | 5 ----- .../dts/starfive/jh7110-evb-uart5-pwm-i2c-tdm.dts | 5 +---- 8 files changed, 25 insertions(+), 23 deletions(-) diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-can-pdm-pwmdac.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-can-pdm-pwmdac.dts index 2c543cc6b41d..cf1865775ad2 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-evb-can-pdm-pwmdac.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-evb-can-pdm-pwmdac.dts @@ -16,15 +16,12 @@ /* default sd card */ &sdio0 { - clock-frequency = <102400000>; - max-frequency = <200000000>; + max-frequency = <100000000>; card-detect-delay = <300>; bus-width = <4>; broken-cd; cap-sd-highspeed; post-power-on-delay-ms = <200>; - pinctrl-names = "default"; - pinctrl-0 = <&sdcard0_pins>; status = "okay"; }; diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-dvp-rgb2hdmi.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-dvp-rgb2hdmi.dts index ab3eee14dc0a..b4bf91049b21 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-evb-dvp-rgb2hdmi.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-evb-dvp-rgb2hdmi.dts @@ -12,6 +12,17 @@ compatible = "starfive,jh7110-evb", "starfive,jh7110"; }; +/* default sd card */ +&sdio0 { + max-frequency = <100000000>; + card-detect-delay = <300>; + bus-width = <4>; + broken-cd; + cap-sd-highspeed; + post-power-on-delay-ms = <200>; + status = "okay"; +}; + &vin_sysctl { pinctrl-names = "default"; pinctrl-0 = <&dvp_pins>; diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-i2s-ac108.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-i2s-ac108.dts index 35160400da24..7d49c501d53c 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-evb-i2s-ac108.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-evb-i2s-ac108.dts @@ -13,6 +13,16 @@ compatible = "starfive,jh7110-evb", "starfive,jh7110"; }; +/* default sd card */ +&sdio0 { + max-frequency = <100000000>; + card-detect-delay = <300>; + bus-width = <4>; + broken-cd; + cap-sd-highspeed; + post-power-on-delay-ms = <200>; + status = "okay"; +}; &i2c0 { status = "okay"; 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 152ef0a1a3df..2639a0fd6fd6 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 @@ -15,15 +15,12 @@ /* default sd card */ &sdio0 { - clock-frequency = <102400000>; - max-frequency = <200000000>; + max-frequency = <100000000>; card-detect-delay = <300>; bus-width = <4>; broken-cd; cap-sd-highspeed; post-power-on-delay-ms = <200>; - pinctrl-names = "default"; - pinctrl-0 = <&sdcard0_pins>; status = "okay"; }; diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-spi-uart2.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-spi-uart2.dts index e9ad788d2d7f..02185222f988 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-evb-spi-uart2.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-evb-spi-uart2.dts @@ -21,8 +21,6 @@ broken-cd; cap-sd-highspeed; post-power-on-delay-ms = <200>; - pinctrl-names = "default"; - pinctrl-0 = <&sdcard0_pins>; status = "okay"; }; diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-uart1-rgb2hdmi.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-uart1-rgb2hdmi.dts index 3580cd0b26d3..b72135b6b4fe 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-evb-uart1-rgb2hdmi.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-evb-uart1-rgb2hdmi.dts @@ -14,15 +14,12 @@ /* default sd card */ &sdio0 { - clock-frequency = <102400000>; - max-frequency = <200000000>; + max-frequency = <100000000>; card-detect-delay = <300>; bus-width = <4>; broken-cd; cap-sd-highspeed; post-power-on-delay-ms = <200>; - pinctrl-names = "default"; - pinctrl-0 = <&sdcard0_pins>; status = "okay"; }; 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 46846c8c1e1f..e0e4e1addd42 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 @@ -36,13 +36,10 @@ non-removable; cap-mmc-hw-reset; post-power-on-delay-ms = <200>; - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; status = "okay"; }; &sdio1 { - clock-frequency = <102400000>; max-frequency = <100000000>; card-detect-delay = <300>; bus-width = <8>; @@ -50,8 +47,6 @@ non-removable; cap-mmc-highspeed; post-power-on-delay-ms = <200>; - pinctrl-names = "default"; - pinctrl-0 = <&emmc1_pins>; status = "okay"; }; diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-uart5-pwm-i2c-tdm.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-uart5-pwm-i2c-tdm.dts index 2da364b0bf72..ce2161038c55 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-evb-uart5-pwm-i2c-tdm.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-evb-uart5-pwm-i2c-tdm.dts @@ -15,15 +15,12 @@ /* default sd card */ &sdio0 { - clock-frequency = <102400000>; - max-frequency = <200000000>; + max-frequency = <100000000>; card-detect-delay = <300>; bus-width = <4>; broken-cd; cap-sd-highspeed; post-power-on-delay-ms = <200>; - pinctrl-names = "default"; - pinctrl-0 = <&sdcard0_pins>; status = "okay"; }; -- 2.34.1