summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-04-22 23:26:25 +0200
committerJason Cooper <jason@lakedaemon.net>2014-04-26 14:40:51 +0000
commit0180ed45da5198e0e7362c56b3a107d3278666f6 (patch)
tree43d31cb469a49884c1d01273a4a233e5906d1db0 /arch/arm
parent98d4db263ebcd32af128ed69acd713113ac16e9b (diff)
ARM: orion5x: convert to use 'clocks' property for UART controllers
Until the previous commit, the Orion5x clocks were not described in the Device Tree. Now that they are described in the Device Tree, we can replace the manual 'clock-frequency' property in the UART nodes by a nicer 'clocks' reference in those UART nodes. This commit consequently removes the 'clock-frequency' property from the LaCie edmini_v2 board, which is at this point the only Orion5x board converted to the Device Tree. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Link: https://lkml.kernel.org/r/1398202002-28530-22-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts1
-rw-r--r--arch/arm/boot/dts/orion5x.dtsi4
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
index 83f45a722055..ba43197d0873 100644
--- a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
+++ b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
@@ -73,6 +73,5 @@
};
&uart0 {
- clock-frequency = <166666667>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
index ad23ff40e0d1..88df8a811ad3 100644
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -65,7 +65,7 @@
reg = <0x12000 0x100>;
reg-shift = <2>;
interrupts = <3>;
- /* set clock-frequency in board dts */
+ clocks = <&core_clk 0>;
status = "disabled";
};
@@ -74,7 +74,7 @@
reg = <0x12100 0x100>;
reg-shift = <2>;
interrupts = <4>;
- /* set clock-frequency in board dts */
+ clocks = <&core_clk 0>;
status = "disabled";
};