diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2026-10-12 11:00:00 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2026-10-12 11:00:00 +0200 |
| commit | 8669c78cc9f13c38b83d94d3b1a3d4430ca859cd (patch) | |
| tree | b7bdffd94114d5820442fc995611e839e7618959 /arch | |
| parent | 7eff5d0a5c02597f9cb7927e0615f4f87a3647ca (diff) | |
| parent | d1b0914f0dacf0d3387eed11bac12b49e8594eb0 (diff) | |
| download | linux-next-8669c78cc9f13c38b83d94d3b1a3d4430ca859cd.tar.gz linux-next-8669c78cc9f13c38b83d94d3b1a3d4430ca859cd.zip | |
Merge branch 'soc/defconfig' into for-next
* soc/defconfig:
arm64: defconfig: Enable PMIC5 Gen3 ADC thermal monitor
arm64: defconfig: Enable QMP PCIe Multi-PHY driver
ARM: shmobile: defconfig: Refresh for v7.3-rc1
arm64: defconfig: enable the necessary drivers for the Ayaneo Pocket S2
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/shmobile_defconfig | 3 | ||||
| -rw-r--r-- | arch/arm64/configs/defconfig | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 6f9696e9fe17..cb7eddd4eb22 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -48,7 +48,6 @@ CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_OF=y CONFIG_MTD_SPI_NOR=y -CONFIG_EEPROM_AT24=y CONFIG_BLK_DEV_SD=y CONFIG_ATA=y CONFIG_SATA_RCAR=y @@ -79,6 +78,7 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y # CONFIG_SERIAL_8250_PCI is not set # CONFIG_SERIAL_8250_EXAR is not set +# CONFIG_SERIAL_8250_MOXA_PCIE is not set CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_EM=y # CONFIG_SERIAL_8250_PERICOM is not set @@ -209,6 +209,7 @@ CONFIG_PWM_RENESAS_RCAR=y CONFIG_PWM_RENESAS_TPU=y CONFIG_PHY_RCAR_GEN2=y CONFIG_PHY_RCAR_GEN3_USB2=y +CONFIG_EEPROM_AT24=y # CONFIG_DNOTIFY is not set CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 6ec8d3a69c98..415aa240c2ec 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -800,6 +800,7 @@ CONFIG_TEGRA_BPMP_THERMAL=m CONFIG_GENERIC_ADC_THERMAL=m CONFIG_QCOM_TSENS=y CONFIG_QCOM_SPMI_ADC_TM5=m +CONFIG_QCOM_SPMI_ADC_TM5_GEN3=m CONFIG_QCOM_SPMI_TEMP_ALARM=m CONFIG_QCOM_LMH=m CONFIG_UNIPHIER_THERMAL=y @@ -895,6 +896,7 @@ CONFIG_REGULATOR_QCOM_USB_VBUS=m CONFIG_REGULATOR_RAA215300=y CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_S2MPS11=y +CONFIG_REGULATOR_SGM3804=y CONFIG_REGULATOR_TPS65132=m CONFIG_REGULATOR_TPS65219=y CONFIG_REGULATOR_VCTRL=m @@ -1026,6 +1028,7 @@ CONFIG_DRM_PANEL_NOVATEK_NT36672E=m CONFIG_DRM_PANEL_NOVATEK_NT37801=m CONFIG_DRM_PANEL_RAYDIUM_RM67191=m CONFIG_DRM_PANEL_RAYDIUM_RM692E5=m +CONFIG_DRM_PANEL_RENESAS_R63419=m CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20=m CONFIG_DRM_PANEL_SITRONIX_ST7703=m CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m @@ -1062,6 +1065,7 @@ CONFIG_DRM_ZYNQMP_DPSUB_AUDIO=y CONFIG_FB=y CONFIG_FB_EFI=y CONFIG_FB_MODE_HELPERS=y +CONFIG_BACKLIGHT_SY7758=m CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_APPLE_DWI=m CONFIG_BACKLIGHT_QCOM_WLED=m @@ -1699,6 +1703,7 @@ CONFIG_MEDIATEK_MT6359_AUXADC=m CONFIG_MEDIATEK_MT6577_AUXADC=m CONFIG_QCOM_SPMI_VADC=m CONFIG_QCOM_SPMI_ADC5=m +CONFIG_QCOM_SPMI_ADC5_GEN3=m CONFIG_ROCKCHIP_SARADC=m CONFIG_RZG2L_ADC=m CONFIG_RZT2H_ADC=m @@ -1778,6 +1783,7 @@ CONFIG_PHY_MTK_DP=m CONFIG_PHY_QCOM_EDP=m CONFIG_PHY_QCOM_PCIE2=m CONFIG_PHY_QCOM_QMP=m +CONFIG_PHY_QCOM_QMP_PCIE_MULTIPHY=m CONFIG_PHY_QCOM_QUSB2=m CONFIG_PHY_QCOM_EUSB2_REPEATER=m CONFIG_PHY_QCOM_M31_USB=m |