summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authoryanhong.wang <yanhong.wang@starfivetech.com>2022-05-19 08:59:28 +0300
committerYanhong Wang <yanhong.wang@linux.starfivetech.com>2022-10-18 11:24:36 +0300
commit967e3296edfa01d8109213f5dd89b7bc9e6c1801 (patch)
treedfd58b976367239274ff116d26ad93c265353246 /arch
parentc43d28132317bd745a485543569e80d4bcfee018 (diff)
downloadu-boot-967e3296edfa01d8109213f5dd89b7bc9e6c1801.tar.xz
riscv:dts:starfive-jh7110: Modify sd node configuration
Modify SD&EMMC node configuration on Starfive EVB board. Signed-off-by: yanhong.wang <yanhong.wang@starfivetech.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/riscv/dts/jh7110-u-boot.dtsi10
-rw-r--r--arch/riscv/dts/jh7110.dtsi12
-rw-r--r--arch/riscv/dts/starfive_evb-u-boot.dtsi9
-rw-r--r--arch/riscv/dts/starfive_evb.dts14
4 files changed, 7 insertions, 38 deletions
diff --git a/arch/riscv/dts/jh7110-u-boot.dtsi b/arch/riscv/dts/jh7110-u-boot.dtsi
index bb24681cc2..2b5cdee19d 100644
--- a/arch/riscv/dts/jh7110-u-boot.dtsi
+++ b/arch/riscv/dts/jh7110-u-boot.dtsi
@@ -75,18 +75,10 @@
};
&sdio0 {
- clock-frequency = <4000000>;
- max-frequency = <1000000>;
- bus-width = <8>;
- status = "okay";
u-boot,dm-spl;
};
&sdio1 {
- clock-frequency = <4000000>;
- max-frequency = <1000000>;
- bus-width = <4>;
- status = "okay";
u-boot,dm-spl;
};
@@ -122,4 +114,4 @@
&gmac0_rmii_refin {
u-boot,dm-spl;
-}; \ No newline at end of file
+};
diff --git a/arch/riscv/dts/jh7110.dtsi b/arch/riscv/dts/jh7110.dtsi
index c2c543cb71..81a36f61a4 100644
--- a/arch/riscv/dts/jh7110.dtsi
+++ b/arch/riscv/dts/jh7110.dtsi
@@ -617,11 +617,6 @@
clock-names = "biu","ciu";
resets = <&rstgen RSTN_U0_DW_SDIO_AHB>;
reset-names = "reset";
- interrupts = <74>;
- fifo-depth = <32>;
- fifo-watermark-aligned;
- data-addr = <0>;
- status = "disabled";
};
sdio1: sdio1@16020000 {
@@ -632,11 +627,6 @@
clock-names = "biu","ciu";
resets = <&rstgen RSTN_U1_DW_SDIO_AHB>;
reset-names = "reset";
- interrupts = <75>;
- fifo-depth = <32>;
- fifo-watermark-aligned;
- data-addr = <0>;
- status = "disabled";
};
vin_sysctl: vin_sysctl@19800000 {
@@ -1385,4 +1375,4 @@
dsp@0 {};
};
};
-}; \ No newline at end of file
+};
diff --git a/arch/riscv/dts/starfive_evb-u-boot.dtsi b/arch/riscv/dts/starfive_evb-u-boot.dtsi
index d283272f41..f508ab3554 100644
--- a/arch/riscv/dts/starfive_evb-u-boot.dtsi
+++ b/arch/riscv/dts/starfive_evb-u-boot.dtsi
@@ -27,12 +27,3 @@
};
};
-&sdio0 {
- clock-frequency = <4000000>;
- max-frequency = <1000000>;
-};
-
-&sdio1 {
- clock-frequency = <4000000>;
- max-frequency = <1000000>;
-};
diff --git a/arch/riscv/dts/starfive_evb.dts b/arch/riscv/dts/starfive_evb.dts
index 85969a1059..f4b22214fd 100644
--- a/arch/riscv/dts/starfive_evb.dts
+++ b/arch/riscv/dts/starfive_evb.dts
@@ -17,8 +17,8 @@
gpio0="/soc/gpio@13040000";
ethernet0=&gmac0;
ethernet1=&gmac1;
- mmc0="/soc/sdio0@16010000";
- mmc1="/soc/sdio1@16020000";
+ mmc0=&sdio0;
+ mmc1=&sdio1;
};
chosen {
@@ -47,17 +47,13 @@
};
&sdio0 {
- clock-frequency = <4000000>;
- max-frequency = <1000000>;
- bus-width = <8>;
+ fifo-depth = <32>;
+ bus-width = <4>;
status = "okay";
};
&sdio1 {
- clock-frequency = <4000000>;
- max-frequency = <1000000>;
- bus-width = <4>;
- status = "okay";
+ status = "disabled";
};
&gmac0 {