Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[u-boot] / arch / arm / dts / uniphier-ph1-sld8.dtsi

diff --git a/arch/arm/dts/uniphier-ph1-sld8.dtsi b/arch/arm/dts/uniphier-ph1-sld8.dtsi
index 985848a027515c228bc8208deffc0191c1bc0c70..e0376a1e9607c0b5900edacbe5056e492307014d 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-sld8.dtsi
+++ b/arch/arm/dts/uniphier-ph1-sld8.dtsi
@@ -220,6 +220,31 @@
                clock-frequency = <100000>;
        };
 
+       sd: sdhc@5a400000 {
+               compatible = "socionext,uniphier-sdhc";
+               status = "disabled";
+               reg = <0x5a400000 0x200>;
+               interrupts = <0 76 4>;
+               pinctrl-names = "default", "1.8v";
+               pinctrl-0 = <&pinctrl_sd>;
+               pinctrl-1 = <&pinctrl_sd_1v8>;
+               clocks = <&mio 0>;
+               bus-width = <4>;
+       };
+
+       emmc: sdhc@5a500000 {
+               compatible = "socionext,uniphier-sdhc";
+               status = "disabled";
+               interrupts = <0 78 4>;
+               reg = <0x5a500000 0x200>;
+               pinctrl-names = "default", "1.8v";
+               pinctrl-0 = <&pinctrl_emmc>;
+               pinctrl-1 = <&pinctrl_emmc_1v8>;
+               clocks = <&mio 1>;
+               bus-width = <8>;
+               non-removable;
+       };
+
        usb0: usb@5a800100 {
                compatible = "socionext,uniphier-ehci", "generic-ehci";
                status = "disabled";
@@ -249,6 +274,11 @@
                pinctrl-0 = <&pinctrl_usb2>;
                clocks = <&mio 5>, <&mio 6>;
        };
+
+       aidet@61830000 {
+               compatible = "simple-mfd", "syscon";
+               reg = <0x61830000 0x200>;
+       };
 };
 
 &refclk {
@@ -285,7 +315,7 @@
 };
 
 &pinctrl {
-       compatible = "socionext,ph1-sld8-pinctrl", "syscon";
+       compatible = "socionext,uniphier-sld8-pinctrl";
 };
 
 &sysctrl {