Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 725bf9dc authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Simon Horman
Browse files

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: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent bb6e7d61

arch/arm/mach-shmobile/setup-r8a7779.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -391,7 +391,7 @@ static struct platform_device sata_device = { 
/* USB PHY */

/* USB PHY */

static struct resource usb_phy_resources[] = {

static struct resource usb_phy_resources[] = {

	[0] = {

	[0] = {

		.start		= 0xffe70000,

		.start		= 0xffe70800,

		.end		= 0xffe70900 - 1,

		.end		= 0xffe70900 - 1,

		.flags		= IORESOURCE_MEM,

		.flags		= IORESOURCE_MEM,

	},

	},

drivers/usb/phy/phy-rcar-usb.c

+10 −18
Original line number Original line Diff line number Diff line
@@ -16,13 +16,13 @@ 
#include <linux/spinlock.h>

#include <linux/spinlock.h>

#include <linux/module.h>

#include <linux/module.h>





/* USBH common register */

/* REGS block */

#define USBPCTRL0	0x0800

#define USBPCTRL0	0x00

#define USBPCTRL1	0x0804

#define USBPCTRL1	0x04

#define USBST		0x0808

#define USBST		0x08

#define USBEH0		0x080C

#define USBEH0		0x0C

#define USBOH0		0x081C

#define USBOH0		0x1C

#define USBCTL0		0x0858

#define USBCTL0		0x58





/* USBPCTRL1 */

/* USBPCTRL1 */

#define PHY_RST		(1 << 2)

#define PHY_RST		(1 << 2)
@@ -139,17 +139,9 @@ static int rcar_usb_phy_probe(struct platform_device *pdev) 
		return -EINVAL;

		return -EINVAL;

	}

	}





	/*

	reg0 = devm_ioremap_resource(dev, res0);

	 * CAUTION

	if (IS_ERR(reg0))

	 *

		return PTR_ERR(reg0);

	 * Because this phy address is also mapped under OHCI/EHCI address area,

	 * this driver can't use devm_request_and_ioremap(dev, res) here

	 */

	reg0 = devm_ioremap_nocache(dev, res0->start, resource_size(res0));

	if (!reg0) {

		dev_err(dev, "ioremap error\n");

		return -ENOMEM;

	}





	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

	if (!priv) {

	if (!priv) {