Merge remote-tracking branch 'google/android-samsung-3.0-jb' into HEAD

Conflicts:
	arch/arm/mach-s5pv210/mach-herring.c
	drivers/media/video/samsung/fimc/fimc_dev.c
	include/trace/events/cpufreq_interactive.h

5 files changed, 22 insertions, 10 deletions

diff --git a/arch/arm/configs/herring_defconfig b/arch/arm/configs/herring_defconfig
index e1c2a379833..74d6850cbc8 100644
--- a/arch/arm/configs/herring_defconfig
+++ b/arch/arm/configs/herring_defconfig
@@ -14,9 +14,8 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_ASHMEM=y
 # CONFIG_AIO is not set
 CONFIG_EMBEDDED=y
-# CONFIG_PERF_EVENTS is not set
+CONFIG_PERF_COUNTERS=y
 CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
 CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
@@ -34,6 +33,7 @@ CONFIG_FIQ_DEBUGGER_CONSOLE=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 CONFIG_COMPACTION=y
+CONFIG_KSM=y
 CONFIG_CMDLINE="console=ttyFIQ0"
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y
@@ -51,6 +51,7 @@ CONFIG_APM_EMULATION=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
+CONFIG_XFRM_USER=y
 CONFIG_NET_KEY=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -87,6 +88,7 @@ CONFIG_NF_CT_NETLINK=y
 CONFIG_NETFILTER_TPROXY=y
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
 CONFIG_NETFILTER_XT_TARGET_MARK=y
 CONFIG_NETFILTER_XT_TARGET_NFLOG=y
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
@@ -162,6 +164,10 @@ CONFIG_BT_BNEP=y
 CONFIG_BT_HIDP=y
 CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_H4=y
+CONFIG_CFG80211=y
+CONFIG_NL80211_TESTMODE=y
+# CONFIG_CFG80211_WEXT is not set
+CONFIG_CFG80211_ALLOW_RECONNECT=y
 CONFIG_WIMAX=y
 CONFIG_RFKILL=y
 CONFIG_RFKILL_INPUT=y
@@ -193,9 +199,9 @@ CONFIG_DM_UEVENT=y
 CONFIG_NETDEVICES=y
 CONFIG_IFB=y
 CONFIG_TUN=y
-CONFIG_BCM4329=m
-CONFIG_BCM4329_FW_PATH="/vendor/firmware/fw_bcm4329.bin"
-CONFIG_BCM4329_NVRAM_PATH="/vendor/firmware/nvram_net.txt"
+CONFIG_BCMDHD=y
+CONFIG_BCMDHD_FW_PATH="/vendor/firmware/fw_bcmdhd.bin"
+CONFIG_BCMDHD_NVRAM_PATH="/vendor/firmware/nvram_net.txt"
 CONFIG_WIMAX_CMC7XX=y
 CONFIG_PPP=y
 CONFIG_PPP_DEFLATE=y
@@ -262,6 +268,7 @@ CONFIG_PVR_SGX=y
 CONFIG_PVR_NEED_PVR_DPF=y
 CONFIG_PVR_NEED_PVR_ASSERT=y
 CONFIG_PVR_USSE_EDM_STATUS_DEBUG=y
+CONFIG_PVR_LINUX_MEM_AREA_POOL=y
 CONFIG_FB=y
 CONFIG_FB_S3C=y
 CONFIG_FB_S3C_NR_BUFFERS=7
@@ -387,11 +394,12 @@ CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_PRINTK_TIME=y
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_INFO=y
 CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_SCHED_TRACER=y
+CONFIG_DYNAMIC_DEBUG=y
 # CONFIG_ARM_UNWIND is not set
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_S3C_UART=2
diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c
index b73014127de..2daf0937fa4 100755
--- a/arch/arm/mach-s5pv210/mach-herring.c
+++ b/arch/arm/mach-s5pv210/mach-herring.c
@@ -366,6 +366,7 @@ static struct s3cfb_lcd r61408 = {
 };
 
 #define  S5PV210_VIDEO_SAMSUNG_MEMSIZE_FIMC0 (6144 * SZ_1K)
+// #define  S5PV210_VIDEO_SAMSUNG_MEMSIZE_FIMC1 (4 * SZ_1K)
 #define  S5PV210_VIDEO_SAMSUNG_MEMSIZE_FIMC2 (6144 * SZ_1K)
 #define  S5PV210_VIDEO_SAMSUNG_MEMSIZE_MFC0 (11264 * SZ_1K) // 11Mb
 #define  S5PV210_VIDEO_SAMSUNG_MEMSIZE_MFC1 (11264 * SZ_1K) // 11Mb
diff --git a/arch/arm/mach-s5pv210/power-domain.c b/arch/arm/mach-s5pv210/power-domain.c
index 59a1a98dd56..683901c64f5 100644
--- a/arch/arm/mach-s5pv210/power-domain.c
+++ b/arch/arm/mach-s5pv210/power-domain.c
@@ -410,7 +410,7 @@ static int s5pv210_pd_is_enabled(struct regulator_dev *dev)
 static int s5pv210_pd_enable(struct regulator_dev *dev)
 {
 	struct s5pv210_pd_data *data = rdev_get_drvdata(dev);
-	int ret;
+	int ret = 0;
 
 	if (data->clk_run)
 		s5pv210_pd_clk_enable(data->clk_run);
@@ -418,13 +418,12 @@ static int s5pv210_pd_enable(struct regulator_dev *dev)
 	ret = s5pv210_pd_ctrl(data->ctrlbit, 1);
 	if (ret < 0) {
 		printk(KERN_ERR "failed to enable power domain\n");
-		return ret;
 	}
 
 	if (data->clk_run)
 		s5pv210_pd_clk_disable(data->clk_run);
 
-	return 0;
+	return ret;
 }
 
 static int s5pv210_pd_disable(struct regulator_dev *dev)
diff --git a/arch/arm/plat-samsung/include/plat/regs-otg.h b/arch/arm/plat-samsung/include/plat/regs-otg.h
index 214d7309764..dccdb26905f 100644
--- a/arch/arm/plat-samsung/include/plat/regs-otg.h
+++ b/arch/arm/plat-samsung/include/plat/regs-otg.h
@@ -208,7 +208,9 @@
 #define DEPCTL_EPENA			(0x1<<31)
 #define DEPCTL_EPDIS			(0x1<<30)
 #define DEPCTL_SETD1PID			(0x1<<29)
+#define DEPCTL_SET_ODD_FRM		(0x1<<29)
 #define DEPCTL_SETD0PID			(0x1<<28)
+#define DEPCTL_SET_EVEN_FRM		(0x1<<28)
 #define DEPCTL_SNAK			(0x1<<27)
 #define DEPCTL_CNAK			(0x1<<26)
 #define DEPCTL_STALL			(0x1<<21)
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index 53cb06fc316..78829fab70e 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -419,13 +419,15 @@ static int vfp_pm_suspend(void)
 		/* disable, just in case */
 		fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN);
 	} else if (vfp_current_hw_state[ti->cpu]) {
+#ifndef CONFIG_SMP
 		fmxr(FPEXC, fpexc | FPEXC_EN);
 		vfp_save_state(vfp_current_hw_state[ti->cpu], fpexc);
 		fmxr(FPEXC, fpexc);
+#endif
 	}
 
 	/* clear any information we had about last context state */
-	memset(vfp_current_hw_state, 0, sizeof(vfp_current_hw_state));
+	vfp_current_hw_state[ti->cpu] = NULL;
 
 	return 0;
 }