Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30ac4367 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'sunxi-dt-for-4.2-2' of... 

Merge tag 'sunxi-dt-for-4.2-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt

Allwinner DT changes for 4.2, take 2

A bunch of new DT changes for the 4.2 merge window, among which:
  - Enable the SRAM controller on the A10/A10s/A13/A20
  - A33 support
  - New boards: A23 EVB, SinA33, GA10H-A33, Mele A1000G

* tag 'sunxi-dt-for-4.2-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box
  ARM: dts: sun8i: Add dts file for the GA10H-A33 tablet
  ARM: dts: sun8i-a33: Add dts for Sinlinx SinA33 development board.
  ARM: dts: sun8i-a33: Add pinmux setting for uart0 on PB pins
  ARM: dts: sun8i: Add pinmux setting for 8bit mmc2
  ARM: dts: sun8i: Add usb_clk node for a23/a33
  ARM: dts: sun8i: Add ET-Q8 A33 support
  ARM: dts: sun8i: Add sun8i-a33 dtsi
  ARM: dts: sun8i: Add sun8i-a23-a33 dtsi
  ARM: dts: sun7i: Add A20 SRAM and SRAM controller
  ARM: dts: sun5i: Add A10s and A13 SRAM and SRAM controller
  ARM: dts: sun4i: Add A10 SRAM and SRAM controller
  ARM: dts: sunxi: Revert SRAM controller drivers patches
  ARM: dts: sun9i: Add device node for watchdog
  ARM: dts: sun7i: Add uart4 support for BananaPro, disable uart2
  ARM: dts: sun7i: Add uart4_pins_b definition
  ARM: sun8i: Introduce A23 Evaluation Board Support
parents 112cadfd 16b2a7d4

arch/arm/boot/dts/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ 
	sun6i-a31-hummingbird.dtb \

	sun6i-a31-i7.dtb \

	sun6i-a31-m9.dtb \

	sun6i-a31-mele-a1000g-quad.dtb \

	sun6i-a31s-cs908.dtb

dtb-$(CONFIG_MACH_SUN7I) += \

	sun7i-a20-bananapi.dtb \
@@ -582,8 +583,12 @@ dtb-$(CONFIG_MACH_SUN7I) += \ 
	sun7i-a20-pcduino3-nano.dtb \

	sun7i-a20-wexler-tab7200.dtb

dtb-$(CONFIG_MACH_SUN8I) += \

	sun8i-a23-evb.dtb \

	sun8i-a23-ippo-q8h-v5.dtb \

	sun8i-a23-ippo-q8h-v1.2.dtb

	sun8i-a23-ippo-q8h-v1.2.dtb \

	sun8i-a33-et-q8-v1.6.dtb \

	sun8i-a33-ga10h-v1.1.dtb \

	sun8i-a33-sinlinx-sina33.dtb

dtb-$(CONFIG_MACH_SUN9I) += \

	sun9i-a80-optimus.dtb \

	sun9i-a80-cubieboard4.dtb

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

+4 −0
Original line number Diff line number Diff line
@@ -108,6 +108,10 @@ 
	status = "okay";

};



&emac_sram {

	status = "okay";

};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins_a>;

arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts

+4 −0
Original line number Diff line number Diff line
@@ -74,6 +74,10 @@ 
	status = "okay";

};



&emac_sram {

	status = "okay";

};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins_a>;

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

+4 −0
Original line number Diff line number Diff line
@@ -102,6 +102,10 @@ 
	status = "okay";

};



&emac_sram {

	status = "okay";

};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins_a>;

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

+4 −0
Original line number Diff line number Diff line
@@ -86,6 +86,10 @@ 
	status = "okay";

};



&emac_sram {

	status = "okay";

};



&ir0 {

	pinctrl-names = "default";

	pinctrl-0 = <&ir0_rx_pins_a>;