Commit 901e0097 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

ARM: tegra: Default configuration updates for v4.10-rc1

Enable audio support for various Toradex devices as well as the GMI.

* tag 'tegra-for-4.10-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux

:
  ARM: tegra: Enable GMI driver in default configuration
  ARM: tegra: Enable SGTL5000 audio
  ARM: tegra: Update default configuration for v4.9-rc1

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 672b6804 dafba3f6

arch/arm/configs/tegra_defconfig

+13 −14
Original line number Original line Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_SYSVIPC=y

CONFIG_FHANDLE=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_NO_HZ=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_IKCONFIG_PROC=y

CONFIG_CGROUPS=y

CONFIG_CGROUPS=y

CONFIG_CGROUP_DEBUG=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_SCHED=y

CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_DEBUG=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_ELF_CORE is not set

# CONFIG_ELF_CORE is not set

CONFIG_EMBEDDED=y

CONFIG_EMBEDDED=y
@@ -24,14 +23,10 @@ CONFIG_PARTITION_ADVANCED=y 
# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_TEGRA=y

CONFIG_ARCH_TEGRA=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_PCI=y

CONFIG_PCI=y

CONFIG_PCIEPORTBUS=y

CONFIG_PCI_MSI=y

CONFIG_PCI_MSI=y

CONFIG_PCI_TEGRA=y

CONFIG_PCI_TEGRA=y

CONFIG_PCIEPORTBUS=y

CONFIG_SMP=y

CONFIG_SMP=y

CONFIG_PREEMPT=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_AEABI=y
@@ -41,7 +36,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 
CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_KEXEC=y

CONFIG_KEXEC=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_STAT_DETAILS=y

CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

CONFIG_CPUFREQ_DT=y

CONFIG_CPUFREQ_DT=y

CONFIG_CPU_IDLE=y

CONFIG_CPU_IDLE=y
@@ -59,7 +53,6 @@ CONFIG_IP_PNP_RARP=y 
CONFIG_INET_ESP=y

CONFIG_INET_ESP=y

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_INET_DIAG is not set

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_OPTIMISTIC_DAD=y

CONFIG_IPV6_OPTIMISTIC_DAD=y
@@ -86,6 +79,7 @@ CONFIG_DEVTMPFS_MOUNT=y 
# CONFIG_FIRMWARE_IN_KERNEL is not set

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_DMA_CMA=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=64

CONFIG_CMA_SIZE_MBYTES=64

CONFIG_TEGRA_GMI=y

CONFIG_MTD=y

CONFIG_MTD=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_SPI_NOR=y

CONFIG_MTD_SPI_NOR=y
@@ -131,8 +125,8 @@ CONFIG_INPUT_MPU3050=y 
# CONFIG_DEVKMEM is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_TEGRA=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_TEGRA=y

# CONFIG_HW_RANDOM is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_I2C_COMPAT is not set

# CONFIG_I2C_COMPAT is not set

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_CHARDEV=y
@@ -151,11 +145,11 @@ CONFIG_GPIO_PCA953X_IRQ=y 
CONFIG_GPIO_PALMAS=y

CONFIG_GPIO_PALMAS=y

CONFIG_GPIO_TPS6586X=y

CONFIG_GPIO_TPS6586X=y

CONFIG_GPIO_TPS65910=y

CONFIG_GPIO_TPS65910=y

CONFIG_BATTERY_SBS=y

CONFIG_CHARGER_TPS65090=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_AS3722=y

CONFIG_POWER_RESET_AS3722=y

CONFIG_POWER_RESET_GPIO=y

CONFIG_POWER_RESET_GPIO=y

CONFIG_BATTERY_SBS=y

CONFIG_CHARGER_TPS65090=y

CONFIG_SENSORS_LM90=y

CONFIG_SENSORS_LM90=y

CONFIG_SENSORS_LM95245=y

CONFIG_SENSORS_LM95245=y

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG=y
@@ -216,6 +210,7 @@ CONFIG_SND_SOC_TEGRA_WM9712=y 
CONFIG_SND_SOC_TEGRA_TRIMSLICE=y

CONFIG_SND_SOC_TEGRA_TRIMSLICE=y

CONFIG_SND_SOC_TEGRA_ALC5632=y

CONFIG_SND_SOC_TEGRA_ALC5632=y

CONFIG_SND_SOC_TEGRA_MAX98090=y

CONFIG_SND_SOC_TEGRA_MAX98090=y

CONFIG_SND_SOC_TEGRA_SGTL5000=y

CONFIG_USB=y

CONFIG_USB=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_XHCI_TEGRA=y

CONFIG_USB_XHCI_TEGRA=y
@@ -262,6 +257,10 @@ CONFIG_NVEC_POWER=y 
CONFIG_NVEC_PAZ00=y

CONFIG_NVEC_PAZ00=y

CONFIG_TEGRA_IOMMU_GART=y

CONFIG_TEGRA_IOMMU_GART=y

CONFIG_TEGRA_IOMMU_SMMU=y

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_MEMORY=y

CONFIG_MEMORY=y

CONFIG_IIO=y

CONFIG_IIO=y

CONFIG_AK8975=y

CONFIG_AK8975=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE