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

ARM: OMAP2+: Cleanup omap2_spi_dev_attr and other legacy data 



The omap2_spi_dev_attr data was used to supply instance-specific
data for legacy non-DT devices. The SPI legacy device support
including the usage of the hwmod class revision data has been
dropped in commit 6f3ab009 ("ARM: OMAP2+: Remove unused legacy
code for device init") 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 cc7e3fb6

arch/arm/mach-omap2/omap_hwmod_2420_data.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
 */



#include <linux/i2c-omap.h>

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

#include <linux/omap-dma.h>



#include "omap_hwmod.h"

arch/arm/mach-omap2/omap_hwmod_2430_data.c

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

#include <linux/platform_data/asoc-ti-mcbsp.h>

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

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

#include <linux/omap-dma.h>



#include "omap_hwmod.h"
@@ -157,10 +156,6 @@ static struct omap_hwmod omap2430_mailbox_hwmod = { 
};



/* mcspi3 */

static struct omap2_mcspi_dev_attr omap_mcspi3_dev_attr = {

	.num_chipselect = 2,

};



static struct omap_hwmod omap2430_mcspi3_hwmod = {

	.name		= "mcspi3",

	.main_clk	= "mcspi3_fck",
@@ -172,7 +167,6 @@ static struct omap_hwmod omap2430_mcspi3_hwmod = { 
		},

	},

	.class		= &omap2xxx_mcspi_class,

	.dev_attr	= &omap_mcspi3_dev_attr,

};



/* usbhsotg */

arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c

+0 −13
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ 
#include <linux/types.h>

#include <linux/omap-dma.h>



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



#include "omap_hwmod.h"

#include "omap_hwmod_common_data.h"

#include "cm-regbits-24xx.h"
@@ -159,7 +157,6 @@ static struct omap_hwmod_class_sysconfig omap2xxx_mcspi_sysc = { 
struct omap_hwmod_class omap2xxx_mcspi_class = {

	.name	= "mcspi",

	.sysc	= &omap2xxx_mcspi_sysc,

	.rev	= OMAP2_MCSPI_REV,

};



/*
@@ -593,10 +590,6 @@ struct omap_hwmod omap2xxx_gpio4_hwmod = { 
};



/* mcspi1 */

static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = {

	.num_chipselect = 4,

};



struct omap_hwmod omap2xxx_mcspi1_hwmod = {

	.name		= "mcspi1",

	.main_clk	= "mcspi1_fck",
@@ -608,14 +601,9 @@ struct omap_hwmod omap2xxx_mcspi1_hwmod = { 
		},

	},

	.class		= &omap2xxx_mcspi_class,

	.dev_attr	= &omap_mcspi1_dev_attr,

};



/* mcspi2 */

static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = {

	.num_chipselect = 2,

};



struct omap_hwmod omap2xxx_mcspi2_hwmod = {

	.name		= "mcspi2",

	.main_clk	= "mcspi2_fck",
@@ -627,7 +615,6 @@ struct omap_hwmod omap2xxx_mcspi2_hwmod = { 
		},

	},

	.class		= &omap2xxx_mcspi_class,

	.dev_attr	= &omap_mcspi2_dev_attr,

};



static struct omap_hwmod_class omap2xxx_counter_hwmod_class = {

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h

+0 −2
Original line number Diff line number Diff line
@@ -139,8 +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 omap2_mcspi_dev_attr mcspi_attrib;



void omap_hwmod_am33xx_reg(void);

void omap_hwmod_am43xx_reg(void);

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c

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



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

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

#include "omap_hwmod.h"

#include "i2c.h"

#include "wd_timer.h"
@@ -879,13 +878,9 @@ static struct omap_hwmod_class_sysconfig am33xx_mcspi_sysc = { 
struct omap_hwmod_class am33xx_spi_hwmod_class = {

	.name		= "mcspi",

	.sysc		= &am33xx_mcspi_sysc,

	.rev		= OMAP4_MCSPI_REV,

};



/* spi0 */

struct omap2_mcspi_dev_attr mcspi_attrib = {

	.num_chipselect	= 2,

};

struct omap_hwmod am33xx_spi0_hwmod = {

	.name		= "spi0",

	.class		= &am33xx_spi_hwmod_class,
@@ -896,7 +891,6 @@ struct omap_hwmod am33xx_spi0_hwmod = { 
			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

	.dev_attr	= &mcspi_attrib,

};



/* spi1 */
@@ -910,7 +904,6 @@ struct omap_hwmod am33xx_spi1_hwmod = { 
			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

	.dev_attr	= &mcspi_attrib,

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE