Skip to content

Commit 0c74ef2

Browse files
committed
Merge tag 'samsung-defconfig-6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/defconfig
Samsung defconfig changes for v6.7 Enable several drivers for boards with Samsung Exynos ARM SoCs in exynos_defconfig and multi_v7_defconfig: display PHYs, AHCI DWC, TM2 touchkey (used on ARM and ARM64 Exynos-based boards), Samsung camera sensors and Intersil 29018 light sensor. Enable also IIO in s5pv210_defconfig used by MAX17040 fuel gauge driver. * tag 'samsung-defconfig-6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: exynos_defconfig: add driver for ISL29018 ARM: multi_v7_defconfig: add drivers for S5C73M3 & S5K6A3 camera sensors ARM: multi_v7_defconfig: add tm2-touchkey driver ARM: exynos_defconfig: replace SATA_AHCI_PLATFORM with AHCI_DWC driver ARM: multi_v7_defconfig: add AHCI_DWC driver ARM: multi_v7_defconfig: make Exynos related PHYs modules ARM: s5pv210_defconfig: enable IIO required by MAX17040 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 8788f22 + 438fb57 commit 0c74ef2

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

arch/arm/configs/exynos_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ CONFIG_BLK_DEV_SD=y
9393
CONFIG_CHR_DEV_SG=y
9494
CONFIG_ATA=y
9595
# CONFIG_SATA_PMP is not set
96-
CONFIG_SATA_AHCI_PLATFORM=y
96+
CONFIG_AHCI_DWC=y
9797
# CONFIG_ATA_SFF is not set
9898
CONFIG_MD=y
9999
CONFIG_BLK_DEV_DM=y
@@ -322,6 +322,7 @@ CONFIG_EXYNOS_ADC=y
322322
CONFIG_STMPE_ADC=y
323323
CONFIG_CM36651=y
324324
CONFIG_AK8975=y
325+
CONFIG_SENSORS_ISL29018=y
325326
CONFIG_PWM=y
326327
CONFIG_PWM_SAMSUNG=y
327328
CONFIG_PHY_EXYNOS5250_SATA=y

arch/arm/configs/multi_v7_defconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ CONFIG_SATA_AHCI=y
237237
CONFIG_SATA_AHCI_PLATFORM=y
238238
CONFIG_AHCI_BRCM=y
239239
CONFIG_AHCI_DM816=y
240+
CONFIG_AHCI_DWC=m
240241
CONFIG_AHCI_ST=y
241242
CONFIG_AHCI_IMX=y
242243
CONFIG_AHCI_SUNXI=y
@@ -314,6 +315,7 @@ CONFIG_KEYBOARD_PXA27x=m
314315
CONFIG_KEYBOARD_SAMSUNG=m
315316
CONFIG_KEYBOARD_ST_KEYSCAN=y
316317
CONFIG_KEYBOARD_SPEAR=y
318+
CONFIG_KEYBOARD_TM2_TOUCHKEY=m
317319
CONFIG_KEYBOARD_CROS_EC=m
318320
CONFIG_MOUSE_PS2_ELANTECH=y
319321
CONFIG_MOUSE_CYAPA=m
@@ -691,6 +693,8 @@ CONFIG_VIDEO_STI_HVA=m
691693
CONFIG_VIDEO_STM32_DCMI=m
692694
CONFIG_V4L_TEST_DRIVERS=y
693695
CONFIG_VIDEO_VIVID=m
696+
CONFIG_VIDEO_S5C73M3=m
697+
CONFIG_VIDEO_S5K6A3=m
694698
CONFIG_VIDEO_ADV7180=m
695699
CONFIG_VIDEO_ADV7604=m
696700
CONFIG_VIDEO_ADV7604_CEC=y
@@ -1202,6 +1206,8 @@ CONFIG_PHY_QCOM_USB_HS=y
12021206
CONFIG_PHY_RCAR_GEN2=m
12031207
CONFIG_PHY_ROCKCHIP_DP=m
12041208
CONFIG_PHY_ROCKCHIP_USB=y
1209+
CONFIG_PHY_EXYNOS_DP_VIDEO=m
1210+
CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
12051211
CONFIG_PHY_SAMSUNG_USB2=m
12061212
CONFIG_PHY_EXYNOS5250_SATA=m
12071213
CONFIG_PHY_UNIPHIER_USB2=y

arch/arm/configs/s5pv210_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ CONFIG_MMC_SDHCI_S3C_DMA=y
9797
CONFIG_RTC_CLASS=y
9898
CONFIG_RTC_DRV_MAX8998=m
9999
CONFIG_DMADEVICES=y
100+
CONFIG_IIO=y
100101
CONFIG_PWM=y
101102
CONFIG_PWM_SAMSUNG=y
102103
CONFIG_PHY_SAMSUNG_USB2=m

0 commit comments

Comments
 (0)