Skip to content

Commit 0aea47f

Browse files
committed
Merge tag 'ti-k3-config-for-v6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/defconfig
TI K3 defconfig updates for v6.6 - Various configs for K3 boards including ECAP, Thermal, RTI watchdog, mailbox, sound, MCAN, UFS. - Enable PRUSS for am64/am65x boards such as IOT2050. - Enable IT66121 for BeaglePlay HDMI. * tag 'ti-k3-config-for-v6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: arm64: defconfig: Enable ITE_IT66121 HDMI transmitter arm64: defconfig: Enable TI PRUSS arm64: defconfig: Enable various configs for TI K3 platforms Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 20cf932 + d5c988b commit 0aea47f

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,8 @@ CONFIG_NET_ACT_GATE=m
180180
CONFIG_QRTR_SMD=m
181181
CONFIG_QRTR_TUN=m
182182
CONFIG_CAN=m
183+
CONFIG_CAN_M_CAN=m
184+
CONFIG_CAN_M_CAN_PLATFORM=m
183185
CONFIG_BT=m
184186
CONFIG_BT_HIDP=m
185187
# CONFIG_BT_LE is not set
@@ -376,6 +378,7 @@ CONFIG_AT803X_PHY=y
376378
CONFIG_REALTEK_PHY=y
377379
CONFIG_ROCKCHIP_PHY=y
378380
CONFIG_DP83867_PHY=y
381+
CONFIG_DP83869_PHY=m
379382
CONFIG_DP83TD510_PHY=y
380383
CONFIG_VITESSE_PHY=y
381384
CONFIG_CAN_FLEXCAN=m
@@ -652,6 +655,7 @@ CONFIG_THERMAL_EMULATION=y
652655
CONFIG_IMX_SC_THERMAL=m
653656
CONFIG_IMX8MM_THERMAL=m
654657
CONFIG_QORIQ_THERMAL=m
658+
CONFIG_K3_THERMAL=m
655659
CONFIG_SUN8I_THERMAL=y
656660
CONFIG_ROCKCHIP_THERMAL=m
657661
CONFIG_RCAR_THERMAL=y
@@ -691,6 +695,7 @@ CONFIG_UNIPHIER_WATCHDOG=y
691695
CONFIG_PM8916_WATCHDOG=m
692696
CONFIG_BCM2835_WDT=y
693697
CONFIG_BCM7038_WDT=m
698+
CONFIG_K3_RTI_WATCHDOG=m
694699
CONFIG_MFD_ALTERA_SYSMGR=y
695700
CONFIG_MFD_BD9571MWV=y
696701
CONFIG_MFD_AXP20X_I2C=y
@@ -827,6 +832,7 @@ CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
827832
CONFIG_DRM_LONTIUM_LT8912B=m
828833
CONFIG_DRM_LONTIUM_LT9611=m
829834
CONFIG_DRM_LONTIUM_LT9611UXC=m
835+
CONFIG_DRM_ITE_IT66121=m
830836
CONFIG_DRM_NWL_MIPI_DSI=m
831837
CONFIG_DRM_PARADE_PS8640=m
832838
CONFIG_DRM_SII902X=m
@@ -932,6 +938,7 @@ CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
932938
CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
933939
CONFIG_SND_SOC_PCM3168A_I2C=m
934940
CONFIG_SND_SOC_RT5640=m
941+
CONFIG_SND_SOC_J721E_EVM=m
935942
CONFIG_SND_SOC_RT5659=m
936943
CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
937944
CONFIG_SND_SOC_SIMPLE_MUX=m
@@ -1053,10 +1060,13 @@ CONFIG_MMC_SDHCI_XENON=y
10531060
CONFIG_MMC_SDHCI_AM654=y
10541061
CONFIG_MMC_OWL=y
10551062
CONFIG_SCSI_UFSHCD=y
1063+
CONFIG_SCSI_UFS_BSG=y
10561064
CONFIG_SCSI_UFSHCD_PLATFORM=y
1065+
CONFIG_SCSI_UFS_CDNS_PLATFORM=m
10571066
CONFIG_SCSI_UFS_QCOM=m
10581067
CONFIG_SCSI_UFS_HISI=y
10591068
CONFIG_SCSI_UFS_RENESAS=m
1069+
CONFIG_SCSI_UFS_TI_J721E=m
10601070
CONFIG_SCSI_UFS_EXYNOS=y
10611071
CONFIG_NEW_LEDS=y
10621072
CONFIG_LEDS_CLASS=y
@@ -1234,6 +1244,7 @@ CONFIG_TEGRA186_TIMER=y
12341244
CONFIG_RENESAS_OSTM=y
12351245
CONFIG_ARM_MHU=y
12361246
CONFIG_IMX_MBOX=y
1247+
CONFIG_OMAP2PLUS_MBOX=m
12371248
CONFIG_PLATFORM_MHU=y
12381249
CONFIG_BCM2835_MBOX=y
12391250
CONFIG_QCOM_APCS_IPC=y
@@ -1246,6 +1257,8 @@ CONFIG_MTK_IOMMU=y
12461257
CONFIG_QCOM_IOMMU=y
12471258
CONFIG_REMOTEPROC=y
12481259
CONFIG_IMX_REMOTEPROC=y
1260+
CONFIG_TI_K3_R5_REMOTEPROC=m
1261+
CONFIG_TI_K3_DSP_REMOTEPROC=m
12491262
CONFIG_MTK_SCP=m
12501263
CONFIG_QCOM_Q6V5_ADSP=m
12511264
CONFIG_QCOM_Q6V5_MSS=m
@@ -1317,6 +1330,7 @@ CONFIG_ARCH_TEGRA_186_SOC=y
13171330
CONFIG_ARCH_TEGRA_194_SOC=y
13181331
CONFIG_ARCH_TEGRA_234_SOC=y
13191332
CONFIG_TI_SCI_PM_DOMAINS=y
1333+
CONFIG_TI_PRUSS=m
13201334
CONFIG_ARM_IMX_BUS_DEVFREQ=y
13211335
CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
13221336
CONFIG_ARM_MEDIATEK_CCI_DEVFREQ=m
@@ -1360,6 +1374,7 @@ CONFIG_PWM_SAMSUNG=y
13601374
CONFIG_PWM_SL28CPLD=m
13611375
CONFIG_PWM_SUN4I=m
13621376
CONFIG_PWM_TEGRA=m
1377+
CONFIG_PWM_TIECAP=m
13631378
CONFIG_PWM_TIEHRPWM=m
13641379
CONFIG_PWM_VISCONTI=m
13651380
CONFIG_SL28CPLD_INTC=y
@@ -1443,6 +1458,7 @@ CONFIG_FPGA_REGION=m
14431458
CONFIG_OF_FPGA_REGION=m
14441459
CONFIG_TEE=y
14451460
CONFIG_OPTEE=y
1461+
CONFIG_MUX_GPIO=m
14461462
CONFIG_MUX_MMIO=y
14471463
CONFIG_SLIMBUS=m
14481464
CONFIG_SLIM_QCOM_CTRL=m

0 commit comments

Comments
 (0)