Skip to content

Commit 962abbc

Browse files
committed
Merge tag 'ux500-defconfig-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into arm/defconfig
Ux500 defconfig changes for functionality merged in the v5.7 merge window: - Enable drivers for the Golden and Skomer mobile phones. - Enable drivers for the HREF520 reference design. * tag 'ux500-defconfig-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: defconfig: u8500: Enable new drivers for ux500 ARM: defconfig: u8500: Enable new drivers for samsung-golden Link: https://lore.kernel.org/r/CACRpkdaxT8dc=mhAd51+KtQ0K4Uj5tttt36bYJLqP_hNfWXP8w@mail.gmail.com Signed-off-by: Arnd Bergmann <[email protected]>
2 parents b9bbe6e + 288d3f1 commit 962abbc

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

arch/arm/configs/u8500_defconfig

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ CONFIG_IP_PNP=y
3232
CONFIG_IP_PNP_DHCP=y
3333
CONFIG_NETFILTER=y
3434
CONFIG_PHONET=y
35+
CONFIG_BT=y
36+
CONFIG_BT_HCIUART=m
37+
CONFIG_BT_HCIUART_BCM=y
3538
CONFIG_CFG80211=y
3639
CONFIG_CFG80211_DEBUGFS=y
3740
CONFIG_MAC80211=y
@@ -44,6 +47,7 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
4447
CONFIG_NETDEVICES=y
4548
CONFIG_SMSC911X=y
4649
CONFIG_SMSC_PHY=y
50+
CONFIG_BRCMFMAC=m
4751
CONFIG_CW1200=y
4852
CONFIG_CW1200_WLAN_SDIO=y
4953
CONFIG_INPUT_EVDEV=y
@@ -54,17 +58,21 @@ CONFIG_KEYBOARD_STMPE=y
5458
CONFIG_KEYBOARD_TC3589X=y
5559
# CONFIG_INPUT_MOUSE is not set
5660
CONFIG_INPUT_TOUCHSCREEN=y
61+
CONFIG_TOUCHSCREEN_ATMEL_MXT=y
5762
CONFIG_TOUCHSCREEN_BU21013=y
5863
CONFIG_INPUT_MISC=y
5964
CONFIG_INPUT_AB8500_PONKEY=y
65+
CONFIG_INPUT_GPIO_VIBRA=y
6066
CONFIG_RMI4_CORE=y
6167
CONFIG_RMI4_I2C=y
6268
CONFIG_RMI4_F11=y
6369
# CONFIG_SERIO is not set
6470
# CONFIG_LEGACY_PTYS is not set
6571
CONFIG_SERIAL_AMBA_PL011=y
6672
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
73+
CONFIG_SERIAL_DEV_BUS=y
6774
CONFIG_HW_RANDOM=y
75+
CONFIG_I2C_GPIO=y
6876
CONFIG_SPI=y
6977
CONFIG_SPI_PL022=y
7078
CONFIG_GPIO_STMPE=y
@@ -78,11 +86,14 @@ CONFIG_MFD_TC3589X=y
7886
CONFIG_REGULATOR_AB8500=y
7987
CONFIG_REGULATOR_GPIO=y
8088
CONFIG_DRM=y
89+
CONFIG_DRM_PANEL_NOVATEK_NT35510=y
8190
CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=y
91+
CONFIG_DRM_PANEL_SONY_ACX424AKP=y
8292
CONFIG_DRM_LIMA=y
8393
CONFIG_DRM_MCDE=y
8494
CONFIG_BACKLIGHT_CLASS_DEVICE=y
8595
CONFIG_BACKLIGHT_GENERIC=m
96+
CONFIG_BACKLIGHT_GPIO=y
8697
CONFIG_LOGO=y
8798
CONFIG_SOUND=y
8899
CONFIG_SND=y
@@ -113,9 +124,12 @@ CONFIG_HWSPINLOCK=y
113124
CONFIG_HSEM_U8500=y
114125
CONFIG_IIO=y
115126
CONFIG_IIO_SW_TRIGGER=y
127+
CONFIG_BMA180=y
116128
CONFIG_IIO_ST_ACCEL_3AXIS=y
117129
CONFIG_IIO_ST_GYRO_3AXIS=y
130+
CONFIG_INV_MPU6050_I2C=y
118131
CONFIG_BH1780=y
132+
CONFIG_GP2AP002=y
119133
CONFIG_AK8974=y
120134
CONFIG_IIO_ST_MAGN_3AXIS=y
121135
CONFIG_IIO_HRTIMER_TRIGGER=y

0 commit comments

Comments
 (0)