github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 01:53:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ARM: tegra: Default configuration changes for v7.1-rc1

Browse Source 
Drop the various ARCH_TEGRA_*_SOC options from the default configurations
 since they are now enabled by default for ARCH_TEGRA.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmnI838ACgkQ3SOs138+
 s6G+1g//QRJIYZL3ZX5Xss3gXLqV1JIQHJyrnOGdbOYN96Y4zgFFeoJegNha5hE9
 tfo4A+srqNQ4tFjePPHw4FrbX23Wb1EVJSagnZjSLpWgo3Ft+cYRaBq11fiQf15B
 zG6XRLODVZbhAxnQFMeJkpqjQKXyj4WBmMAnmFVmzG6D2onHi4Y58hyNCk2Pzq1y
 ziwSVQJd4j6ARF4xkB/gafk2DLbDOoB6BI66ImfKzVoZv+5PhVNvWer5HtKrqpiL
 4Ns8SibxWuLQ0p3DlK+Vf/FReEIlIys/pIaZZFCtihyF/YxnLcoiHHU/qd4zf3U1
 wFEFq8uuIRKwUTXP0TBHX1j7YYW9FA/HILZosX9ijU46wazsgv5iXpLs5Yu0b6Cs
 kZpmWVtkP2z6jM4G/Oqj6JNIcrpbP+oBpblo1Vgcx48zqm443Ld08KSgx5BPuTK8
 hMgb16MEvSzPUpVtoW3Gwi51QNNM/kJoEQIWVGDWa0ssjB+k+7WLA4laJOGXZMeR
 oGRfb1wARRpvARcGg41MjweQF79pixdOBKE6JTt9V0gDHdw8l3xDu0OSiutuH7hH
 gUahLh2rG6KdutN/g8Fbq0g4PieBSWxYqEVhWLBTW1f/7vFuMp9YilGJJFikYpSG
 UCVFBnnefbtL840nuphwi8dqnXqwOlNg/6YDAQpe76BJ1o7msT8=
 =/3dE
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmnO2gsACgkQmmx57+YA
 GNkMQw//fdph352eBgBOaQsv9+17R8oV1QjZ89nqG1HNciVzkVCiIqX1ICGgpIkc
 SXnowfEvf1ZlEhvdlFe0mffGQkmOYNIo/7OJmRp8JO9IMJFUqRB6h3Yw1SdzGBNM
 3TYKYy53bs1owEURxp58xWxilbN9vd9Gtos1/RSfdJhMHrSL55urdHrbyRx0UP5M
 u42k0GhQ3uWxw2aMMVy1mz2ZPE9+YwELhG4sxJGSDtJ4v/QyyVENZ2Bgn+z9eX+0
 s8/nchn8pCbmx+DRCQIBwMjlTaxegvCRxboXJMgpQrcSSiNudPbCigfyZOwg+Gg6
 uzGLnwOMw3GfKFLAHY0B1/M02F0NXAERbE/xq5RofgETxOHcl1csnLFOjgqT14lS
 I0eIQV0TmIZJkFa8WVuaFpgGIKseP5RfUxMh5KDQfzDNgxwNN8rMT9K+lYxMCbz9
 CSGkzh8zdtGOKNOl8i4SE1mg+9u7rtzXbe4gatZO2IKxP20B+C0gbSZnGhPSV2DL
 XKeb5Od2WHJowKt5QMXg2uNxuIzofrxtaC6J9MJ4rDhGSUx7UsZTzze+di0t6qSp
 FVUeDpEqVRUla3RvEgLirYw3R8+AxehRtpEfP9i7YM5I86vzxN4Oh30Xc71X5K5+
 pbGIZ8KSLijrW0Pn39VQT7ZC86foVY5dzVQ82v/e4fLLrroVN48=
 =9h6I
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-7.1-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/defconfig

ARM: tegra: Default configuration changes for v7.1-rc1

Drop the various ARCH_TEGRA_*_SOC options from the default configurations
since they are now enabled by default for ARCH_TEGRA.

* tag 'tegra-for-7.1-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: defconfig: Drop redundant ARCH_TEGRA_foo_SOC
  soc/tegra: Make ARCH_TEGRA_SOC_FOO defaults for NVIDIA Tegra

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2026-04-02 23:04:59 +02:00
commit e281307532
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/configs/multi_v7_defconfig
View File

@ -1165,10 +1165,6 @@ CONFIG_QCOM_SOCINFO=m
CONFIG_QCOM_STATS=m
CONFIG_QCOM_WCNSS_CTRL=m
CONFIG_ROCKCHIP_IODOMAIN=y
CONFIG_ARCH_TEGRA_2x_SOC=y
CONFIG_ARCH_TEGRA_3x_SOC=y
CONFIG_ARCH_TEGRA_114_SOC=y
CONFIG_ARCH_TEGRA_124_SOC=y
CONFIG_SOC_TI=y
CONFIG_KEYSTONE_NAVIGATOR_QMSS=y
CONFIG_KEYSTONE_NAVIGATOR_DMA=y

4
arch/arm/configs/tegra_defconfig
View File

@ -296,10 +296,6 @@ CONFIG_CROS_EC=y
CONFIG_CROS_EC_I2C=m
CONFIG_CROS_EC_SPI=m
CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_ARCH_TEGRA_2x_SOC=y
CONFIG_ARCH_TEGRA_3x_SOC=y
CONFIG_ARCH_TEGRA_114_SOC=y
CONFIG_ARCH_TEGRA_124_SOC=y
CONFIG_ARM_TEGRA_DEVFREQ=y
CONFIG_MEMORY=y
CONFIG_IIO=y

11
drivers/soc/tegra/Kconfig
View File

@ -6,6 +6,7 @@ if ARM
config ARCH_TEGRA_2x_SOC
bool "Enable support for Tegra20 family"
default ARCH_TEGRA
select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
select ARM_ERRATA_720789
select ARM_ERRATA_754327 if SMP
@ -23,6 +24,7 @@ config ARCH_TEGRA_2x_SOC
config ARCH_TEGRA_3x_SOC
bool "Enable support for Tegra30 family"
default ARCH_TEGRA
select ARM_ERRATA_754322
select ARM_ERRATA_764369 if SMP
select PINCTRL_TEGRA30
@ -37,6 +39,7 @@ config ARCH_TEGRA_3x_SOC
config ARCH_TEGRA_114_SOC
bool "Enable support for Tegra114 family"
default ARCH_TEGRA
select ARM_ERRATA_798181 if SMP
select HAVE_ARM_ARCH_TIMER
select PINCTRL_TEGRA114
@ -49,6 +52,7 @@ config ARCH_TEGRA_114_SOC
config ARCH_TEGRA_124_SOC
bool "Enable support for Tegra124 family"
default ARCH_TEGRA
select HAVE_ARM_ARCH_TIMER
select PINCTRL_TEGRA124
select SOC_TEGRA_FLOWCTRL
@ -65,6 +69,7 @@ if ARM64
config ARCH_TEGRA_132_SOC
bool "NVIDIA Tegra132 SoC"
default ARCH_TEGRA
select PINCTRL_TEGRA124
select SOC_TEGRA_FLOWCTRL
select SOC_TEGRA_PMC
@ -76,6 +81,7 @@ config ARCH_TEGRA_132_SOC
config ARCH_TEGRA_210_SOC
bool "NVIDIA Tegra210 SoC"
default ARCH_TEGRA
select PINCTRL_TEGRA210
select SOC_TEGRA_FLOWCTRL
select SOC_TEGRA_PMC
@ -95,6 +101,7 @@ config ARCH_TEGRA_210_SOC
config ARCH_TEGRA_186_SOC
bool "NVIDIA Tegra186 SoC"
default ARCH_TEGRA
depends on !CPU_BIG_ENDIAN
select PINCTRL_TEGRA186
select MAILBOX
@ -109,6 +116,7 @@ config ARCH_TEGRA_186_SOC
config ARCH_TEGRA_194_SOC
bool "NVIDIA Tegra194 SoC"
default ARCH_TEGRA
depends on !CPU_BIG_ENDIAN
select MAILBOX
select PINCTRL_TEGRA194
@ -118,6 +126,7 @@ config ARCH_TEGRA_194_SOC
config ARCH_TEGRA_234_SOC
bool "NVIDIA Tegra234 SoC"
default ARCH_TEGRA
depends on !CPU_BIG_ENDIAN
select MAILBOX
select PINCTRL_TEGRA234
@ -127,11 +136,13 @@ config ARCH_TEGRA_234_SOC
config ARCH_TEGRA_241_SOC
bool "NVIDIA Tegra241 SoC"
default ARCH_TEGRA
help
Enable support for the NVIDIA Tegra241 SoC.
config ARCH_TEGRA_264_SOC
bool "NVIDIA Tegra264 SoC"
default ARCH_TEGRA
depends on !CPU_BIG_ENDIAN
select MAILBOX
select SOC_TEGRA_PMC