From: Olof Johansson Date: Sat, 19 Jul 2014 19:19:28 +0000 (-0700) Subject: Merge tag 'sunxi-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripar... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=15bebad68e9ed75ce14c93dbff8123633d9f7481;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge tag 'sunxi-dt-for-3.17' of git://git./linux/kernel/git/mripard/linux into next/dt Merge "Allwinner DT additions for 3.17" from Maxime Ripard: Among the few patches that we have so far, there's a few noticeable changes: - Introduction of the Allwinner A23 SoC - Support for the GMAC on the A31. This is only available so far on the boards which bootloader enable the PHY regulator. - Addition of the infrared receiver * tag 'sunxi-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (22 commits) ARM: dts: sun6i: Add Merrii A31 Hummingbird support ARM: dts: sun6i: Add ethernet alias for GMAC ARM: dts: sun6i: Add A31 GMAC gigabit ethernet controller node ARM: dts: sun6i: Add GMAC clock node to the A31 dtsi ARM: dts: sun6i: Add pin muxing options for GMAC ARM: sun8i: Add PRCM clock and reset controller nodes to the DTSI ARM: sun8i: Add reset controller nodes to the DTSI ARM: sun8i: Add basic clock nodes to the DTSI ARM: dts: sun4i: Add ir node to various boards ARM: dts: sun4i: Add ir controller nodes and pinmux ARM: dts: sun4i: Add new ba10-tvbox board ARM: dts: sun7i: Add board support for LinkSprite pcDuino V3 ARM: dts: sun7i: Add ir receiver support to a20-i12-tvbox ARM: dts: sun7i: Rename sun7i-a20-ir to sun4i-a10-ir ARM: dts: sun7i: Add AXP209 support to various boards ARM: dts: sun4i: Add AXP209 support to various boards ARM: dts: sunxi: Add #interrupt-cells to pinctrl nodes ARM: sun8i: dt: Add Ippo-q8h v5 support ARM: sunxi: Add Allwinner A23 dtsi ARM: sunxi: Add IR controllers on A20 to dtsi ... Signed-off-by: Olof Johansson --- 15bebad68e9ed75ce14c93dbff8123633d9f7481 diff --cc arch/arm/boot/dts/Makefile index fc7f75a323cf,8be3687120d2..4a9dc97e00ba --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@@ -378,9 -357,10 +378,10 @@@ dtb-$(CONFIG_ARCH_STI)+= stih407-b2120. stih415-b2020.dtb \ stih416-b2000.dtb \ stih416-b2020.dtb \ - stih416-b2020-revE.dtb + stih416-b2020e.dtb dtb-$(CONFIG_MACH_SUN4I) += \ sun4i-a10-a1000.dtb \ + sun4i-a10-ba10-tvbox.dtb \ sun4i-a10-cubieboard.dtb \ sun4i-a10-mini-xplus.dtb \ sun4i-a10-hackberry.dtb \