This host controller is available for all UniPhier SoCs.

Signed-off-by: Masahiro Yamada <yamada.masah...@socionext.com>
---

 arch/arm/dts/uniphier-ph1-ld4-ref.dts        |  4 +++
 arch/arm/dts/uniphier-ph1-ld4.dtsi           | 25 +++++++++++++++++++
 arch/arm/dts/uniphier-ph1-ld6b-ref.dts       |  4 +++
 arch/arm/dts/uniphier-ph1-pro4-ref.dts       |  8 ++++++
 arch/arm/dts/uniphier-ph1-pro4.dtsi          | 37 ++++++++++++++++++++++++++++
 arch/arm/dts/uniphier-ph1-pro5-4kbox.dts     |  8 ++++++
 arch/arm/dts/uniphier-ph1-pro5.dtsi          | 24 ++++++++++++++++++
 arch/arm/dts/uniphier-ph1-sld3-ref.dts       |  4 +++
 arch/arm/dts/uniphier-ph1-sld3.dtsi          | 19 ++++++++++++++
 arch/arm/dts/uniphier-ph1-sld8-ref.dts       |  4 +++
 arch/arm/dts/uniphier-ph1-sld8.dtsi          | 25 +++++++++++++++++++
 arch/arm/dts/uniphier-pinctrl.dtsi           | 15 +++++++++++
 arch/arm/dts/uniphier-proxstream2-gentil.dts |  4 +++
 arch/arm/dts/uniphier-proxstream2-vodka.dts  |  4 +++
 arch/arm/dts/uniphier-proxstream2.dtsi       | 24 ++++++++++++++++++
 15 files changed, 209 insertions(+)

diff --git a/arch/arm/dts/uniphier-ph1-ld4-ref.dts 
b/arch/arm/dts/uniphier-ph1-ld4-ref.dts
index 469bd05..3d14239 100644
--- a/arch/arm/dts/uniphier-ph1-ld4-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-ld4-ref.dts
@@ -51,6 +51,10 @@
        status = "okay";
 };
 
+&sd {
+       status = "okay";
+};
+
 &usb0 {
        status = "okay";
 };
diff --git a/arch/arm/dts/uniphier-ph1-ld4.dtsi 
b/arch/arm/dts/uniphier-ph1-ld4.dtsi
index 7c8759f..b93a34f 100644
--- a/arch/arm/dts/uniphier-ph1-ld4.dtsi
+++ b/arch/arm/dts/uniphier-ph1-ld4.dtsi
@@ -108,6 +108,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";
+               reg = <0x5a500000 0x200>;
+               interrupts = <0 78 4>;
+               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";
diff --git a/arch/arm/dts/uniphier-ph1-ld6b-ref.dts 
b/arch/arm/dts/uniphier-ph1-ld6b-ref.dts
index e0a972f..71fe961 100644
--- a/arch/arm/dts/uniphier-ph1-ld6b-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-ld6b-ref.dts
@@ -53,6 +53,10 @@
        status = "okay";
 };
 
+&sd {
+       status = "okay";
+};
+
 &usb0 {
        status = "okay";
 };
diff --git a/arch/arm/dts/uniphier-ph1-pro4-ref.dts 
b/arch/arm/dts/uniphier-ph1-pro4-ref.dts
index 02e74a7..70e3a20 100644
--- a/arch/arm/dts/uniphier-ph1-pro4-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-pro4-ref.dts
@@ -54,6 +54,14 @@
        status = "okay";
 };
 
+&sd {
+       status = "okay";
+};
+
+&sd1 {
+       status = "okay";
+};
+
 &usb0 {
        status = "okay";
 };
diff --git a/arch/arm/dts/uniphier-ph1-pro4.dtsi 
b/arch/arm/dts/uniphier-ph1-pro4.dtsi
index cb5b8f1..f413549 100644
--- a/arch/arm/dts/uniphier-ph1-pro4.dtsi
+++ b/arch/arm/dts/uniphier-ph1-pro4.dtsi
@@ -140,6 +140,43 @@
                clock-frequency = <400000>;
        };
 
+       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";
+               reg = <0x5a500000 0x200>;
+               interrupts = <0 78 4>;
+               pinctrl-names = "default", "1.8v";
+               pinctrl-0 = <&pinctrl_emmc>;
+               pinctrl-1 = <&pinctrl_emmc_1v8>;
+               clocks = <&mio 1>;
+               bus-width = <8>;
+               non-removable;
+       };
+
+       sd1: sdhc@5a600000 {
+               compatible = "socionext,uniphier-sdhc";
+               status = "disabled";
+               reg = <0x5a600000 0x200>;
+               interrupts = <0 85 4>;
+               pinctrl-names = "default", "1.8v";
+               pinctrl-0 = <&pinctrl_sd1>;
+               pinctrl-1 = <&pinctrl_sd1_1v8>;
+               clocks = <&mio 2>;
+               bus-width = <4>;
+       };
+
        usb2: usb@5a800100 {
                compatible = "socionext,uniphier-ehci", "generic-ehci";
                status = "disabled";
diff --git a/arch/arm/dts/uniphier-ph1-pro5-4kbox.dts 
b/arch/arm/dts/uniphier-ph1-pro5-4kbox.dts
index d46e827..721796a 100644
--- a/arch/arm/dts/uniphier-ph1-pro5-4kbox.dts
+++ b/arch/arm/dts/uniphier-ph1-pro5-4kbox.dts
@@ -47,6 +47,14 @@
        status = "okay";
 };
 
+&emmc {
+       status = "okay";
+};
+
+&sd {
+       status = "okay";
+};
+
 /* for U-boot only */
 / {
        soc {
diff --git a/arch/arm/dts/uniphier-ph1-pro5.dtsi 
b/arch/arm/dts/uniphier-ph1-pro5.dtsi
index 087b25a..56b5f3d 100644
--- a/arch/arm/dts/uniphier-ph1-pro5.dtsi
+++ b/arch/arm/dts/uniphier-ph1-pro5.dtsi
@@ -152,6 +152,30 @@
                clock-frequency = <400000>;
        };
 
+       emmc: sdhc@68400000 {
+               compatible = "socionext,uniphier-sdhc";
+               status = "disabled";
+               reg = <0x68400000 0x800>;
+               interrupts = <0 78 4>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_emmc>;
+               clocks = <&mio 1>;
+               bus-width = <8>;
+               non-removable;
+       };
+
+       sd: sdhc@68800000 {
+               compatible = "socionext,uniphier-sdhc";
+               status = "disabled";
+               reg = <0x68800000 0x800>;
+               interrupts = <0 76 4>;
+               pinctrl-names = "default", "1.8v";
+               pinctrl-0 = <&pinctrl_sd>;
+               pinctrl-1 = <&pinctrl_sd_1v8>;
+               clocks = <&mio 0>;
+               bus-width = <4>;
+       };
+
        usb0: usb@65a00000 {
                compatible = "socionext,uniphier-xhci", "generic-xhci";
                status = "disabled";
diff --git a/arch/arm/dts/uniphier-ph1-sld3-ref.dts 
b/arch/arm/dts/uniphier-ph1-sld3-ref.dts
index 1f3aee9..2d44eba 100644
--- a/arch/arm/dts/uniphier-ph1-sld3-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-sld3-ref.dts
@@ -52,6 +52,10 @@
        status = "okay";
 };
 
+&sd {
+       status = "okay";
+};
+
 &usb0 {
        status = "okay";
 };
diff --git a/arch/arm/dts/uniphier-ph1-sld3.dtsi 
b/arch/arm/dts/uniphier-ph1-sld3.dtsi
index 85dde66..d118e17 100644
--- a/arch/arm/dts/uniphier-ph1-sld3.dtsi
+++ b/arch/arm/dts/uniphier-ph1-sld3.dtsi
@@ -186,6 +186,25 @@
                        clocks = <&sysctrl 10>, <&sysctrl 18>;
                };
 
+               emmc: sdhc@5a400000 {
+                       compatible = "socionext,uniphier-sdhc";
+                       status = "disabled";
+                       reg = <0x5a400000 0x200>;
+                       interrupts = <0 78 4>;
+                       clocks = <&mio 1>;
+                       bus-width = <8>;
+                       non-removable;
+               };
+
+               sd: sdhc@5a500000 {
+                       compatible = "socionext,uniphier-sdhc";
+                       status = "disabled";
+                       reg = <0x5a500000 0x200>;
+                       interrupts = <0 76 4>;
+                       clocks = <&mio 0>;
+                       bus-width = <4>;
+               };
+
                usb0: usb@5a800100 {
                        compatible = "socionext,uniphier-ehci", "generic-ehci";
                        status = "disabled";
diff --git a/arch/arm/dts/uniphier-ph1-sld8-ref.dts 
b/arch/arm/dts/uniphier-ph1-sld8-ref.dts
index b58bf07..cdaf6eb 100644
--- a/arch/arm/dts/uniphier-ph1-sld8-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-sld8-ref.dts
@@ -51,6 +51,10 @@
        status = "okay";
 };
 
+&sd {
+       status = "okay";
+};
+
 &usb0 {
        status = "okay";
 };
diff --git a/arch/arm/dts/uniphier-ph1-sld8.dtsi 
b/arch/arm/dts/uniphier-ph1-sld8.dtsi
index f93db83..159354f 100644
--- a/arch/arm/dts/uniphier-ph1-sld8.dtsi
+++ b/arch/arm/dts/uniphier-ph1-sld8.dtsi
@@ -108,6 +108,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";
diff --git a/arch/arm/dts/uniphier-pinctrl.dtsi 
b/arch/arm/dts/uniphier-pinctrl.dtsi
index b1691d0..494139a 100644
--- a/arch/arm/dts/uniphier-pinctrl.dtsi
+++ b/arch/arm/dts/uniphier-pinctrl.dtsi
@@ -12,6 +12,11 @@
                function = "emmc";
        };
 
+       pinctrl_emmc_1v8: emmc_grp_1v8 {
+               groups = "emmc", "emmc_dat8";
+               function = "emmc";
+       };
+
        pinctrl_i2c0: i2c0_grp {
                groups = "i2c0";
                function = "i2c0";
@@ -37,11 +42,21 @@
                function = "sd";
        };
 
+       pinctrl_sd_1v8: sd_grp_1v8 {
+               groups = "sd";
+               function = "sd";
+       };
+
        pinctrl_sd1: sd1_grp {
                groups = "sd1";
                function = "sd1";
        };
 
+       pinctrl_sd1_1v8: sd1_grp_1v8 {
+               groups = "sd1";
+               function = "sd1";
+       };
+
        pinctrl_uart0: uart0_grp {
                groups = "uart0";
                function = "uart0";
diff --git a/arch/arm/dts/uniphier-proxstream2-gentil.dts 
b/arch/arm/dts/uniphier-proxstream2-gentil.dts
index a49215e..4ae16d2 100644
--- a/arch/arm/dts/uniphier-proxstream2-gentil.dts
+++ b/arch/arm/dts/uniphier-proxstream2-gentil.dts
@@ -41,6 +41,10 @@
        status = "okay";
 };
 
+&emmc {
+       status = "okay";
+};
+
 &usb0 {
        status = "okay";
 };
diff --git a/arch/arm/dts/uniphier-proxstream2-vodka.dts 
b/arch/arm/dts/uniphier-proxstream2-vodka.dts
index 63bd363..e9731aa 100644
--- a/arch/arm/dts/uniphier-proxstream2-vodka.dts
+++ b/arch/arm/dts/uniphier-proxstream2-vodka.dts
@@ -41,6 +41,10 @@
        status = "okay";
 };
 
+&emmc {
+       status = "okay";
+};
+
 &usb0 {
        status = "okay";
 };
diff --git a/arch/arm/dts/uniphier-proxstream2.dtsi 
b/arch/arm/dts/uniphier-proxstream2.dtsi
index a70b135..a01725f 100644
--- a/arch/arm/dts/uniphier-proxstream2.dtsi
+++ b/arch/arm/dts/uniphier-proxstream2.dtsi
@@ -163,6 +163,30 @@
                clock-frequency = <400000>;
        };
 
+       emmc: sdhc@5a000000 {
+               compatible = "socionext,uniphier-sdhc";
+               status = "disabled";
+               reg = <0x5a000000 0x800>;
+               interrupts = <0 78 4>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_emmc>;
+               clocks = <&mio 1>;
+               bus-width = <8>;
+               non-removable;
+       };
+
+       sd: sdhc@5a400000 {
+               compatible = "socionext,uniphier-sdhc";
+               status = "disabled";
+               reg = <0x5a400000 0x800>;
+               interrupts = <0 76 4>;
+               pinctrl-names = "default", "1.8v";
+               pinctrl-0 = <&pinctrl_sd>;
+               pinctrl-1 = <&pinctrl_sd_1v8>;
+               clocks = <&mio 0>;
+               bus-width = <4>;
+       };
+
        usb0: usb@65a00000 {
                compatible = "socionext,uniphier-xhci", "generic-xhci";
                status = "disabled";
-- 
1.9.1

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to