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

Commit 459bc971 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Tony Lindgren
Browse files

ARM: OMAP: ocp2scp: create omap device for ocp2scp 



Platfrom device for ocp2scp is created using omap_device_build in
devices file. This is used for both omap4(musb) and omap5(dwc3).

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>
[tony@atomide.com: updated comments for regression info]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 637874dd

arch/arm/mach-omap2/devices.c

+79 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/of.h>

#include <linux/pinctrl/machine.h>

#include <linux/platform_data/omap4-keypad.h>

#include <linux/platform_data/omap_ocp2scp.h>



#include <asm/mach-types.h>

#include <asm/mach/map.h>
@@ -613,6 +614,83 @@ static void omap_init_vout(void) 
static inline void omap_init_vout(void) {}

#endif



#if defined(CONFIG_OMAP_OCP2SCP) || defined(CONFIG_OMAP_OCP2SCP_MODULE)

static int count_ocp2scp_devices(struct omap_ocp2scp_dev *ocp2scp_dev)

{

	int cnt	= 0;



	while (ocp2scp_dev->drv_name != NULL) {

		cnt++;

		ocp2scp_dev++;

	}



	return cnt;

}



static void omap_init_ocp2scp(void)

{

	struct omap_hwmod	*oh;

	struct platform_device	*pdev;

	int			bus_id = -1, dev_cnt = 0, i;

	struct omap_ocp2scp_dev	*ocp2scp_dev;

	const char		*oh_name, *name;

	struct omap_ocp2scp_platform_data *pdata;



	if (!cpu_is_omap44xx())

		return;



	oh_name = "ocp2scp_usb_phy";

	name	= "omap-ocp2scp";



	oh = omap_hwmod_lookup(oh_name);

	if (!oh) {

		pr_err("%s: could not find omap_hwmod for %s\n", __func__,

								oh_name);

		return;

	}



	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);

	if (!pdata) {

		pr_err("%s: No memory for ocp2scp pdata\n", __func__);

		return;

	}



	ocp2scp_dev = oh->dev_attr;

	dev_cnt = count_ocp2scp_devices(ocp2scp_dev);



	if (!dev_cnt) {

		pr_err("%s: No devices connected to ocp2scp\n", __func__);

		kfree(pdata);

		return;

	}



	pdata->devices = kzalloc(sizeof(struct omap_ocp2scp_dev *)

					* dev_cnt, GFP_KERNEL);

	if (!pdata->devices) {

		pr_err("%s: No memory for ocp2scp pdata devices\n", __func__);

		kfree(pdata);

		return;

	}



	for (i = 0; i < dev_cnt; i++, ocp2scp_dev++)

		pdata->devices[i] = ocp2scp_dev;



	pdata->dev_cnt	= dev_cnt;



	pdev = omap_device_build(name, bus_id, oh, pdata, sizeof(*pdata), NULL,

								0, false);

	if (IS_ERR(pdev)) {

		pr_err("Could not build omap_device for %s %s\n",

						name, oh_name);

		kfree(pdata->devices);

		kfree(pdata);

		return;

	}

}

#else

static inline void omap_init_ocp2scp(void) { }

#endif



/*-------------------------------------------------------------------------*/



static int __init omap2_init_devices(void)
@@ -640,6 +718,7 @@ static int __init omap2_init_devices(void) 
	omap_init_sham();

	omap_init_aes();

	omap_init_vout();

	omap_init_ocp2scp();



	return 0;

}