Commit 37177fae authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents 36d29fb5 39138bc6

arch/arm/boot/dts/sun4i-a10.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/sun5i-a13.dtsi

+14 −23
Original line number Diff line number Diff line
@@ -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>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE