Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52e9a333 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC defconfig updates from Olof Johansson:
 "Defconfig updates are kept separate from other branches mostly to
  avoid conflicts between the different categories (driver branch
  enabling something that has context conflict with SoC options, etc).

  A lot of this again is scattered across the various hardware
  platforms.  multi_v7_defconfig, our "generic" config for most 32-bit
  platforms has been gone through by Marvell Berlin maintainers and
  added most options they need to run on their hardware.  Broadcom NSP
  is also added there, and the new Atmel SAMA5D2 (added last release).
  Rockchip also has display and other devices supported in that config.

  In addition to that, the usual small churn of new options being added
  here and there"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)
  ARM: multi_v7_defconfig: enable UniPhier I2C drivers
  ARM: multi_v7_defconfig: Enable rtl8152 ethernet driver for Odroid-XU4
  ARM: exynos_defconfig: Enable rtl8152 ethernet driver for Odroid-XU4
  ARM: exynos_defconfig: Enable WiFi-Ex as a module instead built-in
  ARM: exynos_defconfig: Disable simplefb support
  ARM: exynos_defconfig: Enable LEDS for Odroid-XU3/XU4
  ARM: multi_v7_defconfig: Enable DWC2 USB driver and USB ethernet gadget
  ARM: exynos_defconfig: Enable DWC2 USB driver and USB ethernet gadget
  ARM: exynos_defconfig: Enable USB Video Class support
  ARM: multi_v7_defconfig: improve multi_v7_defconfig support for Berlin
  ARM: tegra: Update multi_v7_defconfig
  ARM: multi_v7_defconfig: Add Atmel SDHCI device
  ARM: multi_v7_defconfig: Add Atmel Flexcom device
  ARM: multi_v7_defconfig: Add Atmel SAMA5D2 SoC
  ARM: at91/defconfig: add sama5d2 and its new devices to sama5 defconfig
  ARM: at91/defconfig: update at91_dt defconfig
  ARM: at91/defconfig: update sama5 defconfig
  ARM: configs: Enable FIXED_PHY in multi_v7 defconfig
  ARM: configs: update lpc18xx defconfig
  ARM: socfpga_defconfig: enable fpga manager
  ...
parents c0d6fe2f 7c9730c5

arch/arm/configs/at91_dt_defconfig

+0 −15
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ CONFIG_ARCH_MULTI_V4T=y 
CONFIG_ARCH_MULTI_V5=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_AT91=y

CONFIG_SOC_SAM_V4_V5=y

CONFIG_SOC_AT91RM9200=y

CONFIG_SOC_AT91SAM9=y

CONFIG_AEABI=y
@@ -28,7 +27,6 @@ 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_AUTO_ZRELADDR=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_NET=y

CONFIG_PACKET=y
@@ -43,7 +41,6 @@ CONFIG_IP_PNP_RARP=y 
# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_DIAG is not set

CONFIG_IPV6=y

# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET6_XFRM_MODE_TUNNEL is not set

# CONFIG_INET6_XFRM_MODE_BEET is not set
@@ -119,7 +116,6 @@ CONFIG_LEGACY_PTY_COUNT=4 
CONFIG_SERIAL_ATMEL=y

CONFIG_SERIAL_ATMEL_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_AT91=y

CONFIG_I2C_GPIO=y

CONFIG_SPI=y
@@ -142,16 +138,12 @@ CONFIG_SOC_CAMERA_OV2640=m 
CONFIG_DRM=y

CONFIG_DRM_ATMEL_HLCDC=y

CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_FB=y

CONFIG_FB_ATMEL=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

# CONFIG_LCD_CLASS_DEVICE is not set

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_BACKLIGHT_ATMEL_LCDC=y

# CONFIG_BACKLIGHT_GENERIC is not set

CONFIG_BACKLIGHT_PWM=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

CONFIG_LOGO=y

CONFIG_SOUND=y

CONFIG_SND=y
@@ -216,18 +208,11 @@ CONFIG_DEBUG_FS=y 
# CONFIG_DEBUG_BUGVERBOSE is not set

# CONFIG_FTRACE is not set

CONFIG_DEBUG_USER=y

CONFIG_CRYPTO=y

CONFIG_CRYPTO_ECB=y

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_ARC4=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC_CCITT=y

CONFIG_CRC_ITU_T=y

CONFIG_CRC7=m

CONFIG_AVERAGE=y

CONFIG_FONTS=y

CONFIG_FONT_8x8=y

CONFIG_FONT_ACORN_8x8=y

arch/arm/configs/exynos_defconfig

+15 −3
Original line number Diff line number Diff line
@@ -61,11 +61,12 @@ CONFIG_BLK_DEV_DM=y 
CONFIG_DM_CRYPT=m

CONFIG_NETDEVICES=y

CONFIG_SMSC911X=y

CONFIG_USB_RTL8152=y

CONFIG_USB_USBNET=y

CONFIG_USB_NET_SMSC75XX=y

CONFIG_USB_NET_SMSC95XX=y

CONFIG_MWIFIEX=y

CONFIG_MWIFIEX_SDIO=y

CONFIG_MWIFIEX=m

CONFIG_MWIFIEX_SDIO=m

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

CONFIG_KEYBOARD_CROS_EC=y
@@ -126,6 +127,10 @@ CONFIG_REGULATOR_S2MPA01=y 
CONFIG_REGULATOR_S2MPS11=y

CONFIG_REGULATOR_S5M8767=y

CONFIG_REGULATOR_TPS65090=y

CONFIG_MEDIA_SUPPORT=m

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_USB_SUPPORT=y

CONFIG_USB_VIDEO_CLASS=m

CONFIG_DRM=y

CONFIG_DRM_NXP_PTN3460=y

CONFIG_DRM_PARADE_PS8622=y
@@ -136,7 +141,6 @@ CONFIG_DRM_EXYNOS_MIXER=y 
CONFIG_DRM_EXYNOS_HDMI=y

CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=y

CONFIG_FB_SIMPLE=y

CONFIG_EXYNOS_VIDEO=y

CONFIG_EXYNOS_MIPI_DSI=y

CONFIG_LCD_CLASS_DEVICE=y
@@ -159,8 +163,10 @@ CONFIG_USB_OHCI_HCD=y 
CONFIG_USB_OHCI_EXYNOS=y

CONFIG_USB_STORAGE=y

CONFIG_USB_DWC3=y

CONFIG_USB_DWC2=y

CONFIG_USB_HSIC_USB3503=y

CONFIG_USB_GADGET=y

CONFIG_USB_ETH=y

CONFIG_MMC=y

CONFIG_MMC_BLOCK_MINORS=16

CONFIG_MMC_SDHCI=y
@@ -168,6 +174,12 @@ CONFIG_MMC_SDHCI_S3C=y 
CONFIG_MMC_SDHCI_S3C_DMA=y

CONFIG_MMC_DW=y

CONFIG_MMC_DW_EXYNOS=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_PWM=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_MAX77686=y

CONFIG_RTC_DRV_MAX77802=y

arch/arm/configs/imx_v6_v7_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ CONFIG_SOC_VF610=y 
CONFIG_PCI=y

CONFIG_PCI_IMX6=y

CONFIG_SMP=y

CONFIG_VMSPLIT_2G=y

CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_AEABI=y

CONFIG_HIGHMEM=y
@@ -159,6 +158,7 @@ CONFIG_MOUSE_PS2=m 
CONFIG_MOUSE_PS2_ELANTECH=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_EGALAX=y

CONFIG_TOUCHSCREEN_IMX6UL_TSC=y

CONFIG_TOUCHSCREEN_MC13783=y

CONFIG_TOUCHSCREEN_TSC2007=y

CONFIG_TOUCHSCREEN_STMPE=y

arch/arm/configs/keystone_defconfig

+27 −27
Original line number Diff line number Diff line
@@ -4,6 +4,12 @@ CONFIG_HIGH_RES_TIMERS=y 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_CGROUPS=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_SCHED=y

CONFIG_BLK_CGROUP=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_KALLSYMS_ALL=y
@@ -27,6 +33,7 @@ CONFIG_SMP=y 
CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_HIGHMEM=y

CONFIG_CMA=y

CONFIG_VFP=y

CONFIG_NEON=y

# CONFIG_SUSPEND is not set
@@ -57,7 +64,6 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y 
CONFIG_IP_PIMSM_V2=y

CONFIG_INET_AH=y

CONFIG_INET_IPCOMP=y

CONFIG_IPV6=y

CONFIG_INET6_XFRM_MODE_TRANSPORT=m

CONFIG_INET6_XFRM_MODE_TUNNEL=m

CONFIG_INET6_XFRM_MODE_BEET=m
@@ -93,7 +99,6 @@ CONFIG_IP_NF_MATCH_ECN=y 
CONFIG_IP_NF_MATCH_TTL=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_TARGET_ULOG=y

CONFIG_IP_NF_MANGLE=y

CONFIG_IP_NF_TARGET_CLUSTERIP=y

CONFIG_IP_NF_TARGET_ECN=y
@@ -106,7 +111,8 @@ CONFIG_IP6_NF_IPTABLES=m 
CONFIG_IP_SCTP=y

CONFIG_VLAN_8021Q=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_CMA=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_DMA_CMA=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y
@@ -117,7 +123,6 @@ CONFIG_MTD_NAND=y 
CONFIG_MTD_NAND_DAVINCI=y

CONFIG_MTD_SPI_NOR=y

CONFIG_MTD_UBI=y

CONFIG_PROC_DEVICETREE=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_EEPROM_AT24=y

CONFIG_SCSI=y
@@ -125,7 +130,7 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_NETDEVICES=y

CONFIG_TI_KEYSTONE_NETCP=y

CONFIG_TI_KEYSTONE_NETCP_ETHSS=y

CONFIG_PHYLIB=y

CONFIG_MARVELL_PHY=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y
@@ -137,12 +142,15 @@ CONFIG_I2C_DAVINCI=y 
CONFIG_SPI=y

CONFIG_SPI_DAVINCI=y

CONFIG_SPI_SPIDEV=y

# CONFIG_HWMON is not set

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_DAVINCI=y

CONFIG_GPIO_SYSCON=y

CONFIG_POWER_SUPPLY=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_KEYSTONE=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_CORE=y

CONFIG_DAVINCI_WATCHDOG=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -150,9 +158,15 @@ CONFIG_USB_MON=y 
CONFIG_USB_XHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_USB_DWC3=y

CONFIG_USB_DWC3_DEBUG=y

CONFIG_USB_DWC3_VERBOSE=y

CONFIG_KEYSTONE_USB_PHY=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_ONESHOT=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_BACKLIGHT=y

CONFIG_LEDS_TRIGGER_GPIO=y

CONFIG_DMADEVICES=y

CONFIG_TI_EDMA=y

CONFIG_SOC_TI=y
@@ -160,8 +174,11 @@ CONFIG_KEYSTONE_NAVIGATOR_QMSS=y 
CONFIG_KEYSTONE_NAVIGATOR_DMA=y

CONFIG_MEMORY=y

CONFIG_TI_AEMIF=y

CONFIG_KEYSTONE_IRQ=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_FANOTIFY=y

CONFIG_AUTOFS4_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_NTFS_FS=y
@@ -179,11 +196,10 @@ CONFIG_NFSD_V3_ACL=y 
CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_SHIRQ=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_SHIRQ=y

CONFIG_DEBUG_USER=y

CONFIG_CRYPTO_USER=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_AUTHENC=y

CONFIG_CRYPTO_CBC=y

CONFIG_CRYPTO_CTR=y
@@ -192,19 +208,3 @@ CONFIG_CRYPTO_DES=y 
CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_CRYPTO_USER_API_HASH=y

CONFIG_CRYPTO_USER_API_SKCIPHER=y
 
CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_DAVINCI=y

CONFIG_LEDS_CLASS=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_ONESHOT=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_BACKLIGHT=y

CONFIG_LEDS_TRIGGER_GPIO=y

CONFIG_KEYSTONE_IRQ=y

CONFIG_GPIO_SYSCON=y

CONFIG_TI_DAVINCI_MDIO=y

CONFIG_MARVELL_PHY=y

CONFIG_DEVTMPFS=y

arch/arm/configs/lpc18xx_defconfig

+22 −4
Original line number Diff line number Diff line
@@ -52,15 +52,22 @@ CONFIG_DEVTMPFS=y 
CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_CFI_STAA=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PHYSMAP_OF=y

CONFIG_MTD_SPI_NOR=y

# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set

CONFIG_SPI_NXP_SPIFI=y

CONFIG_BLK_DEV_RAM=y

CONFIG_SRAM=y

CONFIG_EEPROM_AT24=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set
@@ -102,14 +109,17 @@ CONFIG_SERIAL_8250_CONSOLE=y 
CONFIG_SERIAL_OF_PLATFORM=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_LPC2K=y

CONFIG_SPI=y

CONFIG_SPI_PL022=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_74XX_MMIO=y

CONFIG_GPIO_PCF857X=y

CONFIG_SENSORS_JC42=y

CONFIG_SENSORS_LM75=y

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_CORE=y

CONFIG_MFD_SYSCON=y

CONFIG_LPC18XX_WATCHDOG=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_FB=y
@@ -117,6 +127,8 @@ CONFIG_FB_ARMCLCD=y 
CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_ROOT_HUB_TT=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_STORAGE=y

CONFIG_MMC=y

CONFIG_MMC_DW=y

CONFIG_NEW_LEDS=y
@@ -127,12 +139,20 @@ CONFIG_LEDS_GPIO=y 
CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_LPC24XX=y

CONFIG_DMADEVICES=y

CONFIG_AMBA_PL08X=y

CONFIG_LPC18XX_DMAMUX=y

CONFIG_MEMORY=y

CONFIG_ARM_PL172_MPMC=y

CONFIG_PWM=y

CONFIG_PWM_LPC18XX_SCT=y

CONFIG_PHY_LPC18XX_USB_OTG=y

CONFIG_EXT2_FS=y

# CONFIG_FILE_LOCKING is not set

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

CONFIG_JFFS2_FS=y

# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y
@@ -142,8 +162,6 @@ CONFIG_DEBUG_FS=y 
CONFIG_MAGIC_SYSRQ=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

# CONFIG_RCU_CPU_STALL_INFO is not set

# CONFIG_FTRACE is not set

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

CONFIG_CRC_ITU_T=y