Skip to content

Commit cfd08b9

Browse files
committed
Merge tag 'ux500-defconfig-soc-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/fixes
Defconfig updates for kernel v5.18: - Refresh defconfig with new and moved options - Add some new hardware drivers - Activate battery charging * tag 'ux500-defconfig-soc-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik: ARM: config: u8500: Re-enable AB8500 battery charging ARM: config: u8500: Add some common hardware ARM: config: Refresh U8500 defconfig Link: https://lore.kernel.org/r/CACRpkdY+_Go4XNzOh+Rvc24QBnUud2k-S7VQuaH5d-j71_dJog@mail.gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 475acef + 62f6424 commit cfd08b9

1 file changed

Lines changed: 15 additions & 4 deletions

File tree

arch/arm/configs/u8500_defconfig

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ CONFIG_VFP=y
2020
CONFIG_NEON=y
2121
CONFIG_MODULES=y
2222
CONFIG_MODULE_UNLOAD=y
23-
# CONFIG_BLK_DEV_BSG is not set
2423
CONFIG_PARTITION_ADVANCED=y
2524
CONFIG_CMA=y
2625
CONFIG_NET=y
@@ -41,6 +40,8 @@ CONFIG_MAC80211_LEDS=y
4140
CONFIG_CAIF=y
4241
CONFIG_DEVTMPFS=y
4342
CONFIG_DEVTMPFS_MOUNT=y
43+
CONFIG_GNSS=y
44+
CONFIG_GNSS_SIRF_SERIAL=y
4445
CONFIG_BLK_DEV_RAM=y
4546
CONFIG_BLK_DEV_RAM_SIZE=65536
4647
CONFIG_NETDEVICES=y
@@ -83,6 +84,8 @@ CONFIG_SPI_GPIO=y
8384
CONFIG_SPI_PL022=y
8485
CONFIG_GPIO_STMPE=y
8586
CONFIG_GPIO_TC3589X=y
87+
CONFIG_BATTERY_SAMSUNG_SDI=y
88+
CONFIG_AB8500_BM=y
8689
CONFIG_SENSORS_IIO_HWMON=y
8790
CONFIG_SENSORS_NTC_THERMISTOR=y
8891
CONFIG_THERMAL=y
@@ -98,10 +101,13 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
98101
CONFIG_V4L2_FLASH_LED_CLASS=y
99102
CONFIG_DRM=y
100103
CONFIG_DRM_PANEL_NOVATEK_NT35510=y
104+
CONFIG_DRM_PANEL_NOVATEK_NT35560=y
105+
CONFIG_DRM_PANEL_SAMSUNG_DB7430=y
101106
CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=y
107+
CONFIG_DRM_PANEL_SAMSUNG_S6D27A1=y
102108
CONFIG_DRM_PANEL_SAMSUNG_S6E63M0=y
103109
CONFIG_DRM_PANEL_SAMSUNG_S6E63M0_DSI=y
104-
CONFIG_DRM_PANEL_SONY_ACX424AKP=y
110+
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=y
105111
CONFIG_DRM_LIMA=y
106112
CONFIG_DRM_MCDE=y
107113
CONFIG_FB=y
@@ -129,6 +135,7 @@ CONFIG_LEDS_LM3530=y
129135
CONFIG_LEDS_GPIO=y
130136
CONFIG_LEDS_LP55XX_COMMON=y
131137
CONFIG_LEDS_LP5521=y
138+
CONFIG_LEDS_REGULATOR=y
132139
CONFIG_LEDS_RT8515=y
133140
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
134141
CONFIG_RTC_CLASS=y
@@ -144,17 +151,22 @@ CONFIG_IIO_SW_TRIGGER=y
144151
CONFIG_BMA180=y
145152
CONFIG_BMC150_ACCEL=y
146153
CONFIG_IIO_ST_ACCEL_3AXIS=y
154+
# CONFIG_IIO_ST_ACCEL_SPI_3AXIS is not set
147155
CONFIG_IIO_RESCALE=y
148156
CONFIG_MPU3050_I2C=y
149157
CONFIG_IIO_ST_GYRO_3AXIS=y
158+
# CONFIG_IIO_ST_GYRO_SPI_3AXIS is not set
150159
CONFIG_INV_MPU6050_I2C=y
151160
CONFIG_BH1780=y
152161
CONFIG_GP2AP002=y
162+
CONFIG_TSL2772=y
153163
CONFIG_AK8974=y
154164
CONFIG_IIO_ST_MAGN_3AXIS=y
165+
# CONFIG_IIO_ST_MAGN_SPI_3AXIS is not set
155166
CONFIG_YAMAHA_YAS530=y
156167
CONFIG_IIO_HRTIMER_TRIGGER=y
157168
CONFIG_IIO_ST_PRESS=y
169+
# CONFIG_IIO_ST_PRESS_SPI is not set
158170
CONFIG_EXT2_FS=y
159171
CONFIG_EXT2_FS_XATTR=y
160172
CONFIG_EXT2_FS_POSIX_ACL=y
@@ -173,10 +185,9 @@ CONFIG_CRYPTO_DEV_UX500_CRYP=y
173185
CONFIG_CRYPTO_DEV_UX500_HASH=y
174186
CONFIG_CRYPTO_DEV_UX500_DEBUG=y
175187
CONFIG_PRINTK_TIME=y
176-
CONFIG_DEBUG_INFO=y
188+
CONFIG_DEBUG_KERNEL=y
177189
CONFIG_MAGIC_SYSRQ=y
178190
CONFIG_DEBUG_FS=y
179-
CONFIG_DEBUG_KERNEL=y
180191
# CONFIG_SCHED_DEBUG is not set
181192
# CONFIG_FTRACE is not set
182193
CONFIG_DEBUG_USER=y

0 commit comments

Comments
 (0)