Commit f718e2c0 authored by Benoit Cousson's avatar Benoit Cousson Committed by Kevin Hilman
Browse files

ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures 



Remove all these duplicated structures since a default one is now
available.

Signed-off-by: default avatarBenoit Cousson <b-cousson@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent b7b5bc91

arch/arm/mach-omap2/devices.c

+4 −42
Original line number Diff line number Diff line
@@ -221,14 +221,6 @@ static inline void omap_init_camera(void) 
#endif

}



struct omap_device_pm_latency omap_keyboard_latency[] = {

	{

		.deactivate_func = omap_device_idle_hwmods,

		.activate_func   = omap_device_enable_hwmods,

		.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,

	},

};



int __init omap4_keyboard_init(struct omap4_keypad_platform_data

			*sdp4430_keypad_data, struct omap_board_data *bdata)

{
@@ -248,9 +240,7 @@ int __init omap4_keyboard_init(struct omap4_keypad_platform_data 
	keypad_data = sdp4430_keypad_data;



	pdev = omap_device_build(name, id, oh, keypad_data,

			sizeof(struct omap4_keypad_platform_data),

			omap_keyboard_latency,

			ARRAY_SIZE(omap_keyboard_latency), 0);

			sizeof(struct omap4_keypad_platform_data), NULL, 0, 0);



	if (IS_ERR(pdev)) {

		WARN(1, "Can't build omap_device for %s:%s.\n",
@@ -263,14 +253,6 @@ int __init omap4_keyboard_init(struct omap4_keypad_platform_data 
}



#if defined(CONFIG_OMAP_MBOX_FWK) || defined(CONFIG_OMAP_MBOX_FWK_MODULE)

static struct omap_device_pm_latency mbox_latencies[] = {

	[0] = {

		.activate_func = omap_device_enable_hwmods,

		.deactivate_func = omap_device_idle_hwmods,

		.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,

	},

};



static inline void omap_init_mbox(void)

{

	struct omap_hwmod *oh;
@@ -282,8 +264,7 @@ static inline void omap_init_mbox(void) 
		return;

	}



	pdev = omap_device_build("omap-mailbox", -1, oh, NULL, 0,

				mbox_latencies, ARRAY_SIZE(mbox_latencies), 0);

	pdev = omap_device_build("omap-mailbox", -1, oh, NULL, 0, NULL, 0, 0);

	WARN(IS_ERR(pdev), "%s: could not build device, err %ld\n",

						__func__, PTR_ERR(pdev));

}
@@ -334,14 +315,6 @@ static inline void omap_init_audio(void) {} 


#include <plat/mcspi.h>



struct omap_device_pm_latency omap_mcspi_latency[] = {

	[0] = {

		.deactivate_func = omap_device_idle_hwmods,

		.activate_func   = omap_device_enable_hwmods,

		.flags		 = OMAP_DEVICE_LATENCY_AUTO_ADJUST,

	},

};



static int omap_mcspi_init(struct omap_hwmod *oh, void *unused)

{

	struct platform_device *pdev;
@@ -372,8 +345,7 @@ static int omap_mcspi_init(struct omap_hwmod *oh, void *unused) 


	spi_num++;

	pdev = omap_device_build(name, spi_num, oh, pdata,

				sizeof(*pdata),	omap_mcspi_latency,

				ARRAY_SIZE(omap_mcspi_latency), 0);

				sizeof(*pdata),	NULL, 0, 0);

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

				name, oh->name);

	kfree(pdata);
@@ -698,14 +670,6 @@ static int __init omap2_init_devices(void) 
arch_initcall(omap2_init_devices);



#if defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE)

static struct omap_device_pm_latency omap_wdt_latency[] = {

	[0] = {

		.deactivate_func = omap_device_idle_hwmods,

		.activate_func   = omap_device_enable_hwmods,

		.flags		 = OMAP_DEVICE_LATENCY_AUTO_ADJUST,

	},

};



static int __init omap_init_wdt(void)

{

	int id = -1;
@@ -723,9 +687,7 @@ static int __init omap_init_wdt(void) 
		return -EINVAL;

	}



	pdev = omap_device_build(dev_name, id, oh, NULL, 0,

				omap_wdt_latency,

				ARRAY_SIZE(omap_wdt_latency), 0);

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

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

				dev_name, oh->name);

	return 0;

arch/arm/mach-omap2/display.c

+1 −10
Original line number Diff line number Diff line
@@ -35,14 +35,6 @@ static struct platform_device omap_display_device = { 
	},

};



static struct omap_device_pm_latency omap_dss_latency[] = {

	[0] = {

		.deactivate_func        = omap_device_idle_hwmods,

		.activate_func          = omap_device_enable_hwmods,

		.flags			= OMAP_DEVICE_LATENCY_AUTO_ADJUST,

	},

};



struct omap_dss_hwmod_data {

	const char *oh_name;

	const char *dev_name;
@@ -111,8 +103,7 @@ int __init omap_display_init(struct omap_dss_board_info *board_data) 
		pdev = omap_device_build(curr_dss_hwmod[i].dev_name,

				curr_dss_hwmod[i].id, oh, &pdata,

				sizeof(struct omap_display_platform_data),

				omap_dss_latency,

				ARRAY_SIZE(omap_dss_latency), 0);

				NULL, 0, 0);



		if (WARN((IS_ERR(pdev)), "Could not build omap_device for %s\n",

				curr_dss_hwmod[i].oh_name))

arch/arm/mach-omap2/dma.c

+1 −10
Original line number Diff line number Diff line
@@ -87,14 +87,6 @@ static u16 reg_map[] = { 
	[CCDN]			= 0xd8,

};



static struct omap_device_pm_latency omap2_dma_latency[] = {

	{

		.deactivate_func = omap_device_idle_hwmods,

		.activate_func	 = omap_device_enable_hwmods,

		.flags		 = OMAP_DEVICE_LATENCY_AUTO_ADJUST,

	},

};



static void __iomem *dma_base;

static inline void dma_write(u32 val, int reg, int lch)

{
@@ -258,8 +250,7 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused) 


	p->errata		= configure_dma_errata();



	pdev = omap_device_build(name, 0, oh, p, sizeof(*p),

			omap2_dma_latency, ARRAY_SIZE(omap2_dma_latency), 0);

	pdev = omap_device_build(name, 0, oh, p, sizeof(*p), NULL, 0, 0);

	kfree(p);

	if (IS_ERR(pdev)) {

		pr_err("%s: Can't build omap_device for %s:%s.\n",

arch/arm/mach-omap2/gpio.c

+1 −11
Original line number Diff line number Diff line
@@ -24,14 +24,6 @@ 
#include <plat/omap_hwmod.h>

#include <plat/omap_device.h>



static struct omap_device_pm_latency omap_gpio_latency[] = {

	[0] = {

		.deactivate_func = omap_device_idle_hwmods,

		.activate_func   = omap_device_enable_hwmods,

		.flags		 = OMAP_DEVICE_LATENCY_AUTO_ADJUST,

	},

};



static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)

{

	struct platform_device *pdev;
@@ -108,9 +100,7 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) 
	}



	pdev = omap_device_build(name, id - 1, oh, pdata,

				sizeof(*pdata),	omap_gpio_latency,

				ARRAY_SIZE(omap_gpio_latency),

				false);

				sizeof(*pdata),	NULL, 0, false);

	kfree(pdata);



	if (IS_ERR(pdev)) {

arch/arm/mach-omap2/hsmmc.c

+1 −17
Original line number Diff line number Diff line
@@ -409,31 +409,17 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c, 
	return 0;

}



static struct omap_device_pm_latency omap_hsmmc_latency[] = {

	[0] = {

		.deactivate_func = omap_device_idle_hwmods,

		.activate_func	 = omap_device_enable_hwmods,

		.flags		 = OMAP_DEVICE_LATENCY_AUTO_ADJUST,

	},

	/*

	 * XXX There should also be an entry here to power off/on the

	 * MMC regulators/PBIAS cells, etc.

	 */

};



#define MAX_OMAP_MMC_HWMOD_NAME_LEN		16



void __init omap_init_hsmmc(struct omap2_hsmmc_info *hsmmcinfo, int ctrl_nr)

{

	struct omap_hwmod *oh;

	struct platform_device *pdev;

	struct omap_device_pm_latency *ohl;

	char oh_name[MAX_OMAP_MMC_HWMOD_NAME_LEN];

	struct omap_mmc_platform_data *mmc_data;

	struct omap_mmc_dev_attr *mmc_dev_attr;

	char *name;

	int l;

	int ohl_cnt = 0;



	mmc_data = kzalloc(sizeof(struct omap_mmc_platform_data), GFP_KERNEL);

	if (!mmc_data) {
@@ -448,8 +434,6 @@ void __init omap_init_hsmmc(struct omap2_hsmmc_info *hsmmcinfo, int ctrl_nr) 
	omap_hsmmc_mux(mmc_data, (ctrl_nr - 1));



	name = "omap_hsmmc";

	ohl = omap_hsmmc_latency;

	ohl_cnt = ARRAY_SIZE(omap_hsmmc_latency);



	l = snprintf(oh_name, MAX_OMAP_MMC_HWMOD_NAME_LEN,

		     "mmc%d", ctrl_nr);
@@ -468,7 +452,7 @@ void __init omap_init_hsmmc(struct omap2_hsmmc_info *hsmmcinfo, int ctrl_nr) 
	}



	pdev = omap_device_build(name, ctrl_nr - 1, oh, mmc_data,

		sizeof(struct omap_mmc_platform_data), ohl, ohl_cnt, false);

		sizeof(struct omap_mmc_platform_data), NULL, 0, false);

	if (IS_ERR(pdev)) {

		WARN(1, "Can't build omap_device for %s:%s.\n", name, oh->name);

		kfree(mmc_data->slots[0].name);