]> Git Repo - linux.git/commitdiff
Merge tag 'ti-k3-config-for-v6.6' of https://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <[email protected]>
Mon, 14 Aug 2023 16:45:58 +0000 (18:45 +0200)
committerArnd Bergmann <[email protected]>
Mon, 14 Aug 2023 16:46:07 +0000 (18:46 +0200)
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 <[email protected]>
1  2 
arch/arm64/configs/defconfig

index c431df0dc359a44d1fc36104885178a7423fc164,ef2e6932226033a64968e019ad4ea7db22792849..bc5d418ebba26b3a661a1bcef0556b7a406a3af8
@@@ -180,6 -180,8 +180,8 @@@ CONFIG_NET_ACT_GATE=
  CONFIG_QRTR_SMD=m
  CONFIG_QRTR_TUN=m
  CONFIG_CAN=m
+ CONFIG_CAN_M_CAN=m
+ CONFIG_CAN_M_CAN_PLATFORM=m
  CONFIG_BT=m
  CONFIG_BT_HIDP=m
  # CONFIG_BT_LE is not set
@@@ -195,7 -197,6 +197,7 @@@ CONFIG_BT_HCIUART_MRVL=
  CONFIG_BT_MRVL=m
  CONFIG_BT_MRVL_SDIO=m
  CONFIG_BT_QCOMSMD=m
 +CONFIG_BT_NXPUART=m
  CONFIG_CFG80211=m
  CONFIG_MAC80211=m
  CONFIG_MAC80211_LEDS=y
@@@ -376,6 -377,7 +378,7 @@@ CONFIG_AT803X_PHY=
  CONFIG_REALTEK_PHY=y
  CONFIG_ROCKCHIP_PHY=y
  CONFIG_DP83867_PHY=y
+ CONFIG_DP83869_PHY=m
  CONFIG_DP83TD510_PHY=y
  CONFIG_VITESSE_PHY=y
  CONFIG_CAN_FLEXCAN=m
@@@ -409,7 -411,6 +412,7 @@@ CONFIG_MWIFIEX=
  CONFIG_MWIFIEX_SDIO=m
  CONFIG_MWIFIEX_PCIE=m
  CONFIG_MT7921E=m
 +CONFIG_RSI_91X=m
  CONFIG_WL18XX=m
  CONFIG_WLCORE_SDIO=m
  CONFIG_WWAN=m
@@@ -429,7 -430,6 +432,7 @@@ CONFIG_TOUCHSCREEN_GOODIX=
  CONFIG_TOUCHSCREEN_ELAN=m
  CONFIG_TOUCHSCREEN_EDT_FT5X06=m
  CONFIG_INPUT_MISC=y
 +CONFIG_INPUT_BBNSM_PWRKEY=m
  CONFIG_INPUT_PM8941_PWRKEY=y
  CONFIG_INPUT_PM8XXX_VIBRATOR=m
  CONFIG_INPUT_TPS65219_PWRBUTTON=m
@@@ -538,7 -538,6 +541,7 @@@ CONFIG_SPI_PL022=
  CONFIG_SPI_ROCKCHIP=y
  CONFIG_SPI_RPCIF=m
  CONFIG_SPI_RSPI=m
 +CONFIG_SPI_RZV2M_CSI=m
  CONFIG_SPI_QCOM_QSPI=m
  CONFIG_SPI_QUP=y
  CONFIG_SPI_QCOM_GENI=m
@@@ -652,6 -651,7 +655,7 @@@ CONFIG_THERMAL_EMULATION=
  CONFIG_IMX_SC_THERMAL=m
  CONFIG_IMX8MM_THERMAL=m
  CONFIG_QORIQ_THERMAL=m
+ CONFIG_K3_THERMAL=m
  CONFIG_SUN8I_THERMAL=y
  CONFIG_ROCKCHIP_THERMAL=m
  CONFIG_RCAR_THERMAL=y
@@@ -680,7 -680,6 +684,7 @@@ CONFIG_SUNXI_WATCHDOG=
  CONFIG_NPCM7XX_WATCHDOG=y
  CONFIG_IMX2_WDT=y
  CONFIG_IMX_SC_WDT=m
 +CONFIG_IMX7ULP_WDT=m
  CONFIG_QCOM_WDT=m
  CONFIG_MESON_GXBB_WATCHDOG=m
  CONFIG_MESON_WATCHDOG=m
@@@ -691,6 -690,7 +695,7 @@@ CONFIG_UNIPHIER_WATCHDOG=
  CONFIG_PM8916_WATCHDOG=m
  CONFIG_BCM2835_WDT=y
  CONFIG_BCM7038_WDT=m
+ CONFIG_K3_RTI_WATCHDOG=m
  CONFIG_MFD_ALTERA_SYSMGR=y
  CONFIG_MFD_BD9571MWV=y
  CONFIG_MFD_AXP20X_I2C=y
@@@ -736,7 -736,6 +741,7 @@@ CONFIG_REGULATOR_PWM=
  CONFIG_REGULATOR_QCOM_RPMH=y
  CONFIG_REGULATOR_QCOM_SMD_RPM=y
  CONFIG_REGULATOR_QCOM_SPMI=y
 +CONFIG_REGULATOR_RAA215300=y
  CONFIG_REGULATOR_RK808=y
  CONFIG_REGULATOR_S2MPS11=y
  CONFIG_REGULATOR_TPS65132=m
@@@ -827,6 -826,7 +832,7 @@@ CONFIG_DRM_PANEL_VISIONOX_VTDR6130=
  CONFIG_DRM_LONTIUM_LT8912B=m
  CONFIG_DRM_LONTIUM_LT9611=m
  CONFIG_DRM_LONTIUM_LT9611UXC=m
+ CONFIG_DRM_ITE_IT66121=m
  CONFIG_DRM_NWL_MIPI_DSI=m
  CONFIG_DRM_PARADE_PS8640=m
  CONFIG_DRM_SII902X=m
@@@ -852,7 -852,6 +858,7 @@@ CONFIG_DRM_MEDIATEK=
  CONFIG_DRM_MEDIATEK_HDMI=m
  CONFIG_DRM_MXSFB=m
  CONFIG_DRM_MESON=m
 +CONFIG_DRM_IMX_LCDIF=m
  CONFIG_DRM_PL111=m
  CONFIG_DRM_LIMA=m
  CONFIG_DRM_PANFROST=m
@@@ -932,6 -931,7 +938,7 @@@ CONFIG_SND_SOC_MSM8916_WCD_ANALOG=
  CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
  CONFIG_SND_SOC_PCM3168A_I2C=m
  CONFIG_SND_SOC_RT5640=m
+ CONFIG_SND_SOC_J721E_EVM=m
  CONFIG_SND_SOC_RT5659=m
  CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
  CONFIG_SND_SOC_SIMPLE_MUX=m
@@@ -1053,10 -1053,13 +1060,13 @@@ CONFIG_MMC_SDHCI_XENON=
  CONFIG_MMC_SDHCI_AM654=y
  CONFIG_MMC_OWL=y
  CONFIG_SCSI_UFSHCD=y
+ CONFIG_SCSI_UFS_BSG=y
  CONFIG_SCSI_UFSHCD_PLATFORM=y
+ CONFIG_SCSI_UFS_CDNS_PLATFORM=m
  CONFIG_SCSI_UFS_QCOM=m
  CONFIG_SCSI_UFS_HISI=y
  CONFIG_SCSI_UFS_RENESAS=m
+ CONFIG_SCSI_UFS_TI_J721E=m
  CONFIG_SCSI_UFS_EXYNOS=y
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
@@@ -1081,7 -1084,6 +1091,7 @@@ CONFIG_RTC_DRV_DS1307=
  CONFIG_RTC_DRV_HYM8563=m
  CONFIG_RTC_DRV_MAX77686=y
  CONFIG_RTC_DRV_RK808=m
 +CONFIG_RTC_DRV_ISL1208=m
  CONFIG_RTC_DRV_PCF85063=m
  CONFIG_RTC_DRV_PCF85363=m
  CONFIG_RTC_DRV_M41T80=m
@@@ -1102,7 -1104,6 +1112,7 @@@ CONFIG_RTC_DRV_ARMADA38X=
  CONFIG_RTC_DRV_PM8XXX=m
  CONFIG_RTC_DRV_TEGRA=y
  CONFIG_RTC_DRV_SNVS=m
 +CONFIG_RTC_DRV_BBNSM=m
  CONFIG_RTC_DRV_IMX_SC=m
  CONFIG_RTC_DRV_MT6397=m
  CONFIG_RTC_DRV_XGENE=y
@@@ -1234,6 -1235,7 +1244,7 @@@ CONFIG_TEGRA186_TIMER=
  CONFIG_RENESAS_OSTM=y
  CONFIG_ARM_MHU=y
  CONFIG_IMX_MBOX=y
+ CONFIG_OMAP2PLUS_MBOX=m
  CONFIG_PLATFORM_MHU=y
  CONFIG_BCM2835_MBOX=y
  CONFIG_QCOM_APCS_IPC=y
@@@ -1245,7 -1247,8 +1256,9 @@@ CONFIG_ARM_SMMU_V3=
  CONFIG_MTK_IOMMU=y
  CONFIG_QCOM_IOMMU=y
  CONFIG_REMOTEPROC=y
 +CONFIG_IMX_REMOTEPROC=y
+ CONFIG_TI_K3_R5_REMOTEPROC=m
+ CONFIG_TI_K3_DSP_REMOTEPROC=m
  CONFIG_MTK_SCP=m
  CONFIG_QCOM_Q6V5_ADSP=m
  CONFIG_QCOM_Q6V5_MSS=m
@@@ -1257,7 -1260,6 +1270,7 @@@ CONFIG_RPMSG_CTRL=
  CONFIG_RPMSG_QCOM_GLINK_RPM=y
  CONFIG_RPMSG_QCOM_GLINK_SMEM=m
  CONFIG_RPMSG_QCOM_SMD=y
 +CONFIG_RPMSG_VIRTIO=y
  CONFIG_SOUNDWIRE=m
  CONFIG_SOUNDWIRE_QCOM=m
  CONFIG_OWL_PM_DOMAINS=y
@@@ -1317,6 -1319,7 +1330,7 @@@ CONFIG_ARCH_TEGRA_186_SOC=
  CONFIG_ARCH_TEGRA_194_SOC=y
  CONFIG_ARCH_TEGRA_234_SOC=y
  CONFIG_TI_SCI_PM_DOMAINS=y
+ CONFIG_TI_PRUSS=m
  CONFIG_ARM_IMX_BUS_DEVFREQ=y
  CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
  CONFIG_ARM_MEDIATEK_CCI_DEVFREQ=m
@@@ -1355,11 -1358,11 +1369,12 @@@ CONFIG_PWM_MEDIATEK=
  CONFIG_PWM_RCAR=m
  CONFIG_PWM_RENESAS_TPU=m
  CONFIG_PWM_ROCKCHIP=y
 +CONFIG_PWM_RZ_MTU3=m
  CONFIG_PWM_SAMSUNG=y
  CONFIG_PWM_SL28CPLD=m
  CONFIG_PWM_SUN4I=m
  CONFIG_PWM_TEGRA=m
+ CONFIG_PWM_TIECAP=m
  CONFIG_PWM_TIEHRPWM=m
  CONFIG_PWM_VISCONTI=m
  CONFIG_SL28CPLD_INTC=y
@@@ -1420,9 -1423,7 +1435,9 @@@ CONFIG_QCOM_L3_PMU=
  CONFIG_ARM_SPE_PMU=m
  CONFIG_ARM_DMC620_PMU=m
  CONFIG_HISI_PMU=y
 +CONFIG_NVMEM_LAYOUT_SL28_VPD=m
  CONFIG_NVMEM_IMX_OCOTP=y
 +CONFIG_NVMEM_IMX_OCOTP_ELE=m
  CONFIG_NVMEM_IMX_OCOTP_SCU=y
  CONFIG_NVMEM_LAYERSCAPE_SFP=m
  CONFIG_NVMEM_MESON_EFUSE=m
@@@ -1443,6 -1444,7 +1458,7 @@@ CONFIG_FPGA_REGION=
  CONFIG_OF_FPGA_REGION=m
  CONFIG_TEE=y
  CONFIG_OPTEE=y
+ CONFIG_MUX_GPIO=m
  CONFIG_MUX_MMIO=y
  CONFIG_SLIMBUS=m
  CONFIG_SLIM_QCOM_CTRL=m
This page took 0.071427 seconds and 4 git commands to generate.