]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge tag 'mvebu-arm64-4.6-1' of git://git.infradead.org/linux-mvebu into next/arm64
authorOlof Johansson <olof@lixom.net>
Thu, 25 Feb 2016 00:44:14 +0000 (16:44 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 25 Feb 2016 00:46:14 +0000 (16:46 -0800)
mvebu arm64 for 4.6 (part 1)

Non dt part of the Armada 3700 support:
- Kconfig update
- defconfig update
- documentation update (including MAINTAINERS:)

* tag 'mvebu-arm64-4.6-1' of git://git.infradead.org/linux-mvebu:
  arm64: defconfig: enable Armada 3700 related config
  Documentation: arm: update supported Marvell EBU processors
  MAINTAINERS: Extend dts entry for ARM64 mvebu files
  arm64: add mvebu architecture entry
  irqchip/armada-370-xp: Do not enable it by default when ARCH_MVEBU is selected
  ARM: mvebu: Use the ARMADA_370_XP_IRQ option
  irqchip/armada-370-xp: Allow allocation of multiple MSIs
  irqchip/armada-370-xp: Use shorter names for irq_chip
  irqchip/armada-370-xp: Use PCI_MSI_DOORBELL_START where appropriate
  irqchip/armada-370-xp: Use the generic MSI infrastructure
  irqchip/armada-370-xp: Add Kconfig option for the driver

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
MAINTAINERS
arch/arm64/Kconfig.platforms
arch/arm64/configs/defconfig

diff --cc MAINTAINERS
Simple merge
Simple merge
index 91ae2634cae9b9102567e2dfec92622457e454e4,00a49b4e61c1bdc07c987444a36fbdcaa7d47ac1..774e51fda7fac45bdb349c8395aa6767136271d8
@@@ -36,6 -37,6 +36,7 @@@ CONFIG_ARCH_EXYNOS7=
  CONFIG_ARCH_LAYERSCAPE=y
  CONFIG_ARCH_HISI=y
  CONFIG_ARCH_MEDIATEK=y
++CONFIG_ARCH_MVEBU=y
  CONFIG_ARCH_QCOM=y
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_ARCH_SEATTLE=y
@@@ -170,9 -169,9 +173,11 @@@ CONFIG_SND_SOC=
  CONFIG_SND_SOC_RCAR=y
  CONFIG_SND_SOC_AK4613=y
  CONFIG_USB=y
 +CONFIG_USB_OTG=y
+ CONFIG_USB_XHCI_HCD=y
+ CONFIG_USB_XHCI_PLATFORM=y
  CONFIG_USB_EHCI_HCD=y
 +CONFIG_USB_EHCI_MSM=y
  CONFIG_USB_EHCI_HCD_PLATFORM=y
  CONFIG_USB_OHCI_HCD=y
  CONFIG_USB_OHCI_HCD_PLATFORM=y