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

Commit 96b1b29d authored by Paul Walmsley's avatar Paul Walmsley
Browse files

ARM: OMAP2+: HDQ1W: use omap_device 



Convert the old-style device registration code for HDQ1W to use
omap_device.  This will allow the driver to be converted to use PM
runtime and to take advantage of the OMAP IP block management
infrastructure (hwmod, PM, etc.).

A side benefit of this conversion is that it also makes the HDQ device
available on OMAP2420.  The previous code only enabled it on 2430 and
3430.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: NeilBrown <neilb@suse.de>
Tested-by: default avatarNeilBrown <neilb@suse.de>
parent 2acd0894

arch/arm/mach-omap2/devices.c

+0 −38
Original line number Diff line number Diff line
@@ -672,43 +672,6 @@ void __init omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data) 


#endif



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



#if defined(CONFIG_HDQ_MASTER_OMAP) || defined(CONFIG_HDQ_MASTER_OMAP_MODULE)

#define OMAP_HDQ_BASE	0x480B2000

static struct resource omap_hdq_resources[] = {

	{

		.start		= OMAP_HDQ_BASE,

		.end		= OMAP_HDQ_BASE + 0x1C,

		.flags		= IORESOURCE_MEM,

	},

	{

		.start		= INT_24XX_HDQ_IRQ,

		.flags		= IORESOURCE_IRQ,

	},

};

static struct platform_device omap_hdq_dev = {

	.name = "omap_hdq",

	.id = 0,

	.dev = {

		.platform_data = NULL,

	},

	.num_resources	= ARRAY_SIZE(omap_hdq_resources),

	.resource	= omap_hdq_resources,

};

static inline void omap_hdq_init(void)

{

	if (cpu_is_omap2420())

		return;



	platform_device_register(&omap_hdq_dev);

}

#else

static inline void omap_hdq_init(void) {}

#endif



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



#if defined(CONFIG_VIDEO_OMAP2_VOUT) || \

	defined(CONFIG_VIDEO_OMAP2_VOUT_MODULE)

#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
@@ -753,7 +716,6 @@ static int __init omap2_init_devices(void) 
		omap_init_mcspi();

	}

	omap_init_pmu();

	omap_hdq_init();

	omap_init_sti();

	omap_init_sham();

	omap_init_aes();

arch/arm/mach-omap2/hdq1w.c

+26 −0
Original line number Diff line number Diff line
@@ -22,7 +22,13 @@ 
 * 02110-1301 USA

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/err.h>

#include <linux/platform_device.h>



#include <plat/omap_hwmod.h>

#include <plat/omap_device.h>

#include <plat/hdq1w.h>



#include "common.h"
@@ -70,3 +76,23 @@ int omap_hdq1w_reset(struct omap_hwmod *oh) 


	return 0;

}



static int __init omap_init_hdq(void)

{

	int id = -1;

	struct platform_device *pdev;

	struct omap_hwmod *oh;

	char *oh_name = "hdq1w";

	char *devname = "omap_hdq";



	oh = omap_hwmod_lookup(oh_name);

	if (!oh)

		return 0;



	pdev = omap_device_build(devname, id, oh, NULL, 0, NULL, 0, 0);

	WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",

	     devname, oh->name);



	return 0;

}

arch_initcall(omap_init_hdq);