• Olof Johansson's avatar
    Merge tag 'sunxi-dt-for-3.16' of https://github.com/mripard/linux into next/dt · a59a5911
    Olof Johansson authored
    Merge "Allwinner DT additions for 3.16" from Maxime Ripard:
    
      - Introduction of the MMC controlers
      - New board: A10s R7, Mele M9, APP4-EVB1
      - Enabled the PMU on the Cortex A7-based SoCs
    
    * tag 'sunxi-dt-for-3.16' of https://github.com/mripard/linux: (38 commits)
      ARM: sunxi: dt: declare the r_pio pin controller for A31 SoC
      ARM: sunxi: dt: add PRCM clk and reset controller subdevices
      ARM: sunxi: dt: add APP4-EVB1 board support
      ARM: sun6i: dt: Add support for the USB controllers
      ARM: sun6i: Add the USB clocks to the DTSI
      ARM: dts: sun5i: Add new A10s r7 hdmi tv dongle board
      ARM: dts: sun7i: Add reg_vcc3v3 to sun7i board mmc nodes
      ARM: dts: sun6i: Add reg_vcc3v3 to sun6i board mmc nodes
      ARM: dts: sun5i: Add reg_vcc3v3 to sun5i board mmc nodes
      ARM: dts: sun4i: Add reg_vcc3v3 to sun4i board mmc nodes
      ARM: dts: sunxi: Add reg_vcc3v3 supply to sunxi-common-regulators.dtsi
      ARM: dts: sun7i: Add basic support for the Cubietruck WiFi module
      ARM: dts: sun7i: Enable mmc controller on various A20 boards
      ARM: dts: sun7i: Add pin-muxing info for the mmc controllers
      ARM: dts: sun7i: Add mmc controller nodes
      ARM: dts: sun6i: Add new sun6i-a31-m9 dts file for Mele M9
      ARM: dts: sun6i: Add mmc controller nodes
      ARM: dts: sun6i: Add mmc clocks
      ARM: dts: sun5i: Enable mmc controller on various A10s and A13 boards
      ARM: dts: sun5i: Add mmc controller nodes
      ...
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    a59a5911
Makefile 11.6 KB