UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 6f3ab009a1 ("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: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Suman Anna 2018-02-12 19:32:40 -06:00 committed by Tony Lindgren
parent cc7e3fb641
commit 1cddc36458
13 changed files with 0 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-omap2/omap_hwmod_2420_data.c
View File

@ -14,7 +14,6 @@
*/ */
#include <linux/i2c-omap.h> #include <linux/i2c-omap.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include <linux/omap-dma.h> #include <linux/omap-dma.h>
#include "omap_hwmod.h" #include "omap_hwmod.h"

6
arch/arm/mach-omap2/omap_hwmod_2430_data.c
View File

@ -16,7 +16,6 @@
#include <linux/i2c-omap.h> #include <linux/i2c-omap.h>
#include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/asoc-ti-mcbsp.h>
#include <linux/platform_data/hsmmc-omap.h> #include <linux/platform_data/hsmmc-omap.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include <linux/omap-dma.h> #include <linux/omap-dma.h>
#include "omap_hwmod.h" #include "omap_hwmod.h"
@ -157,10 +156,6 @@ static struct omap_hwmod omap2430_mailbox_hwmod = {
}; };
/* mcspi3 */ /* mcspi3 */
static struct omap2_mcspi_dev_attr omap_mcspi3_dev_attr = {
.num_chipselect = 2,
};
static struct omap_hwmod omap2430_mcspi3_hwmod = { static struct omap_hwmod omap2430_mcspi3_hwmod = {
.name = "mcspi3", .name = "mcspi3",
.main_clk = "mcspi3_fck", .main_clk = "mcspi3_fck",
@ -172,7 +167,6 @@ static struct omap_hwmod omap2430_mcspi3_hwmod = {
}, },
}, },
.class = &omap2xxx_mcspi_class, .class = &omap2xxx_mcspi_class,
.dev_attr = &omap_mcspi3_dev_attr,
}; };
/* usbhsotg */ /* usbhsotg */

13
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
View File

@ -12,8 +12,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/omap-dma.h> #include <linux/omap-dma.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include "omap_hwmod.h" #include "omap_hwmod.h"
#include "omap_hwmod_common_data.h" #include "omap_hwmod_common_data.h"
#include "cm-regbits-24xx.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 = { struct omap_hwmod_class omap2xxx_mcspi_class = {
.name = "mcspi", .name = "mcspi",
.sysc = &omap2xxx_mcspi_sysc, .sysc = &omap2xxx_mcspi_sysc,
.rev = OMAP2_MCSPI_REV,
}; };
/* /*
@ -593,10 +590,6 @@ struct omap_hwmod omap2xxx_gpio4_hwmod = {
}; };
/* mcspi1 */ /* mcspi1 */
static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = {
.num_chipselect = 4,
};
struct omap_hwmod omap2xxx_mcspi1_hwmod = { struct omap_hwmod omap2xxx_mcspi1_hwmod = {
.name = "mcspi1", .name = "mcspi1",
.main_clk = "mcspi1_fck", .main_clk = "mcspi1_fck",
@ -608,14 +601,9 @@ struct omap_hwmod omap2xxx_mcspi1_hwmod = {
}, },
}, },
.class = &omap2xxx_mcspi_class, .class = &omap2xxx_mcspi_class,
.dev_attr = &omap_mcspi1_dev_attr,
}; };
/* mcspi2 */ /* mcspi2 */
static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = {
.num_chipselect = 2,
};
struct omap_hwmod omap2xxx_mcspi2_hwmod = { struct omap_hwmod omap2xxx_mcspi2_hwmod = {
.name = "mcspi2", .name = "mcspi2",
.main_clk = "mcspi2_fck", .main_clk = "mcspi2_fck",
@ -627,7 +615,6 @@ struct omap_hwmod omap2xxx_mcspi2_hwmod = {
}, },
}, },
.class = &omap2xxx_mcspi_class, .class = &omap2xxx_mcspi_class,
.dev_attr = &omap_mcspi2_dev_attr,
}; };
static struct omap_hwmod_class omap2xxx_counter_hwmod_class = { static struct omap_hwmod_class omap2xxx_counter_hwmod_class = {

2
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h
View File

@ -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_ehrpwm_hwmod_class;
extern struct omap_hwmod_class am33xx_spi_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_am33xx_reg(void);
void omap_hwmod_am43xx_reg(void); void omap_hwmod_am43xx_reg(void);

7
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
View File

@ -17,7 +17,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/platform_data/hsmmc-omap.h> #include <linux/platform_data/hsmmc-omap.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include "omap_hwmod.h" #include "omap_hwmod.h"
#include "i2c.h" #include "i2c.h"
#include "wd_timer.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 = { struct omap_hwmod_class am33xx_spi_hwmod_class = {
.name = "mcspi", .name = "mcspi",
.sysc = &am33xx_mcspi_sysc, .sysc = &am33xx_mcspi_sysc,
.rev = OMAP4_MCSPI_REV,
}; };
/* spi0 */ /* spi0 */
struct omap2_mcspi_dev_attr mcspi_attrib = {
.num_chipselect = 2,
};
struct omap_hwmod am33xx_spi0_hwmod = { struct omap_hwmod am33xx_spi0_hwmod = {
.name = "spi0", .name = "spi0",
.class = &am33xx_spi_hwmod_class, .class = &am33xx_spi_hwmod_class,
@ -896,7 +891,6 @@ struct omap_hwmod am33xx_spi0_hwmod = {
.modulemode = MODULEMODE_SWCTRL, .modulemode = MODULEMODE_SWCTRL,
}, },
}, },
.dev_attr = &mcspi_attrib,
}; };
/* spi1 */ /* spi1 */
@ -910,7 +904,6 @@ struct omap_hwmod am33xx_spi1_hwmod = {
.modulemode = MODULEMODE_SWCTRL, .modulemode = MODULEMODE_SWCTRL,
}, },
}, },
.dev_attr = &mcspi_attrib,
}; };
/* /*

2
arch/arm/mach-omap2/omap_hwmod_33xx_data.c
View File

@ -17,8 +17,6 @@
#include <linux/i2c-omap.h> #include <linux/i2c-omap.h>
#include "omap_hwmod.h" #include "omap_hwmod.h"
#include <linux/platform_data/spi-omap2-mcspi.h>
#include "omap_hwmod_common_data.h" #include "omap_hwmod_common_data.h"
#include "control.h" #include "control.h"

26
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
View File

@ -23,7 +23,6 @@
#include "l3_3xxx.h" #include "l3_3xxx.h"
#include "l4_3xxx.h" #include "l4_3xxx.h"
#include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/asoc-ti-mcbsp.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include "soc.h" #include "soc.h"
#include "omap_hwmod.h" #include "omap_hwmod.h"
@ -1189,14 +1188,9 @@ static struct omap_hwmod_class_sysconfig omap34xx_mcspi_sysc = {
static struct omap_hwmod_class omap34xx_mcspi_class = { static struct omap_hwmod_class omap34xx_mcspi_class = {
.name = "mcspi", .name = "mcspi",
.sysc = &omap34xx_mcspi_sysc, .sysc = &omap34xx_mcspi_sysc,
.rev = OMAP3_MCSPI_REV,
}; };
/* mcspi1 */ /* mcspi1 */
static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = {
.num_chipselect = 4,
};
static struct omap_hwmod omap34xx_mcspi1 = { static struct omap_hwmod omap34xx_mcspi1 = {
.name = "mcspi1", .name = "mcspi1",
.main_clk = "mcspi1_fck", .main_clk = "mcspi1_fck",
@ -1208,14 +1202,9 @@ static struct omap_hwmod omap34xx_mcspi1 = {
}, },
}, },
.class = &omap34xx_mcspi_class, .class = &omap34xx_mcspi_class,
.dev_attr = &omap_mcspi1_dev_attr,
}; };
/* mcspi2 */ /* mcspi2 */
static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = {
.num_chipselect = 2,
};
static struct omap_hwmod omap34xx_mcspi2 = { static struct omap_hwmod omap34xx_mcspi2 = {
.name = "mcspi2", .name = "mcspi2",
.main_clk = "mcspi2_fck", .main_clk = "mcspi2_fck",
@ -1227,16 +1216,9 @@ static struct omap_hwmod omap34xx_mcspi2 = {
}, },
}, },
.class = &omap34xx_mcspi_class, .class = &omap34xx_mcspi_class,
.dev_attr = &omap_mcspi2_dev_attr,
}; };
/* mcspi3 */ /* mcspi3 */
static struct omap2_mcspi_dev_attr omap_mcspi3_dev_attr = {
.num_chipselect = 2,
};
static struct omap_hwmod omap34xx_mcspi3 = { static struct omap_hwmod omap34xx_mcspi3 = {
.name = "mcspi3", .name = "mcspi3",
.main_clk = "mcspi3_fck", .main_clk = "mcspi3_fck",
@ -1248,16 +1230,9 @@ static struct omap_hwmod omap34xx_mcspi3 = {
}, },
}, },
.class = &omap34xx_mcspi_class, .class = &omap34xx_mcspi_class,
.dev_attr = &omap_mcspi3_dev_attr,
}; };
/* mcspi4 */ /* mcspi4 */
static struct omap2_mcspi_dev_attr omap_mcspi4_dev_attr = {
.num_chipselect = 1,
};
static struct omap_hwmod omap34xx_mcspi4 = { static struct omap_hwmod omap34xx_mcspi4 = {
.name = "mcspi4", .name = "mcspi4",
.main_clk = "mcspi4_fck", .main_clk = "mcspi4_fck",
@ -1269,7 +1244,6 @@ static struct omap_hwmod omap34xx_mcspi4 = {
}, },
}, },
.class = &omap34xx_mcspi_class, .class = &omap34xx_mcspi_class,
.dev_attr = &omap_mcspi4_dev_attr,
}; };
/* usbhsotg */ /* usbhsotg */

4
arch/arm/mach-omap2/omap_hwmod_43xx_data.c
View File

@ -14,7 +14,6 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <linux/platform_data/spi-omap2-mcspi.h>
#include "omap_hwmod.h" #include "omap_hwmod.h"
#include "omap_hwmod_33xx_43xx_common_data.h" #include "omap_hwmod_33xx_43xx_common_data.h"
#include "prcm43xx.h" #include "prcm43xx.h"
@ -237,7 +236,6 @@ static struct omap_hwmod am43xx_spi2_hwmod = {
.modulemode = MODULEMODE_SWCTRL, .modulemode = MODULEMODE_SWCTRL,
}, },
}, },
.dev_attr = &mcspi_attrib,
}; };
static struct omap_hwmod am43xx_spi3_hwmod = { static struct omap_hwmod am43xx_spi3_hwmod = {
@ -251,7 +249,6 @@ static struct omap_hwmod am43xx_spi3_hwmod = {
.modulemode = MODULEMODE_SWCTRL, .modulemode = MODULEMODE_SWCTRL,
}, },
}, },
.dev_attr = &mcspi_attrib,
}; };
static struct omap_hwmod am43xx_spi4_hwmod = { static struct omap_hwmod am43xx_spi4_hwmod = {
@ -265,7 +262,6 @@ static struct omap_hwmod am43xx_spi4_hwmod = {
.modulemode = MODULEMODE_SWCTRL, .modulemode = MODULEMODE_SWCTRL,
}, },
}, },
.dev_attr = &mcspi_attrib,
}; };
static struct omap_hwmod_opt_clk gpio4_opt_clks[] = { static struct omap_hwmod_opt_clk gpio4_opt_clks[] = {

22
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
View File

@ -27,7 +27,6 @@
#include <linux/omap-dma.h> #include <linux/omap-dma.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/asoc-ti-mcbsp.h>
#include "omap_hwmod.h" #include "omap_hwmod.h"
@ -1838,14 +1837,9 @@ static struct omap_hwmod_class_sysconfig omap44xx_mcspi_sysc = {
static struct omap_hwmod_class omap44xx_mcspi_hwmod_class = { static struct omap_hwmod_class omap44xx_mcspi_hwmod_class = {
.name = "mcspi", .name = "mcspi",
.sysc = &omap44xx_mcspi_sysc, .sysc = &omap44xx_mcspi_sysc,
.rev = OMAP4_MCSPI_REV,
}; };
/* mcspi1 */ /* mcspi1 */
static struct omap2_mcspi_dev_attr mcspi1_dev_attr = {
.num_chipselect = 4,
};
static struct omap_hwmod omap44xx_mcspi1_hwmod = { static struct omap_hwmod omap44xx_mcspi1_hwmod = {
.name = "mcspi1", .name = "mcspi1",
.class = &omap44xx_mcspi_hwmod_class, .class = &omap44xx_mcspi_hwmod_class,
@ -1858,14 +1852,9 @@ static struct omap_hwmod omap44xx_mcspi1_hwmod = {
.modulemode = MODULEMODE_SWCTRL, .modulemode = MODULEMODE_SWCTRL,
}, },
}, },
.dev_attr = &mcspi1_dev_attr,
}; };
/* mcspi2 */ /* mcspi2 */
static struct omap2_mcspi_dev_attr mcspi2_dev_attr = {
.num_chipselect = 2,
};
static struct omap_hwmod omap44xx_mcspi2_hwmod = { static struct omap_hwmod omap44xx_mcspi2_hwmod = {
.name = "mcspi2", .name = "mcspi2",
.class = &omap44xx_mcspi_hwmod_class, .class = &omap44xx_mcspi_hwmod_class,
@ -1878,14 +1867,9 @@ static struct omap_hwmod omap44xx_mcspi2_hwmod = {
.modulemode = MODULEMODE_SWCTRL, .modulemode = MODULEMODE_SWCTRL,
}, },
}, },
.dev_attr = &mcspi2_dev_attr,
}; };
/* mcspi3 */ /* mcspi3 */
static struct omap2_mcspi_dev_attr mcspi3_dev_attr = {
.num_chipselect = 2,
};
static struct omap_hwmod omap44xx_mcspi3_hwmod = { static struct omap_hwmod omap44xx_mcspi3_hwmod = {
.name = "mcspi3", .name = "mcspi3",
.class = &omap44xx_mcspi_hwmod_class, .class = &omap44xx_mcspi_hwmod_class,
@ -1898,14 +1882,9 @@ static struct omap_hwmod omap44xx_mcspi3_hwmod = {
.modulemode = MODULEMODE_SWCTRL, .modulemode = MODULEMODE_SWCTRL,
}, },
}, },
.dev_attr = &mcspi3_dev_attr,
}; };
/* mcspi4 */ /* mcspi4 */
static struct omap2_mcspi_dev_attr mcspi4_dev_attr = {
.num_chipselect = 1,
};
static struct omap_hwmod omap44xx_mcspi4_hwmod = { static struct omap_hwmod omap44xx_mcspi4_hwmod = {
.name = "mcspi4", .name = "mcspi4",
.class = &omap44xx_mcspi_hwmod_class, .class = &omap44xx_mcspi_hwmod_class,
@ -1918,7 +1897,6 @@ static struct omap_hwmod omap44xx_mcspi4_hwmod = {
.modulemode = MODULEMODE_SWCTRL, .modulemode = MODULEMODE_SWCTRL,
}, },
}, },
.dev_attr = &mcspi4_dev_attr,
}; };
/* /*

26
arch/arm/mach-omap2/omap_hwmod_54xx_data.c
View File

@ -23,7 +23,6 @@
#include <linux/i2c-omap.h> #include <linux/i2c-omap.h>
#include <linux/omap-dma.h> #include <linux/omap-dma.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/asoc-ti-mcbsp.h>
#include "omap_hwmod.h" #include "omap_hwmod.h"
@ -1123,15 +1122,9 @@ static struct omap_hwmod_class_sysconfig omap54xx_mcspi_sysc = {
static struct omap_hwmod_class omap54xx_mcspi_hwmod_class = { static struct omap_hwmod_class omap54xx_mcspi_hwmod_class = {
.name = "mcspi", .name = "mcspi",
.sysc = &omap54xx_mcspi_sysc, .sysc = &omap54xx_mcspi_sysc,
.rev = OMAP4_MCSPI_REV,
}; };
/* mcspi1 */ /* mcspi1 */
/* mcspi1 dev_attr */
static struct omap2_mcspi_dev_attr mcspi1_dev_attr = {
.num_chipselect = 4,
};
static struct omap_hwmod omap54xx_mcspi1_hwmod = { static struct omap_hwmod omap54xx_mcspi1_hwmod = {
.name = "mcspi1", .name = "mcspi1",
.class = &omap54xx_mcspi_hwmod_class, .class = &omap54xx_mcspi_hwmod_class,
@ -1144,15 +1137,9 @@ static struct omap_hwmod omap54xx_mcspi1_hwmod = {
.modulemode = MODULEMODE_SWCTRL, .modulemode = MODULEMODE_SWCTRL,
}, },
}, },
.dev_attr = &mcspi1_dev_attr,
}; };
/* mcspi2 */ /* mcspi2 */
/* mcspi2 dev_attr */
static struct omap2_mcspi_dev_attr mcspi2_dev_attr = {
.num_chipselect = 2,
};
static struct omap_hwmod omap54xx_mcspi2_hwmod = { static struct omap_hwmod omap54xx_mcspi2_hwmod = {
.name = "mcspi2", .name = "mcspi2",
.class = &omap54xx_mcspi_hwmod_class, .class = &omap54xx_mcspi_hwmod_class,
@ -1165,15 +1152,9 @@ static struct omap_hwmod omap54xx_mcspi2_hwmod = {
.modulemode = MODULEMODE_SWCTRL, .modulemode = MODULEMODE_SWCTRL,
}, },
}, },
.dev_attr = &mcspi2_dev_attr,
}; };
/* mcspi3 */ /* mcspi3 */
/* mcspi3 dev_attr */
static struct omap2_mcspi_dev_attr mcspi3_dev_attr = {
.num_chipselect = 2,
};
static struct omap_hwmod omap54xx_mcspi3_hwmod = { static struct omap_hwmod omap54xx_mcspi3_hwmod = {
.name = "mcspi3", .name = "mcspi3",
.class = &omap54xx_mcspi_hwmod_class, .class = &omap54xx_mcspi_hwmod_class,
@ -1186,15 +1167,9 @@ static struct omap_hwmod omap54xx_mcspi3_hwmod = {
.modulemode = MODULEMODE_SWCTRL, .modulemode = MODULEMODE_SWCTRL,
}, },
}, },
.dev_attr = &mcspi3_dev_attr,
}; };
/* mcspi4 */ /* mcspi4 */
/* mcspi4 dev_attr */
static struct omap2_mcspi_dev_attr mcspi4_dev_attr = {
.num_chipselect = 1,
};
static struct omap_hwmod omap54xx_mcspi4_hwmod = { static struct omap_hwmod omap54xx_mcspi4_hwmod = {
.name = "mcspi4", .name = "mcspi4",
.class = &omap54xx_mcspi_hwmod_class, .class = &omap54xx_mcspi_hwmod_class,
@ -1207,7 +1182,6 @@ static struct omap_hwmod omap54xx_mcspi4_hwmod = {
.modulemode = MODULEMODE_SWCTRL, .modulemode = MODULEMODE_SWCTRL,
}, },
}, },
.dev_attr = &mcspi4_dev_attr,
}; };
/* /*

26
arch/arm/mach-omap2/omap_hwmod_7xx_data.c
View File

@ -23,7 +23,6 @@
#include <linux/i2c-omap.h> #include <linux/i2c-omap.h>
#include <linux/omap-dma.h> #include <linux/omap-dma.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/asoc-ti-mcbsp.h>
#include "omap_hwmod.h" #include "omap_hwmod.h"
@ -1375,15 +1374,9 @@ static struct omap_hwmod_class_sysconfig dra7xx_mcspi_sysc = {
static struct omap_hwmod_class dra7xx_mcspi_hwmod_class = { static struct omap_hwmod_class dra7xx_mcspi_hwmod_class = {
.name = "mcspi", .name = "mcspi",
.sysc = &dra7xx_mcspi_sysc, .sysc = &dra7xx_mcspi_sysc,
.rev = OMAP4_MCSPI_REV,
}; };
/* mcspi1 */ /* mcspi1 */
/* mcspi1 dev_attr */
static struct omap2_mcspi_dev_attr mcspi1_dev_attr = {
.num_chipselect = 4,
};
static struct omap_hwmod dra7xx_mcspi1_hwmod = { static struct omap_hwmod dra7xx_mcspi1_hwmod = {
.name = "mcspi1", .name = "mcspi1",
.class = &dra7xx_mcspi_hwmod_class, .class = &dra7xx_mcspi_hwmod_class,
@ -1396,15 +1389,9 @@ static struct omap_hwmod dra7xx_mcspi1_hwmod = {
.modulemode = MODULEMODE_SWCTRL, .modulemode = MODULEMODE_SWCTRL,
}, },
}, },
.dev_attr = &mcspi1_dev_attr,
}; };
/* mcspi2 */ /* mcspi2 */
/* mcspi2 dev_attr */
static struct omap2_mcspi_dev_attr mcspi2_dev_attr = {
.num_chipselect = 2,
};
static struct omap_hwmod dra7xx_mcspi2_hwmod = { static struct omap_hwmod dra7xx_mcspi2_hwmod = {
.name = "mcspi2", .name = "mcspi2",
.class = &dra7xx_mcspi_hwmod_class, .class = &dra7xx_mcspi_hwmod_class,
@ -1417,15 +1404,9 @@ static struct omap_hwmod dra7xx_mcspi2_hwmod = {
.modulemode = MODULEMODE_SWCTRL, .modulemode = MODULEMODE_SWCTRL,
}, },
}, },
.dev_attr = &mcspi2_dev_attr,
}; };
/* mcspi3 */ /* mcspi3 */
/* mcspi3 dev_attr */
static struct omap2_mcspi_dev_attr mcspi3_dev_attr = {
.num_chipselect = 2,
};
static struct omap_hwmod dra7xx_mcspi3_hwmod = { static struct omap_hwmod dra7xx_mcspi3_hwmod = {
.name = "mcspi3", .name = "mcspi3",
.class = &dra7xx_mcspi_hwmod_class, .class = &dra7xx_mcspi_hwmod_class,
@ -1438,15 +1419,9 @@ static struct omap_hwmod dra7xx_mcspi3_hwmod = {
.modulemode = MODULEMODE_SWCTRL, .modulemode = MODULEMODE_SWCTRL,
}, },
}, },
.dev_attr = &mcspi3_dev_attr,
}; };
/* mcspi4 */ /* mcspi4 */
/* mcspi4 dev_attr */
static struct omap2_mcspi_dev_attr mcspi4_dev_attr = {
.num_chipselect = 1,
};
static struct omap_hwmod dra7xx_mcspi4_hwmod = { static struct omap_hwmod dra7xx_mcspi4_hwmod = {
.name = "mcspi4", .name = "mcspi4",
.class = &dra7xx_mcspi_hwmod_class, .class = &dra7xx_mcspi_hwmod_class,
@ -1459,7 +1434,6 @@ static struct omap_hwmod dra7xx_mcspi4_hwmod = {
.modulemode = MODULEMODE_SWCTRL, .modulemode = MODULEMODE_SWCTRL,
}, },
}, },
.dev_attr = &mcspi4_dev_attr,
}; };
/* /*

7
arch/arm/mach-omap2/omap_hwmod_81xx_data.c
View File

@ -18,7 +18,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/platform_data/hsmmc-omap.h> #include <linux/platform_data/hsmmc-omap.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include "omap_hwmod_common_data.h" #include "omap_hwmod_common_data.h"
#include "cm81xx.h" #include "cm81xx.h"
@ -1118,11 +1117,6 @@ static struct omap_hwmod_class_sysconfig dm816x_mcspi_sysc = {
static struct omap_hwmod_class dm816x_mcspi_class = { static struct omap_hwmod_class dm816x_mcspi_class = {
.name = "mcspi", .name = "mcspi",
.sysc = &dm816x_mcspi_sysc, .sysc = &dm816x_mcspi_sysc,
.rev = OMAP3_MCSPI_REV,
};
static struct omap2_mcspi_dev_attr dm816x_mcspi1_dev_attr = {
.num_chipselect = 4,
}; };
static struct omap_hwmod dm81xx_mcspi1_hwmod = { static struct omap_hwmod dm81xx_mcspi1_hwmod = {
@ -1136,7 +1130,6 @@ static struct omap_hwmod dm81xx_mcspi1_hwmod = {
}, },
}, },
.class = &dm816x_mcspi_class, .class = &dm816x_mcspi_class,
.dev_attr = &dm816x_mcspi1_dev_attr,
}; };
static struct omap_hwmod_ocp_if dm81xx_l4_ls__mcspi1 = { static struct omap_hwmod_ocp_if dm81xx_l4_ls__mcspi1 = {

8
include/linux/platform_data/spi-omap2-mcspi.h
View File

@ -2,10 +2,6 @@
#ifndef _OMAP2_MCSPI_H #ifndef _OMAP2_MCSPI_H
#define _OMAP2_MCSPI_H #define _OMAP2_MCSPI_H
#define OMAP2_MCSPI_REV 0
#define OMAP3_MCSPI_REV 1
#define OMAP4_MCSPI_REV 2
#define OMAP4_MCSPI_REG_OFFSET 0x100 #define OMAP4_MCSPI_REG_OFFSET 0x100
#define MCSPI_PINDIR_D0_IN_D1_OUT 0 #define MCSPI_PINDIR_D0_IN_D1_OUT 0
@ -17,10 +13,6 @@ struct omap2_mcspi_platform_config {
unsigned int pin_dir:1; unsigned int pin_dir:1;
}; };
struct omap2_mcspi_dev_attr {
unsigned short num_chipselect;
};
struct omap2_mcspi_device_config { struct omap2_mcspi_device_config {
unsigned turbo_mode:1; unsigned turbo_mode:1;