From 07354f8f533443ffb81ccdcf5787b7d5ddedbcde Mon Sep 17 00:00:00 2001
From: Madhusudhan Chikkature Rajashekar <madhu.cr@ti.com>
Date: Tue, 18 Dec 2007 16:30:18 +0530
Subject: [PATCH] Update OMAP2430/3430 MMC clk structures to use ID field

This patch updates the OMAP2430/3430 MMC clock structures to use the id field.

Signed-off-by: Madhusudhan Chikkature<madhu.cr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/clock24xx.h | 18 ++++++++++++------
 arch/arm/mach-omap2/clock34xx.h | 28 ++++++++++++++++------------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/arch/arm/mach-omap2/clock24xx.h b/arch/arm/mach-omap2/clock24xx.h
index d3e4b0cb7d0..49fff3c75f5 100644
--- a/arch/arm/mach-omap2/clock24xx.h
+++ b/arch/arm/mach-omap2/clock24xx.h
@@ -2380,7 +2380,8 @@ static struct clk usbhs_ick = {
 };
 
 static struct clk mmchs1_ick = {
-	.name		= "mmchs1_ick",
+	.name		= "mmchs_ick",
+	.id		= 1,
 	.parent		= &l4_ck,
 	.flags		= CLOCK_IN_OMAP243X,
 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
@@ -2389,7 +2390,8 @@ static struct clk mmchs1_ick = {
 };
 
 static struct clk mmchs1_fck = {
-	.name		= "mmchs1_fck",
+	.name		= "mmchs_fck",
+	.id		= 1,
 	.parent		= &func_96m_ck,
 	.flags		= CLOCK_IN_OMAP243X,
 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
@@ -2398,7 +2400,8 @@ static struct clk mmchs1_fck = {
 };
 
 static struct clk mmchs2_ick = {
-	.name		= "mmchs2_ick",
+	.name		= "mmchs_ick",
+	.id		= 2,
 	.parent		= &l4_ck,
 	.flags		= CLOCK_IN_OMAP243X,
 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
@@ -2407,7 +2410,8 @@ static struct clk mmchs2_ick = {
 };
 
 static struct clk mmchs2_fck = {
-	.name		= "mmchs2_fck",
+	.name		= "mmchs_fck",
+	.id		= 2,
 	.parent		= &func_96m_ck,
 	.flags		= CLOCK_IN_OMAP243X,
 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
@@ -2443,7 +2447,8 @@ static struct clk mdm_intc_ick = {
 };
 
 static struct clk mmchsdb1_fck = {
-	.name		= "mmchsdb1_fck",
+	.name		= "mmchsdb_fck",
+	.id		= 1,
 	.parent		= &func_32k_ck,
 	.flags		= CLOCK_IN_OMAP243X,
 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
@@ -2452,7 +2457,8 @@ static struct clk mmchsdb1_fck = {
 };
 
 static struct clk mmchsdb2_fck = {
-	.name		= "mmchsdb2_fck",
+	.name		= "mmchsdb_fck",
+	.id		= 2,
 	.parent		= &func_32k_ck,
 	.flags		= CLOCK_IN_OMAP243X,
 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
index 2a34c0c190a..968433f80e5 100644
--- a/arch/arm/mach-omap2/clock34xx.h
+++ b/arch/arm/mach-omap2/clock34xx.h
@@ -850,8 +850,9 @@ static struct clk core_96m_fck = {
 	.recalc		= &followparent_recalc,
 };
 
-static struct clk mmc2_fck = {
-	.name		= "mmc2_fck",
+static struct clk mmchs2_fck = {
+	.name		= "mmchs_fck",
+	.id		= 2,
 	.parent		= &core_96m_fck,
 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
 	.enable_bit	= OMAP3430_EN_MMC2_SHIFT,
@@ -868,8 +869,9 @@ static struct clk mspro_fck = {
 	.recalc		= &followparent_recalc,
 };
 
-static struct clk mmc1_fck = {
-	.name		= "mmc1_fck",
+static struct clk mmchs1_fck = {
+	.name		= "mmchs_fck",
+	.id		= 1,
 	.parent		= &core_96m_fck,
 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
 	.enable_bit	= OMAP3430_EN_MMC1_SHIFT,
@@ -1183,8 +1185,9 @@ static struct clk des2_ick = {
 	.recalc		= &followparent_recalc,
 };
 
-static struct clk mmc2_ick = {
-	.name		= "mmc2_ick",
+static struct clk mmchs2_ick = {
+	.name		= "mmchs_ick",
+	.id		= 2,
 	.parent		= &core_l4_ick,
 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
 	.enable_bit	= OMAP3430_EN_MMC2_SHIFT,
@@ -1192,8 +1195,9 @@ static struct clk mmc2_ick = {
 	.recalc		= &followparent_recalc,
 };
 
-static struct clk mmc1_ick = {
-	.name		= "mmc1_ick",
+static struct clk mmchs1_ick = {
+	.name		= "mmchs_ick",
+	.id		= 1,
 	.parent		= &core_l4_ick,
 	.enable_reg	= OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
 	.enable_bit	= OMAP3430_EN_MMC1_SHIFT,
@@ -2265,9 +2269,9 @@ static struct clk *onchip_34xx_clks[] __initdata = {
 	&gpt10_fck,
 	&gpt11_fck,
 	&core_96m_fck,
-	&mmc2_fck,
+	&mmchs2_fck,
 	&mspro_fck,
-	&mmc1_fck,
+	&mmchs1_fck,
 	&i2c3_fck,
 	&i2c2_fck,
 	&i2c1_fck,
@@ -2296,8 +2300,8 @@ static struct clk *onchip_34xx_clks[] __initdata = {
 	&aes2_ick,
 	&sha12_ick,
 	&des2_ick,
-	&mmc2_ick,
-	&mmc1_ick,
+	&mmchs2_ick,
+	&mmchs1_ick,
 	&mspro_ick,
 	&hdq_ick,
 	&mcspi4_ick,
-- 
2.41.1