Commit 56bf6fc2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm-defconfig-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC defconfig updates from Arnd Bergmann:
 "As usual, a number of additional device drivers that were added to the
  kernel are now enabled in the respective configuration files.

  A few of the files get updated to match the current Kconfig files for
  removed or renamed options"

* tag 'arm-defconfig-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (50 commits)
  ARM: configs: sama5_defconfig: add QSPI driver
  ARM: configs: at91_dt_defconfig: add ov7740 module
  ARM: configs: at91_dt_defconfig: add useful helper options
  ARM: configs: at91: DT/ATAG defconfig modifications
  ARM: configs: sama5_defconfig: update and remove unneeded options
  ARM: configs: at91: enable drivers for sam9x60
  arm64: defconfig: Enable RT5659
  arm64: configs: Support DEVAPC on MediaTek platforms
  arm64: configs: Support pwrap on Mediatek MT6779 platform
  arm64: defconfig: Enable PF8x00 as builtin
  ARM: multi_v7_defconfig: add STM32 CEC support
  arm64: defconfig: Enable vibra-pwm
  ARM: omap2plus_defconfig: Update for dropped options
  ARM: omap2plus_defconfig: Update for moved options
  ARM: multi_v7_defconfig: Enable nvmem's rmem driver
  arm64: defconfig: Enable nvmem's rmem driver
  ARM: multi_v7_defconfig: Enable support for the ADC thermal sensor
  ARM: qcom_defconfig: Enable Command DB driver
  ARM: qcom_defconfig: Enable RPMh power domain driver
  ARM: qcom_defconfig: Enable ARM PSCI support
  ...
parents 5011bb9f 21e4675d

arch/arm/configs/at91_dt_defconfig

+12 −6
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ CONFIG_SOC_SAM9X60=y 
# CONFIG_ATMEL_CLOCKSOURCE_PIT is not set

CONFIG_AEABI=y

CONFIG_UACCESS_WITH_MEMCPY=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

# CONFIG_ATAGS is not set

CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw"
@@ -38,6 +37,8 @@ CONFIG_IP_PNP_BOOTP=y 
CONFIG_IP_PNP_RARP=y

# CONFIG_INET_DIAG is not set

CONFIG_IPV6_SIT_6RD=y

CONFIG_CAN=y

CONFIG_CAN_AT91=y

CONFIG_CFG80211=y

CONFIG_MAC80211=y

CONFIG_DEVTMPFS=y
@@ -57,8 +58,8 @@ CONFIG_BLK_DEV_LOOP=y 
CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=4

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_ATMEL_TCLIB=y

CONFIG_ATMEL_SSC=y

CONFIG_EEPROM_AT24=m

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

# CONFIG_SCSI_LOWLEVEL is not set
@@ -92,7 +93,6 @@ CONFIG_RT2800USB_UNKNOWN=y 
CONFIG_RTL8187=m

CONFIG_RTL8192CU=m

# CONFIG_RTLWIFI_DEBUG is not set

CONFIG_INPUT_POLLDEV=y

CONFIG_INPUT_JOYDEV=y

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set
@@ -107,13 +107,16 @@ CONFIG_LEGACY_PTY_COUNT=4 
CONFIG_SERIAL_ATMEL=y

CONFIG_SERIAL_ATMEL_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_AT91=y

CONFIG_I2C_GPIO=y

CONFIG_SPI=y

CONFIG_SPI_ATMEL=y

CONFIG_SPI_ATMEL_QUADSPI=y

CONFIG_SPI_GPIO=y

CONFIG_PINCTRL_MCP23S08=m

CONFIG_GPIO_SYSFS=y

CONFIG_POWER_RESET=y

# CONFIG_POWER_RESET_AT91_SAMA5D2_SHDWC is not set

CONFIG_POWER_SUPPLY=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y
@@ -131,6 +134,7 @@ CONFIG_MEDIA_PLATFORM_SUPPORT=y 
CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_VIDEO_ATMEL_ISI=y

CONFIG_VIDEO_OV2640=m

CONFIG_VIDEO_OV7740=m

CONFIG_VIDEO_MT9V032=m

CONFIG_DRM=y

CONFIG_DRM_ATMEL_HLCDC=y
@@ -209,7 +213,9 @@ CONFIG_NLS_UTF8=y 
CONFIG_CRYPTO_ECB=y

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

# CONFIG_CRYPTO_HW is not set

CONFIG_CRYPTO_DEV_ATMEL_AES=y

CONFIG_CRYPTO_DEV_ATMEL_TDES=y

CONFIG_CRYPTO_DEV_ATMEL_SHA=y

CONFIG_CRC_CCITT=y

CONFIG_FONTS=y

CONFIG_FONT_8x8=y

arch/arm/configs/imx_v6_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ CONFIG_POWER_RESET=y 
CONFIG_POWER_RESET_SYSCON=y

CONFIG_POWER_RESET_SYSCON_POWEROFF=y

CONFIG_POWER_SUPPLY=y

CONFIG_RN5T618_POWER=m

CONFIG_SENSORS_MC13783_ADC=y

CONFIG_SENSORS_GPIO_FAN=y

CONFIG_SENSORS_IIO_HWMON=y

arch/arm/configs/multi_v5_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ CONFIG_MTD_SPI_NOR=y 
CONFIG_SPI_ASPEED_SMC=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_ATMEL_TCLIB=y

CONFIG_ATMEL_SSC=m

CONFIG_EEPROM_AT24=y

# CONFIG_SCSI_PROC_FS is not set

arch/arm/configs/multi_v7_defconfig

+14 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

CONFIG_ARCH_VIRT=y

CONFIG_ARCH_ACTIONS=y

CONFIG_ARCH_ALPINE=y

CONFIG_ARCH_ARTPEC=y

CONFIG_MACH_ARTPEC6=y
@@ -223,7 +224,6 @@ CONFIG_BLK_DEV_RAM_SIZE=65536 
CONFIG_VIRTIO_BLK=y

CONFIG_AD525X_DPOT=y

CONFIG_AD525X_DPOT_I2C=y

CONFIG_ATMEL_TCLIB=y

CONFIG_ICS932S401=y

CONFIG_ATMEL_SSC=m

CONFIG_QCOM_COINCELL=m
@@ -377,6 +377,8 @@ CONFIG_SERIAL_ST_ASC=y 
CONFIG_SERIAL_ST_ASC_CONSOLE=y

CONFIG_SERIAL_STM32=y

CONFIG_SERIAL_STM32_CONSOLE=y

CONFIG_SERIAL_OWL=y

CONFIG_SERIAL_OWL_CONSOLE=y

CONFIG_SERIAL_DEV_BUS=y

CONFIG_VIRTIO_CONSOLE=y

CONFIG_ASPEED_KCS_IPMI_BMC=m
@@ -401,6 +403,7 @@ CONFIG_I2C_EMEV2=m 
CONFIG_I2C_IMX=y

CONFIG_I2C_MESON=y

CONFIG_I2C_MV64XXX=y

CONFIG_I2C_OWL=y

CONFIG_I2C_RIIC=y

CONFIG_I2C_RK3X=y

CONFIG_I2C_S3C2410=y
@@ -449,6 +452,8 @@ CONFIG_PINCTRL_AS3722=y 
CONFIG_PINCTRL_RZA2=y

CONFIG_PINCTRL_STMFX=y

CONFIG_PINCTRL_PALMAS=y

CONFIG_PINCTRL_OWL=y

CONFIG_PINCTRL_S500=y

CONFIG_PINCTRL_APQ8064=y

CONFIG_PINCTRL_APQ8084=y

CONFIG_PINCTRL_IPQ8064=y
@@ -515,7 +520,9 @@ CONFIG_ARMADA_THERMAL=y 
CONFIG_BCM2711_THERMAL=m

CONFIG_BCM2835_THERMAL=m

CONFIG_BRCMSTB_THERMAL=m

CONFIG_GENERIC_ADC_THERMAL=m

CONFIG_ST_THERMAL_MEMMAP=y

CONFIG_TEGRA_SOCTHERM=m

CONFIG_UNIPHIER_THERMAL=y

CONFIG_DA9063_WATCHDOG=m

CONFIG_XILINX_WATCHDOG=y
@@ -656,6 +663,7 @@ CONFIG_V4L_TEST_DRIVERS=y 
CONFIG_VIDEO_VIVID=m

CONFIG_CEC_PLATFORM_DRIVERS=y

CONFIG_CEC_SAMSUNG_S5P=m

CONFIG_CEC_STM32=m

CONFIG_VIDEO_ADV7180=m

CONFIG_VIDEO_ADV7604=m

CONFIG_VIDEO_ADV7604_CEC=y
@@ -878,6 +886,7 @@ CONFIG_MMC_SH_MMCIF=y 
CONFIG_MMC_SUNXI=y

CONFIG_MMC_BCM2835=y

CONFIG_MMC_SDHCI_OMAP=y

CONFIG_MMC_OWL=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS_FLASH=m
@@ -947,6 +956,7 @@ CONFIG_IMX_DMA=y 
CONFIG_IMX_SDMA=y

CONFIG_MV_XOR=y

CONFIG_MXS_DMA=y

CONFIG_OWL_DMA=y

CONFIG_PL330_DMA=y

CONFIG_SIRF_DMA=y

CONFIG_STE_DMA40=y
@@ -977,6 +987,8 @@ CONFIG_COMMON_CLK_MAX77686=y 
CONFIG_COMMON_CLK_RK808=m

CONFIG_COMMON_CLK_SCMI=y

CONFIG_COMMON_CLK_S2MPS11=m

CONFIG_CLK_ACTIONS=y

CONFIG_CLK_OWL_S500=y

CONFIG_CLK_RASPBERRYPI=y

CONFIG_COMMON_CLK_QCOM=y

CONFIG_QCOM_CLK_RPM=y
@@ -1107,6 +1119,7 @@ CONFIG_ROCKCHIP_EFUSE=m 
CONFIG_NVMEM_SUNXI_SID=y

CONFIG_NVMEM_VF610_OCOTP=y

CONFIG_MESON_MX_EFUSE=m

CONFIG_NVMEM_RMEM=m

CONFIG_FSI=m

CONFIG_FSI_MASTER_GPIO=m

CONFIG_FSI_MASTER_HUB=m

arch/arm/configs/omap2plus_defconfig

+5 −17
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ CONFIG_IKCONFIG_PROC=y 
CONFIG_LOG_BUF_SHIFT=16

CONFIG_CGROUPS=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_BLK_CGROUP=y

CONFIG_CGROUP_SCHED=y

CONFIG_CFS_BANDWIDTH=y
@@ -40,9 +39,6 @@ CONFIG_ARM_THUMBEE=y 
CONFIG_ARM_ERRATA_411920=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_SECCOMP=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
@@ -54,10 +50,8 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y 
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y

CONFIG_CPUFREQ_DT=m

# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set

CONFIG_ARM_TI_CPUFREQ=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_CPUIDLE=y

CONFIG_DT_IDLE_STATES=y

CONFIG_KERNEL_MODE_NEON=y

CONFIG_PM_DEBUG=y

CONFIG_ARM_CRYPTO=y
@@ -158,9 +152,9 @@ CONFIG_MTD_ONENAND=y 
CONFIG_MTD_ONENAND_VERIFY_WRITE=y

CONFIG_MTD_ONENAND_OMAP2=y

CONFIG_MTD_RAW_NAND=y

CONFIG_MTD_NAND_ECC_SW_BCH=y

CONFIG_MTD_NAND_OMAP2=y

CONFIG_MTD_NAND_OMAP_BCH=y

CONFIG_MTD_NAND_ECC_SW_BCH=y

CONFIG_MTD_SPI_NOR=m

CONFIG_MTD_UBI=y

CONFIG_ZRAM=m
@@ -202,11 +196,11 @@ CONFIG_TI_CPSW_SWITCHDEV=y 
CONFIG_TI_CPTS=y

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

CONFIG_DP83848_PHY=y

CONFIG_DP83867_PHY=y

CONFIG_MICREL_PHY=y

CONFIG_AT803X_PHY=y

CONFIG_SMSC_PHY=y

CONFIG_DP83848_PHY=y

CONFIG_DP83867_PHY=y

CONFIG_PPP=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_DEFLATE=m
@@ -354,14 +348,8 @@ CONFIG_IR_RX51=m 
CONFIG_IR_GPIO_TX=m

CONFIG_IR_PWM_TX=m

CONFIG_MEDIA_SUPPORT=m

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_CEC_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_VIDEO_OMAP3=m

CONFIG_CEC_PLATFORM_DRIVERS=y

# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set

CONFIG_VIDEO_TVP5150=m

CONFIG_VIDEO_MT9P031=m

CONFIG_DRM=m
@@ -517,14 +505,14 @@ CONFIG_IIO=m 
CONFIG_IIO_SW_DEVICE=m

CONFIG_IIO_SW_TRIGGER=m

CONFIG_IIO_ST_ACCEL_3AXIS=m

CONFIG_KXCJK1013=m

CONFIG_CPCAP_ADC=m

CONFIG_INA2XX_ADC=m

CONFIG_TI_AM335X_ADC=m

CONFIG_TWL4030_MADC=m

CONFIG_SENSORS_ISL29028=m

CONFIG_BMP280=m

CONFIG_KXCJK1013=m

CONFIG_AK8975=m

CONFIG_BMP280=m

CONFIG_PWM=y

CONFIG_PWM_OMAP_DMTIMER=m

CONFIG_PWM_TIECAP=m