Merge branch 'master' of http://git.denx.de/u-boot-sunxi

[oweals/u-boot.git] / arch / arm / dts / uniphier-proxstream2.dtsi

diff --git a/arch/arm/dts/uniphier-proxstream2.dtsi b/arch/arm/dts/uniphier-proxstream2.dtsi
index 23a6bfac872221479add59d649dce1ecb66cbf90..609cbaa9d7c77cdef6df66168999dec1539554e4 100644 (file)
--- a/arch/arm/dts/uniphier-proxstream2.dtsi
+++ b/arch/arm/dts/uniphier-proxstream2.dtsi
@@ -52,12 +52,6 @@
                        clock-frequency = <50000000>;
                };
 
-               uart_clk: uart_clk {
-                       #clock-cells = <0>;
-                       compatible = "fixed-clock";
-                       clock-frequency = <88900000>;
-               };
-
                i2c_clk: i2c_clk {
                        #clock-cells = <0>;
                        compatible = "fixed-clock";
@@ -366,7 +360,7 @@
                interrupts = <0 78 4>;
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_emmc>;
-               clocks = <&mio 1>;
+               clocks = <&mio_clk 1>;
                bus-width = <8>;
                non-removable;
        };
@@ -379,7 +373,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>;
        };
 
@@ -427,22 +421,30 @@
        clock-frequency = <88900000>;
 };
 
-&mio {
-       compatible = "socionext,proxstream2-mioctrl";
-       clock-names = "stdmac";
-       clocks = <&sysctrl 10>;
+&mio_clk {
+       compatible = "socionext,uniphier-pxs2-mio-clock";
+};
+
+&mio_rst {
+       compatible = "socionext,uniphier-pxs2-mio-reset";
+};
+
+&peri_clk {
+       compatible = "socionext,uniphier-pxs2-peri-clock";
 };
 
-&peri {
-       compatible = "socionext,proxstream2-perictrl";
-       clock-names = "uart", "fi2c";
-       clocks = <&sysctrl 3>, <&sysctrl 4>;
+&peri_rst {
+       compatible = "socionext,uniphier-pxs2-peri-reset";
 };
 
 &pinctrl {
        compatible = "socionext,uniphier-pxs2-pinctrl";
 };
 
-&sysctrl {
-       compatible = "socionext,proxstream2-sysctrl";
+&sys_clk {
+       compatible = "socionext,uniphier-pxs2-clock";
+};
+
+&sys_rst {
+       compatible = "socionext,uniphier-pxs2-reset";
 };