• Olof Johansson's avatar
    Merge tag 'sunxi-dt-for-3.20' of... · 8749f9f3
    Olof Johansson authored
    Merge tag 'sunxi-dt-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt
    
    Merge "Allwinner device tree changes for 3.20" from Maxime Ripard:
    
    A lot of changes to the device tree for the 3.20 merge window, mostly with:
      - More DT license convertions, only two DTS and two DTSI are still uncertain
        and have not been converted yet
      - Use the C-preprocessor includes in the device trees.
      - Add support for the A31s SoC and improve the A80 support
      - Add IR receiver, lradc, PS/2 support
      - Add cpufreq support for all SoCs but the A23 and A80.
      - And a lot of new boards
    
    * tag 'sunxi-dt-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (64 commits)
      ARM: dts: sun5i: Enable axp209 support on A13-OLinuxIno
      ARM: sunxi: dts: Add A10/A20 PS2 pin muxing options
      ARM: sunxi: dts: Add PS2 nodes to dtsi for A10,A20
      ARM: dts: sun6i: Add resistive touchscreen controller node to dtsi
      ARM: dts: sun4i: Add Hyundau A7HD board
      ARM: dts: sun4i: Add Marsboard A10 board
      ARM: dts: sun9i: Enable mmc2 on A80 Optimus Board
      ARM: dts: sun9i: Add 8 bit mmc pinmux setting for mmc2
      ARM: dts: sun9i: Enable mmc0 on A80 Optimus Board
      ARM: dts: sun9i: Convert a80 optimus board dts to label referencing
      ARM: dts: sun9i: Add mmc controller nodes to the A80 dtsi
      ARM: dts: sun9i: Add mmc config clock nodes
      ARM: dts: sunxi: Add missing mdio label
      ARM: dts: sun5i: Add mk802_a10s board
      ARM: dts: sun4i: Add mk802ii board
      ARM: dts: sun4i: Add mk802 board
      ARM: dts: sun4i: Add dts file for Chuwi V7 CW0825 tablet
      ARM: dts: sun7i: Add dts file for Bananapro board
      ARM: sun6i: Enable ARM arch timers
      ARM: dts: sun6i: Convert hummingbird a31 dts to label references
      ...
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    8749f9f3
Makefile 15.6 KB