Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2018-12-12 12:04:34 +0100
committerKernel Build Daemon <kbuild@suse.de>2018-12-12 12:04:34 +0100
commit796c22afc04310861d21ded461965a7ac2d8c75d (patch)
tree298a0165373c02483674612d3cfd24389e2db2bd
parent2813271b3c22e22761d0a4a3a8d316d6f9ded79e (diff)
Automatically updated to 4.20-rc6-next-20181212
-rw-r--r--config/arm64/vanilla65
-rw-r--r--config/armv7hl/vanilla1
-rw-r--r--rpm/config.sh2
3 files changed, 67 insertions, 1 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index 5fbdde2bbe..c2af98c472 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -260,6 +260,8 @@ CONFIG_ARCH_HISI=y
CONFIG_ARCH_MEDIATEK=y
CONFIG_ARCH_MESON=y
CONFIG_ARCH_MVEBU=y
+CONFIG_ARCH_MXC=y
+CONFIG_SOC_IMX8MQ=y
CONFIG_ARCH_QCOM=y
CONFIG_ARCH_REALTEK=y
# CONFIG_ARCH_RENESAS is not set
@@ -528,6 +530,8 @@ CONFIG_RESET_ATTACK_MITIGATION=y
CONFIG_UEFI_CPER=y
CONFIG_UEFI_CPER_ARM=y
# CONFIG_EFI_DEV_PATH_PARSER is not set
+CONFIG_IMX_SCU=y
+CONFIG_IMX_SCU_PD=y
CONFIG_MESON_SM=y
#
@@ -2027,6 +2031,7 @@ CONFIG_ARM_CCI=y
CONFIG_ARM_CCI400_COMMON=y
CONFIG_BRCMSTB_GISB_ARB=y
CONFIG_HISILICON_LPC=y
+CONFIG_IMX_WEIM=y
CONFIG_QCOM_EBI2=y
CONFIG_SIMPLE_PM_BUS=y
CONFIG_SUN50I_DE2_BUS=y
@@ -2165,9 +2170,11 @@ CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
CONFIG_MTD_NAND_CAFE=m
CONFIG_MTD_NAND_MARVELL=m
CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_GPMI_NAND=m
# CONFIG_MTD_NAND_BRCMNAND is not set
CONFIG_MTD_NAND_PLATFORM=m
CONFIG_MTD_NAND_FSL_IFC=m
+CONFIG_MTD_NAND_MXC=m
CONFIG_MTD_NAND_SUNXI=m
CONFIG_MTD_NAND_HISI504=m
CONFIG_MTD_NAND_QCOM=m
@@ -2520,6 +2527,7 @@ CONFIG_SATA_AHCI=y
CONFIG_SATA_MOBILE_LPM_POLICY=0
CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_AHCI_BRCM=m
+CONFIG_AHCI_IMX=m
CONFIG_AHCI_CEVA=m
CONFIG_AHCI_MTK=m
CONFIG_AHCI_MVEBU=m
@@ -2574,6 +2582,7 @@ CONFIG_PATA_HPT37X=m
CONFIG_PATA_HPT3X2N=m
CONFIG_PATA_HPT3X3=m
# CONFIG_PATA_HPT3X3_DMA is not set
+CONFIG_PATA_IMX=m
CONFIG_PATA_IT8213=m
CONFIG_PATA_IT821X=m
CONFIG_PATA_JMICRON=m
@@ -2901,6 +2910,7 @@ CONFIG_BE2NET_SKYHAWK=y
CONFIG_NET_VENDOR_EZCHIP=y
CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m
CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_FEC=m
CONFIG_FSL_FMAN=m
CONFIG_FSL_PQ_MDIO=m
CONFIG_FSL_XGMAC_MDIO=m
@@ -3727,6 +3737,7 @@ CONFIG_KEYBOARD_LM8333=m
CONFIG_KEYBOARD_MAX7359=m
CONFIG_KEYBOARD_MCS=m
CONFIG_KEYBOARD_MPR121=m
+CONFIG_KEYBOARD_IMX=m
CONFIG_KEYBOARD_NEWTON=m
CONFIG_KEYBOARD_TEGRA=m
CONFIG_KEYBOARD_OPENCORES=m
@@ -4060,6 +4071,7 @@ CONFIG_SERIAL_SAMSUNG_UARTS=4
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
# CONFIG_SERIAL_MAX3100 is not set
# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_IMX=m
# CONFIG_SERIAL_UARTLITE is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
@@ -4090,6 +4102,7 @@ CONFIG_SERIAL_MVEBU_UART=y
CONFIG_SERIAL_MVEBU_CONSOLE=y
CONFIG_SERIAL_OWL=y
CONFIG_SERIAL_OWL_CONSOLE=y
+CONFIG_SERIAL_MCTRL_GPIO=m
CONFIG_SERIAL_DEV_BUS=y
CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
# CONFIG_TTY_PRINTK is not set
@@ -4114,6 +4127,7 @@ CONFIG_HW_RANDOM_BCM2835=m
CONFIG_HW_RANDOM_IPROC_RNG200=m
# CONFIG_HW_RANDOM_OMAP is not set
CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_IMX_RNGC=m
CONFIG_HW_RANDOM_HISI=m
CONFIG_HW_RANDOM_XGENE=m
CONFIG_HW_RANDOM_MESON=m
@@ -4219,6 +4233,7 @@ CONFIG_I2C_DESIGNWARE_PCI=m
CONFIG_I2C_GPIO=m
# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
# CONFIG_I2C_IMX is not set
+CONFIG_I2C_IMX_LPI2C=m
CONFIG_I2C_KEMPLD=m
CONFIG_I2C_MESON=m
CONFIG_I2C_MT65XX=m
@@ -4292,7 +4307,9 @@ CONFIG_SPI_DW_PCI=m
# CONFIG_SPI_DW_MID_DMA is not set
CONFIG_SPI_DW_MMIO=m
CONFIG_SPI_DLN2=m
+CONFIG_SPI_FSL_LPSPI=m
CONFIG_SPI_GPIO=m
+CONFIG_SPI_IMX=m
# CONFIG_SPI_LM70_LLP is not set
CONFIG_SPI_FSL_LIB=y
CONFIG_SPI_FSL_SPI=y
@@ -4398,6 +4415,8 @@ CONFIG_PINCTRL_AS370=y
# CONFIG_PINCTRL_BERLIN_BG2CD is not set
# CONFIG_PINCTRL_BERLIN_BG2Q is not set
CONFIG_PINCTRL_BERLIN_BG4CT=y
+CONFIG_PINCTRL_IMX=y
+CONFIG_PINCTRL_IMX8MQ=y
CONFIG_PINCTRL_MVEBU=y
CONFIG_PINCTRL_ARMADA_AP806=y
CONFIG_PINCTRL_ARMADA_CP110=y
@@ -4507,6 +4526,7 @@ CONFIG_GPIO_MB86S7X=m
CONFIG_GPIO_MOCKUP=m
# CONFIG_GPIO_MPC8XXX is not set
CONFIG_GPIO_MVEBU=y
+CONFIG_GPIO_MXC=y
CONFIG_GPIO_PL061=y
CONFIG_GPIO_PMIC_EIC_SPRD=m
CONFIG_GPIO_SPRD=m
@@ -4576,6 +4596,7 @@ CONFIG_W1_CON=y
CONFIG_W1_MASTER_MATROX=m
CONFIG_W1_MASTER_DS2490=m
CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_MXC=m
CONFIG_W1_MASTER_DS1WM=m
CONFIG_W1_MASTER_GPIO=m
@@ -4855,6 +4876,7 @@ CONFIG_CLOCK_THERMAL=y
CONFIG_DEVFREQ_THERMAL=y
# CONFIG_THERMAL_EMULATION is not set
CONFIG_HISI_THERMAL=m
+CONFIG_IMX_THERMAL=m
CONFIG_MAX77620_THERMAL=m
CONFIG_QORIQ_THERMAL=m
CONFIG_ROCKCHIP_THERMAL=m
@@ -5480,6 +5502,8 @@ CONFIG_VIDEO_CADENCE=y
CONFIG_SOC_CAMERA=m
CONFIG_SOC_CAMERA_PLATFORM=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_CODA=m
+CONFIG_VIDEO_IMX_PXP=m
CONFIG_VIDEO_MEDIATEK_VPU=m
CONFIG_VIDEO_MEDIATEK_MDP=m
CONFIG_VIDEO_MEDIATEK_VCODEC=m
@@ -6038,6 +6062,8 @@ CONFIG_DRM_DW_HDMI_CEC=m
CONFIG_DRM_DW_MIPI_DSI=m
CONFIG_DRM_VC4=m
CONFIG_DRM_VC4_HDMI_CEC=y
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_ETNAVIV_THERMAL=y
# CONFIG_DRM_ARCPGU is not set
CONFIG_DRM_HISI_HIBMC=m
CONFIG_DRM_HISI_KIRIN=m
@@ -6089,6 +6115,7 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_PM2 is not set
# CONFIG_FB_ARMCLCD is not set
+CONFIG_FB_IMX=m
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_IMSTT is not set
@@ -6124,6 +6151,8 @@ CONFIG_FB_METRONOME=m
CONFIG_FB_MB862XX=m
CONFIG_FB_MB862XX_PCI_GDC=y
CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_MX3=m
+CONFIG_FB_MXS=m
# CONFIG_FB_SIMPLE is not set
# CONFIG_FB_SSD1307 is not set
# CONFIG_FB_SM712 is not set
@@ -6358,7 +6387,20 @@ CONFIG_SND_SOC_FSL_SAI=m
CONFIG_SND_SOC_FSL_SSI=m
CONFIG_SND_SOC_FSL_SPDIF=m
CONFIG_SND_SOC_FSL_ESAI=m
+CONFIG_SND_SOC_FSL_UTILS=m
+CONFIG_SND_SOC_IMX_PCM_DMA=m
CONFIG_SND_SOC_IMX_AUDMUX=m
+CONFIG_SND_IMX_SOC=m
+CONFIG_SND_SOC_IMX_SSI=m
+
+#
+# SoC Audio support for Freescale i.MX boards:
+#
+CONFIG_SND_SOC_EUKREA_TLV320=m
+CONFIG_SND_SOC_IMX_ES8328=m
+CONFIG_SND_SOC_IMX_SGTL5000=m
+CONFIG_SND_SOC_IMX_SPDIF=m
+CONFIG_SND_SOC_FSL_ASOC_CARD=m
CONFIG_SND_I2S_HI6210_I2S=m
CONFIG_SND_KIRKWOOD_SOC=m
CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
@@ -6776,6 +6818,7 @@ CONFIG_USB_EHCI_HCD=m
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
CONFIG_USB_EHCI_PCI=m
+CONFIG_USB_EHCI_MXC=m
CONFIG_USB_EHCI_HCD_ORION=m
CONFIG_USB_EHCI_TEGRA=m
CONFIG_USB_EHCI_EXYNOS=m
@@ -7000,6 +7043,7 @@ CONFIG_USB_PHY=y
CONFIG_NOP_USB_XCEIV=m
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
+CONFIG_USB_MXS_PHY=m
CONFIG_USB_TEGRA_PHY=m
CONFIG_USB_ULPI=y
CONFIG_USB_ULPI_VIEWPORT=y
@@ -7014,6 +7058,7 @@ CONFIG_U_SERIAL_CONSOLE=y
#
# USB Peripheral Controller
#
+CONFIG_USB_FSL_USB2=m
# CONFIG_USB_FOTG210_UDC is not set
# CONFIG_USB_GR_UDC is not set
# CONFIG_USB_R8A66597 is not set
@@ -7161,6 +7206,7 @@ CONFIG_MMC_SDHCI_OF_ARASAN=m
CONFIG_MMC_SDHCI_OF_ESDHC=m
CONFIG_MMC_SDHCI_OF_DWCMSHC=m
CONFIG_MMC_SDHCI_CADENCE=m
+CONFIG_MMC_SDHCI_ESDHC_IMX=m
CONFIG_MMC_SDHCI_TEGRA=m
# CONFIG_MMC_SDHCI_PXAV3 is not set
CONFIG_MMC_SDHCI_F_SDH30=m
@@ -7169,6 +7215,7 @@ CONFIG_MMC_MESON_GX=m
# CONFIG_MMC_MESON_MX_SDIO is not set
CONFIG_MMC_ALCOR=m
CONFIG_MMC_SDHCI_MSM=m
+CONFIG_MMC_MXC=m
CONFIG_MMC_TIFM_SD=m
# CONFIG_MMC_SPI is not set
CONFIG_MMC_SDHCI_SPRD=m
@@ -7197,6 +7244,7 @@ CONFIG_MMC_MTK=m
CONFIG_MMC_SDHCI_BRCMSTB=m
CONFIG_MMC_SDHCI_XENON=m
# CONFIG_MMC_SDHCI_OMAP is not set
+CONFIG_MMC_SDHCI_AM654=m
CONFIG_MEMSTICK=m
# CONFIG_MEMSTICK_DEBUG is not set
@@ -7459,6 +7507,7 @@ CONFIG_RTC_DRV_CROS_EC=m
#
# on-CPU RTC drivers
#
+CONFIG_RTC_DRV_IMXDI=m
CONFIG_HAVE_S3C_RTC=y
CONFIG_RTC_DRV_S3C=m
CONFIG_RTC_DRV_PL030=y
@@ -7469,6 +7518,8 @@ CONFIG_RTC_DRV_MV=y
CONFIG_RTC_DRV_FTRTC010=m
CONFIG_RTC_DRV_PM8XXX=m
CONFIG_RTC_DRV_TEGRA=m
+CONFIG_RTC_DRV_MXC=m
+CONFIG_RTC_DRV_MXC_V2=m
# CONFIG_RTC_DRV_SNVS is not set
CONFIG_RTC_DRV_MT7622=m
CONFIG_RTC_DRV_XGENE=y
@@ -7499,10 +7550,15 @@ CONFIG_DMA_SUN6I=m
CONFIG_DW_AXI_DMAC=m
# CONFIG_FSL_EDMA is not set
CONFIG_FSL_QDMA=m
+CONFIG_IMX_DMA=m
+CONFIG_IMX_SDMA=m
# CONFIG_INTEL_IDMA64 is not set
CONFIG_K3_DMA=m
CONFIG_MV_XOR=y
CONFIG_MV_XOR_V2=y
+CONFIG_MXS_DMA=y
+CONFIG_MX3_IPU=y
+CONFIG_MX3_IPU_IRQS=4
CONFIG_OWL_DMA=m
# CONFIG_PL330_DMA is not set
CONFIG_SPRD_DMA=m
@@ -7946,6 +8002,7 @@ CONFIG_SPRD_TIMER=y
CONFIG_CLKSRC_VERSATILE=y
CONFIG_MAILBOX=y
# CONFIG_ARM_MHU is not set
+CONFIG_IMX_MBOX=m
CONFIG_PLATFORM_MHU=m
# CONFIG_PL320_MBOX is not set
CONFIG_ROCKCHIP_MBOX=y
@@ -8050,6 +8107,7 @@ CONFIG_FSL_MC_DPIO=m
#
# i.MX SoC drivers
#
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
#
# MediaTek SoC drivers
@@ -8218,6 +8276,7 @@ CONFIG_ENVELOPE_DETECTOR=m
CONFIG_HI8435=m
CONFIG_HX711=m
CONFIG_INA2XX_ADC=m
+CONFIG_IMX7D_ADC=m
CONFIG_LTC2471=m
CONFIG_LTC2485=m
CONFIG_LTC2497=m
@@ -8588,6 +8647,7 @@ CONFIG_PWM_BRCMSTB=m
CONFIG_PWM_CROS_EC=m
# CONFIG_PWM_FSL_FTM is not set
CONFIG_PWM_HIBVT=m
+CONFIG_PWM_IMX=m
CONFIG_PWM_LP3943=m
CONFIG_PWM_MESON=m
CONFIG_PWM_MTK_DISP=m
@@ -8743,6 +8803,7 @@ CONFIG_DAX_DRIVER=y
CONFIG_DAX=y
CONFIG_DEV_DAX=m
CONFIG_NVMEM=y
+CONFIG_NVMEM_IMX_IIM=m
CONFIG_MTK_EFUSE=m
CONFIG_QCOM_QFPROM=m
CONFIG_ROCKCHIP_EFUSE=m
@@ -9413,12 +9474,15 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC=m
+CONFIG_CRYPTO_DEV_SAHARA=m
+CONFIG_CRYPTO_DEV_MXC_SCC=m
CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
CONFIG_CRYPTO_DEV_S5P=m
CONFIG_CRYPTO_DEV_CCP=y
CONFIG_CRYPTO_DEV_CCP_DD=m
CONFIG_CRYPTO_DEV_SP_CCP=y
CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+CONFIG_CRYPTO_DEV_MXS_DCP=m
CONFIG_CRYPTO_DEV_CPT=m
CONFIG_CAVIUM_CPT=m
CONFIG_CRYPTO_DEV_NITROX=m
@@ -9467,6 +9531,7 @@ CONFIG_GENERIC_STRNCPY_FROM_USER=y
CONFIG_GENERIC_STRNLEN_USER=y
CONFIG_GENERIC_NET_UTILS=y
CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_STMP_DEVICE=y
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
CONFIG_INDIRECT_PIO=y
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index 4c94f1b840..594a5eba2a 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -7477,6 +7477,7 @@ CONFIG_MMC_MTK=m
CONFIG_MMC_SDHCI_BRCMSTB=m
CONFIG_MMC_SDHCI_XENON=m
CONFIG_MMC_SDHCI_OMAP=m
+CONFIG_MMC_SDHCI_AM654=m
CONFIG_MEMSTICK=m
# CONFIG_MEMSTICK_DEBUG is not set
diff --git a/rpm/config.sh b/rpm/config.sh
index d458e6b4b6..ab579d14cd 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=4.20-rc6-next-20181211
+SRCVERSION=4.20-rc6-next-20181212
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# Set to 1 if the tree does not contain any non-vanilla patches at all