Commit 70451127 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Remove hwmod .rev data and use local SoC checks instead 



We can just check for omap2 and 3 for i2c and smartreflex locally.
The rest of the .rev data is already unused.

Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent b57250fa

arch/arm/mach-omap2/i2c.c

+3 −8
Original line number Original line Diff line number Diff line
@@ -53,15 +53,10 @@ int omap_i2c_reset(struct omap_hwmod *oh) 
	u16 i2c_con;

	u16 i2c_con;

	int c = 0;

	int c = 0;





	if (oh->class->rev == OMAP_I2C_IP_VERSION_2) {

	if (soc_is_omap24xx() || soc_is_omap34xx() || soc_is_am35xx())

		i2c_con = OMAP4_I2C_CON_OFFSET;

	} else if (oh->class->rev == OMAP_I2C_IP_VERSION_1) {

		i2c_con = OMAP2_I2C_CON_OFFSET;

		i2c_con = OMAP2_I2C_CON_OFFSET;

	} else {

	else

		WARN(1, "Cannot reset I2C block %s: unsupported revision\n",

		i2c_con = OMAP4_I2C_CON_OFFSET;

		     oh->name);

		return -EINVAL;

	}





	/* Disable I2C */

	/* Disable I2C */

	v = omap_hwmod_read(oh, i2c_con);

	v = omap_hwmod_read(oh, i2c_con);

arch/arm/mach-omap2/omap_hwmod.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -503,7 +503,6 @@ struct omap_hwmod_omap4_prcm { 
 * struct omap_hwmod_class - the type of an IP block

 * struct omap_hwmod_class - the type of an IP block

 * @name: name of the hwmod_class

 * @name: name of the hwmod_class

 * @sysc: device SYSCONFIG/SYSSTATUS register data

 * @sysc: device SYSCONFIG/SYSSTATUS register data

 * @rev: revision of the IP class

 * @pre_shutdown: ptr to fn to be executed immediately prior to device shutdown

 * @pre_shutdown: ptr to fn to be executed immediately prior to device shutdown

 * @reset: ptr to fn to be executed in place of the standard hwmod reset fn

 * @reset: ptr to fn to be executed in place of the standard hwmod reset fn

 * @enable_preprogram:  ptr to fn to be executed during device enable

 * @enable_preprogram:  ptr to fn to be executed during device enable
@@ -529,7 +528,6 @@ struct omap_hwmod_omap4_prcm { 
struct omap_hwmod_class {

struct omap_hwmod_class {

	const char				*name;

	const char				*name;

	struct omap_hwmod_class_sysconfig	*sysc;

	struct omap_hwmod_class_sysconfig	*sysc;

	u32					rev;

	int					(*pre_shutdown)(struct omap_hwmod *oh);

	int					(*pre_shutdown)(struct omap_hwmod *oh);

	int					(*reset)(struct omap_hwmod *oh);

	int					(*reset)(struct omap_hwmod *oh);

	int					(*enable_preprogram)(struct omap_hwmod *oh);

	int					(*enable_preprogram)(struct omap_hwmod *oh);

arch/arm/mach-omap2/omap_hwmod_2420_data.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -91,7 +91,6 @@ static struct omap_hwmod_class_sysconfig i2c_sysc = { 
static struct omap_hwmod_class i2c_class = {

static struct omap_hwmod_class i2c_class = {

	.name		= "i2c",

	.name		= "i2c",

	.sysc		= &i2c_sysc,

	.sysc		= &i2c_sysc,

	.rev		= OMAP_I2C_IP_VERSION_1,

	.reset		= &omap_i2c_reset,

	.reset		= &omap_i2c_reset,

};

};

arch/arm/mach-omap2/omap_hwmod_2430_data.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -68,7 +68,6 @@ static struct omap_hwmod_class_sysconfig i2c_sysc = { 
static struct omap_hwmod_class i2c_class = {

static struct omap_hwmod_class i2c_class = {

	.name		= "i2c",

	.name		= "i2c",

	.sysc		= &i2c_sysc,

	.sysc		= &i2c_sysc,

	.rev		= OMAP_I2C_IP_VERSION_1,

	.reset		= &omap_i2c_reset,

	.reset		= &omap_i2c_reset,

};

};

arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -96,7 +96,6 @@ static struct omap_hwmod_class_sysconfig omap2xxx_gpio_sysc = { 
struct omap_hwmod_class omap2xxx_gpio_hwmod_class = {

struct omap_hwmod_class omap2xxx_gpio_hwmod_class = {

	.name = "gpio",

	.name = "gpio",

	.sysc = &omap2xxx_gpio_sysc,

	.sysc = &omap2xxx_gpio_sysc,

	.rev = 0,

};

};





/* system dma */

/* system dma */

CRA Git | Maintained and supported by SUSTech CRA and CCSE