diff options
| author | Tero Kristo <t-kristo@ti.com> | 2020-07-17 14:47:23 +0300 |
|---|---|---|
| committer | Tero Kristo <t-kristo@ti.com> | 2020-07-17 14:47:23 +0300 |
| commit | 1e3d655fe7b48c2341d63f981774742e21744f53 (patch) | |
| tree | 5236a9568bf81829cc55080bef636cae60e645c2 | |
| parent | 04fe6477efce92adaf373a6044c90fa8445d2bff (diff) | |
| parent | 3506ddd676a3c617d4679382dc9cdbb30d4c69a7 (diff) | |
| download | linux-ti-k3-next.tar.gz | |
Merge branch 'ti-k3-config-next' into ti-k3-nextti-k3-next
| -rw-r--r-- | arch/arm64/Kconfig.platforms | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 8dd05b2a925c5..1d3710e3626a0 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -98,6 +98,7 @@ config ARCH_K3 select TI_SCI_PROTOCOL select TI_SCI_INTR_IRQCHIP select TI_SCI_INTA_IRQCHIP + select TI_K3_SOCINFO help This enables support for Texas Instruments' K3 multicore SoC architecture. diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 883e8bace3ed2..40dd13e0adc5e 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -731,6 +731,7 @@ CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SUNXI=y CONFIG_MMC_BCM2835=y CONFIG_MMC_SDHCI_XENON=y +CONFIG_MMC_SDHCI_AM654=y CONFIG_MMC_OWL=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y |