aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/shmobile_defconfig19
1 files changed, 16 insertions, 3 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index 99e122694f5e..4f9868dc8c22 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -17,6 +17,7 @@ CONFIG_ARCH_R8A7779=y
17CONFIG_ARCH_R8A7790=y 17CONFIG_ARCH_R8A7790=y
18CONFIG_ARCH_R8A7791=y 18CONFIG_ARCH_R8A7791=y
19CONFIG_ARCH_R8A7794=y 19CONFIG_ARCH_R8A7794=y
20CONFIG_ARCH_SH73A0=y
20CONFIG_MACH_LAGER=y 21CONFIG_MACH_LAGER=y
21CONFIG_MACH_MARZEN=y 22CONFIG_MACH_MARZEN=y
22CONFIG_CPU_BPREDICT_DISABLE=y 23CONFIG_CPU_BPREDICT_DISABLE=y
@@ -45,7 +46,6 @@ CONFIG_CPUFREQ_DT=y
45CONFIG_VFP=y 46CONFIG_VFP=y
46CONFIG_NEON=y 47CONFIG_NEON=y
47# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 48# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
48CONFIG_PM=y
49CONFIG_NET=y 49CONFIG_NET=y
50CONFIG_PACKET=y 50CONFIG_PACKET=y
51CONFIG_UNIX=y 51CONFIG_UNIX=y
@@ -55,6 +55,7 @@ CONFIG_IP_PNP_DHCP=y
55CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 55CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
56CONFIG_DEVTMPFS=y 56CONFIG_DEVTMPFS=y
57CONFIG_DEVTMPFS_MOUNT=y 57CONFIG_DEVTMPFS_MOUNT=y
58CONFIG_SIMPLE_PM_BUS=y
58CONFIG_MTD=y 59CONFIG_MTD=y
59CONFIG_MTD_BLOCK=y 60CONFIG_MTD_BLOCK=y
60CONFIG_MTD_M25P80=y 61CONFIG_MTD_M25P80=y
@@ -82,10 +83,13 @@ CONFIG_SMSC911X=y
82CONFIG_SMSC_PHY=y 83CONFIG_SMSC_PHY=y
83CONFIG_MICREL_PHY=y 84CONFIG_MICREL_PHY=y
84# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 85# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
86CONFIG_INPUT_EVDEV=y
85CONFIG_KEYBOARD_GPIO=y 87CONFIG_KEYBOARD_GPIO=y
86# CONFIG_INPUT_MOUSE is not set 88# CONFIG_INPUT_MOUSE is not set
87CONFIG_INPUT_TOUCHSCREEN=y 89CONFIG_INPUT_TOUCHSCREEN=y
88CONFIG_TOUCHSCREEN_ST1232=y 90CONFIG_TOUCHSCREEN_ST1232=y
91CONFIG_INPUT_MISC=y
92CONFIG_INPUT_ADXL34X=y
89# CONFIG_LEGACY_PTYS is not set 93# CONFIG_LEGACY_PTYS is not set
90CONFIG_SERIAL_8250=y 94CONFIG_SERIAL_8250=y
91CONFIG_SERIAL_8250_CONSOLE=y 95CONFIG_SERIAL_8250_CONSOLE=y
@@ -94,6 +98,7 @@ CONFIG_SERIAL_8250_EM=y
94CONFIG_SERIAL_SH_SCI=y 98CONFIG_SERIAL_SH_SCI=y
95CONFIG_SERIAL_SH_SCI_NR_UARTS=20 99CONFIG_SERIAL_SH_SCI_NR_UARTS=20
96CONFIG_SERIAL_SH_SCI_CONSOLE=y 100CONFIG_SERIAL_SH_SCI_CONSOLE=y
101CONFIG_I2C_CHARDEV=y
97CONFIG_I2C_GPIO=y 102CONFIG_I2C_GPIO=y
98CONFIG_I2C_RIIC=y 103CONFIG_I2C_RIIC=y
99CONFIG_I2C_SH_MOBILE=y 104CONFIG_I2C_SH_MOBILE=y
@@ -104,14 +109,16 @@ CONFIG_SPI_SH_MSIOF=y
104CONFIG_SPI_SH_HSPI=y 109CONFIG_SPI_SH_HSPI=y
105CONFIG_GPIO_EM=y 110CONFIG_GPIO_EM=y
106CONFIG_GPIO_RCAR=y 111CONFIG_GPIO_RCAR=y
112CONFIG_GPIO_PCF857X=y
107# CONFIG_HWMON is not set 113# CONFIG_HWMON is not set
108CONFIG_THERMAL=y 114CONFIG_THERMAL=y
109CONFIG_CPU_THERMAL=y 115CONFIG_CPU_THERMAL=y
110CONFIG_RCAR_THERMAL=y 116CONFIG_RCAR_THERMAL=y
111CONFIG_WATCHDOG=y 117CONFIG_WATCHDOG=y
112CONFIG_DA9063_WATCHDOG=y 118CONFIG_DA9063_WATCHDOG=y
119CONFIG_MFD_AS3711=y
113CONFIG_MFD_DA9063=y 120CONFIG_MFD_DA9063=y
114CONFIG_REGULATOR=y 121CONFIG_REGULATOR_AS3711=y
115CONFIG_REGULATOR_DA9210=y 122CONFIG_REGULATOR_DA9210=y
116CONFIG_REGULATOR_GPIO=y 123CONFIG_REGULATOR_GPIO=y
117CONFIG_MEDIA_SUPPORT=y 124CONFIG_MEDIA_SUPPORT=y
@@ -128,10 +135,12 @@ CONFIG_VIDEO_RENESAS_VSP1=y
128CONFIG_VIDEO_ADV7180=y 135CONFIG_VIDEO_ADV7180=y
129CONFIG_DRM=y 136CONFIG_DRM=y
130CONFIG_DRM_RCAR_DU=y 137CONFIG_DRM_RCAR_DU=y
131CONFIG_BACKLIGHT_LCD_SUPPORT=y 138CONFIG_FB_SH_MOBILE_LCDC=y
139CONFIG_FB_SH_MOBILE_MERAM=y
132# CONFIG_LCD_CLASS_DEVICE is not set 140# CONFIG_LCD_CLASS_DEVICE is not set
133# CONFIG_BACKLIGHT_GENERIC is not set 141# CONFIG_BACKLIGHT_GENERIC is not set
134CONFIG_BACKLIGHT_PWM=y 142CONFIG_BACKLIGHT_PWM=y
143CONFIG_BACKLIGHT_AS3711=y
135CONFIG_SOUND=y 144CONFIG_SOUND=y
136CONFIG_SND=y 145CONFIG_SND=y
137CONFIG_SND_SOC=y 146CONFIG_SND_SOC=y
@@ -142,6 +151,7 @@ CONFIG_SND_SOC_WM8978=y
142CONFIG_USB=y 151CONFIG_USB=y
143CONFIG_USB_EHCI_HCD=y 152CONFIG_USB_EHCI_HCD=y
144CONFIG_USB_OHCI_HCD=y 153CONFIG_USB_OHCI_HCD=y
154CONFIG_USB_R8A66597_HCD=y
145CONFIG_USB_RENESAS_USBHS=y 155CONFIG_USB_RENESAS_USBHS=y
146CONFIG_USB_RCAR_PHY=y 156CONFIG_USB_RCAR_PHY=y
147CONFIG_USB_RCAR_GEN2_PHY=y 157CONFIG_USB_RCAR_GEN2_PHY=y
@@ -155,11 +165,14 @@ CONFIG_NEW_LEDS=y
155CONFIG_LEDS_CLASS=y 165CONFIG_LEDS_CLASS=y
156CONFIG_LEDS_GPIO=y 166CONFIG_LEDS_GPIO=y
157CONFIG_RTC_CLASS=y 167CONFIG_RTC_CLASS=y
168CONFIG_RTC_DRV_RS5C372=y
158CONFIG_RTC_DRV_S35390A=y 169CONFIG_RTC_DRV_S35390A=y
159CONFIG_DMADEVICES=y 170CONFIG_DMADEVICES=y
160CONFIG_SH_DMAE=y 171CONFIG_SH_DMAE=y
161CONFIG_RCAR_DMAC=y 172CONFIG_RCAR_DMAC=y
162# CONFIG_IOMMU_SUPPORT is not set 173# CONFIG_IOMMU_SUPPORT is not set
174CONFIG_IIO=y
175CONFIG_AK8975=y
163CONFIG_PWM=y 176CONFIG_PWM=y
164CONFIG_PWM_RENESAS_TPU=y 177CONFIG_PWM_RENESAS_TPU=y
165# CONFIG_DNOTIFY is not set 178# CONFIG_DNOTIFY is not set