Skip to content

Commit 6e2a587

Browse files
committed
ARM: ux500: update defconfig
This updates the Ux500 defconfig with the new drivers for HWSEM and AB5500 core that were merged in the 3.2 cycle. Signed-off-by: Linus Walleij <[email protected]>
1 parent 58aa4eb commit 6e2a587

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

arch/arm/configs/u8500_defconfig

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ CONFIG_MODULE_UNLOAD=y
1010
CONFIG_ARCH_U8500=y
1111
CONFIG_UX500_SOC_DB5500=y
1212
CONFIG_UX500_SOC_DB8500=y
13-
CONFIG_MACH_U8500=y
13+
CONFIG_MACH_HREFV60=y
1414
CONFIG_MACH_SNOWBALL=y
1515
CONFIG_MACH_U5500=y
1616
CONFIG_NO_HZ=y
@@ -24,6 +24,7 @@ CONFIG_CPU_FREQ=y
2424
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
2525
CONFIG_VFP=y
2626
CONFIG_NEON=y
27+
CONFIG_PM_RUNTIME=y
2728
CONFIG_NET=y
2829
CONFIG_PACKET=y
2930
CONFIG_UNIX=y
@@ -41,11 +42,8 @@ CONFIG_MISC_DEVICES=y
4142
CONFIG_AB8500_PWM=y
4243
CONFIG_SENSORS_BH1780=y
4344
CONFIG_NETDEVICES=y
44-
CONFIG_SMSC_PHY=y
45-
CONFIG_NET_ETHERNET=y
4645
CONFIG_SMSC911X=y
47-
# CONFIG_NETDEV_1000 is not set
48-
# CONFIG_NETDEV_10000 is not set
46+
CONFIG_SMSC_PHY=y
4947
# CONFIG_WLAN is not set
5048
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
5149
CONFIG_INPUT_EVDEV=y
@@ -72,15 +70,12 @@ CONFIG_SPI=y
7270
CONFIG_SPI_PL022=y
7371
CONFIG_GPIO_STMPE=y
7472
CONFIG_GPIO_TC3589X=y
75-
# CONFIG_HWMON is not set
7673
CONFIG_MFD_STMPE=y
7774
CONFIG_MFD_TC3589X=y
75+
CONFIG_AB5500_CORE=y
7876
CONFIG_AB8500_CORE=y
7977
CONFIG_REGULATOR_AB8500=y
8078
# CONFIG_HID_SUPPORT is not set
81-
CONFIG_USB_MUSB_HDRC=y
82-
CONFIG_USB_GADGET_MUSB_HDRC=y
83-
CONFIG_MUSB_PIO_ONLY=y
8479
CONFIG_USB_GADGET=y
8580
CONFIG_AB8500_USB=y
8681
CONFIG_MMC=y
@@ -97,6 +92,7 @@ CONFIG_DMADEVICES=y
9792
CONFIG_STE_DMA40=y
9893
CONFIG_STAGING=y
9994
CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y
95+
CONFIG_HSEM_U8500=y
10096
CONFIG_EXT2_FS=y
10197
CONFIG_EXT2_FS_XATTR=y
10298
CONFIG_EXT2_FS_POSIX_ACL=y

0 commit comments

Comments
 (0)