lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'sunxi-dt-for-3.10-4' of git://github.com/mripard/linux into next/dt

Browse Source 
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>
This commit is contained in:
Olof Johansson
2013-04-18 09:26:44 -07:00
parent da0851fe3a 92fd6e066a
commit 88cf9c5e49
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/boot/dts/sun4i-a10.dtsi
View File

@@ -42,17 +42,11 @@
clock-frequency = <0>; clock-frequency = <0>;
}; };
osc24M_fixed: osc24M_fixed {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <24000000>;
};
osc24M: osc24M@01c20050 { osc24M: osc24M@01c20050 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "allwinner,sun4i-osc-clk"; compatible = "allwinner,sun4i-osc-clk";
reg = <0x01c20050 0x4>; reg = <0x01c20050 0x4>;
clocks = <&osc24M_fixed>; clock-frequency = <24000000>;
}; };
osc32k: osc32k { osc32k: osc32k {

8
arch/arm/boot/dts/sun5i-a13.dtsi
View File

@@ -43,17 +43,11 @@
clock-frequency = <0>; clock-frequency = <0>;
}; };
osc24M_fixed: osc24M_fixed {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <24000000>;
};
osc24M: osc24M@01c20050 { osc24M: osc24M@01c20050 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "allwinner,sun4i-osc-clk"; compatible = "allwinner,sun4i-osc-clk";
reg = <0x01c20050 0x4>; reg = <0x01c20050 0x4>;
clocks = <&osc24M_fixed>; clock-frequency = <24000000>;
}; };
osc32k: osc32k { osc32k: osc32k {