Skip to content

Commit 38ea77a

Browse files
committed
Merge tag 'soc-defconfig-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC defconfig updates from Arnd Bergmann: "The updates to the defconfig files are fairly small, enabling drivers for eight of the arm and riscv based platforms" * tag 'soc-defconfig-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: arm64: defconfig: enable mt8365 sound riscv: defconfig: Enable pinctrl support for CV18XX Series SoC arm64: defconfig: Enable ADP5585 GPIO and PWM drivers arm64: defconfig: Enable Tegra194 PCIe Endpoint arm64: defconfig: Enable E5010 JPEG Encoder riscv: defconfig: sophgo: enable clks for sg2042 arm64: defconfig: build CONFIG_REGULATOR_QCOM_REFGEN as module ARM: configs: at91: enable config flags for sam9x7 SoC family arm64: defconfig: Enable R-Car Ethernet-TSN support ARM: shmobile: defconfig: Enable slab hardening and kmalloc buckets arm64: defconfig: Enable AK4619 codec support
2 parents b8979c6 + 7eee0f8 commit 38ea77a

File tree

4 files changed

+19
-0
lines changed

4 files changed

+19
-0
lines changed

arch/arm/configs/at91_dt_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ CONFIG_ARCH_AT91=y
1616
CONFIG_SOC_AT91RM9200=y
1717
CONFIG_SOC_AT91SAM9=y
1818
CONFIG_SOC_SAM9X60=y
19+
CONFIG_SOC_SAM9X7=y
1920
# CONFIG_ATMEL_CLOCKSOURCE_PIT is not set
2021
CONFIG_AEABI=y
2122
CONFIG_UACCESS_WITH_MEMCPY=y

arch/arm/configs/shmobile_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ CONFIG_CPUFREQ_DT=y
2424
CONFIG_VFP=y
2525
CONFIG_NEON=y
2626
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
27+
CONFIG_SLAB_FREELIST_HARDENED=y
2728
CONFIG_CMA=y
2829
CONFIG_NET=y
2930
CONFIG_PACKET=y

arch/arm64/configs/defconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ CONFIG_PCIE_KIRIN=y
232232
CONFIG_PCIE_HISI_STB=y
233233
CONFIG_PCIE_ARMADA_8K=y
234234
CONFIG_PCIE_TEGRA194_HOST=m
235+
CONFIG_PCIE_TEGRA194_EP=m
235236
CONFIG_PCIE_QCOM=y
236237
CONFIG_PCIE_RCAR_GEN4_HOST=m
237238
CONFIG_PCIE_RCAR_GEN4_EP=m
@@ -366,6 +367,7 @@ CONFIG_R8169=m
366367
CONFIG_SH_ETH=y
367368
CONFIG_RAVB=y
368369
CONFIG_RENESAS_ETHER_SWITCH=y
370+
CONFIG_RTSN=y
369371
CONFIG_SMC91X=y
370372
CONFIG_SMSC911X=y
371373
CONFIG_SNI_AVE=y
@@ -655,6 +657,7 @@ CONFIG_GPIO_XGENE_SB=y
655657
CONFIG_GPIO_MAX732X=y
656658
CONFIG_GPIO_PCA953X=y
657659
CONFIG_GPIO_PCA953X_IRQ=y
660+
CONFIG_GPIO_ADP5585=m
658661
CONFIG_GPIO_BD9571MWV=m
659662
CONFIG_GPIO_MAX77620=y
660663
CONFIG_GPIO_SL28CPLD=m
@@ -736,6 +739,7 @@ CONFIG_UNIPHIER_WATCHDOG=y
736739
CONFIG_PM8916_WATCHDOG=m
737740
CONFIG_BCM2835_WDT=y
738741
CONFIG_BCM7038_WDT=m
742+
CONFIG_MFD_ADP5585=m
739743
CONFIG_MFD_ALTERA_SYSMGR=y
740744
CONFIG_MFD_BD9571MWV=y
741745
CONFIG_MFD_AXP20X_I2C=y
@@ -785,6 +789,7 @@ CONFIG_REGULATOR_PCA9450=y
785789
CONFIG_REGULATOR_PF8X00=y
786790
CONFIG_REGULATOR_PFUZE100=y
787791
CONFIG_REGULATOR_PWM=y
792+
CONFIG_REGULATOR_QCOM_REFGEN=m
788793
CONFIG_REGULATOR_QCOM_RPMH=y
789794
CONFIG_REGULATOR_QCOM_SMD_RPM=y
790795
CONFIG_REGULATOR_QCOM_SPMI=y
@@ -820,6 +825,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m
820825
CONFIG_VIDEO_MEDIATEK_JPEG=m
821826
CONFIG_VIDEO_MEDIATEK_VCODEC=m
822827
CONFIG_VIDEO_WAVE_VPU=m
828+
CONFIG_VIDEO_E5010_JPEG_ENC=m
823829
CONFIG_VIDEO_IMX7_CSI=m
824830
CONFIG_VIDEO_IMX_MIPI_CSIS=m
825831
CONFIG_VIDEO_IMX8_ISI=m
@@ -961,6 +967,8 @@ CONFIG_SND_SOC_MT8192=m
961967
CONFIG_SND_SOC_MT8192_MT6359_RT1015_RT5682=m
962968
CONFIG_SND_SOC_MT8195=m
963969
CONFIG_SND_SOC_MT8195_MT6359=m
970+
CONFIG_SND_SOC_MT8365=m
971+
CONFIG_SND_SOC_MT8365_MT6357=m
964972
CONFIG_SND_MESON_AXG_SOUND_CARD=m
965973
CONFIG_SND_MESON_GX_SOUND_CARD=m
966974
CONFIG_SND_SOC_QCOM=m
@@ -1006,6 +1014,7 @@ CONFIG_SND_SOC_TEGRA_AUDIO_GRAPH_CARD=m
10061014
CONFIG_SND_SOC_DAVINCI_MCASP=m
10071015
CONFIG_SND_SOC_J721E_EVM=m
10081016
CONFIG_SND_SOC_AK4613=m
1017+
CONFIG_SND_SOC_AK4619=m
10091018
CONFIG_SND_SOC_DA7213=m
10101019
CONFIG_SND_SOC_ES7134=m
10111020
CONFIG_SND_SOC_ES7241=m
@@ -1485,6 +1494,7 @@ CONFIG_IIO_ST_MAGN_3AXIS=m
14851494
CONFIG_IIO_CROS_EC_BARO=m
14861495
CONFIG_MPL3115=m
14871496
CONFIG_PWM=y
1497+
CONFIG_PWM_ADP5585=m
14881498
CONFIG_PWM_BCM2835=m
14891499
CONFIG_PWM_BRCMSTB=m
14901500
CONFIG_PWM_CROS_EC=m

arch/riscv/configs/defconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,10 @@ CONFIG_SPI_RSPI=m
167167
CONFIG_SPI_SIFIVE=y
168168
CONFIG_SPI_SUN6I=y
169169
# CONFIG_PTP_1588_CLOCK is not set
170+
CONFIG_PINCTRL_SOPHGO_CV1800B=y
171+
CONFIG_PINCTRL_SOPHGO_CV1812H=y
172+
CONFIG_PINCTRL_SOPHGO_SG2000=y
173+
CONFIG_PINCTRL_SOPHGO_SG2002=y
170174
CONFIG_GPIO_SIFIVE=y
171175
CONFIG_POWER_RESET_GPIO_RESTART=y
172176
CONFIG_SENSORS_SFCTEMP=m
@@ -249,6 +253,9 @@ CONFIG_VIRTIO_BALLOON=y
249253
CONFIG_VIRTIO_INPUT=y
250254
CONFIG_VIRTIO_MMIO=y
251255
CONFIG_CLK_SOPHGO_CV1800=y
256+
CONFIG_CLK_SOPHGO_SG2042_PLL=y
257+
CONFIG_CLK_SOPHGO_SG2042_CLKGEN=y
258+
CONFIG_CLK_SOPHGO_SG2042_RPGATE=y
252259
CONFIG_SUN8I_DE2_CCU=m
253260
CONFIG_RENESAS_OSTM=y
254261
CONFIG_SUN50I_IOMMU=y

0 commit comments

Comments
 (0)