leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allwinner SoCs DT additions for 3.11

Browse Source 
- Switch to using the sun5i clocks for the A13
   - Register the pio node as an interrupt controller
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJRujsyAAoJEBx+YmzsjxAgjGMP/3bRiViygOoOuyeqU4macqym
 RlhhVYboHn8aBb1DFjWyDtJdjewDnK6ASXJS2QjnEioRWpaZ1nbdCiN3VA1nF+Vy
 c8+QozVbwBSvWXEyOAP3YQ2ansGIXikYvX25EbulnWbK7qqKOog7azoDiZTrPwPI
 7GcN4zNffeuHCxXi2ple6dua3zxdaU+Fu498eKeXvU6a2nKF0z03ximksdV+y9wP
 n5WHvITJFzZl+uXZ2V8rf21EdD6yEE3pL7RMlRyiMLISf1icCVE2O4wQeeC8PyV0
 /1l59lUUUO3NmDtJEubIEhiDUG4Qn9GTFvA1Jdc/TuLVsw/GGCfCgRp0NuaSG4VG
 JbBYQUBZdp0Y7si85skP9wEcMRwD851nzx/1wSyZfCzWQB0aHIKF/sV6Y1yB3bGf
 EZC1Z1ycOi/vRrmyWIeb8rQ/BdpORklWiH0v/ldmPBbA4qg1qJzSzt24LpDrFJev
 Sr+dmb1i9gqh3TtO6Ki51AqWxy0uqm+4NaG86o+OEsBvd4X6/JqPtoYvGsfoFvmP
 lBSORoAtq40UYBv64LAX0I7IMB55RHX/rQ/0vfStjv4AqrJru3XhmUJdPSZax+G0
 ZeNuiWjRG0hllQF/biPTw6eZv6kzY8c9Go9z7o++9v5Mo/IuoNb67Yf/jcqANmEi
 QzNq2QySVbliv6MlpJjo
 =3kFd
 -----END PGP SIGNATURE-----

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

From Maxime Ripard:
Allwinner SoCs DT additions for 3.11
  - Switch to using the sun5i clocks for the A13
  - Register the pio node as an interrupt controller

* tag 'sunxi-dt-for-3.11' of git://github.com/mripard/linux:
  ARM: sunxi: dt: Register the pio node as interrupt controller
  ARM: sun5i: Update the clock compatible strings

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2013-06-14 18:42:59 -07:00
commit 37177faefc
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,8 +177,10 @@
pio: pinctrl@01c20800 {
compatible = "allwinner,sun4i-a10-pinctrl";
reg = <0x01c20800 0x400>;
interrupts = <28>;
clocks = <&apb0_gates 5>;
gpio-controller;
interrupt-controller;
#address-cells = <1>;
#size-cells = <0>;
#gpio-cells = <3>;

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

@ -99,20 +99,15 @@
ahb_gates: ahb_gates@01c20060 {
#clock-cells = <1>;
compatible = "allwinner,sun4i-ahb-gates-clk";
compatible = "allwinner,sun5i-a13-ahb-gates-clk";
reg = <0x01c20060 0x8>;
clocks = <&ahb>;
clock-output-names = "ahb_usb0", "ahb_ehci0",
"ahb_ohci0", "ahb_ehci1", "ahb_ohci1", "ahb_ss",
"ahb_dma", "ahb_bist", "ahb_mmc0", "ahb_mmc1",
"ahb_mmc2", "ahb_mmc3", "ahb_ms", "ahb_nand",
"ahb_sdram", "ahb_ace", "ahb_emac", "ahb_ts",
"ahb_spi0", "ahb_spi1", "ahb_spi2", "ahb_spi3",
"ahb_pata", "ahb_sata", "ahb_gps", "ahb_ve",
"ahb_tvd", "ahb_tve0", "ahb_tve1", "ahb_lcd0",
"ahb_lcd1", "ahb_csi0", "ahb_csi1", "ahb_hdmi",
"ahb_de_be0", "ahb_de_be1", "ahb_de_fe0",
"ahb_de_fe1", "ahb_mp", "ahb_mali400";
clock-output-names = "ahb_usbotg", "ahb_ehci", "ahb_ohci",
"ahb_ss", "ahb_dma", "ahb_bist", "ahb_mmc0",
"ahb_mmc1", "ahb_mmc2", "ahb_nand", "ahb_sdram",
"ahb_spi0", "ahb_spi1", "ahb_spi2", "ahb_stimer",
"ahb_ve", "ahb_lcd", "ahb_csi", "ahb_de_be",
"ahb_de_fe", "ahb_iep", "ahb_mali400";
};
apb0: apb0@01c20054 {
@ -124,15 +119,13 @@
apb0_gates: apb0_gates@01c20068 {
#clock-cells = <1>;
compatible = "allwinner,sun4i-apb0-gates-clk";
compatible = "allwinner,sun5i-a13-apb0-gates-clk";
reg = <0x01c20068 0x4>;
clocks = <&apb0>;
clock-output-names = "apb0_codec", "apb0_spdif",
"apb0_ac97", "apb0_iis", "apb0_pio", "apb0_ir0",
"apb0_ir1", "apb0_keypad";
clock-output-names = "apb0_codec", "apb0_pio", "apb0_ir";
};
/* dummy is pll62 */
/* dummy is pll6 */
apb1_mux: apb1_mux@01c20058 {
#clock-cells = <0>;
compatible = "allwinner,sun4i-apb1-mux-clk";
@ -149,15 +142,11 @@
apb1_gates: apb1_gates@01c2006c {
#clock-cells = <1>;
compatible = "allwinner,sun4i-apb1-gates-clk";
compatible = "allwinner,sun5i-a13-apb1-gates-clk";
reg = <0x01c2006c 0x4>;
clocks = <&apb1>;
clock-output-names = "apb1_i2c0", "apb1_i2c1",
"apb1_i2c2", "apb1_can", "apb1_scr",
"apb1_ps20", "apb1_ps21", "apb1_uart0",
"apb1_uart1", "apb1_uart2", "apb1_uart3",
"apb1_uart4", "apb1_uart5", "apb1_uart6",
"apb1_uart7";
"apb1_i2c2", "apb1_uart1", "apb1_uart3";
};
};
@ -178,8 +167,10 @@
pio: pinctrl@01c20800 {
compatible = "allwinner,sun5i-a13-pinctrl";
reg = <0x01c20800 0x400>;
interrupts = <28>;
clocks = <&apb0_gates 5>;
gpio-controller;
interrupt-controller;
#address-cells = <1>;
#size-cells = <0>;
#gpio-cells = <3>;