Commit c74f162e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-arm64-4.6-1' of git://git.infradead.org/linux-mvebu into next/arm64 

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: default avatarOlof Johansson <olof@lixom.net>
parents 8f4f2721 e772ca05

Documentation/arm/Marvell/README

+13 −0
Original line number Diff line number Diff line
@@ -118,6 +118,19 @@ EBU Armada family 
  Linux kernel mach directory: arch/arm/mach-mvebu

  Linux kernel plat directory: none



EBU Armada family ARMv8

-----------------------



  Armada 3710/3720 Flavors:

	88F3710

	88F3720



  Core: ARM Cortex A53 (ARMv8)



  Homepage     : http://www.marvell.com/embedded-processors/armada-3700/



  Device tree descritpion located in arch/arm64/boot/dts/marvell/armada-37*



Avanta family

-------------

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1278,6 +1278,7 @@ F: arch/arm/mach-mvebu/ 
F:	drivers/rtc/rtc-armada38x.c

F:	arch/arm/boot/dts/armada*

F:	arch/arm/boot/dts/kirkwood*

F:	arch/arm64/boot/dts/marvell/armada*





ARM/Marvell Berlin SoC support

arch/arm/mach-mvebu/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ menuconfig ARCH_MVEBU 
	depends on ARCH_MULTI_V7 || ARCH_MULTI_V5

	select ARCH_SUPPORTS_BIG_ENDIAN

	select CLKSRC_MMIO

	select GENERIC_IRQ_CHIP

	select PINCTRL

	select PLAT_ORION

	select SOC_BUS
@@ -29,6 +28,7 @@ config MACH_ARMADA_370 
	bool "Marvell Armada 370 boards"

	depends on ARCH_MULTI_V7

	select ARMADA_370_CLK

	select ARMADA_370_XP_IRQ

	select CPU_PJ4B

	select MACH_MVEBU_V7

	select PINCTRL_ARMADA_370
@@ -39,6 +39,7 @@ config MACH_ARMADA_370 
config MACH_ARMADA_375

	bool "Marvell Armada 375 boards"

	depends on ARCH_MULTI_V7

	select ARMADA_370_XP_IRQ

	select ARM_ERRATA_720789

	select ARM_ERRATA_753970

	select ARM_GIC
@@ -58,6 +59,7 @@ config MACH_ARMADA_38X 
	select ARM_ERRATA_720789

	select ARM_ERRATA_753970

	select ARM_GIC

	select ARMADA_370_XP_IRQ

	select ARMADA_38X_CLK

	select HAVE_ARM_SCU

	select HAVE_ARM_TWD if SMP
@@ -72,6 +74,7 @@ config MACH_ARMADA_39X 
	bool "Marvell Armada 39x boards"

	depends on ARCH_MULTI_V7

	select ARM_GIC

	select ARMADA_370_XP_IRQ

	select ARMADA_39X_CLK

	select CACHE_L2X0

	select HAVE_ARM_SCU
@@ -86,6 +89,7 @@ config MACH_ARMADA_39X 
config MACH_ARMADA_XP

	bool "Marvell Armada XP boards"

	depends on ARCH_MULTI_V7

	select ARMADA_370_XP_IRQ

	select ARMADA_XP_CLK

	select CPU_PJ4B

	select MACH_MVEBU_V7

arch/arm64/Kconfig.platforms

+6 −0
Original line number Diff line number Diff line
@@ -48,6 +48,12 @@ config ARCH_MEDIATEK 
	help

	  Support for Mediatek MT65xx & MT81xx ARMv8 SoCs



config ARCH_MVEBU

	bool "Marvell EBU SoC Family"

	help

	  This enables support for Marvell EBU family such as the

	  Armada 3700 SoC family.



config ARCH_QCOM

	bool "Qualcomm Platforms"

	select PINCTRL

arch/arm64/configs/defconfig

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ CONFIG_ARCH_EXYNOS7=y 
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
@@ -95,6 +96,7 @@ CONFIG_ATA=y 
CONFIG_SATA_AHCI=y

CONFIG_SATA_AHCI_PLATFORM=y

CONFIG_AHCI_CEVA=y

CONFIG_AHCI_MVEBU=y

CONFIG_AHCI_XGENE=y

CONFIG_SATA_RCAR=y

CONFIG_PATA_PLATFORM=y
@@ -136,6 +138,7 @@ CONFIG_SERIAL_MSM=y 
CONFIG_SERIAL_MSM_CONSOLE=y

CONFIG_SERIAL_XILINX_PS_UART=y

CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y

CONFIG_SERIAL_MVEBU_UART=y

CONFIG_VIRTIO_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C_QUP=y
@@ -171,6 +174,8 @@ 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

CRA Git | Maintained and supported by SUSTech CRA and CCSE