| From 235de170447eb60b37d382d9ac5166df505bc41c Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Sun, 2 Jun 2013 01:50:25 +0400 |
| Subject: phy-rcar-usb: correct base address |
| |
| The memory region that is used by the driver overlaps EHCI and OHCI register |
| regions for absolutely no reason now -- fix it by adding offset of 0x800 to |
| the base address, changing the register #define's accordingly. This has extra |
| positive effect that we now can use devm_ioremap_resource()... |
| |
| Note that the driver and the SoC code have to be in one patch to keep the code |
| bisectable... |
| |
| The patch has been tested on the Marzen board. |
| |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Acked-by: Felipe Balbi <balbi@ti.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 725bf9dcafe16aa69c8ab34c63ba36c6eb4492f2) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| drivers/usb/phy/phy-rcar-usb.c |
| --- |
| arch/arm/mach-shmobile/setup-r8a7779.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c |
| index ef40d326..64ff4dc4 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a7779.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a7779.c |
| @@ -391,7 +391,7 @@ static struct platform_device sata_device = { |
| /* USB PHY */ |
| static struct resource usb_phy_resources[] = { |
| [0] = { |
| - .start = 0xffe70000, |
| + .start = 0xffe70800, |
| .end = 0xffe70900 - 1, |
| .flags = IORESOURCE_MEM, |
| }, |
| -- |
| 1.8.4.3.gca3854a |
| |
