diff options
Diffstat (limited to 'recipes/linux/linux-2.6.31/pcm043/0090-mx3x-Fixup-USB-base-addresses.patch')
| -rw-r--r-- | recipes/linux/linux-2.6.31/pcm043/0090-mx3x-Fixup-USB-base-addresses.patch | 93 |
1 files changed, 93 insertions, 0 deletions
diff --git a/recipes/linux/linux-2.6.31/pcm043/0090-mx3x-Fixup-USB-base-addresses.patch b/recipes/linux/linux-2.6.31/pcm043/0090-mx3x-Fixup-USB-base-addresses.patch new file mode 100644 index 0000000000..61fe36c6ea --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0090-mx3x-Fixup-USB-base-addresses.patch @@ -0,0 +1,93 @@ +From c5ff90856d241112b588e091167e6fc69020d535 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer <s.hauer@pengutronix.de> +Date: Fri, 17 Apr 2009 16:52:25 +0200 +Subject: [PATCH 090/101] mx3x: Fixup USB base addresses + +Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> + +rebased to 2.6.31.6, but without pcm037.c changes +Signed-off-by: Jan Weitzel <J.Weitzel@phytec.de> +--- + arch/arm/mach-mx3/devices.c | 20 ++++++++++++++------ + arch/arm/mach-mx3/pcm037.c | 20 ++++++++++---------- + arch/arm/plat-mxc/include/mach/mx31.h | 2 +- + arch/arm/plat-mxc/include/mach/mx35.h | 1 + + 4 files changed, 26 insertions(+), 17 deletions(-) + +Index: linux-2.6.31.6/arch/arm/mach-mx3/devices.c +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/mach-mx3/devices.c 2009-12-10 11:33:07.024614628 +0100 ++++ linux-2.6.31.6/arch/arm/mach-mx3/devices.c 2009-12-10 11:33:10.356276214 +0100 +@@ -371,8 +371,8 @@ + + static struct resource otg_resources[] = { + { +- .start = OTG_BASE_ADDR, +- .end = OTG_BASE_ADDR + 0x1ff, ++ .start = MX31_OTG_BASE_ADDR, ++ .end = MX31_OTG_BASE_ADDR + 0x1ff, + .flags = IORESOURCE_MEM, + }, { + .start = MXC_INT_USB3, +@@ -410,8 +410,8 @@ + + static struct resource mxc_usbh1_resources[] = { + { +- .start = OTG_BASE_ADDR + 0x200, +- .end = OTG_BASE_ADDR + 0x3ff, ++ .start = MX31_OTG_BASE_ADDR + 0x200, ++ .end = MX31_OTG_BASE_ADDR + 0x3ff, + .flags = IORESOURCE_MEM, + }, { + .start = MXC_INT_USB1, +@@ -435,8 +435,8 @@ + + static struct resource mxc_usbh2_resources[] = { + { +- .start = OTG_BASE_ADDR + 0x400, +- .end = OTG_BASE_ADDR + 0x5ff, ++ .start = MX31_OTG_BASE_ADDR + 0x400, ++ .end = MX31_OTG_BASE_ADDR + 0x5ff, + .flags = IORESOURCE_MEM, + }, { + .start = MXC_INT_USB2, +@@ -586,6 +586,14 @@ + if (cpu_is_mx35()) { + mxc_nand_resources[0].start = MX35_NFC_BASE_ADDR; + mxc_nand_resources[0].end = MX35_NFC_BASE_ADDR + 0xfff; ++ otg_resources[0].start = MX35_OTG_BASE_ADDR; ++ otg_resources[0].end = MX35_OTG_BASE_ADDR + 0x1ff; ++ otg_resources[1].start = MXC_INT_USBOTG; ++ otg_resources[1].end = MXC_INT_USBOTG; ++ mxc_usbh1_resources[0].start = MX35_OTG_BASE_ADDR + 0x400; ++ mxc_usbh1_resources[0].end = MX35_OTG_BASE_ADDR + 0x5ff; ++ mxc_usbh1_resources[1].start = MXC_INT_USBHS; ++ mxc_usbh1_resources[1].end = MXC_INT_USBHS; + imx_ssi_resources0[1].start = MX35_INT_SSI1; + imx_ssi_resources0[1].end = MX35_INT_SSI1; + imx_ssi_resources1[1].start = MX35_INT_SSI2; +Index: linux-2.6.31.6/arch/arm/plat-mxc/include/mach/mx31.h +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/plat-mxc/include/mach/mx31.h 2009-12-10 11:33:07.004682613 +0100 ++++ linux-2.6.31.6/arch/arm/plat-mxc/include/mach/mx31.h 2009-12-10 11:33:10.356276214 +0100 +@@ -4,7 +4,7 @@ + #define MX31_IRAM_BASE_ADDR 0x1FFC0000 /* internal ram */ + #define MX31_IRAM_SIZE SZ_16K + +-#define OTG_BASE_ADDR (AIPS1_BASE_ADDR + 0x00088000) ++#define MX31_OTG_BASE_ADDR (AIPS1_BASE_ADDR + 0x00088000) + #define ATA_BASE_ADDR (AIPS1_BASE_ADDR + 0x0008C000) + #define UART4_BASE_ADDR (AIPS1_BASE_ADDR + 0x000B0000) + #define UART5_BASE_ADDR (AIPS1_BASE_ADDR + 0x000B4000) +Index: linux-2.6.31.6/arch/arm/plat-mxc/include/mach/mx35.h +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/plat-mxc/include/mach/mx35.h 2009-12-10 11:33:07.014617995 +0100 ++++ linux-2.6.31.6/arch/arm/plat-mxc/include/mach/mx35.h 2009-12-10 11:33:10.356276214 +0100 +@@ -5,6 +5,7 @@ + #define MX35_IRAM_SIZE SZ_128K + + #define MXC_FEC_BASE_ADDR 0x50038000 ++#define MX35_OTG_BASE_ADDR 0x53ff4000 + #define MX35_NFC_BASE_ADDR 0xBB000000 + + /* |