From 0180ed45da5198e0e7362c56b3a107d3278666f6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 22 Apr 2014 23:26:25 +0200 Subject: 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 Acked-by: Sebastian Hesselbarth Link: https://lkml.kernel.org/r/1398202002-28530-22-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper --- arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 1 - arch/arm/boot/dts/orion5x.dtsi | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'arch/arm') 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"; }; -- cgit v1.2.3-70-g09d2