Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

S:	Maintained

F:	drivers/memory/*emif*

ARM/LG1K ARCHITECTURE

M:	Chanho Min <chanho.min@lge.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm64/boot/dts/lg/

ARM/LOGICPD PXA270 MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

M:	Philipp Zabel <philipp.zabel@gmail.com>

S:	Maintained

ARM/Marvell Kirkwood and Armada 370, 375, 38x, XP SOC support

ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support

M:	Jason Cooper <jason@lakedaemon.net>

M:	Andrew Lunn <andrew@lunn.ch>

M:	Gregory Clement <gregory.clement@free-electrons.com>

	help

	  This enables support for the Freescale Layerscape SoC family.

config ARCH_LG1K

	bool "LG Electronics LG1K SoC Family"

	help

	  This enables support for LG Electronics LG1K SoC Family

config ARCH_HISI

	bool "Hisilicon SoC Family"

	select ARM_TIMER_SP804

	select HISILICON_IRQ_MBIGEN

	help

	  This enables support for Hisilicon ARMv8 SoC family

config ARCH_MVEBU

	bool "Marvell EBU SoC Family"

	select ARMADA_AP806_CORE_CLK

	select ARMADA_AP806_RING_CLK

	select ARMADA_AP806_SYSCON

	select ARMADA_CP110_SYSCON

	select MVEBU_ODMI

	help

	  This enables support for Marvell EBU familly, including:

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_AUDIT=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_ARCH_BERLIN=y

CONFIG_ARCH_EXYNOS=y

CONFIG_ARCH_LAYERSCAPE=y

CONFIG_ARCH_LG1K=y

CONFIG_ARCH_HISI=y

CONFIG_ARCH_MEDIATEK=y

CONFIG_ARCH_MESON=y

CONFIG_ARCH_MVEBU=y

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_ROCKCHIP=y

CONFIG_PCI_LAYERSCAPE=y

CONFIG_PCI_HISI=y

CONFIG_PCIE_QCOM=y

CONFIG_ARM64_VA_BITS_48=y

CONFIG_SCHED_MC=y

CONFIG_PREEMPT=y

CONFIG_KSM=y

CONFIG_IP_PNP_BOOTP=y

# CONFIG_IPV6 is not set

CONFIG_BPF_JIT=y

# CONFIG_WIRELESS is not set

CONFIG_CFG80211=m

CONFIG_MAC80211=m

CONFIG_MAC80211_LEDS=y

CONFIG_RFKILL=m

CONFIG_NET_9P=y

CONFIG_NET_9P_VIRTIO=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_DMA_CMA=y

CONFIG_MTD=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_SPI_NOR=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_VIRTIO_BLK=y

# CONFIG_SCSI_PROC_FS is not set

CONFIG_AHCI_CEVA=y

CONFIG_AHCI_MVEBU=y

CONFIG_AHCI_XGENE=y

CONFIG_AHCI_QORIQ=y

CONFIG_SATA_RCAR=y

CONFIG_SATA_SIL24=y

CONFIG_PATA_PLATFORM=y

CONFIG_PATA_OF_PLATFORM=y

CONFIG_NETDEVICES=y

CONFIG_SMC91X=y

CONFIG_SMSC911X=y

CONFIG_MICREL_PHY=y

# CONFIG_WLAN is not set

CONFIG_USB_PEGASUS=m

CONFIG_USB_RTL8150=m

CONFIG_USB_RTL8152=m

CONFIG_USB_USBNET=m

CONFIG_USB_NET_DM9601=m

CONFIG_USB_NET_SR9800=m

CONFIG_USB_NET_SMSC75XX=m

CONFIG_USB_NET_SMSC95XX=m

CONFIG_USB_NET_PLUSB=m

CONFIG_USB_NET_MCS7830=m

CONFIG_WL18XX=m

CONFIG_WLCORE_SDIO=m

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_SERIO_SERPORT is not set

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI_NR_UARTS=11

CONFIG_SERIAL_SH_SCI_CONSOLE=y

CONFIG_SERIAL_MESON=y

CONFIG_SERIAL_MESON_CONSOLE=y

CONFIG_SERIAL_MSM=y

CONFIG_SERIAL_MSM_CONSOLE=y

CONFIG_SERIAL_XILINX_PS_UART=y

CONFIG_VIRTIO_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MUX=y

CONFIG_I2C_MUX_PCA954x=y

CONFIG_I2C_DESIGNWARE_PLATFORM=y

CONFIG_I2C_IMX=y

CONFIG_I2C_MV64XXX=y

CONFIG_I2C_QUP=y

CONFIG_I2C_TEGRA=y

CONFIG_I2C_UNIPHIER_F=y

CONFIG_I2C_RCAR=y

CONFIG_SPI=y

CONFIG_SPI_ORION=y

CONFIG_SPI_PL022=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=m

CONFIG_SPMI=y

CONFIG_PINCTRL_SINGLE=y

CONFIG_PINCTRL_MSM8916=y

CONFIG_POWER_RESET_MSM=y

CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

# CONFIG_HWMON is not set

CONFIG_SENSORS_LM90=m

CONFIG_SENSORS_INA2XX=m

CONFIG_THERMAL=y

CONFIG_THERMAL_EMULATION=y

CONFIG_EXYNOS_THERMAL=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_MFD_SEC_CORE=y

CONFIG_MFD_HI655X_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_HI655X=y

CONFIG_REGULATOR_QCOM_SMD_RPM=y

CONFIG_REGULATOR_QCOM_SPMI=y

CONFIG_REGULATOR_S2MPS11=y

CONFIG_USB=y

CONFIG_USB_OTG=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_XHCI_PLATFORM=y

CONFIG_USB_XHCI_RCAR=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MSM=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_MMC_ARMMMCI=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_OF_ESDHC=y

CONFIG_MMC_SDHCI_TEGRA=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_SPI=y

CONFIG_LEDS_TRIGGER_CPU=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_S5M=y

CONFIG_RTC_DRV_DS3232=y

CONFIG_RTC_DRV_EFI=y

CONFIG_RTC_DRV_PL031=y

CONFIG_RTC_DRV_SUN6I=y

CONFIG_RTC_DRV_XGENE=y

CONFIG_DMADEVICES=y

CONFIG_PL330_DMA=y

CONFIG_TEGRA20_APB_DMA=y

CONFIG_QCOM_BAM_DMA=y

CONFIG_RCAR_DMAC=y

CONFIG_XEN_GRANT_DEV_ALLOC=y

CONFIG_COMMON_CLK_SCPI=y

CONFIG_COMMON_CLK_CS2000_CP=y

CONFIG_CLK_QORIQ=y

CONFIG_COMMON_CLK_QCOM=y

CONFIG_MSM_GCC_8916=y

CONFIG_HWSPINLOCK_QCOM=y