arm64: mvebu: armada-7040-db.dts: Add I2C and SPI aliases

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

diff --git a/arch/arm/dts/uniphier-ph1-sld3.dtsi b/arch/arm/dts/uniphier-ph1-sld3.dtsi
index d8c44b7a0d8fec361493204e240f2eef98c1e325..a554b086e8164bd1fcb81119c94d5a0dbf56a0c7 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-sld3.dtsi
+++ b/arch/arm/dts/uniphier-ph1-sld3.dtsi
@@ -42,12 +42,6 @@
                        clock-frequency = <50000000>;
                };
 
-               uart_clk: uart_clk {
-                       #clock-cells = <0>;
-                       compatible = "fixed-clock";
-                       clock-frequency = <36864000>;
-               };
-
                iobus_clk: iobus_clk {
                        #clock-cells = <0>;
                        compatible = "fixed-clock";
@@ -92,7 +86,6 @@
                        interrupts = <0 33 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart0>;
-                       clocks = <&uart_clk>;
                        clock-frequency = <36864000>;
                };
 
@@ -103,7 +96,6 @@
                        interrupts = <0 35 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart1>;
-                       clocks = <&uart_clk>;
                        clock-frequency = <36864000>;
                };
 
@@ -114,7 +106,6 @@
                        interrupts = <0 37 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart2>;
-                       clocks = <&uart_clk>;
                        clock-frequency = <36864000>;
                };
 
@@ -299,12 +290,22 @@
                        reg = <0x59801000 0x400>;
                };
 
-               mio: mioctrl@59810000 {
-                       compatible = "socionext,ph1-sld3-mioctrl";
+               mioctrl@59810000 {
+                       compatible = "socionext,uniphier-mioctrl",
+                                    "simple-mfd", "syscon";
                        reg = <0x59810000 0x800>;
-                       #clock-cells = <1>;
-                       clock-names = "stdmac", "ehci";
-                       clocks = <&sysctrl 10>, <&sysctrl 18>;
+                       u-boot,dm-pre-reloc;
+
+                       mio_clk: clock {
+                               compatible = "socionext,uniphier-sld3-mio-clock";
+                               #clock-cells = <1>;
+                               u-boot,dm-pre-reloc;
+                       };
+
+                       mio_rst: reset {
+                               compatible = "socionext,uniphier-sld3-mio-reset";
+                               #reset-cells = <1>;
+                       };
                };
 
                emmc: sdhc@5a400000 {
@@ -315,7 +316,7 @@
                        pinctrl-names = "default", "1.8v";
                        pinctrl-0 = <&pinctrl_emmc>;
                        pinctrl-1 = <&pinctrl_emmc_1v8>;
-                       clocks = <&mio 1>;
+                       clocks = <&mio_clk 1>;
                        bus-width = <8>;
                        non-removable;
                };
@@ -328,7 +329,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>;
                };
 
@@ -339,7 +340,7 @@
                        interrupts = <0 80 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb0>;
-                       clocks = <&mio 3>, <&mio 6>;
+                       clocks = <&mio_clk 3>, <&mio_clk 6>;
                };
 
                usb1: usb@5a810100 {
@@ -349,7 +350,7 @@
                        interrupts = <0 81 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb1>;
-                       clocks = <&mio 4>, <&mio 6>;
+                       clocks = <&mio_clk 4>, <&mio_clk 6>;
                };
 
                usb2: usb@5a820100 {
@@ -359,7 +360,7 @@
                        interrupts = <0 82 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb2>;
-                       clocks = <&mio 5>, <&mio 6>;
+                       clocks = <&mio_clk 5>, <&mio_clk 6>;
                };
 
                usb3: usb@5a830100 {
@@ -369,7 +370,7 @@
                        interrupts = <0 83 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb3>;
-                       clocks = <&mio 7>, <&mio 6>;
+                       clocks = <&mio_clk 7>, <&mio_clk 6>;
                };
 
                soc-glue@5f800000 {
@@ -388,12 +389,20 @@
                        reg = <0xf1830000 0x200>;
                };
 
-               sysctrl: sysctrl@f1840000 {
-                       compatible = "socionext,ph1-sld3-sysctrl";
+               sysctrl@f1840000 {
+                       compatible = "socionext,uniphier-sysctrl",
+                                    "simple-mfd", "syscon";
                        reg = <0xf1840000 0x4000>;
-                       #clock-cells = <1>;
-                       clock-names = "ref";
-                       clocks = <&refclk>;
+
+                       sys_clk: clock {
+                               compatible = "socionext,uniphier-sld3-clock";
+                               #clock-cells = <1>;
+                       };
+
+                       sys_rst: reset {
+                               compatible = "socionext,uniphier-sld3-reset";
+                               #reset-cells = <1>;
+                       };
                };
 
                nand: nand@f8000000 {