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

Commit 637874dd authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Tony Lindgren
Browse files

ARM: OMAP4: add _dev_attr_ to ocp2scp for representing usb_phy 



In order to reflect devices(usb_phy) attached to ocp2scp bus, ocp2scp
is assigned a device attribute to represent the attached devices.

This is needed to fix MUSB regression caused by commit c9e4412a
(arm: omap: phy: remove unused functions from omap-phy-internal.c)

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
[tony@atomide.com: updated comments for regression info]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 0133370f

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+28 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/io.h>

#include <linux/platform_data/gpio-omap.h>

#include <linux/power/smartreflex.h>

#include <linux/platform_data/omap_ocp2scp.h>



#include <plat/omap_hwmod.h>

#include <plat/i2c.h>
@@ -2681,6 +2682,32 @@ static struct omap_hwmod_class omap44xx_ocp2scp_hwmod_class = { 
	.sysc	= &omap44xx_ocp2scp_sysc,

};



/* ocp2scp dev_attr */

static struct resource omap44xx_usb_phy_and_pll_addrs[] = {

	{

		.name		= "usb_phy",

		.start		= 0x4a0ad080,

		.end		= 0x4a0ae000,

		.flags		= IORESOURCE_MEM,

	},

	{

		/* XXX: Remove this once control module driver is in place */

		.name		= "ctrl_dev",

		.start		= 0x4a002300,

		.end		= 0x4a002303,

		.flags		= IORESOURCE_MEM,

	},

	{ }

};



static struct omap_ocp2scp_dev ocp2scp_dev_attr[] = {

	{

		.drv_name       = "omap-usb2",

		.res		= omap44xx_usb_phy_and_pll_addrs,

	},

	{ }

};



/* ocp2scp_usb_phy */

static struct omap_hwmod omap44xx_ocp2scp_usb_phy_hwmod = {

	.name		= "ocp2scp_usb_phy",
@@ -2694,6 +2721,7 @@ static struct omap_hwmod omap44xx_ocp2scp_usb_phy_hwmod = { 
			.modulemode   = MODULEMODE_HWCTRL,

		},

	},

	.dev_attr	= ocp2scp_dev_attr,

};



/*