diff options
| author | Olof Johansson <olof@lixom.net> | 2015-10-26 14:43:38 +0900 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-10-26 14:43:38 +0900 |
| commit | 3d2ef3b3962c60e3b25de6a981127d95cb0be98b (patch) | |
| tree | a7efc70a3dccd852d8d68ca53e3faec786c47d16 /arch/arm/boot/dts/Makefile | |
| parent | edd2a06d9c06a28f6f636929d586d17de835cd6b (diff) | |
| parent | a5ea06d0bc123cc7f49d042fab60ddd3964764c8 (diff) | |
Merge tag 'sunxi-dt-for-4.4-3' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt
Allwinner DT changes for 4.4, round 3
A bunch of new boards, but mostly enable the support for the Audio Codec
on the older SoCs (A10, A10s, A13, A20, R8) and enable it on various
boards.
* tag 'sunxi-dt-for-4.4-3' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
ARM: dts: sun6i: Add dts file for MSI Primo81 tablet
ARM: dts: sun6i: Add simplefb node labels to reference at board level
ARM: dts: sun4i: Enable audio codec on Marsboard A10.
ARM: dts: sun4i: Add dts file for the pov protab2-ips9 tablet
ARM: sun4i: Enable cubieboard audio codec
ARM: sun5i: chip: Enable the audio codec
ARM: sun4i: Enable audio-codec on Mele A1000
ARM: sun7i: Enable cubieboard2 audio codec
ARM: sun7i: dt: enable audio codec on Cubietruck
ARM: sun7i: Add sunxi codec device node
ARM: sun5i: Add the Audio codec DT node
ARM: sun4i: Add sunxi codec device node
ARM: sun7i: Add audio codec clock
ARM: sun5i: Add audio codec clock
ARM: sun4i: Add audio codec clock
ARM: sun7i: Add audio PLL
ARM: sun5i: Add audio PLL
ARM: sun4i: Add audio PLL
ARM: dts: sun7i: Enable USB DRC on pcDuino v3 Nano
ARM: dts: sun6i: Add support for Sinlinx A31s SDK board
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 1a8d79944013..4d5f825c575b 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -603,7 +603,8 @@ dtb-$(CONFIG_MACH_SUN4I) += \ sun4i-a10-mk802ii.dtb \ sun4i-a10-olinuxino-lime.dtb \ sun4i-a10-pcduino.dtb \ - sun4i-a10-pcduino2.dtb + sun4i-a10-pcduino2.dtb \ + sun4i-a10-pov-protab2-ips9.dtb dtb-$(CONFIG_MACH_SUN5I) += \ sun5i-a10s-auxtek-t003.dtb \ sun5i-a10s-auxtek-t004.dtb \ @@ -626,6 +627,8 @@ dtb-$(CONFIG_MACH_SUN6I) += \ sun6i-a31-m9.dtb \ sun6i-a31-mele-a1000g-quad.dtb \ sun6i-a31s-cs908.dtb \ + sun6i-a31s-primo81.dtb \ + sun6i-a31s-sina31s.dtb \ sun6i-a31s-sinovoip-bpi-m2.dtb \ sun6i-a31s-yones-toptech-bs1078-v2.dtb dtb-$(CONFIG_MACH_SUN7I) += \ |