Commit 5939224c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC defconfig updates from Olof Johansson:
 "We keep this in a separate branch to avoid cross-branch conflicts, but
  most of the material here is fairly boring -- some new drivers turned
  on for hardware since they were merged, and some refreshed files due
  to time having moved a lot of entries around"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (38 commits)
  ARM: configs: at91: enable MMC_SDHCI_OF_AT91 and MICROCHIP_PIT64B
  arm64: defconfig: Enable Broadcom's GENET Ethernet controller
  ARM: multi_v7_defconfig: Enable devfreq thermal integration
  ARM: exynos_defconfig: Enable devfreq thermal integration
  ARM: multi_v7_defconfig: Enable NFS v4.1 and v4.2
  ARM: exynos_defconfig: Enable NFS v4.1 and v4.2
  arm64: defconfig: Enable Actions Semi specific drivers
  arm64: defconfig: Enable Broadcom's STB PCIe controller
  arm64: defconfig: Enable CONFIG_CLK_IMX8MP by default
  ARM: configs: at91: enable config flags for sam9x60 SoC
  ARM: configs: at91: use savedefconfig
  arm64: defconfig: Enable tegra XUDC support
  ARM: defconfig: gemini: Update defconfig
  arm64: defconfig: enable CONFIG_ARM_QCOM_CPUFREQ_NVMEM
  arm64: defconfig: enable CONFIG_QCOM_CPR
  arm64: defconfig: Enable HFPLL
  arm64: defconfig: Enable CRYPTO_DEV_FSL_CAAM
  ARM: imx_v6_v7_defconfig: Select the TFP410 driver
  ARM: imx_v6_v7_defconfig: Enable NFS_V4_1 and NFS_V4_2 support
  arm64: defconfig: Enable ATH10K_SNOC
  ...
parents eab35405 1342a6aa

arch/arm/configs/at91_dt_defconfig

+30 −29
Original line number Diff line number Diff line
@@ -7,17 +7,13 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
CONFIG_KALLSYMS_ALL=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_MULTI_V4T=y

CONFIG_ARCH_MULTI_V5=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_AT91=y

CONFIG_SOC_AT91RM9200=y

CONFIG_SOC_AT91SAM9=y

CONFIG_SOC_SAM9X60=y

# CONFIG_ATMEL_CLOCKSOURCE_PIT is not set

CONFIG_AEABI=y

CONFIG_UACCESS_WITH_MEMCPY=y
@@ -27,6 +23,9 @@ CONFIG_ARM_APPENDED_DTB=y 
CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw"

CONFIG_KEXEC=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_NET=y

CONFIG_PACKET=y
@@ -37,13 +36,7 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_DIAG is not set

# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET6_XFRM_MODE_TUNNEL is not set

# CONFIG_INET6_XFRM_MODE_BEET is not set

CONFIG_IPV6_SIT_6RD=y

CONFIG_CFG80211=y

CONFIG_MAC80211=y
@@ -57,6 +50,7 @@ CONFIG_MTD_BLOCK=y 
CONFIG_MTD_DATAFLASH=y

CONFIG_MTD_RAW_NAND=y

CONFIG_MTD_NAND_ATMEL=y

CONFIG_MTD_SPI_NOR=y

CONFIG_MTD_UBI=y

CONFIG_MTD_UBI_GLUEBI=y

CONFIG_BLK_DEV_LOOP=y
@@ -69,8 +63,8 @@ CONFIG_SCSI=y 
CONFIG_BLK_DEV_SD=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

CONFIG_MACB=y

# CONFIG_NET_VENDOR_BROADCOM is not set

CONFIG_MACB=y

CONFIG_DM9000=y

# CONFIG_NET_VENDOR_FARADAY is not set

# CONFIG_NET_VENDOR_INTEL is not set
@@ -82,10 +76,12 @@ CONFIG_DM9000=y 
# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_DAVICOM_PHY=y

CONFIG_MICREL_PHY=y

CONFIG_RTL8187=m

CONFIG_LIBERTAS=m

CONFIG_LIBERTAS_SDIO=m

CONFIG_LIBERTAS_SPI=m

CONFIG_MWIFIEX=m

CONFIG_MWIFIEX_SDIO=m

CONFIG_MWIFIEX_USB=m

CONFIG_RT2X00=m

CONFIG_RT2500USB=m

CONFIG_RT73USB=m
@@ -93,15 +89,10 @@ CONFIG_RT2800USB=m 
CONFIG_RT2800USB_RT53XX=y

CONFIG_RT2800USB_RT55XX=y

CONFIG_RT2800USB_UNKNOWN=y

CONFIG_RTL8187=m

CONFIG_RTL8192CU=m

# CONFIG_RTLWIFI_DEBUG is not set

CONFIG_MWIFIEX=m

CONFIG_MWIFIEX_SDIO=m

CONFIG_MWIFIEX_USB=m

CONFIG_INPUT_POLLDEV=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_MOUSEDEV_SCREEN_X=480

CONFIG_INPUT_MOUSEDEV_SCREEN_Y=272

CONFIG_INPUT_JOYDEV=y

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set
@@ -110,6 +101,7 @@ CONFIG_KEYBOARD_GPIO=y 
# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ADS7846=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=y

# CONFIG_SERIO is not set

CONFIG_LEGACY_PTY_COUNT=4

CONFIG_SERIAL_ATMEL=y
@@ -119,25 +111,25 @@ CONFIG_I2C_AT91=y 
CONFIG_I2C_GPIO=y

CONFIG_SPI=y

CONFIG_SPI_ATMEL=y

CONFIG_POWER_SUPPLY=y

CONFIG_SPI_ATMEL_QUADSPI=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

CONFIG_AT91SAM9X_WATCHDOG=y

CONFIG_MFD_ATMEL_FLEXCOM=y

CONFIG_MFD_ATMEL_HLCDC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_VIDEO_ATMEL_ISI=y

CONFIG_SOC_CAMERA_OV2640=m

CONFIG_DRM=y

CONFIG_DRM_ATMEL_HLCDC=y

CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_FB_ATMEL=y

# CONFIG_LCD_CLASS_DEVICE is not set

CONFIG_BACKLIGHT_ATMEL_LCDC=y

# CONFIG_BACKLIGHT_GENERIC is not set

CONFIG_BACKLIGHT_PWM=y
@@ -150,6 +142,9 @@ CONFIG_SND_ATMEL_SOC=y 
CONFIG_SND_AT91_SOC_SAM9G20_WM8731=y

CONFIG_SND_ATMEL_SOC_WM8904=y

CONFIG_SND_AT91_SOC_SAM9X5_WM8731=y

CONFIG_SND_ATMEL_SOC_CLASSD=y

CONFIG_SND_SOC_MIKROE_PROTO=m

CONFIG_SND_MCHP_SOC_I2S_MCC=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_EHCI_HCD=y
@@ -165,6 +160,9 @@ CONFIG_USB_AT91=y 
CONFIG_USB_ATMEL_USBA=y

CONFIG_USB_G_SERIAL=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_OF_AT91=y

CONFIG_MMC_ATMELMCI=y

CONFIG_MMC_SPI=y

CONFIG_NEW_LEDS=y
@@ -181,9 +179,12 @@ CONFIG_RTC_DRV_AT91RM9200=y 
CONFIG_RTC_DRV_AT91SAM9=y

CONFIG_DMADEVICES=y

CONFIG_AT_HDMAC=y

CONFIG_AT_XDMAC=y

CONFIG_MICROCHIP_PIT64B=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_IIO=y

CONFIG_AT91_ADC=y

CONFIG_AT91_SAMA5D2_ADC=y

CONFIG_PWM=y

CONFIG_PWM_ATMEL=y

CONFIG_PWM_ATMEL_HLCDC_PWM=y
@@ -200,12 +201,6 @@ CONFIG_NLS_CODEPAGE_437=y 
CONFIG_NLS_CODEPAGE_850=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_UTF8=y

CONFIG_STRIP_ASM_SYMS=y

CONFIG_DEBUG_FS=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

# CONFIG_FTRACE is not set

CONFIG_DEBUG_USER=y

CONFIG_CRYPTO_ECB=y

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m
@@ -215,3 +210,9 @@ CONFIG_FONTS=y 
CONFIG_FONT_8x8=y

CONFIG_FONT_ACORN_8x8=y

CONFIG_FONT_MINI_4x6=y

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_STRIP_ASM_SYMS=y

CONFIG_DEBUG_FS=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_FTRACE is not set

CONFIG_DEBUG_USER=y

arch/arm/configs/exynos_defconfig

+9 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ CONFIG_CRYPTO_SHA256_ARM=m 
CONFIG_CRYPTO_SHA512_ARM=m

CONFIG_CRYPTO_AES_ARM_BS=m

CONFIG_CRYPTO_CHACHA20_NEON=m

CONFIG_KALLSYMS_ALL=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_PARTITION_ADVANCED=y
@@ -92,6 +93,7 @@ CONFIG_BLK_DEV_LOOP=y 
CONFIG_BLK_DEV_CRYPTOLOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

CONFIG_ATA=y
@@ -154,6 +156,7 @@ CONFIG_SENSORS_NTC_THERMISTOR=y 
CONFIG_SENSORS_PWM_FAN=y

CONFIG_SENSORS_INA2XX=y

CONFIG_CPU_THERMAL=y

CONFIG_DEVFREQ_THERMAL=y

CONFIG_THERMAL_EMULATION=y

CONFIG_WATCHDOG=y

CONFIG_S3C2410_WATCHDOG=y
@@ -291,6 +294,7 @@ CONFIG_CROS_EC_SPI=y 
CONFIG_COMMON_CLK_MAX77686=y

CONFIG_COMMON_CLK_S2MPS11=y

CONFIG_EXYNOS_IOMMU=y

CONFIG_PM_DEVFREQ=y

CONFIG_DEVFREQ_GOV_PERFORMANCE=y

CONFIG_DEVFREQ_GOV_POWERSAVE=y

CONFIG_DEVFREQ_GOV_USERSPACE=y
@@ -319,6 +323,8 @@ CONFIG_CRAMFS=y 
CONFIG_ROMFS_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V4=y

CONFIG_NFS_V4_1=y

CONFIG_NFS_V4_2=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y
@@ -356,4 +362,7 @@ CONFIG_SOFTLOCKUP_DETECTOR=y 
# CONFIG_DETECT_HUNG_TASK is not set

CONFIG_PROVE_LOCKING=y

CONFIG_DEBUG_ATOMIC_SLEEP=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_USER=y

arch/arm/configs/gemini_defconfig

+18 −6
Original line number Diff line number Diff line
@@ -2,28 +2,36 @@ 
CONFIG_SYSVIPC=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_USER_NS=y

CONFIG_RELAY=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_ARCH_MULTI_V4=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_GEMINI=y

CONFIG_PCI=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_HIGHMEM=y

CONFIG_CMA=y

CONFIG_CMDLINE="console=ttyS0,115200n8"

CONFIG_KEXEC=y

CONFIG_BINFMT_MISC=y

CONFIG_PM=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_BINFMT_MISC=y

CONFIG_CMA=y

CONFIG_NET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_BRIDGE=y

CONFIG_BRIDGE_VLAN_FILTERING=y

CONFIG_NET_DSA=y

CONFIG_VLAN_8021Q=y

CONFIG_CFG80211=y

CONFIG_CFG80211_WEXT=y

CONFIG_MAC80211=y

CONFIG_PCI=y

CONFIG_DEVTMPFS=y

CONFIG_MTD=y

CONFIG_MTD_REDBOOT_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y
@@ -40,10 +48,12 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_ATA=y

CONFIG_PATA_FTIDE010=y

CONFIG_NETDEVICES=y

CONFIG_TUN=y

CONFIG_NET_DSA_REALTEK_SMI=y

CONFIG_GEMINI_ETHERNET=y

CONFIG_MDIO_BITBANG=y

CONFIG_MDIO_GPIO=y

CONFIG_REALTEK_PHY=y

CONFIG_MARVELL_PHY=y

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set
@@ -69,7 +79,9 @@ CONFIG_DRM_TVE200=y 
CONFIG_LOGO=y

CONFIG_USB=y

CONFIG_USB_MON=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_FOTG210_HCD=y

CONFIG_USB_UHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

arch/arm/configs/imx_v6_v7_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ CONFIG_TOUCHSCREEN_ADS7846=y 
CONFIG_TOUCHSCREEN_DA9052=y

CONFIG_TOUCHSCREEN_EGALAX=y

CONFIG_TOUCHSCREEN_GOODIX=y

CONFIG_TOUCHSCREEN_ILI210X=y

CONFIG_TOUCHSCREEN_MAX11801=y

CONFIG_TOUCHSCREEN_IMX6UL_TSC=y

CONFIG_TOUCHSCREEN_EDT_FT5X06=y
@@ -282,6 +283,7 @@ CONFIG_DRM_MSM=y 
CONFIG_DRM_PANEL_LVDS=y

CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_DRM_PANEL_SEIKO_43WVF1G=y

CONFIG_DRM_TI_TFP410=y

CONFIG_DRM_DW_HDMI_AHB_AUDIO=m

CONFIG_DRM_DW_HDMI_CEC=y

CONFIG_DRM_IMX=y
@@ -323,6 +325,7 @@ CONFIG_USB=y 
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MXC=y

CONFIG_USB_ACM=m

CONFIG_USB_STORAGE=y

CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_UDC=y
@@ -442,6 +445,8 @@ CONFIG_UBIFS_FS=y 
CONFIG_NFS_FS=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_NFS_V4_1=y

CONFIG_NFS_V4_2=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_DEFAULT="cp437"

CONFIG_NLS_CODEPAGE_437=y

arch/arm/configs/multi_v7_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -492,6 +492,7 @@ CONFIG_SENSORS_PWM_FAN=m 
CONFIG_SENSORS_RASPBERRYPI_HWMON=m

CONFIG_SENSORS_INA2XX=m

CONFIG_CPU_THERMAL=y

CONFIG_DEVFREQ_THERMAL=y

CONFIG_IMX_THERMAL=y

CONFIG_ROCKCHIP_THERMAL=y

CONFIG_RCAR_THERMAL=y
@@ -1094,6 +1095,8 @@ CONFIG_PSTORE_RAM=y 
CONFIG_NFS_FS=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_NFS_V4_1=y

CONFIG_NFS_V4_2=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE