From 53de839eb8360c40c26fafadb3a24f7f660af10c Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Sat, 31 Mar 2012 21:00:52 -0500
Subject: [PATCH] 3.4-rc1-d0 release

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 patch.sh                                      | 13 +++-
 .../0001-cleanup-OMAP_GPIO_IRQ-gone.patch     | 44 +++++++++++++
 .../expansion/0001-ulcd-fix-ulcd-struct.patch | 65 +++++++++++++++++++
 .../0001-ulcd-move-gpio_to_irq.patch          | 33 ++++++++++
 patches/defconfig                             | 31 ++++-----
 patches/ref_omap2plus_defconfig               | 31 ++++-----
 version.sh                                    |  6 +-
 7 files changed, 177 insertions(+), 46 deletions(-)
 create mode 100644 patches/beagle/expansion/0001-cleanup-OMAP_GPIO_IRQ-gone.patch
 create mode 100644 patches/beagle/expansion/0001-ulcd-fix-ulcd-struct.patch
 create mode 100644 patches/beagle/expansion/0001-ulcd-move-gpio_to_irq.patch

diff --git a/patch.sh b/patch.sh
index 68d1920a7..518ae132b 100644
--- a/patch.sh
+++ b/patch.sh
@@ -114,7 +114,9 @@ function omapdrm {
 	git am "${DIR}/patches/drm/cma/0012-mm-trigger-page-reclaim-in-alloc_contig_range-to-sta.patch"
 	git am "${DIR}/patches/drm/cma/0013-drivers-add-Contiguous-Memory-Allocator.patch"
 	git am "${DIR}/patches/drm/cma/0014-X86-integrate-CMA-with-DMA-mapping-subsystem.patch"
-	git am "${DIR}/patches/drm/cma/0015-ARM-integrate-CMA-with-DMA-mapping-subsystem.patch"
+
+#meeds to be tweaked rc1
+#	git am "${DIR}/patches/drm/cma/0015-ARM-integrate-CMA-with-DMA-mapping-subsystem.patch"
 
 	echo "Patches for cma-v23"
 	git am "${DIR}/patches/drm/cma/0001-cma-23-mm-compaction-export-some-of-the-functions.patch"
@@ -163,8 +165,13 @@ function fixes {
 	git am "${DIR}/patches/omap/0001-tidspbridge-fix-build-after-iomap.h-move.patch"
 
 	#3/29/2012
-	git am "${DIR}/patches/omap/0001-add-include-to-fix-implicit-declaration-of-function-.patch"
-	git am "${DIR}/patches/omap/0001-fix-mach-omap2-pm-build.patch"
+#	git am "${DIR}/patches/omap/0001-add-include-to-fix-implicit-declaration-of-function-.patch"
+#	git am "${DIR}/patches/omap/0001-fix-mach-omap2-pm-build.patch"
+
+	#3.4-rc1 fixes:
+	git am "${DIR}/patches/beagle/expansion/0001-cleanup-OMAP_GPIO_IRQ-gone.patch"
+	git am "${DIR}/patches/beagle/expansion/0001-ulcd-move-gpio_to_irq.patch"
+	git am "${DIR}/patches/beagle/expansion/0001-ulcd-fix-ulcd-struct.patch"
 }
 
 bugs_trivial
diff --git a/patches/beagle/expansion/0001-cleanup-OMAP_GPIO_IRQ-gone.patch b/patches/beagle/expansion/0001-cleanup-OMAP_GPIO_IRQ-gone.patch
new file mode 100644
index 000000000..9d3e8d0f8
--- /dev/null
+++ b/patches/beagle/expansion/0001-cleanup-OMAP_GPIO_IRQ-gone.patch
@@ -0,0 +1,44 @@
+From ef15b35454ace6304ed1fbb571acdeaf3f9d473f Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Sat, 31 Mar 2012 20:30:48 -0500
+Subject: [PATCH] cleanup: OMAP_GPIO_IRQ gone
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index 1d27397..610b22a 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -193,7 +193,7 @@ static void __init omap3beagle_enc28j60_init(void)
+ 	if ((gpio_request(OMAP3BEAGLE_GPIO_ENC28J60_IRQ, "ENC28J60_IRQ") == 0) &&
+ 	    (gpio_direction_input(OMAP3BEAGLE_GPIO_ENC28J60_IRQ) == 0)) {
+ 		gpio_export(OMAP3BEAGLE_GPIO_ENC28J60_IRQ, 0);
+-		omap3beagle_zippy_spi_board_info[0].irq	= OMAP_GPIO_IRQ(OMAP3BEAGLE_GPIO_ENC28J60_IRQ);
++		omap3beagle_zippy_spi_board_info[0].irq	= gpio_to_irq(OMAP3BEAGLE_GPIO_ENC28J60_IRQ);
+ 		irq_set_irq_type(omap3beagle_zippy_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING);
+ 	} else {
+ 		printk(KERN_ERR "could not obtain gpio for ENC28J60_IRQ\n");
+@@ -235,7 +235,7 @@ static void __init omap3beagle_ks8851_init(void)
+ 	if ((gpio_request(OMAP3BEAGLE_GPIO_KS8851_IRQ, "KS8851_IRQ") == 0) &&
+ 	    (gpio_direction_input(OMAP3BEAGLE_GPIO_KS8851_IRQ) == 0)) {
+ 		gpio_export(OMAP3BEAGLE_GPIO_KS8851_IRQ, 0);
+-		omap3beagle_zippy2_spi_board_info[0].irq = OMAP_GPIO_IRQ(OMAP3BEAGLE_GPIO_KS8851_IRQ);
++		omap3beagle_zippy2_spi_board_info[0].irq = gpio_to_irq(OMAP3BEAGLE_GPIO_KS8851_IRQ);
+ 		irq_set_irq_type(omap3beagle_zippy2_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING);
+ 	} else {
+ 		printk(KERN_ERR "could not obtain gpio for KS8851_IRQ\n");
+@@ -587,7 +587,7 @@ static struct i2c_board_info __initdata beagle_i2c2_bbtoys_ulcd[] = {
+ 	{
+ 		I2C_BOARD_INFO("tlc59108", 0x40),
+ 		I2C_BOARD_INFO("tsc2007", 0x48),
+-		.irq = OMAP_GPIO_IRQ(OMAP3BEAGLE_TSC2007_GPIO),
++		.irq = gpio_to_irq(OMAP3BEAGLE_TSC2007_GPIO),
+ 		.platform_data = &tsc2007_info,
+ 	},
+ };
+-- 
+1.7.9.1
+
diff --git a/patches/beagle/expansion/0001-ulcd-fix-ulcd-struct.patch b/patches/beagle/expansion/0001-ulcd-fix-ulcd-struct.patch
new file mode 100644
index 000000000..3e7af592d
--- /dev/null
+++ b/patches/beagle/expansion/0001-ulcd-fix-ulcd-struct.patch
@@ -0,0 +1,65 @@
+From c142eadd094d27257440338a49ccaf9f4b52eb07 Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Sat, 31 Mar 2012 20:49:45 -0500
+Subject: [PATCH] ulcd: fix ulcd struct
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |   29 +++++++++++++++--------------
+ 1 files changed, 15 insertions(+), 14 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index 0230dd1..fc0414c 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -556,11 +556,26 @@ static struct i2c_board_info __initdata beagle_i2c2_boardinfo[] = {};
+ 	( defined(CONFIG_TOUCHSCREEN_TSC2007) || defined(CONFIG_TOUCHSCREEN_TSC2007_MODULE))
+ /* Touchscreen */
+ #define OMAP3BEAGLE_TSC2007_GPIO 157
++
+ static int omap3beagle_tsc2007_get_pendown_state(void)
+ {
+ 	return !gpio_get_value(OMAP3BEAGLE_TSC2007_GPIO);
+ }
+ 
++static struct tsc2007_platform_data tsc2007_info = {
++	.model = 2007,
++	.x_plate_ohms = 180,
++	.get_pendown_state = omap3beagle_tsc2007_get_pendown_state,
++};
++
++static struct i2c_board_info __initdata beagle_i2c2_bbtoys_ulcd[] __initdata = {
++	{
++		I2C_BOARD_INFO("tlc59108", 0x40),
++		I2C_BOARD_INFO("tsc2007", 0x48),
++		.platform_data = &tsc2007_info,
++	},
++};
++
+ static void __init omap3beagle_tsc2007_init(void)
+ {
+ 	int r;
+@@ -577,20 +592,6 @@ static void __init omap3beagle_tsc2007_init(void)
+ 	beagle_i2c2_bbtoys_ulcd[0].irq = gpio_to_irq(OMAP3BEAGLE_TSC2007_GPIO);
+ 	irq_set_irq_type(gpio_to_irq(OMAP3BEAGLE_TSC2007_GPIO), IRQ_TYPE_EDGE_FALLING);
+ }
+-
+-static struct tsc2007_platform_data tsc2007_info = {
+-	.model = 2007,
+-	.x_plate_ohms = 180,
+-	.get_pendown_state = omap3beagle_tsc2007_get_pendown_state,
+-};
+-
+-static struct i2c_board_info __initdata beagle_i2c2_bbtoys_ulcd[] = {
+-	{
+-		I2C_BOARD_INFO("tlc59108", 0x40),
+-		I2C_BOARD_INFO("tsc2007", 0x48),
+-		.platform_data = &tsc2007_info,
+-	},
+-};
+ #else
+ static struct i2c_board_info __initdata beagle_i2c2_bbtoys_ulcd[] = {};
+ static void __init omap3beagle_tsc2007_init(void) { return; }
+-- 
+1.7.9.1
+
diff --git a/patches/beagle/expansion/0001-ulcd-move-gpio_to_irq.patch b/patches/beagle/expansion/0001-ulcd-move-gpio_to_irq.patch
new file mode 100644
index 000000000..67d9fa558
--- /dev/null
+++ b/patches/beagle/expansion/0001-ulcd-move-gpio_to_irq.patch
@@ -0,0 +1,33 @@
+From 4609a6fa38a9b9f586ad577924afc89c222f475c Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Sat, 31 Mar 2012 20:42:28 -0500
+Subject: [PATCH] ulcd: move gpio_to_irq
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index 610b22a..0230dd1 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -574,6 +574,7 @@ static void __init omap3beagle_tsc2007_init(void)
+ 		return;
+ 	}
+ 
++	beagle_i2c2_bbtoys_ulcd[0].irq = gpio_to_irq(OMAP3BEAGLE_TSC2007_GPIO);
+ 	irq_set_irq_type(gpio_to_irq(OMAP3BEAGLE_TSC2007_GPIO), IRQ_TYPE_EDGE_FALLING);
+ }
+ 
+@@ -587,7 +588,6 @@ static struct i2c_board_info __initdata beagle_i2c2_bbtoys_ulcd[] = {
+ 	{
+ 		I2C_BOARD_INFO("tlc59108", 0x40),
+ 		I2C_BOARD_INFO("tsc2007", 0x48),
+-		.irq = gpio_to_irq(OMAP3BEAGLE_TSC2007_GPIO),
+ 		.platform_data = &tsc2007_info,
+ 	},
+ };
+-- 
+1.7.9.1
+
diff --git a/patches/defconfig b/patches/defconfig
index a6ed0163a..262e670cf 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1,10 +1,9 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.3.0 Kernel Configuration
+# Linux/arm 3.4.0-rc1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_HAVE_SCHED_CLOCK=y
 CONFIG_GENERIC_GPIO=y
 # CONFIG_ARCH_USES_GETTIMEOFFSET is not set
 CONFIG_GENERIC_CLOCKEVENTS=y
@@ -39,9 +38,11 @@ CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZMA is not set
+CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
@@ -67,11 +68,10 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
 # IRQ subsystem
 #
 CONFIG_GENERIC_HARDIRQS=y
-CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_DOMAIN=y
-# CONFIG_SPARSE_IRQ is not set
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
 
 #
 # RCU Subsystem
@@ -162,15 +162,16 @@ CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_KPROBES=y
+# CONFIG_JUMP_LABEL is not set
 CONFIG_KRETPROBES=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
 
 #
 # GCOV-based kernel profiling
@@ -240,7 +241,6 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_INLINE_SPIN_LOCK_BH is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
 # CONFIG_INLINE_SPIN_UNLOCK_BH is not set
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
@@ -1088,6 +1088,8 @@ CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
 # CONFIG_NETPRIO_CGROUP is not set
 CONFIG_BQL=y
+CONFIG_HAVE_BPF_JIT=y
+# CONFIG_BPF_JIT is not set
 
 #
 # Network testing
@@ -1299,19 +1301,6 @@ CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=m
 # CONFIG_DMA_SHARED_BUFFER is not set
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=16
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8
-CONFIG_CMA_AREAS=7
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_MTD=y
@@ -1417,6 +1406,7 @@ CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+# CONFIG_MTD_NAND_DOCG4 is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
 CONFIG_MTD_NAND_PLATFORM=y
 # CONFIG_MTD_ALAUDA is not set
@@ -2306,6 +2296,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_MANAGER is not set
+# CONFIG_CHARGER_SMB347 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index a40b477a6..50e243971 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,10 +1,9 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.3.0 Kernel Configuration
+# Linux/arm 3.4.0-rc1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_HAVE_SCHED_CLOCK=y
 CONFIG_GENERIC_GPIO=y
 # CONFIG_ARCH_USES_GETTIMEOFFSET is not set
 CONFIG_GENERIC_CLOCKEVENTS=y
@@ -39,9 +38,11 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
@@ -60,11 +61,10 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
 # IRQ subsystem
 #
 CONFIG_GENERIC_HARDIRQS=y
-CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_DOMAIN=y
-# CONFIG_SPARSE_IRQ is not set
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
 
 #
 # RCU Subsystem
@@ -131,15 +131,16 @@ CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_KPROBES=y
+# CONFIG_JUMP_LABEL is not set
 CONFIG_KRETPROBES=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
 
 #
 # GCOV-based kernel profiling
@@ -200,7 +201,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_INLINE_SPIN_LOCK_BH is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
+CONFIG_UNINLINE_SPIN_UNLOCK=y
 # CONFIG_INLINE_SPIN_UNLOCK_BH is not set
 # CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
@@ -487,7 +488,6 @@ CONFIG_HAVE_MEMBLOCK=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=999999
 # CONFIG_COMPACTION is not set
-CONFIG_MIGRATION=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_VIRT_TO_BUS=y
@@ -669,6 +669,8 @@ CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
 CONFIG_BQL=y
+CONFIG_HAVE_BPF_JIT=y
+# CONFIG_BPF_JIT is not set
 
 #
 # Network testing
@@ -757,19 +759,6 @@ CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=m
 # CONFIG_DMA_SHARED_BUFFER is not set
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=16
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8
-CONFIG_CMA_AREAS=7
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_MTD=y
@@ -857,6 +846,7 @@ CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_OMAP2=y
 CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_DOCG4 is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_ALAUDA is not set
@@ -1500,6 +1490,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_MANAGER is not set
+# CONFIG_CHARGER_SMB347 is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/version.sh b/version.sh
index 051c783cd..721e65167 100644
--- a/version.sh
+++ b/version.sh
@@ -2,14 +2,14 @@
 
 unset BUILD
 
-KERNEL_REL=3.3
+#KERNEL_REL=3.3
 
 #for x.x.X
 #STABLE_PATCH=1
 
 #for x.x-rcX
-#RC_KERNEL=3.3
-#RC_PATCH=-rc7
+RC_KERNEL=3.4
+RC_PATCH=-rc1
 
 ABI=0
 
-- 
GitLab