Skip to content

Commit 0570e90

Browse files
committed
Merge tag 'tegra-for-6.17-arm64-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/defconfig
arm64: tegra: Default configuration updates for v6.17-rc1 Enable the HSP and BPMP via the configuration instead of selecting them, which can lead to problems. Also enable support for Tegra241, which was never done after support for it was added, and Tegra264. * tag 'tegra-for-6.17-arm64-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: arm64: defconfig: Enable Tegra241 and Tegra264 arm64: defconfig: Enable Tegra HSP and BPMP Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents acbf491 + bd3b8e5 commit 0570e90

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

arch/arm64/configs/defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE=y
266266
CONFIG_QCOM_QSEECOM=y
267267
CONFIG_QCOM_QSEECOM_UEFISECAPP=y
268268
CONFIG_EXYNOS_ACPM_PROTOCOL=m
269+
CONFIG_TEGRA_BPMP=y
269270
CONFIG_GNSS=m
270271
CONFIG_GNSS_MTK_SERIAL=m
271272
CONFIG_MTD=y
@@ -1447,6 +1448,7 @@ CONFIG_PLATFORM_MHU=y
14471448
CONFIG_BCM2835_MBOX=y
14481449
CONFIG_QCOM_APCS_IPC=y
14491450
CONFIG_MTK_ADSP_MBOX=m
1451+
CONFIG_TEGRA_HSP_MBOX=y
14501452
CONFIG_QCOM_IPCC=y
14511453
CONFIG_ROCKCHIP_IOMMU=y
14521454
CONFIG_TEGRA_IOMMU_SMMU=y
@@ -1505,6 +1507,8 @@ CONFIG_ARCH_TEGRA_210_SOC=y
15051507
CONFIG_ARCH_TEGRA_186_SOC=y
15061508
CONFIG_ARCH_TEGRA_194_SOC=y
15071509
CONFIG_ARCH_TEGRA_234_SOC=y
1510+
CONFIG_ARCH_TEGRA_241_SOC=y
1511+
CONFIG_ARCH_TEGRA_264_SOC=y
15081512
CONFIG_TI_PRUSS=m
15091513
CONFIG_OWL_PM_DOMAINS=y
15101514
CONFIG_RASPBERRYPI_POWER=y

drivers/soc/tegra/Kconfig

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ config ARCH_TEGRA_186_SOC
9797
bool "NVIDIA Tegra186 SoC"
9898
depends on !CPU_BIG_ENDIAN
9999
select MAILBOX
100-
select TEGRA_BPMP
101-
select TEGRA_HSP_MBOX
102-
select TEGRA_IVC
103100
select SOC_TEGRA_PMC
104101
help
105102
Enable support for the NVIDIA Tegar186 SoC. The Tegra186 features a
@@ -114,9 +111,6 @@ config ARCH_TEGRA_194_SOC
114111
depends on !CPU_BIG_ENDIAN
115112
select MAILBOX
116113
select PINCTRL_TEGRA194
117-
select TEGRA_BPMP
118-
select TEGRA_HSP_MBOX
119-
select TEGRA_IVC
120114
select SOC_TEGRA_PMC
121115
help
122116
Enable support for the NVIDIA Tegra194 SoC.
@@ -126,9 +120,6 @@ config ARCH_TEGRA_234_SOC
126120
depends on !CPU_BIG_ENDIAN
127121
select MAILBOX
128122
select PINCTRL_TEGRA234
129-
select TEGRA_BPMP
130-
select TEGRA_HSP_MBOX
131-
select TEGRA_IVC
132123
select SOC_TEGRA_PMC
133124
help
134125
Enable support for the NVIDIA Tegra234 SoC.

0 commit comments

Comments
 (0)