Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bec93811 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

ARM: OMAP2/3: hwmod data: update old names 



Some of the 2xxx and 3xxx hwmod data files use the old naming style
for hwmods, ending in a "_hwmod".  These names are used by the OMAP
integration code to map hwmods to platform_devices, so they need to be
consistent, or the platform_devices won't be created.  Remove the
_hwmod suffix to conform with the rest of the OMAP SoC data.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 6c0c27fd

arch/arm/mach-omap2/omap_hwmod_2420_data.c

+2 −2
Original line number Diff line number Diff line
@@ -1375,7 +1375,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = { 
};



static struct omap_hwmod omap2420_mcspi1_hwmod = {

	.name		= "mcspi1_hwmod",

	.name		= "mcspi1",

	.mpu_irqs	= omap2_mcspi1_mpu_irqs,

	.sdma_reqs	= omap2_mcspi1_sdma_reqs,

	.main_clk	= "mcspi1_fck",
@@ -1404,7 +1404,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = { 
};



static struct omap_hwmod omap2420_mcspi2_hwmod = {

	.name		= "mcspi2_hwmod",

	.name		= "mcspi2",

	.mpu_irqs	= omap2_mcspi2_mpu_irqs,

	.sdma_reqs	= omap2_mcspi2_sdma_reqs,

	.main_clk	= "mcspi2_fck",

arch/arm/mach-omap2/omap_hwmod_2430_data.c

+3 −3
Original line number Diff line number Diff line
@@ -1480,7 +1480,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = { 
};



static struct omap_hwmod omap2430_mcspi1_hwmod = {

	.name		= "mcspi1_hwmod",

	.name		= "mcspi1",

	.mpu_irqs	= omap2_mcspi1_mpu_irqs,

	.sdma_reqs	= omap2_mcspi1_sdma_reqs,

	.main_clk	= "mcspi1_fck",
@@ -1509,7 +1509,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = { 
};



static struct omap_hwmod omap2430_mcspi2_hwmod = {

	.name		= "mcspi2_hwmod",

	.name		= "mcspi2",

	.mpu_irqs	= omap2_mcspi2_mpu_irqs,

	.sdma_reqs	= omap2_mcspi2_sdma_reqs,

	.main_clk	= "mcspi2_fck",
@@ -1551,7 +1551,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi3_dev_attr = { 
};



static struct omap_hwmod omap2430_mcspi3_hwmod = {

	.name		= "mcspi3_hwmod",

	.name		= "mcspi3",

	.mpu_irqs	= omap2430_mcspi3_mpu_irqs,

	.sdma_reqs	= omap2430_mcspi3_sdma_reqs,

	.main_clk	= "mcspi3_fck",

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+5 −5
Original line number Diff line number Diff line
@@ -2683,7 +2683,7 @@ static struct omap_hwmod_ocp_if *omap3_sr1_slaves[] = { 
};



static struct omap_hwmod omap34xx_sr1_hwmod = {

	.name		= "sr1_hwmod",

	.name		= "sr1",

	.class		= &omap34xx_smartreflex_hwmod_class,

	.main_clk	= "sr1_fck",

	.prcm		= {
@@ -2703,7 +2703,7 @@ static struct omap_hwmod omap34xx_sr1_hwmod = { 
};



static struct omap_hwmod omap36xx_sr1_hwmod = {

	.name		= "sr1_hwmod",

	.name		= "sr1",

	.class		= &omap36xx_smartreflex_hwmod_class,

	.main_clk	= "sr1_fck",

	.prcm		= {
@@ -2731,7 +2731,7 @@ static struct omap_hwmod_ocp_if *omap3_sr2_slaves[] = { 
};



static struct omap_hwmod omap34xx_sr2_hwmod = {

	.name		= "sr2_hwmod",

	.name		= "sr2",

	.class		= &omap34xx_smartreflex_hwmod_class,

	.main_clk	= "sr2_fck",

	.prcm		= {
@@ -2751,7 +2751,7 @@ static struct omap_hwmod omap34xx_sr2_hwmod = { 
};



static struct omap_hwmod omap36xx_sr2_hwmod = {

	.name		= "sr2_hwmod",

	.name		= "sr2",

	.class		= &omap36xx_smartreflex_hwmod_class,

	.main_clk	= "sr2_fck",

	.prcm		= {