Commit a0e37da2 authored by Suman Anna's avatar Suman Anna Committed by Tony Lindgren
Browse files

ARM: OMAP2+: Cleanup omap_gpio_dev_attr usage 



The omap_gpio_dev_attr data was used to supply instance-specific
data for legacy non-DT devices. The GPIO legacy device support has
been cleaned up in commit 14944934 ("ARM: OMAP2+: Remove legacy
gpio code") a while ago and this data is therefore no longer needed.
So, cleanup the structure and all the associated data in various
hwmod data files.

Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent ddd6a9d9

arch/arm/mach-omap2/omap_hwmod_2430_data.c

+0 −1
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ static struct omap_hwmod omap2430_gpio5_hwmod = { 
		},

	},

	.class		= &omap2xxx_gpio_hwmod_class,

	.dev_attr	= &omap2xxx_gpio_dev_attr,

};



/* dma attributes */

arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c

+1 −12
Original line number Diff line number Diff line
@@ -10,9 +10,8 @@ 
 */



#include <linux/types.h>



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

#include <linux/omap-dma.h>



#include <plat/dmtimer.h>

#include <linux/platform_data/spi-omap2-mcspi.h>
@@ -570,12 +569,6 @@ struct omap_hwmod omap2xxx_dss_venc_hwmod = { 
	.flags		= HWMOD_NO_IDLEST,

};



/* gpio dev_attr */

struct omap_gpio_dev_attr omap2xxx_gpio_dev_attr = {

	.bank_width = 32,

	.dbck_flag = false,

};



/* gpio1 */

struct omap_hwmod omap2xxx_gpio1_hwmod = {

	.name		= "gpio1",
@@ -589,7 +582,6 @@ struct omap_hwmod omap2xxx_gpio1_hwmod = { 
		},

	},

	.class		= &omap2xxx_gpio_hwmod_class,

	.dev_attr	= &omap2xxx_gpio_dev_attr,

};



/* gpio2 */
@@ -605,7 +597,6 @@ struct omap_hwmod omap2xxx_gpio2_hwmod = { 
		},

	},

	.class		= &omap2xxx_gpio_hwmod_class,

	.dev_attr	= &omap2xxx_gpio_dev_attr,

};



/* gpio3 */
@@ -621,7 +612,6 @@ struct omap_hwmod omap2xxx_gpio3_hwmod = { 
		},

	},

	.class		= &omap2xxx_gpio_hwmod_class,

	.dev_attr	= &omap2xxx_gpio_dev_attr,

};



/* gpio4 */
@@ -637,7 +627,6 @@ struct omap_hwmod omap2xxx_gpio4_hwmod = { 
		},

	},

	.class		= &omap2xxx_gpio_hwmod_class,

	.dev_attr	= &omap2xxx_gpio_dev_attr,

};



/* mcspi1 */

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h

+0 −1
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ extern struct omap_hwmod_class am33xx_epwmss_hwmod_class; 
extern struct omap_hwmod_class am33xx_ehrpwm_hwmod_class;

extern struct omap_hwmod_class am33xx_spi_hwmod_class;



extern struct omap_gpio_dev_attr gpio_dev_attr;

extern struct omap2_mcspi_dev_attr mcspi_attrib;



void omap_hwmod_am33xx_reg(void);

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c

+0 −9
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


#include <linux/types.h>



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

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

#include <linux/platform_data/spi-omap2-mcspi.h>

#include "omap_hwmod.h"
@@ -539,11 +538,6 @@ struct omap_hwmod_class am33xx_gpio_hwmod_class = { 
	.rev		= 2,

};



struct omap_gpio_dev_attr gpio_dev_attr = {

	.bank_width	= 32,

	.dbck_flag	= true,

};



/* gpio1 */

static struct omap_hwmod_opt_clk gpio1_opt_clks[] = {

	{ .role = "dbclk", .clk = "gpio1_dbclk" },
@@ -562,7 +556,6 @@ struct omap_hwmod am33xx_gpio1_hwmod = { 
	},

	.opt_clks	= gpio1_opt_clks,

	.opt_clks_cnt	= ARRAY_SIZE(gpio1_opt_clks),

	.dev_attr	= &gpio_dev_attr,

};



/* gpio2 */
@@ -583,7 +576,6 @@ struct omap_hwmod am33xx_gpio2_hwmod = { 
	},

	.opt_clks	= gpio2_opt_clks,

	.opt_clks_cnt	= ARRAY_SIZE(gpio2_opt_clks),

	.dev_attr	= &gpio_dev_attr,

};



/* gpio3 */
@@ -604,7 +596,6 @@ struct omap_hwmod am33xx_gpio3_hwmod = { 
	},

	.opt_clks	= gpio3_opt_clks,

	.opt_clks_cnt	= ARRAY_SIZE(gpio3_opt_clks),

	.dev_attr	= &gpio_dev_attr,

};



/* gpmc */

arch/arm/mach-omap2/omap_hwmod_33xx_data.c

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/i2c-omap.h>



#include "omap_hwmod.h"

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

#include <linux/platform_data/spi-omap2-mcspi.h>



#include "omap_hwmod_common_data.h"
@@ -252,7 +251,6 @@ static struct omap_hwmod am33xx_gpio0_hwmod = { 
	},

	.opt_clks	= gpio0_opt_clks,

	.opt_clks_cnt	= ARRAY_SIZE(gpio0_opt_clks),

	.dev_attr	= &gpio_dev_attr,

};



/* lcdc */

CRA Git | Maintained and supported by SUSTech CRA and CCSE