summaryrefslogtreecommitdiff
path: root/arch/arm/dts/uniphier-sld8.dtsi
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-09-11 08:50:10 -0400
committerTom Rini <trini@konsulko.com>2018-09-11 08:50:10 -0400
commitd1e15041abf3ccd38169ae7aa8736f78200f8ee3 (patch)
tree460ad7dfaa95c4e14cf44f29e70ff48e1528fbc5 /arch/arm/dts/uniphier-sld8.dtsi
parent89aa19d0926b02f5d30460bbdba394819e891561 (diff)
parente39eed8f476b6f8861318fc122b546158edce259 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/dts/uniphier-sld8.dtsi')
-rw-r--r--arch/arm/dts/uniphier-sld8.dtsi17
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/arm/dts/uniphier-sld8.dtsi b/arch/arm/dts/uniphier-sld8.dtsi
index f20926e4a9..437265bb73 100644
--- a/arch/arm/dts/uniphier-sld8.dtsi
+++ b/arch/arm/dts/uniphier-sld8.dtsi
@@ -229,13 +229,13 @@
};
sd: sdhc@5a400000 {
- compatible = "socionext,uniphier-sdhc";
+ compatible = "socionext,uniphier-sd-v2.91";
status = "disabled";
reg = <0x5a400000 0x200>;
interrupts = <0 76 4>;
- pinctrl-names = "default", "1.8v";
+ pinctrl-names = "default", "uhs";
pinctrl-0 = <&pinctrl_sd>;
- pinctrl-1 = <&pinctrl_sd_1v8>;
+ pinctrl-1 = <&pinctrl_sd_uhs>;
clocks = <&mio_clk 0>;
reset-names = "host", "bridge";
resets = <&mio_rst 0>, <&mio_rst 3>;
@@ -247,20 +247,19 @@
};
emmc: sdhc@5a500000 {
- compatible = "socionext,uniphier-sdhc";
+ compatible = "socionext,uniphier-sd-v2.91";
status = "disabled";
reg = <0x5a500000 0x200>;
interrupts = <0 78 4>;
- pinctrl-names = "default", "1.8v";
+ pinctrl-names = "default";
pinctrl-0 = <&pinctrl_emmc>;
- pinctrl-1 = <&pinctrl_emmc_1v8>;
clocks = <&mio_clk 1>;
- reset-names = "host", "bridge";
- resets = <&mio_rst 1>, <&mio_rst 4>;
+ reset-names = "host", "bridge", "hw";
+ resets = <&mio_rst 1>, <&mio_rst 4>, <&mio_rst 6>;
bus-width = <8>;
- non-removable;
cap-mmc-highspeed;
cap-mmc-hw-reset;
+ non-removable;
};
usb0: usb@5a800100 {