>From 8977f96447000c29c9884791daa3feecfa83c9cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Sun, 19 Jan 2014 23:43:59 +0100
Subject: [PATCH] config: armv7hl: Enable Nvidia Tegra support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It used to be in a separate tegra flavor.

Signed-off-by: Andreas F��rber <afaerber@suse.de>
---
 config/armv7hl/default | 65 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 61 insertions(+), 4 deletions(-)

diff --git a/config/armv7hl/default b/config/armv7hl/default
index 3dc42d8..c4431a7 100644
--- a/config/armv7hl/default
+++ b/config/armv7hl/default
@@ -499,7 +499,17 @@ CONFIG_SH_TIMER_TMU=y
 CONFIG_EM_TIMER_STI=y
 CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_SIRF is not set
-# CONFIG_ARCH_TEGRA is not set
+CONFIG_ARCH_TEGRA=y
+
+#
+# NVIDIA Tegra options
+#
+CONFIG_ARCH_TEGRA_2x_SOC=y
+CONFIG_ARCH_TEGRA_3x_SOC=y
+# CONFIG_ARCH_TEGRA_114_SOC is not set
+# CONFIG_ARCH_TEGRA_124_SOC is not set
+CONFIG_TEGRA_AHB=y
+CONFIG_TEGRA_EMC_SCALING_ENABLE=y
 # CONFIG_ARCH_U8500 is not set
 CONFIG_ARCH_VEXPRESS=y
 
@@ -571,7 +581,7 @@ CONFIG_ARM_ERRATA_720789=y
 CONFIG_PL310_ERRATA_727915=y
 CONFIG_PL310_ERRATA_753970=y
 CONFIG_ARM_ERRATA_754322=y
-# CONFIG_ARM_ERRATA_754327 is not set
+CONFIG_ARM_ERRATA_754327=y
 CONFIG_ARM_ERRATA_764369=y
 CONFIG_PL310_ERRATA_769419=y
 CONFIG_ARM_ERRATA_775420=y
@@ -611,7 +621,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_NR_CPUS=5
 CONFIG_HOTPLUG_CPU=y
 CONFIG_ARM_PSCI=y
-CONFIG_ARCH_NR_GPIO=512
+CONFIG_ARCH_NR_GPIO=1024
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
@@ -719,6 +729,7 @@ CONFIG_ARM_HIGHBANK_CPUFREQ=m
 CONFIG_ARM_IMX6Q_CPUFREQ=m
 # CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+CONFIG_ARM_TEGRA_CPUFREQ=y
 CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=y
 
 #
@@ -2487,6 +2498,7 @@ CONFIG_KEYBOARD_MCS=m
 CONFIG_KEYBOARD_MPR121=m
 CONFIG_KEYBOARD_IMX=m
 CONFIG_KEYBOARD_NEWTON=m
+CONFIG_KEYBOARD_TEGRA=m
 CONFIG_KEYBOARD_OPENCORES=m
 CONFIG_KEYBOARD_SAMSUNG=m
 # CONFIG_KEYBOARD_STOWAWAY is not set
@@ -2724,6 +2736,7 @@ CONFIG_SERIAL_AMBA_PL010=m
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 # CONFIG_SERIAL_KGDB_NMI is not set
+CONFIG_SERIAL_TEGRA=y
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX310X is not set
 CONFIG_SERIAL_IMX=y
@@ -2826,6 +2839,7 @@ CONFIG_I2C_OMAP=y
 CONFIG_I2C_SH_MOBILE=m
 # CONFIG_I2C_SIMTEC is not set
 CONFIG_I2C_ST=m
+CONFIG_I2C_TEGRA=m
 CONFIG_I2C_VERSATILE=m
 CONFIG_I2C_WMT=m
 # CONFIG_I2C_XILINX is not set
@@ -2872,6 +2886,9 @@ CONFIG_SPI_OMAP24XX=m
 # CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
 # CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_TEGRA114 is not set
+CONFIG_SPI_TEGRA20_SFLASH=m
+CONFIG_SPI_TEGRA20_SLINK=m
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
 # CONFIG_SPI_DESIGNWARE is not set
@@ -2929,6 +2946,9 @@ CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_SUNXI=y
 CONFIG_PINCTRL_ST=y
+CONFIG_PINCTRL_TEGRA=y
+CONFIG_PINCTRL_TEGRA20=y
+CONFIG_PINCTRL_TEGRA30=y
 CONFIG_PINCTRL_PALMAS=y
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_ARMADA_370=y
@@ -4152,6 +4172,7 @@ CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_HIFACE=m
 CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_ATMEL_SOC=m
 CONFIG_SND_DAVINCI_SOC=m
@@ -4179,15 +4200,33 @@ CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
 CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
 CONFIG_SND_OMAP_SOC_OMAP_HDMI=m
 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
+CONFIG_SND_SOC_TEGRA=m
+CONFIG_SND_SOC_TEGRA20_AC97=m
+CONFIG_SND_SOC_TEGRA20_DAS=m
+CONFIG_SND_SOC_TEGRA20_I2S=m
+CONFIG_SND_SOC_TEGRA20_SPDIF=m
+CONFIG_SND_SOC_TEGRA30_AHUB=m
+CONFIG_SND_SOC_TEGRA30_I2S=m
+CONFIG_SND_SOC_TEGRA_RT5640=m
+CONFIG_SND_SOC_TEGRA_WM8753=m
+CONFIG_SND_SOC_TEGRA_WM8903=m
+CONFIG_SND_SOC_TEGRA_WM9712=m
+CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
+CONFIG_SND_SOC_TEGRA_ALC5632=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_ALC5632=m
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_RT5640=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TWL4030=m
 CONFIG_SND_SOC_TWL6040=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8903=m
 CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM9712=m
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SOUND_PRIME=m
@@ -4332,6 +4371,7 @@ CONFIG_USB_FSL_MPH_DR_OF=m
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_EHCI_HCD_OMAP=m
 CONFIG_USB_EHCI_HCD_ORION=m
+CONFIG_USB_EHCI_TEGRA=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
@@ -4521,6 +4561,7 @@ CONFIG_USB_ISP1301=m
 CONFIG_USB_MXS_PHY=m
 CONFIG_USB_RCAR_PHY=m
 CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -4590,6 +4631,7 @@ CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
+CONFIG_MMC_SDHCI_TEGRA=m
 CONFIG_MMC_SDHCI_PXAV3=m
 CONFIG_MMC_SDHCI_PXAV2=m
 # CONFIG_MMC_SDHCI_BCM_KONA is not set
@@ -4779,6 +4821,7 @@ CONFIG_RTC_DRV_PL030=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_VT8500=y
 CONFIG_RTC_DRV_MV=y
+CONFIG_RTC_DRV_TEGRA=y
 CONFIG_RTC_DRV_MXC=y
 CONFIG_RTC_DRV_SNVS=y
 CONFIG_RTC_DRV_MOXART=m
@@ -4800,6 +4843,7 @@ CONFIG_DW_DMAC=m
 CONFIG_MV_XOR=y
 CONFIG_MX3_IPU=y
 CONFIG_MX3_IPU_IRQS=4
+CONFIG_TEGRA20_APB_DMA=y
 CONFIG_TIMB_DMA=m
 CONFIG_TI_EDMA=y
 # CONFIG_PL330_DMA is not set
@@ -5010,6 +5054,11 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
+CONFIG_MFD_NVEC=m
+CONFIG_KEYBOARD_NVEC=m
+CONFIG_SERIO_NVEC_PS2=m
+CONFIG_NVEC_POWER=m
+CONFIG_NVEC_PAZ00=m
 CONFIG_STAGING_MEDIA=y
 # CONFIG_DVB_AS102 is not set
 # CONFIG_VIDEO_GO7007 is not set
@@ -5099,6 +5148,8 @@ CONFIG_OF_IOMMU=y
 CONFIG_OMAP_IOMMU=y
 CONFIG_OMAP_IOVMM=m
 CONFIG_OMAP_IOMMU_DEBUG=m
+CONFIG_TEGRA_IOMMU_GART=y
+CONFIG_TEGRA_IOMMU_SMMU=y
 # CONFIG_SHMOBILE_IOMMU is not set
 
 #
@@ -5126,7 +5177,11 @@ CONFIG_DEVFREQ_GOV_USERSPACE=m
 # DEVFREQ Drivers
 #
 # CONFIG_EXTCON is not set
-# CONFIG_MEMORY is not set
+CONFIG_MEMORY=y
+# CONFIG_TI_EMIF is not set
+# CONFIG_MVEBU_DEVBUS is not set
+CONFIG_TEGRA20_MC=y
+CONFIG_TEGRA30_MC=y
 CONFIG_IIO=m
 CONFIG_IIO_BUFFER=y
 # CONFIG_IIO_BUFFER_CB is not set
@@ -5280,6 +5335,7 @@ CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 CONFIG_PWM_IMX=m
 # CONFIG_PWM_PCA9685 is not set
+CONFIG_PWM_TEGRA=m
 CONFIG_PWM_TIECAP=m
 CONFIG_PWM_TIEHRPWM=m
 CONFIG_PWM_TIPWMSS=y
@@ -5951,6 +6007,7 @@ CONFIG_CRYPTO_DEV_MV_CESA=m
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_CRYPTO_DEV_SAHARA=m
+CONFIG_CRYPTO_DEV_TEGRA_AES=m
 CONFIG_ASYMMETRIC_KEY_TYPE=m
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
 CONFIG_PUBLIC_KEY_ALGO_RSA=m
-- 
1.8.4

