From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Fri, 7 Mar 2014 09:51:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kc/karo-tx6q-fsl' into work-tx-da-edt7-2014... 
X-Git-Tag: KARO-TX6-FSL-3.0.35-CoMTFT
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=724598733c885f48408abcb35aae1269bdc67dfc;hp=e7c5cf6bbecefaee4fdeb12571b6cb0120b71b7f;p=karo-tx-linux.git

Merge remote-tracking branch 'remotes/kc/karo-tx6q-fsl' into work-tx-da-edt7-2014-03-04
---

diff --git a/arch/arm/configs/tx6_defconfig b/arch/arm/configs/tx6_defconfig
index 3680565c8733..ebb12cfd3eca 100644
--- a/arch/arm/configs/tx6_defconfig
+++ b/arch/arm/configs/tx6_defconfig
@@ -4,6 +4,8 @@ CONFIG_LOCALVERSION="-karo"
 CONFIG_SYSVIPC=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_EMBEDDED=y
+# CONFIG_VM_EVENT_COUNTERS is not set
+# CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
@@ -67,7 +69,6 @@ CONFIG_CAN_RAW=y
 CONFIG_CAN_BCM=y
 CONFIG_CAN_VCAN=y
 CONFIG_CAN_FLEXCAN=y
-CONFIG_CAN_DEBUG_DEVICES=y
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
 CONFIG_DEVTMPFS=y
@@ -202,7 +203,6 @@ CONFIG_SND_SOC=y
 CONFIG_SND_IMX_SOC=y
 CONFIG_SND_SOC_IMX_SGTL5000=y
 CONFIG_HIDRAW=y
-CONFIG_USB_DEBUG=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_SUSPEND=y
@@ -247,7 +247,6 @@ CONFIG_MXC_IPU=y
 CONFIG_MXC_DAM=y
 # CONFIG_MXC_HMP4E is not set
 # CONFIG_MXC_HWEVENT is not set
-CONFIG_MXC_VPU_DEBUG=y
 CONFIG_MXC_ASRC=y
 CONFIG_MXC_MLB150=y
 CONFIG_MXC_GPU_VIV=y
diff --git a/arch/arm/mach-mx6/board-mx6_tx6.c b/arch/arm/mach-mx6/board-mx6_tx6.c
index ef9af44232c2..bf9bdb7f5220 100755
--- a/arch/arm/mach-mx6/board-mx6_tx6.c
+++ b/arch/arm/mach-mx6/board-mx6_tx6.c
@@ -710,7 +710,7 @@ static void tx6_disable_pwm_pad(void)
 }
 
 static const struct mxc_pwm_platform_data tx6_pwm_pdata __initconst = {
-	.pwmo_invert = 1,
+	.pwmo_invert = 0,
 	.enable_pwm_pad = tx6_enable_pwm_pad,
 	.disable_pwm_pad = tx6_disable_pwm_pad,
 };
diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c
index 4c98d51f13b0..6cd90a7148e3 100644
--- a/drivers/video/mxc/mxc_ipuv3_fb.c
+++ b/drivers/video/mxc/mxc_ipuv3_fb.c
@@ -589,7 +589,7 @@ static int mxcfb_set_par(struct fb_info *fbi)
 		if (fbi->var.sync & FB_SYNC_VERT_HIGH_ACT)
 			sig_cfg.Vsync_pol = true;
 		if (!(fbi->var.sync & FB_SYNC_CLK_LAT_FALL))
-			sig_cfg.clk_pol = true;
+			sig_cfg.clk_pol = false;
 		if (fbi->var.sync & FB_SYNC_DATA_INVERT)
 			sig_cfg.data_pol = true;
 		if (!(fbi->var.sync & FB_SYNC_OE_LOW_ACT))