diff mbox

OMAP3: drop SmartReflex base addresses mistakenly added by EHCI patch

Message ID 1245085932-9996-1-git-send-email-khilman@deeprootsystems.com (mailing list archive)
State Accepted
Commit b380e36df8b03a2c89dfefda8f862aa871b1047a
Headers show

Commit Message

Kevin Hilman June 15, 2009, 5:12 p.m. UTC 
From: Kevin Hilman <khilman@ti.deeprootsystems.com>

Drop them for now.  They will be re-added with the SmartReflex
patches coming from the PM branch, and will use the
L4_34XX_BASE + <offset> approach.

Signed-off-by: Kevin Hilman <khilman@ti.deeprootsystems.com>
---
 arch/arm/plat-omap/include/mach/omap34xx.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

Comments

Tony Lindgren June 17, 2009, 1:40 p.m. UTC | #1 
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: master

Initial commit ID (Likely to change): b380e36df8b03a2c89dfefda8f862aa871b1047a

PatchWorks
http://patchwork.kernel.org/patch/30380/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=b380e36df8b03a2c89dfefda8f862aa871b1047a


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren June 17, 2009, 1:43 p.m. UTC | #2 
* Kevin Hilman <khilman@deeprootsystems.com> [090615 10:12]:
> From: Kevin Hilman <khilman@ti.deeprootsystems.com>
> 
> Drop them for now.  They will be re-added with the SmartReflex
> patches coming from the PM branch, and will use the
> L4_34XX_BASE + <offset> approach.

Felipe, can you please update your ehci-omap branch accordingly?

Also, please remove the addition of omap3evm_flash_init() call
for board-omap3evm.c in your branch.

Thanks,

Tony
 
> Signed-off-by: Kevin Hilman <khilman@ti.deeprootsystems.com>
> ---
>  arch/arm/plat-omap/include/mach/omap34xx.h |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/plat-omap/include/mach/omap34xx.h b/arch/arm/plat-omap/include/mach/omap34xx.h
> index 4655707..6a58f3d 100644
> --- a/arch/arm/plat-omap/include/mach/omap34xx.h
> +++ b/arch/arm/plat-omap/include/mach/omap34xx.h
> @@ -78,8 +78,6 @@
>  #define OMAP34XX_UHH_CONFIG_BASE	(L4_34XX_BASE + 0x64000)
>  #define OMAP34XX_OHCI_BASE	(L4_34XX_BASE + 0x64400)
>  #define OMAP34XX_EHCI_BASE	(L4_34XX_BASE + 0x64800)
> -#define OMAP34XX_SR1_BASE	0x480C9000
> -#define OMAP34XX_SR2_BASE	0x480CB000
>  
>  #define OMAP34XX_MAILBOX_BASE		(L4_34XX_BASE + 0x94000)
>  
> -- 
> 1.6.2.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/plat-omap/include/mach/omap34xx.h b/arch/arm/plat-omap/include/mach/omap34xx.h
index 4655707..6a58f3d 100644
--- a/arch/arm/plat-omap/include/mach/omap34xx.h
+++ b/arch/arm/plat-omap/include/mach/omap34xx.h
@@ -78,8 +78,6 @@ 
 #define OMAP34XX_UHH_CONFIG_BASE	(L4_34XX_BASE + 0x64000)
 #define OMAP34XX_OHCI_BASE	(L4_34XX_BASE + 0x64400)
 #define OMAP34XX_EHCI_BASE	(L4_34XX_BASE + 0x64800)
-#define OMAP34XX_SR1_BASE	0x480C9000
-#define OMAP34XX_SR2_BASE	0x480CB000
 
 #define OMAP34XX_MAILBOX_BASE		(L4_34XX_BASE + 0x94000)