Merge git://www.denx.de/git/u-boot-marvell

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

diff --git a/arch/arm/dts/uniphier-ph1-pro5.dtsi b/arch/arm/dts/uniphier-ph1-pro5.dtsi
index bd1b4b1b66f946028579c2f4286e3dfb6c0c5b33..22a70b1a601ce04578ea5cf4123cd141d34ad6e8 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-pro5.dtsi
+++ b/arch/arm/dts/uniphier-ph1-pro5.dtsi
@@ -38,12 +38,6 @@
                        clock-frequency = <50000000>;
                };
 
-               uart_clk: uart_clk {
-                       #clock-cells = <0>;
-                       compatible = "fixed-clock";
-                       clock-frequency = <73728000>;
-               };
-
                i2c_clk: i2c_clk {
                        #clock-cells = <0>;
                        compatible = "fixed-clock";
@@ -355,6 +349,11 @@
                clock-frequency = <400000>;
        };
 
+       aidet@5fc20000 {
+               compatible = "simple-mfd", "syscon";
+               reg = <0x5fc20000 0x200>;
+       };
+
        emmc: sdhc@68400000 {
                compatible = "socionext,uniphier-sdhc";
                status = "disabled";
@@ -362,7 +361,7 @@
                interrupts = <0 78 4>;
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_emmc>;
-               clocks = <&mio 1>;
+               clocks = <&mio_clk 1>;
                bus-width = <8>;
                non-removable;
        };
@@ -375,7 +374,7 @@
                pinctrl-names = "default", "1.8v";
                pinctrl-0 = <&pinctrl_sd>;
                pinctrl-1 = <&pinctrl_sd_1v8>;
-               clocks = <&mio 0>;
+               clocks = <&mio_clk 0>;
                bus-width = <4>;
        };
 
@@ -418,22 +417,30 @@
        clock-frequency = <73728000>;
 };
 
-&mio {
-       compatible = "socionext,ph1-pro5-mioctrl";
-       clock-names = "stdmac";
-       clocks = <&sysctrl 10>;
+&mio_clk {
+       compatible = "socionext,uniphier-pro5-mio-clock";
 };
 
-&peri {
-       compatible = "socionext,ph1-pro5-perictrl";
-       clock-names = "uart", "fi2c";
-       clocks = <&sysctrl 3>, <&sysctrl 4>;
+&mio_rst {
+       compatible = "socionext,uniphier-pro5-mio-reset";
+};
+
+&peri_clk {
+       compatible = "socionext,uniphier-pro5-peri-clock";
+};
+
+&peri_rst {
+       compatible = "socionext,uniphier-pro5-peri-reset";
 };
 
 &pinctrl {
-       compatible = "socionext,ph1-pro5-pinctrl", "syscon";
+       compatible = "socionext,uniphier-pro5-pinctrl";
+};
+
+&sys_clk {
+       compatible = "socionext,uniphier-pro5-clock";
 };
 
-&sysctrl {
-       compatible = "socionext,ph1-pro5-sysctrl";
+&sys_rst {
+       compatible = "socionext,uniphier-pro5-reset";
 };