From ec797c16515f36d150b996c4d2671517499ec70a Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Thu, 19 Apr 2012 04:03:50 -0600 Subject: [PATCH] --- yaml --- r: 303015 b: refs/heads/master c: bec9381157159e654be16f69e4e8882ab4e609bd h: refs/heads/master i: 303013: 71e0d23c3591f9dbc10c836ceb0a42b709539905 303011: 234f712f8a7e31179e355e211511d3172e65e49f 303007: 0b2906a8ea6c5f5644bb45f7c2842e7128d570b7 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/omap_hwmod_2420_data.c | 4 ++-- trunk/arch/arm/mach-omap2/omap_hwmod_2430_data.c | 6 +++--- trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 6e1063261189..976dd2406a4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c0c27fdb10e15780af800d51711305f65665f25 +refs/heads/master: bec9381157159e654be16f69e4e8882ab4e609bd diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_2420_data.c index a6bde34e443a..3e8938005da8 100644 --- a/trunk/arch/arm/mach-omap2/omap_hwmod_2420_data.c +++ b/trunk/arch/arm/mach-omap2/omap_hwmod_2420_data.c @@ -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", diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_2430_data.c index 04a3885f4475..6a156a931097 100644 --- a/trunk/arch/arm/mach-omap2/omap_hwmod_2430_data.c +++ b/trunk/arch/arm/mach-omap2/omap_hwmod_2430_data.c @@ -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", diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index db86ce90c69f..ab229787639b 100644 --- a/trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -1098,7 +1098,7 @@ static struct omap_hwmod omap3xxx_timer11_hwmod = { .class = &omap3xxx_timer_hwmod_class, }; -/* timer12*/ +/* timer12 */ static struct omap_hwmod omap3xxx_timer12_hwmod; static struct omap_hwmod_irq_info omap3xxx_timer12_mpu_irqs[] = { { .irq = 95, }, @@ -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 = {