aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-12-21 23:56:33 -0500
committerOlof Johansson <olof@lixom.net>2015-12-21 23:56:33 -0500
commita67c7129d4d9ba621f2d176e1de2221921841325 (patch)
tree9d7239f42015e519f9bb33d606bfc5e7a1cb58e8
parentf541316928d1b3f127c5dfc1d49a77a998a279da (diff)
parent00a5e81fff2d81c3b1bf45712d3a12c905bc7c66 (diff)
Merge tag 'samsung-defconfig-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig
Defconfig (exynos and multi_v7) changes for Exynos based boards for 4.5: 1. Enable Maxim 8997 and 77693 family drivers (charger, extcon, LED, RTC, haptic/motor, regulator). 2. Build ChromeOS EC drivers as modules on multi_v7. 3. Enable drivers important for Exynos4210-based Universal C210 board. 4. Enable NFSv4 client. 5. On exynos_defconfig set some options to a value recommended by systemd. This also makes it more consistent with multi_v7. * tag 'samsung-defconfig-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: exynos_defconfig: Set recommended options for systemd ARM: exynos_defconfig: Enable NFSv4 client ARM: exynos_defconfig: Add drivers for Exynos4210 Universal C210 board ARM: multi_v7_defconfig: Build ChromeOS EC drivers as modules ARM: multi_v7_defconfig: Enable Maxim 77693 LED and haptic drivers ARM: multi_v7_defconfig: Enable Maxim 8997 family drivers ARM: exynos_defconfig: Enable Maxim 77693 LED and haptic drivers ARM: exynos_defconfig: Enable Maxim 8997 family drivers Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat
-rw-r--r--arch/arm/configs/exynos_defconfig18
-rw-r--r--arch/arm/configs/multi_v7_defconfig15
2 files changed, 28 insertions, 5 deletions
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
index e0841a58ff9d..24dcd2bb1215 100644
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@ -7,7 +7,6 @@ CONFIG_BLK_DEV_INITRD=y
7CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y 10CONFIG_PARTITION_ADVANCED=y
12CONFIG_ARCH_EXYNOS=y 11CONFIG_ARCH_EXYNOS=y
13CONFIG_ARCH_EXYNOS3=y 12CONFIG_ARCH_EXYNOS3=y
@@ -44,7 +43,6 @@ CONFIG_IP_PNP_BOOTP=y
44CONFIG_IP_PNP_RARP=y 43CONFIG_IP_PNP_RARP=y
45CONFIG_CFG80211=y 44CONFIG_CFG80211=y
46CONFIG_RFKILL_REGULATOR=y 45CONFIG_RFKILL_REGULATOR=y
47CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
48CONFIG_DEVTMPFS=y 46CONFIG_DEVTMPFS=y
49CONFIG_DEVTMPFS_MOUNT=y 47CONFIG_DEVTMPFS_MOUNT=y
50CONFIG_DMA_CMA=y 48CONFIG_DMA_CMA=y
@@ -74,6 +72,9 @@ CONFIG_KEYBOARD_CROS_EC=y
74CONFIG_MOUSE_CYAPA=y 72CONFIG_MOUSE_CYAPA=y
75CONFIG_INPUT_TOUCHSCREEN=y 73CONFIG_INPUT_TOUCHSCREEN=y
76CONFIG_TOUCHSCREEN_ATMEL_MXT=y 74CONFIG_TOUCHSCREEN_ATMEL_MXT=y
75CONFIG_INPUT_MISC=y
76CONFIG_INPUT_MAX77693_HAPTIC=y
77CONFIG_INPUT_MAX8997_HAPTIC=y
77CONFIG_SERIAL_8250=y 78CONFIG_SERIAL_8250=y
78CONFIG_SERIAL_SAMSUNG=y 79CONFIG_SERIAL_SAMSUNG=y
79CONFIG_SERIAL_SAMSUNG_CONSOLE=y 80CONFIG_SERIAL_SAMSUNG_CONSOLE=y
@@ -87,6 +88,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
87CONFIG_I2C_GPIO=y 88CONFIG_I2C_GPIO=y
88CONFIG_I2C_CROS_EC_TUNNEL=y 89CONFIG_I2C_CROS_EC_TUNNEL=y
89CONFIG_SPI=y 90CONFIG_SPI=y
91CONFIG_SPI_GPIO=y
90CONFIG_SPI_S3C64XX=y 92CONFIG_SPI_S3C64XX=y
91CONFIG_DEBUG_GPIO=y 93CONFIG_DEBUG_GPIO=y
92CONFIG_POWER_SUPPLY=y 94CONFIG_POWER_SUPPLY=y
@@ -95,6 +97,7 @@ CONFIG_BATTERY_MAX17040=y
95CONFIG_BATTERY_MAX17042=y 97CONFIG_BATTERY_MAX17042=y
96CONFIG_CHARGER_MAX14577=y 98CONFIG_CHARGER_MAX14577=y
97CONFIG_CHARGER_MAX77693=y 99CONFIG_CHARGER_MAX77693=y
100CONFIG_CHARGER_MAX8997=y
98CONFIG_CHARGER_TPS65090=y 101CONFIG_CHARGER_TPS65090=y
99CONFIG_SENSORS_LM90=y 102CONFIG_SENSORS_LM90=y
100CONFIG_SENSORS_NTC_THERMISTOR=y 103CONFIG_SENSORS_NTC_THERMISTOR=y
@@ -113,6 +116,7 @@ CONFIG_MFD_MAX14577=y
113CONFIG_MFD_MAX77686=y 116CONFIG_MFD_MAX77686=y
114CONFIG_MFD_MAX77693=y 117CONFIG_MFD_MAX77693=y
115CONFIG_MFD_MAX8997=y 118CONFIG_MFD_MAX8997=y
119CONFIG_MFD_MAX8998=y
116CONFIG_MFD_SEC_CORE=y 120CONFIG_MFD_SEC_CORE=y
117CONFIG_MFD_TPS65090=y 121CONFIG_MFD_TPS65090=y
118CONFIG_REGULATOR=y 122CONFIG_REGULATOR=y
@@ -120,6 +124,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
120CONFIG_REGULATOR_GPIO=y 124CONFIG_REGULATOR_GPIO=y
121CONFIG_REGULATOR_MAX14577=y 125CONFIG_REGULATOR_MAX14577=y
122CONFIG_REGULATOR_MAX8997=y 126CONFIG_REGULATOR_MAX8997=y
127CONFIG_REGULATOR_MAX8998=y
123CONFIG_REGULATOR_MAX77686=y 128CONFIG_REGULATOR_MAX77686=y
124CONFIG_REGULATOR_MAX77693=y 129CONFIG_REGULATOR_MAX77693=y
125CONFIG_REGULATOR_MAX77802=y 130CONFIG_REGULATOR_MAX77802=y
@@ -138,8 +143,10 @@ CONFIG_DRM_EXYNOS=y
138CONFIG_DRM_EXYNOS_FIMD=y 143CONFIG_DRM_EXYNOS_FIMD=y
139CONFIG_DRM_EXYNOS_DSI=y 144CONFIG_DRM_EXYNOS_DSI=y
140CONFIG_DRM_EXYNOS_MIXER=y 145CONFIG_DRM_EXYNOS_MIXER=y
146CONFIG_DRM_EXYNOS_DPI=y
141CONFIG_DRM_EXYNOS_HDMI=y 147CONFIG_DRM_EXYNOS_HDMI=y
142CONFIG_DRM_PANEL_SIMPLE=y 148CONFIG_DRM_PANEL_SIMPLE=y
149CONFIG_DRM_PANEL_SAMSUNG_LD9040=y
143CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=y 150CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=y
144CONFIG_EXYNOS_VIDEO=y 151CONFIG_EXYNOS_VIDEO=y
145CONFIG_EXYNOS_MIPI_DSI=y 152CONFIG_EXYNOS_MIPI_DSI=y
@@ -176,11 +183,15 @@ CONFIG_MMC_DW=y
176CONFIG_MMC_DW_EXYNOS=y 183CONFIG_MMC_DW_EXYNOS=y
177CONFIG_NEW_LEDS=y 184CONFIG_NEW_LEDS=y
178CONFIG_LEDS_CLASS=y 185CONFIG_LEDS_CLASS=y
186CONFIG_LEDS_CLASS_FLASH=y
179CONFIG_LEDS_GPIO=y 187CONFIG_LEDS_GPIO=y
180CONFIG_LEDS_PWM=y 188CONFIG_LEDS_PWM=y
189CONFIG_LEDS_MAX77693=y
190CONFIG_LEDS_MAX8997=y
181CONFIG_LEDS_TRIGGERS=y 191CONFIG_LEDS_TRIGGERS=y
182CONFIG_LEDS_TRIGGER_HEARTBEAT=y 192CONFIG_LEDS_TRIGGER_HEARTBEAT=y
183CONFIG_RTC_CLASS=y 193CONFIG_RTC_CLASS=y
194CONFIG_RTC_DRV_MAX8997=y
184CONFIG_RTC_DRV_MAX77686=y 195CONFIG_RTC_DRV_MAX77686=y
185CONFIG_RTC_DRV_MAX77802=y 196CONFIG_RTC_DRV_MAX77802=y
186CONFIG_RTC_DRV_S5M=y 197CONFIG_RTC_DRV_S5M=y
@@ -195,6 +206,7 @@ CONFIG_COMMON_CLK_S2MPS11=y
195CONFIG_EXTCON=y 206CONFIG_EXTCON=y
196CONFIG_EXTCON_MAX14577=y 207CONFIG_EXTCON_MAX14577=y
197CONFIG_EXTCON_MAX77693=y 208CONFIG_EXTCON_MAX77693=y
209CONFIG_EXTCON_MAX8997=y
198CONFIG_IIO=y 210CONFIG_IIO=y
199CONFIG_EXYNOS_ADC=y 211CONFIG_EXYNOS_ADC=y
200CONFIG_PWM=y 212CONFIG_PWM=y
@@ -203,6 +215,7 @@ CONFIG_PHY_EXYNOS5250_SATA=y
203CONFIG_EXT2_FS=y 215CONFIG_EXT2_FS=y
204CONFIG_EXT3_FS=y 216CONFIG_EXT3_FS=y
205CONFIG_EXT4_FS=y 217CONFIG_EXT4_FS=y
218CONFIG_AUTOFS4_FS=y
206CONFIG_MSDOS_FS=y 219CONFIG_MSDOS_FS=y
207CONFIG_VFAT_FS=y 220CONFIG_VFAT_FS=y
208CONFIG_TMPFS=y 221CONFIG_TMPFS=y
@@ -210,6 +223,7 @@ CONFIG_TMPFS_POSIX_ACL=y
210CONFIG_CRAMFS=y 223CONFIG_CRAMFS=y
211CONFIG_ROMFS_FS=y 224CONFIG_ROMFS_FS=y
212CONFIG_NFS_FS=y 225CONFIG_NFS_FS=y
226CONFIG_NFS_V4=y
213CONFIG_ROOT_NFS=y 227CONFIG_ROOT_NFS=y
214CONFIG_NLS_CODEPAGE_437=y 228CONFIG_NLS_CODEPAGE_437=y
215CONFIG_NLS_ASCII=y 229CONFIG_NLS_ASCII=y
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 367eb14ff60c..449fce8c9c13 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -248,7 +248,7 @@ CONFIG_KEYBOARD_GPIO=y
248CONFIG_KEYBOARD_TEGRA=y 248CONFIG_KEYBOARD_TEGRA=y
249CONFIG_KEYBOARD_SPEAR=y 249CONFIG_KEYBOARD_SPEAR=y
250CONFIG_KEYBOARD_ST_KEYSCAN=y 250CONFIG_KEYBOARD_ST_KEYSCAN=y
251CONFIG_KEYBOARD_CROS_EC=y 251CONFIG_KEYBOARD_CROS_EC=m
252CONFIG_MOUSE_PS2_ELANTECH=y 252CONFIG_MOUSE_PS2_ELANTECH=y
253CONFIG_MOUSE_CYAPA=m 253CONFIG_MOUSE_CYAPA=m
254CONFIG_MOUSE_ELAN_I2C=y 254CONFIG_MOUSE_ELAN_I2C=y
@@ -259,6 +259,8 @@ CONFIG_TOUCHSCREEN_STMPE=y
259CONFIG_TOUCHSCREEN_SUN4I=y 259CONFIG_TOUCHSCREEN_SUN4I=y
260CONFIG_TOUCHSCREEN_WM97XX=m 260CONFIG_TOUCHSCREEN_WM97XX=m
261CONFIG_INPUT_MISC=y 261CONFIG_INPUT_MISC=y
262CONFIG_INPUT_MAX77693_HAPTIC=m
263CONFIG_INPUT_MAX8997_HAPTIC=m
262CONFIG_INPUT_MPU3050=y 264CONFIG_INPUT_MPU3050=y
263CONFIG_INPUT_AXP20X_PEK=m 265CONFIG_INPUT_AXP20X_PEK=m
264CONFIG_INPUT_ADXL34X=m 266CONFIG_INPUT_ADXL34X=m
@@ -382,6 +384,7 @@ CONFIG_BATTERY_MAX17040=m
382CONFIG_BATTERY_MAX17042=m 384CONFIG_BATTERY_MAX17042=m
383CONFIG_CHARGER_MAX14577=m 385CONFIG_CHARGER_MAX14577=m
384CONFIG_CHARGER_MAX77693=m 386CONFIG_CHARGER_MAX77693=m
387CONFIG_CHARGER_MAX8997=m
385CONFIG_CHARGER_TPS65090=y 388CONFIG_CHARGER_TPS65090=y
386CONFIG_AXP20X_POWER=m 389CONFIG_AXP20X_POWER=m
387CONFIG_POWER_RESET_AS3722=y 390CONFIG_POWER_RESET_AS3722=y
@@ -418,13 +421,14 @@ CONFIG_MFD_BCM590XX=y
418CONFIG_MFD_AXP20X=y 421CONFIG_MFD_AXP20X=y
419CONFIG_MFD_AXP20X_I2C=m 422CONFIG_MFD_AXP20X_I2C=m
420CONFIG_MFD_AXP20X_RSB=m 423CONFIG_MFD_AXP20X_RSB=m
421CONFIG_MFD_CROS_EC=y 424CONFIG_MFD_CROS_EC=m
422CONFIG_MFD_CROS_EC_I2C=m 425CONFIG_MFD_CROS_EC_I2C=m
423CONFIG_MFD_CROS_EC_SPI=y 426CONFIG_MFD_CROS_EC_SPI=m
424CONFIG_MFD_MAX14577=y 427CONFIG_MFD_MAX14577=y
425CONFIG_MFD_MAX77686=y 428CONFIG_MFD_MAX77686=y
426CONFIG_MFD_MAX77693=y 429CONFIG_MFD_MAX77693=y
427CONFIG_MFD_MAX8907=y 430CONFIG_MFD_MAX8907=y
431CONFIG_MFD_MAX8997=y
428CONFIG_MFD_RK808=y 432CONFIG_MFD_RK808=y
429CONFIG_MFD_PM8921_CORE=y 433CONFIG_MFD_PM8921_CORE=y
430CONFIG_MFD_QCOM_RPM=y 434CONFIG_MFD_QCOM_RPM=y
@@ -451,6 +455,7 @@ CONFIG_POWER_RESET_SYSCON=y
451CONFIG_REGULATOR_MAX14577=m 455CONFIG_REGULATOR_MAX14577=m
452CONFIG_REGULATOR_MAX8907=y 456CONFIG_REGULATOR_MAX8907=y
453CONFIG_REGULATOR_MAX8973=y 457CONFIG_REGULATOR_MAX8973=y
458CONFIG_REGULATOR_MAX8997=m
454CONFIG_REGULATOR_MAX77686=y 459CONFIG_REGULATOR_MAX77686=y
455CONFIG_REGULATOR_MAX77693=m 460CONFIG_REGULATOR_MAX77693=m
456CONFIG_REGULATOR_MAX77802=m 461CONFIG_REGULATOR_MAX77802=m
@@ -607,8 +612,11 @@ CONFIG_MMC_SH_MMCIF=y
607CONFIG_MMC_SUNXI=y 612CONFIG_MMC_SUNXI=y
608CONFIG_NEW_LEDS=y 613CONFIG_NEW_LEDS=y
609CONFIG_LEDS_CLASS=y 614CONFIG_LEDS_CLASS=y
615CONFIG_LEDS_CLASS_FLASH=m
610CONFIG_LEDS_GPIO=y 616CONFIG_LEDS_GPIO=y
611CONFIG_LEDS_PWM=y 617CONFIG_LEDS_PWM=y
618CONFIG_LEDS_MAX77693=m
619CONFIG_LEDS_MAX8997=m
612CONFIG_LEDS_TRIGGERS=y 620CONFIG_LEDS_TRIGGERS=y
613CONFIG_LEDS_TRIGGER_TIMER=y 621CONFIG_LEDS_TRIGGER_TIMER=y
614CONFIG_LEDS_TRIGGER_ONESHOT=y 622CONFIG_LEDS_TRIGGER_ONESHOT=y
@@ -628,6 +636,7 @@ CONFIG_RTC_DRV_AS3722=y
628CONFIG_RTC_DRV_DS1307=y 636CONFIG_RTC_DRV_DS1307=y
629CONFIG_RTC_DRV_HYM8563=m 637CONFIG_RTC_DRV_HYM8563=m
630CONFIG_RTC_DRV_MAX8907=y 638CONFIG_RTC_DRV_MAX8907=y
639CONFIG_RTC_DRV_MAX8997=m
631CONFIG_RTC_DRV_MAX77686=y 640CONFIG_RTC_DRV_MAX77686=y
632CONFIG_RTC_DRV_RK808=m 641CONFIG_RTC_DRV_RK808=m
633CONFIG_RTC_DRV_MAX77802=m 642CONFIG_RTC_DRV_MAX77802=m
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-31 20:19:29 -0400