OMAP clock: drop .id field; ensure each clock has a unique name

After the clkdev conversion, the struct clk.id field became
superfluous, so, drop it.  Bring the clock names closer to the TRMs
and ensure they are unique for debugfs.

Signed-off-by: Paul Walmsley <paul@pwsan.com>

1 files changed, 3 insertions, 7 deletions

diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c
index edefb3440d3..cea91cdf624 100644
--- a/arch/arm/mach-omap1/clock_data.c
+++ b/arch/arm/mach-omap1/clock_data.c
@@ -530,7 +530,7 @@ static struct clk bclk_16xx = {
 };
 
 static struct clk mmc1_ck = {
-        .name           = "mmc_ck",
+        .name           = "mmc1_ck",
         .ops            = &clkops_generic,
         /* Functional clock is direct from ULPD, interface clock is ARMPER */
         .parent         = &armper_ck.clk,
@@ -541,8 +541,7 @@ static struct clk mmc1_ck = {
 };
 
 static struct clk mmc2_ck = {
-        .name           = "mmc_ck",
-        .id             = 1,
+        .name           = "mmc2_ck",
         .ops            = &clkops_generic,
         /* Functional clock is direct from ULPD, interface clock is ARMPER */
         .parent         = &armper_ck.clk,
@@ -553,8 +552,7 @@ static struct clk mmc2_ck = {
 };
 
 static struct clk mmc3_ck = {
-        .name           = "mmc_ck",
-        .id             = 2,
+        .name           = "mmc3_ck",
         .ops            = &clkops_generic,
         /* Functional clock is direct from ULPD, interface clock is ARMPER */
         .parent         = &armper_ck.clk,
@@ -577,7 +575,6 @@ static struct clk virtual_ck_mpu = {
 remains active during MPU idle whenever this is enabled */
 static struct clk i2c_fck = {
         .name           = "i2c_fck",
-        .id             = 1,
         .ops            = &clkops_null,
         .flags          = CLOCK_NO_IDLE_PARENT,
         .parent         = &armxor_ck.clk,
@@ -586,7 +583,6 @@ static struct clk i2c_fck = {
 
 static struct clk i2c_ick = {
         .name           = "i2c_ick",
-        .id             = 1,
         .ops            = &clkops_null,
         .flags          = CLOCK_NO_IDLE_PARENT,
         .parent         = &armper_ck.clk,