[Armadeus-commitlog] SF.net SVN: armadeus:[1212] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.27.13/281-apf27-armadeus-add_apf27.c.patch

[<th...@us...>]

Revision: 1212
          http://armadeus.svn.sourceforge.net/armadeus/?rev=1212&view=rev
Author:   thom25
Date:     2009-04-10 12:08:02 +0000 (Fri, 10 Apr 2009)

Log Message:
-----------
[LINUX] fix ticket 7 for USB port 1

Modified Paths:
--------------
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/281-apf27-armadeus-add_apf27.c.patch

Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/281-apf27-armadeus-add_apf27.c.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/281-apf27-armadeus-add_apf27.c.patch	2009-04-10 09:58:34 UTC (rev 1211)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/281-apf27-armadeus-add_apf27.c.patch	2009-04-10 12:08:02 UTC (rev 1212)
@@ -5,7 +5,7 @@
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ linux-2.6.27.13/arch/arm/mach-mx2/apf27.c	2009-04-08 15:48:50.000000000 +0200
-@@ -0,0 +1,1473 @@
+@@ -0,0 +1,1482 @@
 + /*
 + * apf27.c
 + *
@@ -862,10 +862,12 @@
 +	pr_debug("reset controller: 0x%08x\n", temp);
 +	mdelay(10);
 +
-+	ret = isp1504_set_vbus_power((void __iomem *)(IO_ADDRESS(OTG_BASE_ADDR + 0x170)), 1);
 +	if (ret)
 +		mxc_gpio_release_multiple(mxc_usbotg_pins,
 +			ARRAY_SIZE(mxc_usbotg_pins));
++
++	ret = isp1504_set_vbus_power((void __iomem *)(IO_ADDRESS(OTG_BASE_ADDR + 0x170)), 1);
++
 +	return ret;
 +}
 +
@@ -909,7 +911,6 @@
 +	temp |= 3 << 30;
 +	writel(temp, IO_ADDRESS(OTG_BASE_ADDR) + 0x384);
 +	pr_debug("PORTSC1 after: 0x%08x\n", temp);
-+
 +	mdelay(10);
 +
 +	temp = readl(IO_ADDRESS(OTG_BASE_ADDR) + 0x340);
@@ -918,6 +919,14 @@
 +	pr_debug("reset controller: 0x%08x\n", temp);
 +	mdelay(10);
 +
++	/* force port powerup in case of connected device */
++	temp = readl(IO_ADDRESS(OTG_BASE_ADDR) + 0x384);
++	pr_debug("PORTSC1 before: 0x%08x\n", temp);
++	temp &= ~(1 << 12);
++	temp |= 1 << 12;
++	writel(temp, IO_ADDRESS(OTG_BASE_ADDR) + 0x384);
++	mdelay(10);
++
 +	return ret;
 +}
 +


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.