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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJRa8R+AAoJEBx+YmzsjxAgEAQP/RTPMOL2nyyRuIjNdRP35Yr/
 wDtICD8I/ZFYPXkhEg5UqyidNPlg7x5jmsxBUVatH6wPC/9XoBowlDTBphHeRrQ0
 7GyVhKq3L7p6LmJu7n5ImSWnPiVCb0AjobDJsfJIizfPc0fSn6ilF6BWo5kDoWjL
 S4Q9DHHHzEhvAapt2JjVPUoEb5jeqKXKQEmAYjZAST+AuCfjzUzsbubNogH7icB1
 Ckst1PslPO8x1MeAEptuaPSBPaSjfBIcPBHW+5QxwRESWqthBm1SD2KJ1zhCrRAZ
 hLRX9IZ2NZXBotTV3vR+SDM9rvCjTSasnXF39JtZcez6Y6dSZuvg8lP5n6BGgepg
 vrK7AQJ2RYJGVjH3hZu4SuGfpwmQG1wPYx/3/K8uff+ugcx8Q7lc3u1imTE9d8ID
 MCfx5Fxb9OJ5Qa3unv2F97wa84etyYTdSyZ0bKhpJv39g+6bkSiky1UtpRC7SRjz
 zd+AqfTHwOGFNTn01DmM3MkoTf97MAv1oqXCLX5feCJa9ta/I7goQqjhnXrExdV1
 QaowX69hCuYgEKg5dFx34RQAnYsATYUrtnFJ6M1o6mbsLFsF0DbwJMKMvERVU2Sn
 UbiWROIPSG8zjGSleYEZnT0Tr3f7RcJwUQPKd7Txi+rptm8NdF/Ze1O30dgrqbVd
 G5cmvxBEMfjZVMVsfBCi
 =Iadx
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2013-04-18 09:26:44 -07:00
commit 88cf9c5e49
2 changed files with 2 additions and 14 deletions

View file

@ -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 {

View file

@ -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 {