diff options
author | Jan Luebbe <jlu@pengutronix.de> | 2012-11-22 11:58:36 +0100 |
---|---|---|
committer | Jan Luebbe <jlu@pengutronix.de> | 2012-11-22 12:46:51 +0100 |
commit | ce6e38fa64f60a7554546f39b7f462574719e484 (patch) | |
tree | 3e13722641d21ea0e6f4e752ed46b2dc7042c315 /patches/linux-3.7-rc6/0082-ARM-am33xx-fix-mem-regions-in-USB-hwmod.patch | |
parent | 25f57ac7c79468e9a2d3e4ae7473a75a7dd74d05 (diff) | |
download | platform-pengutronix-beagleboneti-ce6e38fa64f60a7554546f39b7f462574719e484.tar.gz platform-pengutronix-beagleboneti-ce6e38fa64f60a7554546f39b7f462574719e484.tar.xz |
kernel: switch to mainline-based patch stack
Thanks to Koen Kooi for maintaining the patch stack.
Also update to PTXdist master.
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Diffstat (limited to 'patches/linux-3.7-rc6/0082-ARM-am33xx-fix-mem-regions-in-USB-hwmod.patch')
-rw-r--r-- | patches/linux-3.7-rc6/0082-ARM-am33xx-fix-mem-regions-in-USB-hwmod.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/patches/linux-3.7-rc6/0082-ARM-am33xx-fix-mem-regions-in-USB-hwmod.patch b/patches/linux-3.7-rc6/0082-ARM-am33xx-fix-mem-regions-in-USB-hwmod.patch new file mode 100644 index 0000000..5fd84b3 --- /dev/null +++ b/patches/linux-3.7-rc6/0082-ARM-am33xx-fix-mem-regions-in-USB-hwmod.patch @@ -0,0 +1,45 @@ +From 23ec7954c2eb161d52ce3df4fac3f7a188319120 Mon Sep 17 00:00:00 2001 +From: Daniel Mack <zonque@gmail.com> +Date: Wed, 17 Oct 2012 16:39:00 +0200 +Subject: [PATCH] ARM: am33xx: fix mem regions in USB hwmod + +Signed-off-by: Daniel Mack <zonque@gmail.com> +--- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 24 ++++++++++++++++++------ + 1 file changed, 18 insertions(+), 6 deletions(-) + +diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c +index b6f78c1..2a5032f 100644 +--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c ++++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c +@@ -3310,12 +3310,24 @@ static struct omap_hwmod_addr_space am33xx_usbss_addr_space[] = { + .pa_end = 0x47401000 + SZ_2K - 1, + .flags = ADDR_TYPE_RT + }, +- { +- .name = "musb1", +- .pa_start = 0x47401800, +- .pa_end = 0x47401800 + SZ_2K - 1, +- .flags = ADDR_TYPE_RT +- }, ++ { ++ .name = "usb_ctrl0", ++ .pa_start = 0x44E10620, ++ .pa_end = 0x44E10620 + SZ_4 - 1, ++ .flags = ADDR_TYPE_RT ++ }, ++ { ++ .name = "musb1", ++ .pa_start = 0x47401800, ++ .pa_end = 0x47401800 + SZ_2K - 1, ++ .flags = ADDR_TYPE_RT ++ }, ++ { ++ .name = "usb_ctrl1", ++ .pa_start = 0x44E10628, ++ .pa_end = 0x44E10628 + SZ_4 - 1, ++ .flags = ADDR_TYPE_RT ++ }, + { } + }; + |