From 8e47e69f0270a7b48b48f68ace83a1dbf4a878f4 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Sun, 12 May 2013 14:40:38 -0500
Subject: [PATCH] v3.10-rc1 builds

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 patch.sh                                      |  2 +-
 patches/defconfig                             | 29 ++++----
 ...1-ARM-imx-Enable-UART1-for-Sabrelite.patch |  4 +-
 ...expansion-add-CircuitCo-ulcd-Support.patch |  4 +-
 .../0003-Panda-expansion-add-spidev.patch     | 13 ++--
 patches/ref_omap2plus_defconfig               | 69 +++++--------------
 version.sh                                    |  8 +--
 7 files changed, 47 insertions(+), 82 deletions(-)

diff --git a/patch.sh b/patch.sh
index 5ada29e9d..afa5d4ca9 100644
--- a/patch.sh
+++ b/patch.sh
@@ -136,7 +136,7 @@ imx () {
 	${git} "${DIR}/patches/imx/0005-SAUCE-imx6-enable-sata-clk-if-SATA_AHCI_PLATFORM.patch"
 #	${git} "${DIR}/patches/imx/0005-staging-imx-drm-request-irq-only-after-adding-the-cr.patch"
 	${git} "${DIR}/patches/imx/0006-arm-fec-use-random-mac-when-everything-else-fails.patch"
-	${git} "${DIR}/patches/imx/0007-ARM-imx-compile-fix-for-hotplug.c.patch"
+#	${git} "${DIR}/patches/imx/0007-ARM-imx-compile-fix-for-hotplug.c.patch"
 }
 
 chipidea () {
diff --git a/patches/defconfig b/patches/defconfig
index e97823bfb..f5fc07ce8 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1,10 +1,9 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.9.0 Kernel Configuration
+# Linux/arm 3.10.0-rc1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_GENERIC_GPIO=y
 CONFIG_HAVE_PROC_CPU=y
 CONFIG_NO_IOPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
@@ -338,6 +337,7 @@ CONFIG_ARCH_MXC=y
 # CONFIG_MXC_IRQ_PRIOR is not set
 CONFIG_MXC_TZIC=y
 # CONFIG_MXC_DEBUG_BOARD is not set
+CONFIG_HAVE_IMX_ANATOP=y
 CONFIG_HAVE_IMX_GPC=y
 CONFIG_HAVE_IMX_MMDC=y
 CONFIG_HAVE_IMX_SRC=y
@@ -1438,8 +1438,6 @@ CONFIG_MTD_OF_PARTS=y
 #
 # User Modules And Translation Layers
 #
-CONFIG_MTD_CHAR=y
-CONFIG_HAVE_MTD_OTP=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 CONFIG_FTL=m
@@ -1508,22 +1506,14 @@ CONFIG_MTD_BLOCK2MTD=m
 #
 # Disk-On-Chip Device Drivers
 #
-CONFIG_MTD_DOC2000=m
-CONFIG_MTD_DOC2001=m
-CONFIG_MTD_DOC2001PLUS=m
 # CONFIG_MTD_DOCG3 is not set
 CONFIG_BCH_CONST_M=13
 CONFIG_BCH_CONST_T=8
-CONFIG_MTD_DOCPROBE=m
-CONFIG_MTD_DOCECC=m
-# CONFIG_MTD_DOCPROBE_ADVANCED is not set
-CONFIG_MTD_DOCPROBE_ADDRESS=0x0
 CONFIG_MTD_NAND_ECC=y
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_ECC_BCH is not set
 # CONFIG_MTD_SM_COMMON is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DENALI is not set
 # CONFIG_MTD_NAND_GPIO is not set
 CONFIG_MTD_NAND_OMAP2=y
@@ -1546,7 +1536,6 @@ CONFIG_MTD_ONENAND_GENERIC=y
 CONFIG_MTD_ONENAND_OMAP2=y
 CONFIG_MTD_ONENAND_OTP=y
 CONFIG_MTD_ONENAND_2X_PROGRAM=y
-# CONFIG_MTD_ONENAND_SIM is not set
 
 #
 # LPDDR flash memory drivers
@@ -1747,6 +1736,7 @@ CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
+# CONFIG_BCACHE is not set
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_DEBUG=y
 CONFIG_DM_CRYPT=m
@@ -1895,6 +1885,7 @@ CONFIG_USB_CATC=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
 CONFIG_USB_USBNET=y
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_AX88179_178A=y
@@ -2459,7 +2450,9 @@ CONFIG_GPIO_DA9052=y
 # CONFIG_GPIO_EM is not set
 CONFIG_GPIO_MXC=y
 # CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_RCAR is not set
 # CONFIG_GPIO_TS5500 is not set
+# CONFIG_GPIO_GRGPIO is not set
 
 #
 # I2C GPIO expanders:
@@ -4120,6 +4113,7 @@ CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP55XX_COMMON=m
 CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
 CONFIG_LEDS_PCA955X=m
 CONFIG_LEDS_PCA9633=m
 CONFIG_LEDS_DA9052=m
@@ -4134,11 +4128,11 @@ CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_LM355x=m
 CONFIG_LEDS_OT200=m
 CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
+CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_ONESHOT=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
@@ -4151,6 +4145,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # iptables trigger is under Netfilter config (LED target)
 #
 CONFIG_LEDS_TRIGGER_TRANSIENT=y
+# CONFIG_LEDS_TRIGGER_CAMERA is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
@@ -4636,7 +4631,8 @@ CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC=y
 CONFIG_IPACK_BUS=m
 # CONFIG_SERIAL_IPOCTAL is not set
-# CONFIG_RESET_CONTROLLER is not set
+CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_RESET_CONTROLLER=y
 
 #
 # File systems
@@ -4676,6 +4672,7 @@ CONFIG_XFS_FS=m
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_XFS_RT=y
+# CONFIG_XFS_WARN is not set
 # CONFIG_XFS_DEBUG is not set
 CONFIG_GFS2_FS=m
 CONFIG_GFS2_FS_LOCKING_DLM=y
@@ -4688,6 +4685,8 @@ CONFIG_OCFS2_DEBUG_MASKLOG=y
 CONFIG_BTRFS_FS=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
 CONFIG_NILFS2_FS=m
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
diff --git a/patches/imx/0001-ARM-imx-Enable-UART1-for-Sabrelite.patch b/patches/imx/0001-ARM-imx-Enable-UART1-for-Sabrelite.patch
index 5043d61ce..9a83a6817 100644
--- a/patches/imx/0001-ARM-imx-Enable-UART1-for-Sabrelite.patch
+++ b/patches/imx/0001-ARM-imx-Enable-UART1-for-Sabrelite.patch
@@ -40,8 +40,8 @@ index 21e6758..4461daa 100644
 +
 +					pinctrl_uart1_2: uart1grp-2 {
 +						fsl,pins = <
-+							MX6Q_PAD_SD3_DAT7__UART1_TXD 0x1b0b1
-+							MX6Q_PAD_SD3_DAT6__UART1_RXD 0x1b0b1
++							MX6Q_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
++							MX6Q_PAD_SD3_DAT7__UART1_RX_DATA 0x1b0b1
 +						>;
 +					};
  				};
diff --git a/patches/omap_beagle_expansion/0005-Beagle-expansion-add-CircuitCo-ulcd-Support.patch b/patches/omap_beagle_expansion/0005-Beagle-expansion-add-CircuitCo-ulcd-Support.patch
index 0d58470db..8b716eebc 100644
--- a/patches/omap_beagle_expansion/0005-Beagle-expansion-add-CircuitCo-ulcd-Support.patch
+++ b/patches/omap_beagle_expansion/0005-Beagle-expansion-add-CircuitCo-ulcd-Support.patch
@@ -24,7 +24,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  2 files changed, 163 insertions(+)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index b5ed547..a8de97e 100644
+index 0f9b253..b2807c2 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -118,12 +118,16 @@ static struct {
@@ -35,7 +35,7 @@ index b5ed547..a8de97e 100644
 +	int lcd_pwren;
  } beagle_config = {
  	.mmc1_gpio_wp = -EINVAL,
- 	.usb_pwr_level = GPIOF_OUT_INIT_LOW,
+ 	.usb_pwr_level = 0,
  	.dvi_pd_gpio = -EINVAL,
  	.usr_button_gpio = 4,
  	.mmc_caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
diff --git a/patches/omap_panda/0003-Panda-expansion-add-spidev.patch b/patches/omap_panda/0003-Panda-expansion-add-spidev.patch
index 26275c1f6..93698524c 100644
--- a/patches/omap_panda/0003-Panda-expansion-add-spidev.patch
+++ b/patches/omap_panda/0003-Panda-expansion-add-spidev.patch
@@ -10,11 +10,11 @@ https://github.com/RobertCNelson/stable-kernel/issues/22
 Signed-off-by: Adrien Ferre <ferre.adrien@gmail.com>
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
- arch/arm/mach-omap2/board-omap4panda.c |   44 ++++++++++++++++++++++++++++++++
- 1 file changed, 44 insertions(+)
+ arch/arm/mach-omap2/board-omap4panda.c |   43 ++++++++++++++++++++++++++++++++
+ 1 file changed, 43 insertions(+)
 
 diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
-index a71ad34..6268258 100644
+index 1e2c75e..3563f86 100644
 --- a/arch/arm/mach-omap2/board-omap4panda.c
 +++ b/arch/arm/mach-omap2/board-omap4panda.c
 @@ -22,6 +22,7 @@
@@ -87,18 +87,17 @@ index a71ad34..6268258 100644
  static void __init omap4_ehci_init(void)
  {
  	int ret;
-@@ -435,11 +470,20 @@ static void __init omap4_panda_init(void)
+@@ -435,11 +470,19 @@ static void __init omap4_panda_init(void)
  	omap_sdrc_init(NULL, NULL);
  	omap4_twl6030_hsmmc_init(mmc);
  	omap4_ehci_init();
-+	if (!strcmp(expboard_name, "spidev"))
-+	{
++	if (!strcmp(expboard_name, "spidev")) {
 +	#if IS_ENABLED(CONFIG_SPI_SPIDEV)
 +		pr_info("Panda expansionboard: spidev: enabling spi3/spi4\n");
 +		spi_register_board_info(panda_mcspi_board_info, ARRAY_SIZE(panda_mcspi_board_info));
 +	#endif
 +	}
- 	usb_bind_phy("musb-hdrc.0.auto", 0, "omap-usb2.1.auto");
+ 	usb_bind_phy("musb-hdrc.2.auto", 0, "omap-usb2.3.auto");
  	usb_musb_init(&musb_board_data);
  	omap4_panda_display_init();
  }
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index 11b49536a..e4edca144 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,12 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.9.0 Kernel Configuration
+# Linux/arm 3.10.0-rc1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_GENERIC_GPIO=y
 CONFIG_HAVE_PROC_CPU=y
-CONFIG_NO_IOPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -371,20 +369,10 @@ CONFIG_MACH_OMAP4_PANDA=y
 # CONFIG_ARCH_SIRF is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_U8500 is not set
-CONFIG_ARCH_VEXPRESS=y
-
-#
-# Versatile Express platform type
-#
-CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
-CONFIG_ARCH_VEXPRESS_CA9X4=y
-CONFIG_PLAT_VERSATILE_CLCD=y
-CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y
+# CONFIG_ARCH_VEXPRESS is not set
 # CONFIG_ARCH_VIRT is not set
 # CONFIG_ARCH_WM8850 is not set
 # CONFIG_ARCH_ZYNQ is not set
-CONFIG_PLAT_VERSATILE=y
-CONFIG_ARM_TIMER_SP804=y
 
 #
 # Processor Type
@@ -416,7 +404,6 @@ CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
-CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_CACHE_L2X0=y
 CONFIG_CACHE_PL310=y
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
@@ -428,19 +415,17 @@ CONFIG_MULTI_IRQ_HANDLER=y
 CONFIG_PL310_ERRATA_588369=y
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_PL310_ERRATA_727915=y
-CONFIG_PL310_ERRATA_753970=y
+# CONFIG_PL310_ERRATA_753970 is not set
 CONFIG_ARM_ERRATA_754322=y
 # CONFIG_ARM_ERRATA_754327 is not set
 # CONFIG_ARM_ERRATA_764369 is not set
 # CONFIG_PL310_ERRATA_769419 is not set
 CONFIG_ARM_ERRATA_775420=y
 # CONFIG_ARM_ERRATA_798181 is not set
-CONFIG_ICST=y
 
 #
 # Bus support
 #
-CONFIG_ARM_AMBA=y
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_PCCARD is not set
 
@@ -840,7 +825,6 @@ CONFIG_MTD_OF_PARTS=y
 #
 # User Modules And Translation Layers
 #
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
@@ -899,16 +883,12 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # Disk-On-Chip Device Drivers
 #
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
 # CONFIG_MTD_DOCG3 is not set
 CONFIG_MTD_NAND_ECC=y
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_ECC_BCH is not set
 # CONFIG_MTD_SM_COMMON is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DENALI is not set
 # CONFIG_MTD_NAND_GPIO is not set
 CONFIG_MTD_NAND_OMAP2=y
@@ -925,7 +905,6 @@ CONFIG_MTD_ONENAND_VERIFY_WRITE=y
 CONFIG_MTD_ONENAND_OMAP2=y
 # CONFIG_MTD_ONENAND_OTP is not set
 # CONFIG_MTD_ONENAND_2X_PROGRAM is not set
-# CONFIG_MTD_ONENAND_SIM is not set
 
 #
 # LPDDR flash memory drivers
@@ -990,7 +969,6 @@ CONFIG_SENSORS_TSL2550=m
 # CONFIG_HMC6352 is not set
 # CONFIG_DS1682 is not set
 # CONFIG_TI_DAC7512 is not set
-# CONFIG_ARM_CHARLCD is not set
 CONFIG_BMP085=y
 CONFIG_BMP085_I2C=m
 # CONFIG_BMP085_SPI is not set
@@ -1064,10 +1042,10 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_OSD_INITIATOR is not set
-CONFIG_HAVE_PATA_PLATFORM=y
 # CONFIG_ATA is not set
 CONFIG_MD=y
 # CONFIG_BLK_DEV_MD is not set
+# CONFIG_BCACHE is not set
 # CONFIG_BLK_DEV_DM is not set
 # CONFIG_TARGET_CORE is not set
 CONFIG_NETDEVICES=y
@@ -1179,6 +1157,7 @@ CONFIG_SMSC_PHY=y
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_RTL8152 is not set
 CONFIG_USB_USBNET=y
 CONFIG_USB_NET_AX8817X=y
 CONFIG_USB_NET_AX88179_178A=y
@@ -1359,6 +1338,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_CM109 is not set
 CONFIG_INPUT_TWL4030_PWRBUTTON=y
 # CONFIG_INPUT_TWL4030_VIBRA is not set
+# CONFIG_INPUT_TWL6040_VIBRA is not set
 # CONFIG_INPUT_UINPUT is not set
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
@@ -1370,7 +1350,6 @@ CONFIG_INPUT_TWL4030_PWRBUTTON=y
 #
 CONFIG_SERIO=y
 CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_AMBAKMI is not set
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_RAW is not set
 # CONFIG_SERIO_ALTERA_PS2 is not set
@@ -1417,9 +1396,6 @@ CONFIG_SERIAL_8250_RSA=y
 #
 # Non-8250 serial port support
 #
-# CONFIG_SERIAL_AMBA_PL010 is not set
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX310X is not set
 CONFIG_SERIAL_CORE=y
@@ -1461,13 +1437,11 @@ CONFIG_I2C_HELPER_AUTO=y
 # CONFIG_I2C_CBUS_GPIO is not set
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 # CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_NOMADIK is not set
 # CONFIG_I2C_OCORES is not set
 CONFIG_I2C_OMAP=y
 # CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_PXA_PCI is not set
 # CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_VERSATILE is not set
 # CONFIG_I2C_XILINX is not set
 
 #
@@ -1498,7 +1472,6 @@ CONFIG_SPI_MASTER=y
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_OC_TINY is not set
 CONFIG_SPI_OMAP24XX=y
-# CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
 # CONFIG_SPI_SC18IS602 is not set
 # CONFIG_SPI_XCOMM is not set
@@ -1560,8 +1533,9 @@ CONFIG_GPIO_SYSFS=y
 #
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_EM is not set
-# CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_RCAR is not set
 # CONFIG_GPIO_TS5500 is not set
+# CONFIG_GPIO_GRGPIO is not set
 
 #
 # I2C GPIO expanders:
@@ -1571,6 +1545,7 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_SX150X is not set
 CONFIG_GPIO_TWL4030=y
+# CONFIG_GPIO_TWL6040 is not set
 # CONFIG_GPIO_ADP5588 is not set
 # CONFIG_GPIO_ADNP is not set
 
@@ -1644,10 +1619,8 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
-CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_GPIO is not set
+# CONFIG_POWER_RESET is not set
 # CONFIG_POWER_RESET_RESTART is not set
-CONFIG_POWER_RESET_VEXPRESS=y
 # CONFIG_POWER_AVS is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
@@ -1745,7 +1718,6 @@ CONFIG_SENSORS_LM75=m
 # CONFIG_SENSORS_TMP102 is not set
 # CONFIG_SENSORS_TMP401 is not set
 # CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_VEXPRESS is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83791D is not set
@@ -1765,7 +1737,6 @@ CONFIG_WATCHDOG_CORE=y
 # Watchdog Device Drivers
 #
 # CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_ARM_SP805_WATCHDOG is not set
 # CONFIG_DW_WATCHDOG is not set
 # CONFIG_MPCORE_WATCHDOG is not set
 CONFIG_OMAP_WATCHDOG=y
@@ -1846,7 +1817,7 @@ CONFIG_TWL4030_CORE=y
 # CONFIG_TWL4030_MADC is not set
 CONFIG_TWL4030_POWER=y
 CONFIG_MFD_TWL4030_AUDIO=y
-# CONFIG_TWL6040_CORE is not set
+CONFIG_TWL6040_CORE=y
 # CONFIG_MFD_WL1273_CORE is not set
 # CONFIG_MFD_LM3533 is not set
 # CONFIG_MFD_TC3589X is not set
@@ -1861,7 +1832,6 @@ CONFIG_MFD_TWL4030_AUDIO=y
 # CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
-CONFIG_VEXPRESS_CONFIG=y
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR_DUMMY is not set
@@ -1889,7 +1859,6 @@ CONFIG_REGULATOR_TPS65217=y
 # CONFIG_REGULATOR_TPS6524X is not set
 CONFIG_REGULATOR_TPS65910=y
 CONFIG_REGULATOR_TWL4030=y
-# CONFIG_REGULATOR_VEXPRESS is not set
 # CONFIG_MEDIA_SUPPORT is not set
 
 #
@@ -1921,7 +1890,6 @@ CONFIG_FB_TILEBLITTING=y
 #
 # Frame buffer hardware drivers
 #
-# CONFIG_FB_ARMCLCD is not set
 # CONFIG_FB_UVESA is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_TMIO is not set
@@ -2046,7 +2014,6 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_MPU401 is not set
 CONFIG_SND_ARM=y
-# CONFIG_SND_ARMAACI is not set
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
@@ -2058,15 +2025,20 @@ CONFIG_SND_SOC_DMAENGINE_PCM=y
 # CONFIG_SND_ATMEL_SOC is not set
 # CONFIG_SND_DESIGNWARE_I2S is not set
 CONFIG_SND_OMAP_SOC=m
+CONFIG_SND_OMAP_SOC_DMIC=m
 CONFIG_SND_OMAP_SOC_MCBSP=m
+CONFIG_SND_OMAP_SOC_MCPDM=m
 # CONFIG_SND_OMAP_SOC_RX51 is not set
 # CONFIG_SND_OMAP_SOC_AM3517EVM is not set
 CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
+CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
 # CONFIG_SND_OMAP_SOC_OMAP_HDMI is not set
 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ALL_CODECS is not set
+CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_TWL4030=m
+CONFIG_SND_SOC_TWL6040=m
 # CONFIG_SND_SIMPLE_CARD is not set
 # CONFIG_SOUND_PRIME is not set
 
@@ -2302,7 +2274,6 @@ CONFIG_SDIO_UART=y
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
-CONFIG_MMC_ARMMMCI=y
 # CONFIG_MMC_SDHCI is not set
 # CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_MMC_SDHCI_PXAV2 is not set
@@ -2402,8 +2373,6 @@ CONFIG_RTC_DRV_TWL4030=y
 # on-CPU RTC drivers
 #
 CONFIG_RTC_DRV_OMAP=y
-# CONFIG_RTC_DRV_PL030 is not set
-# CONFIG_RTC_DRV_PL031 is not set
 # CONFIG_RTC_DRV_SNVS is not set
 
 #
@@ -2416,10 +2385,8 @@ CONFIG_DMADEVICES=y
 #
 # DMA Devices
 #
-# CONFIG_AMBA_PL08X is not set
 # CONFIG_DW_DMAC is not set
 # CONFIG_TIMB_DMA is not set
-# CONFIG_PL330_DMA is not set
 CONFIG_DMA_OMAP=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
@@ -2452,8 +2419,8 @@ CONFIG_COMMON_CLK=y
 # Common Clock Framework
 #
 # CONFIG_COMMON_CLK_DEBUG is not set
-CONFIG_COMMON_CLK_VERSATILE=y
 # CONFIG_COMMON_CLK_SI5351 is not set
+# CONFIG_CLK_TWL6040 is not set
 
 #
 # Hardware Spinlock drivers
@@ -2803,7 +2770,6 @@ CONFIG_ARM_UNWIND=y
 # CONFIG_DEBUG_LL is not set
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
-# CONFIG_OC_ETM is not set
 # CONFIG_ARM_KPROBES_TEST is not set
 # CONFIG_PID_IN_CONTEXTIDR is not set
 
@@ -2966,6 +2932,7 @@ CONFIG_LZO_DECOMPRESS=y
 # CONFIG_XZ_DEC_BCJ is not set
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
diff --git a/version.sh b/version.sh
index 2b7e0c737..69c7d10da 100644
--- a/version.sh
+++ b/version.sh
@@ -18,12 +18,12 @@ fi
 config="omap2plus_defconfig"
 
 #Kernel/Build
-KERNEL_REL=3.9
-KERNEL_TAG=${KERNEL_REL}
-BUILD=armv7-d0.8
+KERNEL_REL=3.10
+KERNEL_TAG=${KERNEL_REL}-rc1
+BUILD=armv7-d0.9
 
 #v3.X-rcX + upto SHA
-KERNEL_SHA="d7ab7302f970a254997687a1cdede421a5635c68"
+#KERNEL_SHA="d7ab7302f970a254997687a1cdede421a5635c68"
 
 #git branch
 #BRANCH="v3.10.x"
-- 
GitLab