diff --git a/arch/arm/boot/dts/tegra30-lenovo-ideatab-a2109a.dts b/arch/arm/boot/dts/tegra30-lenovo-ideatab-a2109a.dts
index 87db03482a2ce..8203109a12493 100644
--- a/arch/arm/boot/dts/tegra30-lenovo-ideatab-a2109a.dts
+++ b/arch/arm/boot/dts/tegra30-lenovo-ideatab-a2109a.dts
@@ -1067,6 +1067,9 @@
 			interrupt-parent = <&gpio>;
 			interrupts = <TEGRA_GPIO(H, 4) IRQ_TYPE_EDGE_FALLING>;
 			reset-gpios = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_LOW>;
+
+			touchscreen-size-x = <1280>;
+			touchscreen-size-y = <800>;
 		};
 	};
 
diff --git a/arch/arm/configs/cl2n_defconfig b/arch/arm/configs/cl2n_defconfig
index d9d1487d85178..358cc1989ea40 100644
--- a/arch/arm/configs/cl2n_defconfig
+++ b/arch/arm/configs/cl2n_defconfig
@@ -25,14 +25,16 @@ CONFIG_HIGHMEM=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND=y
-CONFIG_CMDLINE="console=tty0 console=ttyTHS0,115200 earlyprintk gpt clk_ignore_unused root=/dev/mmcblk2p3 rootfstype=ext4 rw PMOS_NO_OUTPUT_REDIRECT"
+CONFIG_CMDLINE="console=tty0 console=ttyTHS0,115200 earlyprintk gpt"
 CONFIG_CMDLINE_FORCE=y
 CONFIG_KEXEC=y
+# CONFIG_ATAGS_PROC is not set
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_CPUFREQ_DT=y
 # CONFIG_ARM_TEGRA124_CPUFREQ is not set
 CONFIG_CPU_IDLE=y
@@ -79,10 +81,10 @@ CONFIG_CFG80211=y
 CONFIG_RFKILL=y
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL_GPIO=y
-CONFIG_NFC=y
-CONFIG_NFC_HCI=y
+CONFIG_NFC=m
+CONFIG_NFC_HCI=m
 CONFIG_NFC_SHDLC=y
-CONFIG_NFC_PN544_I2C=y
+CONFIG_NFC_PN544_I2C=m
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCI_MSI=y
@@ -90,7 +92,6 @@ CONFIG_PCI_TEGRA=y
 CONFIG_UEVENT_HELPER=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_DMA_FENCE_TRACE=y
 CONFIG_TEGRA_GMI=y
 CONFIG_MTD=y
 CONFIG_MTD_SPI_NOR=y
@@ -119,7 +120,10 @@ CONFIG_USB_PEGASUS=y
 CONFIG_USB_USBNET=y
 CONFIG_USB_NET_SMSC75XX=y
 CONFIG_USB_NET_SMSC95XX=y
-CONFIG_BRCMFMAC=y
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCM_TRACING=y
+CONFIG_BRCMDBG=y
 CONFIG_INPUT_JOYDEV=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
@@ -143,7 +147,8 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_TEGRA=y
 CONFIG_SERIAL_DEV_BUS=y
-# CONFIG_HW_RANDOM is not set
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
 # CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX_PCA954x=y
@@ -207,13 +212,17 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=y
 CONFIG_USB_GSPCA=y
+# CONFIG_CXD2880_SPI_DRV is not set
+# CONFIG_DVB_CXD2880 is not set
 CONFIG_DRM=y
-CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_TEGRA=y
 CONFIG_DRM_TEGRA_STAGING=y
 CONFIG_DRM_PANEL_LVDS=y
 CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_DRM_LVDS_CODEC=y
+CONFIG_DRM_LEGACY=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_PWM=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -242,6 +251,8 @@ CONFIG_SND_SOC_TEGRA_TRIMSLICE=y
 CONFIG_SND_SOC_TEGRA_ALC5632=y
 CONFIG_SND_SOC_TEGRA_MAX98090=y
 CONFIG_SND_SOC_TEGRA_SGTL5000=y
+CONFIG_SND_SOC_TLV320AIC3X_I2C=m
+CONFIG_SND_SOC_TLV320AIC3X_SPI=m
 CONFIG_USB=y
 CONFIG_USB_OTG=y
 CONFIG_USB_OTG_FSM=y
@@ -344,10 +355,16 @@ CONFIG_SMB_SERVER=m
 CONFIG_SMB_SERVER_KERBEROS5=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_UTF8=y
 CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,bpf"
 CONFIG_CRYPTO_ECDSA=y
 CONFIG_CRYPTO_CCM=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRC_CCITT=y
 CONFIG_DMA_CMA=y
 CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_PRINTK_TIME=y
@@ -358,14 +375,8 @@ CONFIG_DEBUG_INFO=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_SLAB=y
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_SCHEDSTATS=y
 # CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_SG=y
-CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_UNCOMPRESS=y
-CONFIG_EARLY_PRINTK=y
 CONFIG_MEMTEST=y