Skip to content

Commit 2ee6120

Browse files
committed
Merge tag 'ti-k3-config-for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux into arm/defconfig
Texas Instruments K3 SoC config updates for v5.9 - Enable chipid driver for j721e/am65x - Enable SDHCI driver for am65x * tag 'ti-k3-config-for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux: arm64: defconfig: Enable AM654x SDHCI controller arm64: arch_k3: enable chipid driver Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents a1224fd + 3506ddd commit 2ee6120

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

arch/arm64/Kconfig.platforms

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ config ARCH_K3
9898
select TI_SCI_PROTOCOL
9999
select TI_SCI_INTR_IRQCHIP
100100
select TI_SCI_INTA_IRQCHIP
101+
select TI_K3_SOCINFO
101102
help
102103
This enables support for Texas Instruments' K3 multicore SoC
103104
architecture.

arch/arm64/configs/defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -752,6 +752,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
752752
CONFIG_MMC_SUNXI=y
753753
CONFIG_MMC_BCM2835=y
754754
CONFIG_MMC_SDHCI_XENON=y
755+
CONFIG_MMC_SDHCI_AM654=y
755756
CONFIG_MMC_OWL=y
756757
CONFIG_NEW_LEDS=y
757758
CONFIG_LEDS_CLASS=y

0 commit comments

Comments
 (0)