diff options
author | Peter Robinson <pbrobinson@gmail.com> | 2014-02-03 11:27:17 +0000 |
---|---|---|
committer | Peter Robinson <pbrobinson@gmail.com> | 2014-02-03 11:27:17 +0000 |
commit | 9d8fe1abd3525c6ae0fe73ef5ed1e8fab6cf66d0 (patch) | |
tree | 0684e262f28ba93585aa92389b62dfd986ac2168 /config-armv7 | |
parent | be304f4743cfe7d58c3b0e12bd3e4c89229d203d (diff) | |
download | kernel-9d8fe1abd3525c6ae0fe73ef5ed1e8fab6cf66d0.tar.gz kernel-9d8fe1abd3525c6ae0fe73ef5ed1e8fab6cf66d0.tar.xz kernel-9d8fe1abd3525c6ae0fe73ef5ed1e8fab6cf66d0.zip |
Re-enable modular Tegra DRM driver, Add SD driver for ZYNQ SoCs, drop obsolete CLK debug option
Diffstat (limited to 'config-armv7')
-rw-r--r-- | config-armv7 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/config-armv7 b/config-armv7 index 8b1fd0a17..c148a6708 100644 --- a/config-armv7 +++ b/config-armv7 @@ -538,10 +538,6 @@ CONFIG_SND_SOC_TEGRA20_AC97=m CONFIG_SND_SOC_TEGRA30_AHUB=m CONFIG_SND_SOC_TEGRA30_I2S=m -# bool only, upstream aiming for modular in 3.14 -# https://lkml.org/lkml/2013/11/18/47 -# CONFIG_DRM_TEGRA is not set - # AC100 (PAZ00) CONFIG_MFD_NVEC=y CONFIG_MFD_TPS80031=y @@ -559,10 +555,13 @@ CONFIG_PWM_TEGRA=m CONFIG_TEGRA_HOST1X=m CONFIG_TEGRA_HOST1X_FIREWALL=y - -CONFIG_DRM_TEGRA=y -# CONFIG_DRM_TEGRA_STAGING is not set +CONFIG_DRM_TEGRA=m +# CONFIG_DRM_TEGRA_FBDEV is not set # CONFIG_DRM_TEGRA_DEBUG is not set +# CONFIG_DRM_TEGRA_STAGING is not set +CONFIG_DRM_PANEL=y +CONFIG_DRM_PANEL_SIMPLE=m + CONFIG_CRYPTO_DEV_TEGRA_AES=m @@ -585,6 +584,7 @@ CONFIG_XILINX_EMACLITE=m CONFIG_GPIO_XILINX=y CONFIG_I2C_XILINX=m CONFIG_SPI_XILINX=m +CONFIG_MMC_SDHCI_OF_ARASAN=m # Multi function devices CONFIG_MFD_88PM800=m |