diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-06 10:12:13 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-06 10:12:13 +0200 |
| commit | da5df6440834c64943e09c254dcfb8336ffbac15 (patch) | |
| tree | 1d344a9b19dd1353fc5c33cebd08b33e47472b67 /arch/arm/boot/dts/Makefile | |
| parent | 027b4a6d6affec15626e3e985852cf67a6a89842 (diff) | |
| parent | 60018d027d792bdfe9d98c83a470fa2cdd6a0e1a (diff) | |
| download | op-kernel-dev-da5df6440834c64943e09c254dcfb8336ffbac15.zip op-kernel-dev-da5df6440834c64943e09c254dcfb8336ffbac15.tar.gz | |
Merge tag 'sunxi-dt-for-4.3' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt
Allwinner Device Tree changes for 4.3
A bunch of device tree patches that:
- Enable the OTG controller on some boards
- Various additions to the existing boards
- New boards: A33 Ippo Q8H, Iteaduino Plus,
* tag 'sunxi-dt-for-4.3' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (35 commits)
ARM: dts: sun7i: Change cubietruck wifi enable pin to use mmc-pwrseq
ARM: dts: sun5i: hsg-h702: Enable USB OTG controller
ARM: dts: sun5i: hsg-h702: Enable side volume buttons with LRADC
ARM: dts: sun8i: Enable USB DRC on Ippo Q8H-A33 tablet
ARM: dts: sun5i: Enable USB DRC on A13 OLinuxIno
ARM: dts: sun5i: Enable USB DRC on A10s OLinuxIno Micro
ARM: dts: sun4i: Enable USB DRC on A10 OLinuxIno Lime
ARM: sunxi: dt: Convert users to the PIO interrupts binding
ARM: dts: sun4i: Add Iteaduino Plus A10
ARM: dts: A10s-OLinuxIno: Add a node for axp152 pmic
ARM: dts: axp152: Add a dtsi file for the axp152 pmic
ARM: dts: sun6i: Enable otg controller on the cs908
ARM: dts: sun4i: Enable otg controller on the mini-x
ARM: dts: sun4i: Enable otg controller on the ba10-tvbox
ARM: dts: sunxi: Add regulator-boot-on to usb host port regulator nodes
devicetree: Add msi to the vendor-prefix list
ARM: sun8i: dts: Add Ippo-q8h v1.2 with A33
ARM: dts: sun8i: sina33: Enable USB hosts
ARM: dts: sun8i: Enable USB host on GA10H-A33 tablets
ARM: dts: sun8i: Enable USB DRC on GA10H-A33 tablets
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index b60d151..f1cc5b3 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -573,6 +573,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \ sun4i-a10-hackberry.dtb \ sun4i-a10-hyundai-a7hd.dtb \ sun4i-a10-inet97fv2.dtb \ + sun4i-a10-itead-iteaduino-plus.dts \ sun4i-a10-jesurun-q5.dtb \ sun4i-a10-marsboard.dtb \ sun4i-a10-mini-xplus.dtb \ @@ -620,6 +621,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ sun8i-a23-ippo-q8h-v1.2.dtb \ sun8i-a33-et-q8-v1.6.dtb \ sun8i-a33-ga10h-v1.1.dtb \ + sun8i-a33-ippo-q8h-v1.2.dtb \ sun8i-a33-sinlinx-sina33.dtb dtb-$(CONFIG_MACH_SUN9I) += \ sun9i-a80-optimus.dtb \ |
