aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-10-15 02:32:18 -0400
committerOlof Johansson <olof@lixom.net>2014-10-15 02:32:31 -0400
commit22414f776d0b137a4156b84db3ec07dfec56784c (patch)
treee5b189a1e5ed88a75911e14e642e46d102a93c38
parente17fd8e58a1eb39e23f29da065ccc1498f022ed7 (diff)
parent508423bebcda29eb0ba7c627f895387dad7cdcd6 (diff)
Merge tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
Merge "Samsung defconfig, actually exynos_defconig updates for v3.18" from Kukjin Kim: - enable USB gadget support - enable Maxim77802 support - enable Maxim77693 and I2C GPIO drivers - enable Atmel maXTouch support - enable SBS battery support - enable Control Groups support * tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: exynos_defconfig: enable USB gadget support ARM: exynos_defconfig: Enable Maxim 77693 and I2C GPIO drivers ARM: exynos_defconfig: Enable SBS battery support ARM: exynos_defconfig: Enable Control Groups support ARM: exynos_defconfig: Enable Atmel maXTouch support ARM: exynos_defconfig: Enable MAX77802 Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/configs/exynos_defconfig10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
index fc7d1683bf67..72058b8a6f4d 100644
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@ -1,6 +1,7 @@
1CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y 2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y 3CONFIG_HIGH_RES_TIMERS=y
4CONFIG_CGROUPS=y
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5CONFIG_KALLSYMS_ALL=y 6CONFIG_KALLSYMS_ALL=y
6CONFIG_MODULES=y 7CONFIG_MODULES=y
@@ -54,12 +55,14 @@ CONFIG_SMSC911X=y
54CONFIG_USB_USBNET=y 55CONFIG_USB_USBNET=y
55CONFIG_USB_NET_SMSC75XX=y 56CONFIG_USB_NET_SMSC75XX=y
56CONFIG_USB_NET_SMSC95XX=y 57CONFIG_USB_NET_SMSC95XX=y
58CONFIG_USB_GADGET=y
57CONFIG_INPUT_EVDEV=y 59CONFIG_INPUT_EVDEV=y
58CONFIG_KEYBOARD_GPIO=y 60CONFIG_KEYBOARD_GPIO=y
59CONFIG_KEYBOARD_CROS_EC=y 61CONFIG_KEYBOARD_CROS_EC=y
60# CONFIG_MOUSE_PS2 is not set 62# CONFIG_MOUSE_PS2 is not set
61CONFIG_MOUSE_CYAPA=y 63CONFIG_MOUSE_CYAPA=y
62CONFIG_INPUT_TOUCHSCREEN=y 64CONFIG_INPUT_TOUCHSCREEN=y
65CONFIG_TOUCHSCREEN_ATMEL_MXT=y
63CONFIG_SERIAL_8250=y 66CONFIG_SERIAL_8250=y
64CONFIG_SERIAL_SAMSUNG=y 67CONFIG_SERIAL_SAMSUNG=y
65CONFIG_SERIAL_SAMSUNG_CONSOLE=y 68CONFIG_SERIAL_SAMSUNG_CONSOLE=y
@@ -68,15 +71,18 @@ CONFIG_HW_RANDOM=y
68CONFIG_TCG_TPM=y 71CONFIG_TCG_TPM=y
69CONFIG_TCG_TIS_I2C_INFINEON=y 72CONFIG_TCG_TIS_I2C_INFINEON=y
70CONFIG_I2C=y 73CONFIG_I2C=y
74CONFIG_I2C_CHARDEV=y
71CONFIG_I2C_MUX=y 75CONFIG_I2C_MUX=y
72CONFIG_I2C_ARB_GPIO_CHALLENGE=y 76CONFIG_I2C_ARB_GPIO_CHALLENGE=y
73CONFIG_I2C_EXYNOS5=y 77CONFIG_I2C_EXYNOS5=y
78CONFIG_I2C_GPIO=y
74CONFIG_I2C_CROS_EC_TUNNEL=y 79CONFIG_I2C_CROS_EC_TUNNEL=y
75CONFIG_SPI=y 80CONFIG_SPI=y
76CONFIG_SPI_S3C64XX=y 81CONFIG_SPI_S3C64XX=y
77CONFIG_I2C_S3C2410=y 82CONFIG_I2C_S3C2410=y
78CONFIG_DEBUG_GPIO=y 83CONFIG_DEBUG_GPIO=y
79CONFIG_POWER_SUPPLY=y 84CONFIG_POWER_SUPPLY=y
85CONFIG_BATTERY_SBS=y
80CONFIG_CHARGER_TPS65090=y 86CONFIG_CHARGER_TPS65090=y
81# CONFIG_HWMON is not set 87# CONFIG_HWMON is not set
82CONFIG_THERMAL=y 88CONFIG_THERMAL=y
@@ -88,6 +94,7 @@ CONFIG_MFD_CROS_EC=y
88CONFIG_MFD_CROS_EC_I2C=y 94CONFIG_MFD_CROS_EC_I2C=y
89CONFIG_MFD_CROS_EC_SPI=y 95CONFIG_MFD_CROS_EC_SPI=y
90CONFIG_MFD_MAX77686=y 96CONFIG_MFD_MAX77686=y
97CONFIG_MFD_MAX77693=y
91CONFIG_MFD_MAX8997=y 98CONFIG_MFD_MAX8997=y
92CONFIG_MFD_SEC_CORE=y 99CONFIG_MFD_SEC_CORE=y
93CONFIG_MFD_TPS65090=y 100CONFIG_MFD_TPS65090=y
@@ -96,6 +103,8 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
96CONFIG_REGULATOR_GPIO=y 103CONFIG_REGULATOR_GPIO=y
97CONFIG_REGULATOR_MAX8997=y 104CONFIG_REGULATOR_MAX8997=y
98CONFIG_REGULATOR_MAX77686=y 105CONFIG_REGULATOR_MAX77686=y
106CONFIG_REGULATOR_MAX77802=y
107CONFIG_REGULATOR_MAX77693=y
99CONFIG_REGULATOR_S2MPA01=y 108CONFIG_REGULATOR_S2MPA01=y
100CONFIG_REGULATOR_S2MPS11=y 109CONFIG_REGULATOR_S2MPS11=y
101CONFIG_REGULATOR_S5M8767=y 110CONFIG_REGULATOR_S5M8767=y
@@ -115,6 +124,7 @@ CONFIG_SND_SOC=y
115CONFIG_SND_SOC_SAMSUNG=y 124CONFIG_SND_SOC_SAMSUNG=y
116CONFIG_SND_SOC_SNOW=y 125CONFIG_SND_SOC_SNOW=y
117CONFIG_USB=y 126CONFIG_USB=y
127CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
118CONFIG_USB_XHCI_HCD=y 128CONFIG_USB_XHCI_HCD=y
119CONFIG_USB_EHCI_HCD=y 129CONFIG_USB_EHCI_HCD=y
120CONFIG_USB_EHCI_EXYNOS=y 130CONFIG_USB_EHCI_EXYNOS=y