Skip to content

Commit 3bb3396

Browse files
committed
Merge tag 'soc-defconfig-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC defconfig updates from Arnd Bergmann: "A small set of updates for the arm64 defconfig to enable more drivers, plus a bit for housekeeping on some of the arm32 defconfigs on particular SoC families" * tag 'soc-defconfig-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: arm: defconfig: drop RT_GROUP_SCHED=y from bcm2835/tegra/omap2plus arm64: defconfig: Enable USB retimer and redriver arm64: defconfig: Build NSS Clock Controller driver for IPQ9574 arm64: defconfig: Enable SPI NAND flashes arm64: defconfig: Enable Synopsys HDMI receiver arm64: defconfig: Enable Rockchip UFS host driver arm64: defconfig: enable Qualcomm IRIS & VIDEOCC_8550 as module arm64: defconfig: Enable HSR protocol driver arm64: defconfig: Enable gb_beagleplay arm64: defconfig: enable DRM_DISPLAY_CONNECTOR as a module arm64: defconfig: Enable Qualcomm QCM2290 GPU clock controller ARM: shmobile: defconfig: Supplement DTB with ATAG information
2 parents a9fc230 + 8ce2a15 commit 3bb3396

5 files changed

Lines changed: 15 additions & 3 deletions

File tree

arch/arm/configs/bcm2835_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ CONFIG_BSD_PROCESS_ACCT=y
77
CONFIG_BSD_PROCESS_ACCT_V3=y
88
CONFIG_LOG_BUF_SHIFT=18
99
CONFIG_CFS_BANDWIDTH=y
10-
CONFIG_RT_GROUP_SCHED=y
1110
CONFIG_CGROUP_FREEZER=y
1211
CONFIG_CPUSETS=y
1312
CONFIG_CGROUP_DEVICE=y

arch/arm/configs/omap2plus_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ CONFIG_MEMCG=y
1313
CONFIG_BLK_CGROUP=y
1414
CONFIG_CGROUP_SCHED=y
1515
CONFIG_CFS_BANDWIDTH=y
16-
CONFIG_RT_GROUP_SCHED=y
1716
CONFIG_CGROUP_FREEZER=y
1817
CONFIG_CPUSETS=y
1918
CONFIG_CGROUP_DEVICE=y

arch/arm/configs/shmobile_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ CONFIG_SCHED_MC=y
1414
CONFIG_NR_CPUS=8
1515
CONFIG_HIGHMEM=y
1616
CONFIG_ARM_APPENDED_DTB=y
17+
CONFIG_ARM_ATAG_DTB_COMPAT=y
1718
CONFIG_CPU_FREQ=y
1819
CONFIG_CPU_FREQ_STAT=y
1920
CONFIG_CPU_FREQ_GOV_POWERSAVE=y

arch/arm/configs/tegra_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ CONFIG_IKCONFIG=y
66
CONFIG_IKCONFIG_PROC=y
77
CONFIG_CGROUPS=y
88
CONFIG_CGROUP_SCHED=y
9-
CONFIG_RT_GROUP_SCHED=y
109
CONFIG_CGROUP_FREEZER=y
1110
CONFIG_CGROUP_CPUACCT=y
1211
CONFIG_CGROUP_DEBUG=y

arch/arm64/configs/defconfig

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ CONFIG_NET_CLS_FLOWER=m
177177
CONFIG_NET_CLS_ACT=y
178178
CONFIG_NET_ACT_GACT=m
179179
CONFIG_NET_ACT_MIRRED=m
180+
CONFIG_HSR=m
180181
CONFIG_NET_ACT_GATE=m
181182
CONFIG_QRTR_SMD=m
182183
CONFIG_QRTR_TUN=m
@@ -284,6 +285,7 @@ CONFIG_MTD_NAND_BRCMNAND=m
284285
CONFIG_MTD_NAND_FSL_IFC=y
285286
CONFIG_MTD_NAND_QCOM=y
286287
CONFIG_MTD_SPI_NOR=y
288+
CONFIG_MTD_SPI_NAND=m
287289
CONFIG_MTD_UBI=m
288290
CONFIG_MTD_HYPERBUS=m
289291
CONFIG_HBMC_AM654=m
@@ -845,6 +847,7 @@ CONFIG_VIDEO_IMX8_ISI=m
845847
CONFIG_VIDEO_IMX8_ISI_M2M=y
846848
CONFIG_VIDEO_IMX8_JPEG=m
847849
CONFIG_VIDEO_QCOM_CAMSS=m
850+
CONFIG_VIDEO_QCOM_IRIS=m
848851
CONFIG_VIDEO_QCOM_VENUS=m
849852
CONFIG_VIDEO_RCAR_ISP=m
850853
CONFIG_VIDEO_RCAR_CSI2=m
@@ -859,6 +862,8 @@ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
859862
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
860863
CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
861864
CONFIG_VIDEO_SUN6I_CSI=m
865+
CONFIG_VIDEO_SYNOPSYS_HDMIRX=m
866+
CONFIG_VIDEO_SYNOPSYS_HDMIRX_LOAD_DEFAULT_EDID=y
862867
CONFIG_VIDEO_TI_J721E_CSI2RX=m
863868
CONFIG_VIDEO_HANTRO=m
864869
CONFIG_VIDEO_IMX219=m
@@ -911,6 +916,7 @@ CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20=m
911916
CONFIG_DRM_PANEL_SITRONIX_ST7703=m
912917
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
913918
CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
919+
CONFIG_DRM_DISPLAY_CONNECTOR=m
914920
CONFIG_DRM_FSL_LDB=m
915921
CONFIG_DRM_ITE_IT6263=m
916922
CONFIG_DRM_LONTIUM_LT8912B=m
@@ -1147,6 +1153,7 @@ CONFIG_TYPEC_HD3SS3220=m
11471153
CONFIG_TYPEC_MUX_FSA4480=m
11481154
CONFIG_TYPEC_MUX_GPIO_SBU=m
11491155
CONFIG_TYPEC_MUX_NB7VPQ904M=m
1156+
CONFIG_TYPEC_MUX_PS883X=m
11501157
CONFIG_TYPEC_MUX_WCD939X_USBSS=m
11511158
CONFIG_TYPEC_DP_ALTMODE=m
11521159
CONFIG_MMC=y
@@ -1188,6 +1195,7 @@ CONFIG_SCSI_UFS_HISI=y
11881195
CONFIG_SCSI_UFS_RENESAS=m
11891196
CONFIG_SCSI_UFS_TI_J721E=m
11901197
CONFIG_SCSI_UFS_EXYNOS=y
1198+
CONFIG_SCSI_UFS_ROCKCHIP=y
11911199
CONFIG_NEW_LEDS=y
11921200
CONFIG_LEDS_CLASS=y
11931201
CONFIG_LEDS_CLASS_MULTICOLOR=m
@@ -1270,6 +1278,8 @@ CONFIG_VIRTIO_BALLOON=y
12701278
CONFIG_VIRTIO_MMIO=y
12711279
CONFIG_XEN_GNTDEV=y
12721280
CONFIG_XEN_GRANT_DEV_ALLOC=y
1281+
CONFIG_GREYBUS=m
1282+
CONFIG_GREYBUS_BEAGLEPLAY=m
12731283
CONFIG_STAGING=y
12741284
CONFIG_STAGING_MEDIA=y
12751285
CONFIG_VIDEO_MAX96712=m
@@ -1320,6 +1330,7 @@ CONFIG_CLK_X1E80100_DISPCC=m
13201330
CONFIG_CLK_X1E80100_GCC=y
13211331
CONFIG_CLK_X1E80100_GPUCC=m
13221332
CONFIG_CLK_X1E80100_TCSRCC=y
1333+
CONFIG_CLK_QCM2290_GPUCC=m
13231334
CONFIG_QCOM_A53PLL=y
13241335
CONFIG_QCOM_CLK_APCS_MSM8916=y
13251336
CONFIG_QCOM_CLK_APCC_MSM8996=y
@@ -1333,6 +1344,7 @@ CONFIG_IPQ_GCC_5332=y
13331344
CONFIG_IPQ_GCC_6018=y
13341345
CONFIG_IPQ_GCC_8074=y
13351346
CONFIG_IPQ_GCC_9574=y
1347+
CONFIG_IPQ_NSSCC_9574=m
13361348
CONFIG_MSM_GCC_8916=y
13371349
CONFIG_MSM_MMCC_8994=m
13381350
CONFIG_MSM_GCC_8994=y
@@ -1394,6 +1406,7 @@ CONFIG_SM_TCSRCC_8650=y
13941406
CONFIG_SM_TCSRCC_8750=m
13951407
CONFIG_SA_VIDEOCC_8775P=m
13961408
CONFIG_SM_VIDEOCC_8250=y
1409+
CONFIG_SM_VIDEOCC_8550=m
13971410
CONFIG_QCOM_HFPLL=y
13981411
CONFIG_CLK_GFM_LPASS_SM8250=m
13991412
CONFIG_CLK_RCAR_USB2_CLOCK_SEL=y
@@ -1561,6 +1574,7 @@ CONFIG_RESET_RZG2L_USBPHY_CTRL=y
15611574
CONFIG_RESET_TI_SCI=y
15621575
CONFIG_PHY_XGENE=y
15631576
CONFIG_PHY_CAN_TRANSCEIVER=m
1577+
CONFIG_PHY_NXP_PTN3222=m
15641578
CONFIG_PHY_SUN4I_USB=y
15651579
CONFIG_PHY_CADENCE_TORRENT=m
15661580
CONFIG_PHY_CADENCE_DPHY_RX=m

0 commit comments

Comments
 (0)