Merge tag 'sunxi-dt-h3-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Wed, 19 Apr 2017 12:39:05 +0000 (05:39 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 19 Apr 2017 12:39:05 +0000 (05:39 -0700)
commita9465b581da59ea20daadfa9c0c0d69053cedd85
treecd6002d60b572355485a435c25d969a71b55b134
parentec4c22e7c348885ab2d928e3ee1cac04e91fb19d
parent72897fa31fcf6222a11c6ebb0bcca25628bb1f7c
Merge tag 'sunxi-dt-h3-for-4.12' of https://git./linux/kernel/git/sunxi/linux into next/dt

Allwinner H3 DT changes for 4.12

H3 patches for 4.12, which are mostly related to reworking the H3 DTSI to
be usable on the arm64 H5 DTSI, that shares almost everything with the H3
but the CPU cores.

We also have some new device addition (USB, mostly) that would conflict
otherwise.

* tag 'sunxi-dt-h3-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: sun8i: h2+: enable USB OTG for Orange Pi Zero board
  ARM: sun8i: h3: enable USB OTG on Orange Pi One
  ARM: sunxi: h3/h5: add usb_otg and OHCI/EHCI for usbc0 on H3/H5
  arm: sun8i: h3: split Allwinner H3 .dtsi
  arm: sun8i: h3: correct the GIC compatible in H3 to gic-400
  arm: sun8i: h3: drop pinctrl-a10.h inclusion for H3 DTSI
  arm: sun8i: h3: drop skeleton.dtsi inclusion in H3 DTSI

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
arch/arm/boot/dts/sun8i-h3-orangepi-one.dts