For better maintainability.

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

Changes in v2:
  - Newly added

 arch/arm/dts/uniphier-ld11.dtsi |  2 +-
 arch/arm/dts/uniphier-pxs2.dtsi | 22 ++++++++--------------
 arch/arm/dts/uniphier-sld3.dtsi |  7 +++++--
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/arch/arm/dts/uniphier-ld11.dtsi b/arch/arm/dts/uniphier-ld11.dtsi
index 8488984..2843adb 100644
--- a/arch/arm/dts/uniphier-ld11.dtsi
+++ b/arch/arm/dts/uniphier-ld11.dtsi
@@ -318,7 +318,7 @@
                };
 
                mioctrl@5b3e0000 {
-                       compatible = "socionext,uniphier-mioctrl",
+                       compatible = "socionext,uniphier-ld11-mioctrl",
                                     "simple-mfd", "syscon";
                        reg = <0x5b3e0000 0x800>;
 
diff --git a/arch/arm/dts/uniphier-pxs2.dtsi b/arch/arm/dts/uniphier-pxs2.dtsi
index 904320c..b0f6f94 100644
--- a/arch/arm/dts/uniphier-pxs2.dtsi
+++ b/arch/arm/dts/uniphier-pxs2.dtsi
@@ -112,12 +112,6 @@
                        compatible = "fixed-clock";
                        clock-frequency = <50000000>;
                };
-
-               i2c_clk: i2c_clk {
-                       #clock-cells = <0>;
-                       compatible = "fixed-clock";
-                       clock-frequency = <50000000>;
-               };
        };
 
        soc {
@@ -389,7 +383,7 @@
                        interrupts = <0 41 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c0>;
-                       clocks = <&i2c_clk>;
+                       clocks = <&peri_clk 4>;
                        clock-frequency = <100000>;
                };
 
@@ -402,7 +396,7 @@
                        interrupts = <0 42 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c1>;
-                       clocks = <&i2c_clk>;
+                       clocks = <&peri_clk 5>;
                        clock-frequency = <100000>;
                };
 
@@ -415,7 +409,7 @@
                        interrupts = <0 43 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c2>;
-                       clocks = <&i2c_clk>;
+                       clocks = <&peri_clk 6>;
                        clock-frequency = <100000>;
                };
 
@@ -428,7 +422,7 @@
                        interrupts = <0 44 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c3>;
-                       clocks = <&i2c_clk>;
+                       clocks = <&peri_clk 7>;
                        clock-frequency = <100000>;
                };
 
@@ -439,7 +433,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        interrupts = <0 45 4>;
-                       clocks = <&i2c_clk>;
+                       clocks = <&peri_clk 8>;
                        clock-frequency = <400000>;
                };
 
@@ -450,7 +444,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        interrupts = <0 25 4>;
-                       clocks = <&i2c_clk>;
+                       clocks = <&peri_clk 9>;
                        clock-frequency = <400000>;
                };
 
@@ -461,7 +455,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        interrupts = <0 26 4>;
-                       clocks = <&i2c_clk>;
+                       clocks = <&peri_clk 10>;
                        clock-frequency = <400000>;
                };
 
@@ -590,7 +584,7 @@
                sysctrl@61840000 {
                        compatible = "socionext,uniphier-pxs2-sysctrl",
                                     "simple-mfd", "syscon";
-                       reg = <0x61840000 0x4000>;
+                       reg = <0x61840000 0x10000>;
 
                        sys_clk: clock {
                                compatible = "socionext,uniphier-pxs2-clock";
diff --git a/arch/arm/dts/uniphier-sld3.dtsi b/arch/arm/dts/uniphier-sld3.dtsi
index 7578920..9e458d3 100644
--- a/arch/arm/dts/uniphier-sld3.dtsi
+++ b/arch/arm/dts/uniphier-sld3.dtsi
@@ -101,6 +101,7 @@
                        interrupts = <0 33 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart0>;
+                       clocks = <&sys_clk 0>;
                        clock-frequency = <36864000>;
                };
 
@@ -111,6 +112,7 @@
                        interrupts = <0 35 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart1>;
+                       clocks = <&sys_clk 0>;
                        clock-frequency = <36864000>;
                };
 
@@ -121,6 +123,7 @@
                        interrupts = <0 37 4>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart2>;
+                       clocks = <&sys_clk 0>;
                        clock-frequency = <36864000>;
                };
 
@@ -307,7 +310,7 @@
                };
 
                mioctrl@59810000 {
-                       compatible = "socionext,uniphier-mioctrl",
+                       compatible = "socionext,uniphier-sld3-mioctrl",
                                     "simple-mfd", "syscon";
                        reg = <0x59810000 0x800>;
                        u-boot,dm-pre-reloc;
@@ -427,7 +430,7 @@
                sysctrl@f1840000 {
                        compatible = "socionext,uniphier-sld3-sysctrl",
                                     "simple-mfd", "syscon";
-                       reg = <0xf1840000 0x4000>;
+                       reg = <0xf1840000 0x10000>;
 
                        sys_clk: clock {
                                compatible = "socionext,uniphier-sld3-clock";
-- 
2.7.4

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

Reply via email to