diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-18 09:26:44 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-18 09:27:46 -0700 |
| commit | 88cf9c5e494795a53ec360d0b38f483a6d4e508f (patch) | |
| tree | a5e62ef870083ad32ab9046153997b4c3badd236 /arch/arm/boot/dts | |
| parent | da0851fe3a8ebc416ab61ce50ef2fb3c3d7375c9 (diff) | |
| parent | 92fd6e066a4ecdf161710afe6460bc372899ae5f (diff) | |
Merge tag 'sunxi-dt-for-3.10-4' of git://github.com/mripard/linux into next/dt
From Maxime Ripard:
Fourth round of dt additions for 3.10
There's only one late patch that merge together two clocks that were
already defined in a previous patch.
* tag 'sunxi-dt-for-3.10-4' of git://github.com/mripard/linux:
ARM: sunxi: unify osc24M_fixed and osc24M
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/sun4i-a10.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun5i-a13.dtsi | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 5619a213da9..e7ef619a70a 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -42,17 +42,11 @@ clock-frequency = <0>; }; - osc24M_fixed: osc24M_fixed { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <24000000>; - }; - osc24M: osc24M@01c20050 { #clock-cells = <0>; compatible = "allwinner,sun4i-osc-clk"; reg = <0x01c20050 0x4>; - clocks = <&osc24M_fixed>; + clock-frequency = <24000000>; }; osc32k: osc32k { diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index 391bcb70858..31fa38f8cc9 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -43,17 +43,11 @@ clock-frequency = <0>; }; - osc24M_fixed: osc24M_fixed { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <24000000>; - }; - osc24M: osc24M@01c20050 { #clock-cells = <0>; compatible = "allwinner,sun4i-osc-clk"; reg = <0x01c20050 0x4>; - clocks = <&osc24M_fixed>; + clock-frequency = <24000000>; }; osc32k: osc32k { |