Unverified Commit e2813075 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-7.1-arm-defconfig' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents feb46c1b 21e380f2

arch/arm/configs/multi_v7_defconfig

+0 −4
Original line number Diff line number Diff line
@@ -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

arch/arm/configs/tegra_defconfig

+0 −4
Original line number Diff line number Diff line
@@ -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

drivers/soc/tegra/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -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