Commit 42aee275 authored by Masahiro Yamada's avatar Masahiro Yamada

arm64: dts: uniphier: use clock/reset controllers

The UniPhier reset controller driver has been merged.  Enable it.
Also, replace the fixed-rate clocks with the dedicated clock
drivers.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 5d9a83c9
...@@ -114,18 +114,6 @@ refclk: ref { ...@@ -114,18 +114,6 @@ refclk: ref {
#clock-cells = <0>; #clock-cells = <0>;
clock-frequency = <25000000>; clock-frequency = <25000000>;
}; };
uart_clk: uart_clk {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <58820000>;
};
i2c_clk: i2c_clk {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <50000000>;
};
}; };
timer { timer {
...@@ -149,7 +137,7 @@ serial0: serial@54006800 { ...@@ -149,7 +137,7 @@ serial0: serial@54006800 {
interrupts = <0 33 4>; interrupts = <0 33 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart0>; pinctrl-0 = <&pinctrl_uart0>;
clocks = <&uart_clk>; clocks = <&peri_clk 0>;
}; };
serial1: serial@54006900 { serial1: serial@54006900 {
...@@ -159,7 +147,7 @@ serial1: serial@54006900 { ...@@ -159,7 +147,7 @@ serial1: serial@54006900 {
interrupts = <0 35 4>; interrupts = <0 35 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart1>; pinctrl-0 = <&pinctrl_uart1>;
clocks = <&uart_clk>; clocks = <&peri_clk 1>;
}; };
serial2: serial@54006a00 { serial2: serial@54006a00 {
...@@ -169,7 +157,7 @@ serial2: serial@54006a00 { ...@@ -169,7 +157,7 @@ serial2: serial@54006a00 {
interrupts = <0 37 4>; interrupts = <0 37 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart2>; pinctrl-0 = <&pinctrl_uart2>;
clocks = <&uart_clk>; clocks = <&peri_clk 2>;
}; };
serial3: serial@54006b00 { serial3: serial@54006b00 {
...@@ -179,7 +167,7 @@ serial3: serial@54006b00 { ...@@ -179,7 +167,7 @@ serial3: serial@54006b00 {
interrupts = <0 177 4>; interrupts = <0 177 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart3>; pinctrl-0 = <&pinctrl_uart3>;
clocks = <&uart_clk>; clocks = <&peri_clk 3>;
}; };
i2c0: i2c@58780000 { i2c0: i2c@58780000 {
...@@ -191,7 +179,7 @@ i2c0: i2c@58780000 { ...@@ -191,7 +179,7 @@ i2c0: i2c@58780000 {
interrupts = <0 41 4>; interrupts = <0 41 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c0>; pinctrl-0 = <&pinctrl_i2c0>;
clocks = <&i2c_clk>; clocks = <&peri_clk 4>;
clock-frequency = <100000>; clock-frequency = <100000>;
}; };
...@@ -204,7 +192,7 @@ i2c1: i2c@58781000 { ...@@ -204,7 +192,7 @@ i2c1: i2c@58781000 {
interrupts = <0 42 4>; interrupts = <0 42 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c1>; pinctrl-0 = <&pinctrl_i2c1>;
clocks = <&i2c_clk>; clocks = <&peri_clk 5>;
clock-frequency = <100000>; clock-frequency = <100000>;
}; };
...@@ -214,7 +202,7 @@ i2c2: i2c@58782000 { ...@@ -214,7 +202,7 @@ i2c2: i2c@58782000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
interrupts = <0 43 4>; interrupts = <0 43 4>;
clocks = <&i2c_clk>; clocks = <&peri_clk 6>;
clock-frequency = <400000>; clock-frequency = <400000>;
}; };
...@@ -227,7 +215,7 @@ i2c3: i2c@58783000 { ...@@ -227,7 +215,7 @@ i2c3: i2c@58783000 {
interrupts = <0 44 4>; interrupts = <0 44 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c3>; pinctrl-0 = <&pinctrl_i2c3>;
clocks = <&i2c_clk>; clocks = <&peri_clk 7>;
clock-frequency = <100000>; clock-frequency = <100000>;
}; };
...@@ -240,7 +228,7 @@ i2c4: i2c@58784000 { ...@@ -240,7 +228,7 @@ i2c4: i2c@58784000 {
interrupts = <0 45 4>; interrupts = <0 45 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c4>; pinctrl-0 = <&pinctrl_i2c4>;
clocks = <&i2c_clk>; clocks = <&peri_clk 8>;
clock-frequency = <100000>; clock-frequency = <100000>;
}; };
...@@ -250,7 +238,7 @@ i2c5: i2c@58785000 { ...@@ -250,7 +238,7 @@ i2c5: i2c@58785000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
interrupts = <0 25 4>; interrupts = <0 25 4>;
clocks = <&i2c_clk>; clocks = <&peri_clk 9>;
clock-frequency = <400000>; clock-frequency = <400000>;
}; };
...@@ -269,6 +257,38 @@ smpctrl@59800000 { ...@@ -269,6 +257,38 @@ smpctrl@59800000 {
reg = <0x59801000 0x400>; reg = <0x59801000 0x400>;
}; };
mioctrl@59810000 {
compatible = "socionext,uniphier-mioctrl",
"simple-mfd", "syscon";
reg = <0x59810000 0x800>;
mio_clk: clock {
compatible = "socionext,uniphier-ld20-mio-clock";
#clock-cells = <1>;
};
mio_rst: reset {
compatible = "socionext,uniphier-ld20-mio-reset";
#reset-cells = <1>;
};
};
perictrl@59820000 {
compatible = "socionext,uniphier-perictrl",
"simple-mfd", "syscon";
reg = <0x59820000 0x200>;
peri_clk: clock {
compatible = "socionext,uniphier-ld20-peri-clock";
#clock-cells = <1>;
};
peri_rst: reset {
compatible = "socionext,uniphier-ld20-peri-reset";
#reset-cells = <1>;
};
};
soc-glue@5f800000 { soc-glue@5f800000 {
compatible = "simple-mfd", "syscon"; compatible = "simple-mfd", "syscon";
reg = <0x5f800000 0x2000>; reg = <0x5f800000 0x2000>;
...@@ -286,6 +306,22 @@ gic: interrupt-controller@5fe00000 { ...@@ -286,6 +306,22 @@ gic: interrupt-controller@5fe00000 {
#interrupt-cells = <3>; #interrupt-cells = <3>;
interrupts = <1 9 4>; interrupts = <1 9 4>;
}; };
sysctrl@61840000 {
compatible = "socionext,uniphier-sysctrl",
"simple-mfd", "syscon";
reg = <0x61840000 0x4000>;
sys_clk: clock {
compatible = "socionext,uniphier-ld20-clock";
#clock-cells = <1>;
};
sys_rst: reset {
compatible = "socionext,uniphier-ld20-reset";
#reset-cells = <1>;
};
};
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment