[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-124-ge935993
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-124-ge935993
|
From: Julien B a. A. <ar...@us...> - 2010-11-24 18:26:58
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via e9359933afc329838e492b175617fe58954edeeb (commit)
from a7182e83b93bced66c5de0485294d52cf802a1af (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e9359933afc329838e492b175617fe58954edeeb
Author: Julien Boibessot <jul...@ar...>
Date: Wed Nov 24 19:23:03 2010 +0100
[LINUX] PPS: add missing patches to have a compiling kernel
-----------------------------------------------------------------------
Summary of changes:
...355e-armadeus-fsl_udc-reset_temporary_fix.patch | 39 ++++++++++++++++++++
...dd_usb3315_registers_definition_in_ulpi_h.patch | 28 ++++++++++++++
2 files changed, 67 insertions(+), 0 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/355e-armadeus-fsl_udc-reset_temporary_fix.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/364-armadeus-add_usb3315_registers_definition_in_ulpi_h.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/355e-armadeus-fsl_udc-reset_temporary_fix.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/355e-armadeus-fsl_udc-reset_temporary_fix.patch
new file mode 100644
index 0000000..6153c2f
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/355e-armadeus-fsl_udc-reset_temporary_fix.patch
@@ -0,0 +1,39 @@
+!! Temporary fix !!
+
+Make USB device working on APF27.
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+
+Index: linux-2.6.29.6/drivers/usb/gadget/fsl_udc_core.c
+===================================================================
+--- linux-2.6.29.6.orig/drivers/usb/gadget/fsl_udc_core.c 2010-04-22 14:49:58.000000000 +0200
++++ linux-2.6.29.6/drivers/usb/gadget/fsl_udc_core.c 2010-04-22 14:53:56.000000000 +0200
+@@ -1627,6 +1627,7 @@ static void reset_irq(struct fsl_udc *ud
+ {
+ u32 temp;
+ unsigned long timeout;
++ static int first = 1;
+
+ /* Clear the device address */
+ temp = fsl_readl(&dr_regs->deviceaddr);
+@@ -1664,7 +1665,19 @@ static void reset_irq(struct fsl_udc *ud
+ /* Write 1s to the flush register */
+ fsl_writel(0xffffffff, &dr_regs->endptflush);
+
+- if (fsl_readl(&dr_regs->portsc1) & PORTSCX_PORT_RESET) {
++ if (first) {
++ dr_controller_setup(udc);
++
++ /* Reset all internal used Queues */
++ reset_queues(udc);
++
++ ep0_setup(udc);
++
++ /* Enable DR IRQ reg, Set Run bit, change udc state */
++ dr_controller_run(udc);
++ udc->usb_state = USB_STATE_ATTACHED;
++ first = 0;
++ } else if (fsl_readl(&dr_regs->portsc1) & PORTSCX_PORT_RESET) {
+ VDBG("Bus reset");
+ /* Reset all the queues, include XD, dTD, EP queue
+ * head and TR Queue */
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/364-armadeus-add_usb3315_registers_definition_in_ulpi_h.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/364-armadeus-add_usb3315_registers_definition_in_ulpi_h.patch
new file mode 100644
index 0000000..4ddbb9d
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/364-armadeus-add_usb3315_registers_definition_in_ulpi_h.patch
@@ -0,0 +1,28 @@
+Add USB3315 registers definition to arch/arm/plat-mxc/include/mach/ulpi.h
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+
+Index: linux-2.6.29.6/arch/arm/plat-mxc/include/mach/ulpi.h
+===================================================================
+--- linux-2.6.29.6.orig/arch/arm/plat-mxc/include/mach/ulpi.h 2010-02-23 16:29:43.000000000 +0100
++++ linux-2.6.29.6/arch/arm/plat-mxc/include/mach/ulpi.h 2010-02-23 16:30:49.000000000 +0100
+@@ -18,6 +18,19 @@
+ #define ISP1504_REG_SET 0x01
+ #define ISP1504_REG_CLEAR 0x02
+
++/* USB3315 register addresses */
++#define USB3315_VID_LOW 0x00 /* Vendor ID low */
++#define USB3315_VID_HIGH 0x01 /* Vendor ID high */
++#define USB3315_PID_LOW 0x02 /* Product ID low */
++#define USB3315_PID_HIGH 0x03 /* Product ID high */
++#define USB3315_FCNCTL 0x04 /* Function Control */
++#define USB3315_ITFCTL 0x07 /* Interface Control */
++#define USB3315_OTGCTL 0x0A /* OTG Control */
++
++/* Add to above register address to access Set/Clear functions */
++#define USB3315_REG_SET 0x01
++#define USB3315_REG_CLEAR 0x02
++
+ /* 1504 Function Control Register bits */
+ #define SUSPENDM (1 << 6) /* Suspend LOW */
+ #define RESET (1 << 5) /* Reset */
hooks/post-receive
--
armadeus
|
