Merge commit 'rel_imx_3.0.35_12.11.01_RC3' into imx_3.0.35_android_r13.4.y

5 files changed, 6 insertions, 21 deletions

diff --git a/arch/arm/mach-mx6/system.c b/arch/arm/mach-mx6/system.c
index 6ecd51e9f9ea..6d24f22d156c 100644
--- a/arch/arm/mach-mx6/system.c
+++ b/arch/arm/mach-mx6/system.c
@@ -157,7 +157,7 @@ void mxc_cpu_lp_set(enum mxc_cpu_pwr_mode mode)
 		   * The PUPSCR should include the time it takes for the ARM LDO to
 		   * ramp up.
 		   */
-		__raw_writel(0x202, gpc_base + GPC_PGC_CPU_PUPSCR_OFFSET);
+		__raw_writel(0xf0f, gpc_base + GPC_PGC_CPU_PUPSCR_OFFSET);
 		/* The PDNSCR is a counter that counts in IPG_CLK cycles. This counter
 		  * can be set to minimum values to power down faster.
 		  */
diff --git a/drivers/dma/pxp/pxp_device.c b/drivers/dma/pxp/pxp_device.c
index 6b3d7aa37dce..5981fa6331a9 100644
--- a/drivers/dma/pxp/pxp_device.c
+++ b/drivers/dma/pxp/pxp_device.c
@@ -477,9 +477,6 @@ static int __devinit pxp_device_probe(struct platform_device *pdev)
 {
 	int ret;
 
-	/* PxP DMA interface */
-	dmaengine_get();
-
 	ret = misc_register(&pxp_device_miscdev);
 	if (ret)
 		return ret;
@@ -492,8 +489,6 @@ static int __devexit pxp_device_remove(struct platform_device *pdev)
 {
 	misc_deregister(&pxp_device_miscdev);
 
-	dmaengine_put();
-
 	return 0;
 }
 
diff --git a/drivers/usb/host/ehci-arc.c b/drivers/usb/host/ehci-arc.c
index 35815869bb8d..cf9d9e1612f0 100755
--- a/drivers/usb/host/ehci-arc.c
+++ b/drivers/usb/host/ehci-arc.c
@@ -159,16 +159,6 @@ static irqreturn_t ehci_fsl_pre_irq(int irq, void *dev)
 		pdata->wakeup_event = WAKEUP_EVENT_INVALID;
 		fsl_usb_recover_hcd(pdev);
 		return IRQ_HANDLED;
-	} else {
-		u32 portsc = 0;
-		struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-		portsc = ehci_readl(ehci, &ehci->regs->port_status[0]);
-		/* PORT_USB11 macro is used to judge line state K*/
-		if ((PORT_USB11(portsc)) && (portsc & PORT_SUSPEND)) {
-			pdata = hcd->self.controller->platform_data;
-			if (pdata->platform_resume)
-				pdata->platform_resume(pdata);
-		}
 	}
 	return IRQ_NONE;
 }
@@ -485,10 +475,10 @@ static int ehci_fsl_bus_resume(struct usb_hcd *hcd)
 	}
 
 	if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags)) {
-		set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
 		fsl_usb_clk_gate(hcd->self.controller->platform_data, true);
 		usb_host_set_wakeup(hcd->self.controller, false);
 		fsl_usb_lowpower_mode(pdata, false);
+		set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
 	}
 
 	if (pdata->platform_resume)
diff --git a/sound/soc/codecs/cs42888.c b/sound/soc/codecs/cs42888.c
index ce240834b2e1..698ff4b59826 100644
--- a/sound/soc/codecs/cs42888.c
+++ b/sound/soc/codecs/cs42888.c
@@ -793,7 +793,7 @@ struct snd_soc_dai_driver cs42888_dai[] = {
 	.name = "CS42888",
 	.playback = {
 		.stream_name = "Playback",
-		.channels_min = 1,
+		.channels_min = 2,
 		.channels_max = 8,
 		.rates = (SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |
 			SNDRV_PCM_RATE_192000),
@@ -801,7 +801,7 @@ struct snd_soc_dai_driver cs42888_dai[] = {
 	},
 	.capture = {
 		.stream_name = "Capture",
-		.channels_min = 1,
+		.channels_min = 2,
 		.channels_max = 4,
 		.rates = (SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |
 			SNDRV_PCM_RATE_192000),
@@ -813,7 +813,7 @@ struct snd_soc_dai_driver cs42888_dai[] = {
 		.name = "CS42888_ASRC",
 		.playback = {
 			.stream_name = "Playback",
-			.channels_min = 1,
+			.channels_min = 2,
 			.channels_max = 8,
 			.rates = SNDRV_PCM_RATE_8000_192000,
 			.formats = CS42888_FORMATS,
diff --git a/sound/soc/imx/imx-esai.c b/sound/soc/imx/imx-esai.c
index 359cb2a4aea0..8951a81f6824 100644
--- a/sound/soc/imx/imx-esai.c
+++ b/sound/soc/imx/imx-esai.c
@@ -579,7 +579,7 @@ static struct snd_soc_dai_driver imx_esai_dai = {
 	 .suspend = imx_esai_suspend,
 	 .resume = imx_esai_resume,
 	 .playback = {
-		      .channels_min = 2,
+		      .channels_min = 1,
 		      .channels_max = 12,
 		      .rates = IMX_ESAI_RATES,
 		      .formats = IMX_ESAI_FORMATS,