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

Commit 1a429fce authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'armsoc-defconfig' into test-merge 

ARM: SoC: defconfig updates for v4.2

We keep collecting defconfig updates in a separate branch mostly to encourage
people to handle them separately and avoid conflicts between different topics.

Most of these are enablement of new SoCs, boards or drivers that have
come in, or minor config refreshes due to reorderings in Kconfig
files, etc. I.e. mostly minor churn of various kinds.

Conflicts: None

# gpg: Signature made Wed Jun 24 21:32:27 2015 PDT using RSA key ID D3FBC665
# gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>"
# gpg:                 aka "Kevin Hilman <khilman@linaro.org>"
# gpg:                 aka "Kevin Hilman <khilman@kernel.org>"
parents 32270e80 dec36f6a

arch/arm/configs/at91_dt_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ CONFIG_POWER_RESET=y 
CONFIG_WATCHDOG=y

CONFIG_AT91SAM9X_WATCHDOG=y

CONFIG_SSB=m

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_FB=y

CONFIG_FB_ATMEL=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

arch/arm/configs/efm32_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ CONFIG_GPIO_SYSFS=y 
# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

CONFIG_MMC_SPI=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

# CONFIG_FILE_LOCKING is not set

# CONFIG_DNOTIFY is not set

arch/arm/configs/exynos_defconfig

+16 −34
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ CONFIG_ZBOOT_ROM_BSS=0x0 
CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"

CONFIG_CPU_FREQ=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_EXYNOS_CPUIDLE=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -40,15 +40,11 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

CONFIG_WIRELESS=y

CONFIG_CFG80211=y

CONFIG_MWIFIEX=y

CONFIG_MWIFIEX_SDIO=y

CONFIG_RFKILL_REGULATOR=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_PROC_DEVICETREE=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=64

CONFIG_BLK_DEV_LOOP=y
@@ -66,7 +62,8 @@ CONFIG_SMSC911X=y 
CONFIG_USB_USBNET=y

CONFIG_USB_NET_SMSC75XX=y

CONFIG_USB_NET_SMSC95XX=y

CONFIG_USB_GADGET=y

CONFIG_MWIFIEX=y

CONFIG_MWIFIEX_SDIO=y

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

CONFIG_KEYBOARD_CROS_EC=y
@@ -81,16 +78,13 @@ CONFIG_SERIAL_OF_PLATFORM=y 
CONFIG_HW_RANDOM=y

CONFIG_TCG_TPM=y

CONFIG_TCG_TIS_I2C_INFINEON=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MUX=y

CONFIG_I2C_ARB_GPIO_CHALLENGE=y

CONFIG_I2C_EXYNOS5=y

CONFIG_I2C_GPIO=y

CONFIG_I2C_CROS_EC_TUNNEL=y

CONFIG_SPI=y

CONFIG_SPI_S3C64XX=y

CONFIG_I2C_S3C2410=y

CONFIG_DEBUG_GPIO=y

CONFIG_POWER_SUPPLY=y

CONFIG_BATTERY_SBS=y
@@ -99,13 +93,13 @@ CONFIG_BATTERY_MAX17042=y 
CONFIG_CHARGER_MAX14577=y

CONFIG_CHARGER_MAX77693=y

CONFIG_CHARGER_TPS65090=y

CONFIG_HWMON=y

CONFIG_SENSORS_LM90=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_THERMAL=y

CONFIG_SENSORS_PWM_FAN=y

CONFIG_SENSORS_INA2XX=y

CONFIG_THERMAL=y

CONFIG_EXYNOS_THERMAL=y

CONFIG_CPU_THERMAL=y

CONFIG_THERMAL_EMULATION=y

CONFIG_EXYNOS_THERMAL=y

CONFIG_WATCHDOG=y

CONFIG_S3C2410_WATCHDOG=y

CONFIG_MFD_CROS_EC=y
@@ -123,36 +117,27 @@ CONFIG_REGULATOR_GPIO=y 
CONFIG_REGULATOR_MAX14577=y

CONFIG_REGULATOR_MAX8997=y

CONFIG_REGULATOR_MAX77686=y

CONFIG_REGULATOR_MAX77802=y

CONFIG_REGULATOR_MAX77693=y

CONFIG_REGULATOR_MAX77802=y

CONFIG_REGULATOR_S2MPA01=y

CONFIG_REGULATOR_S2MPS11=y

CONFIG_REGULATOR_S5M8767=y

CONFIG_REGULATOR_TPS65090=y

CONFIG_DRM=y

CONFIG_DRM_EXYNOS_HDMI=y

CONFIG_DRM_BRIDGE=y

CONFIG_DRM_PTN3460=y

CONFIG_DRM_PS8622=y

CONFIG_DRM_EXYNOS=y

CONFIG_DRM_EXYNOS_FIMD=y

CONFIG_DRM_EXYNOS_DP=y

CONFIG_DRM_PANEL=y

CONFIG_DRM_EXYNOS_DSI=y

CONFIG_DRM_EXYNOS_HDMI=y

CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_FB=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_DRM_PANEL_S6E8AA0=y

CONFIG_FB_SIMPLE=y

CONFIG_EXYNOS_VIDEO=y

CONFIG_EXYNOS_MIPI_DSI=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_PLATFORM=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_BACKLIGHT_GENERIC=y

CONFIG_BACKLIGHT_PWM=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FONTS=y

CONFIG_FONT_7x14=y

CONFIG_LOGO=y

CONFIG_SOUND=y

CONFIG_SND=y
@@ -169,6 +154,7 @@ CONFIG_USB_OHCI_EXYNOS=y 
CONFIG_USB_STORAGE=y

CONFIG_USB_DWC3=y

CONFIG_USB_HSIC_USB3503=y

CONFIG_USB_GADGET=y

CONFIG_MMC=y

CONFIG_MMC_BLOCK_MINORS=16

CONFIG_MMC_SDHCI=y
@@ -197,11 +183,6 @@ CONFIG_EXYNOS_ADC=y 
CONFIG_PWM=y

CONFIG_PWM_SAMSUNG=y

CONFIG_PHY_EXYNOS5250_SATA=y

CONFIG_PHY_SAMSUNG_USB2=y

CONFIG_PHY_EXYNOS4210_USB2=y

CONFIG_PHY_EXYNOS4X12_USB2=y

CONFIG_PHY_EXYNOS5250_USB2=y

CONFIG_PHY_EXYNOS5_USBDRD=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS=y
@@ -217,15 +198,16 @@ CONFIG_NLS_CODEPAGE_437=y 
CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_FS=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_USER=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRC_CCITT=y

CONFIG_FONTS=y

CONFIG_FONT_7x14=y

arch/arm/configs/hisi_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ CONFIG_ATA=y 
CONFIG_SATA_AHCI_PLATFORM=y

CONFIG_NETDEVICES=y

CONFIG_HIX5HD2_GMAC=y

CONFIG_HIP04_ETH=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y

CONFIG_SERIAL_8250_CONSOLE=y
@@ -51,6 +52,7 @@ CONFIG_GPIO_SYSFS=y 
CONFIG_GPIOLIB=y

CONFIG_GPIO_GENERIC_PLATFORM=y

CONFIG_REGULATOR_GPIO=y

CONFIG_GPIO_DWAPB=y

CONFIG_MFD_SYSCON=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_DRM=y

arch/arm/configs/imx_v6_v7_defconfig

+9 −0
Original line number Diff line number Diff line
@@ -38,7 +38,9 @@ CONFIG_SOC_IMX53=y 
CONFIG_SOC_IMX6Q=y

CONFIG_SOC_IMX6SL=y

CONFIG_SOC_IMX6SX=y

CONFIG_SOC_IMX7D=y

CONFIG_SOC_VF610=y

CONFIG_SOC_LS1021A=y

CONFIG_PCI=y

CONFIG_PCI_IMX6=y

CONFIG_SMP=y
@@ -73,6 +75,7 @@ CONFIG_CAN=y 
CONFIG_CAN_FLEXCAN=y

CONFIG_BT=y

CONFIG_BT_HCIUART=y

CONFIG_BT_HCIUART_LL=y

CONFIG_BT_HCIUART_3WIRE=y

CONFIG_CFG80211=y

CONFIG_MAC80211=y
@@ -139,6 +142,10 @@ CONFIG_USB_RTL8152=m 
CONFIG_USB_USBNET=m

CONFIG_USB_NET_CDC_EEM=m

CONFIG_BRCMFMAC=m

CONFIG_WL_TI=y

CONFIG_WL12XX=m

CONFIG_WLCORE_SDIO=m

# CONFIG_WILINK_PLATFORM_DATA is not set

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=y

CONFIG_INPUT_EVBUG=m
@@ -151,6 +158,7 @@ CONFIG_TOUCHSCREEN_EGALAX=y 
CONFIG_TOUCHSCREEN_MC13783=y

CONFIG_TOUCHSCREEN_TSC2007=y

CONFIG_TOUCHSCREEN_STMPE=y

CONFIG_TOUCHSCREEN_SX8654=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_MMA8450=y

CONFIG_SERIO_SERPORT=m
@@ -283,6 +291,7 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_INTF_DEV_UIE_EMUL=y

CONFIG_RTC_DRV_DS1307=y

CONFIG_RTC_DRV_ISL1208=y

CONFIG_RTC_DRV_PCF8523=y

CONFIG_RTC_DRV_PCF8563=y

CONFIG_RTC_DRV_MC13XXX=y

CONFIG_RTC_DRV_MXC=y