Skip to contentSkip to conversation

ARM: omap4: rename gpmc clock to gpmc_ick

PATCH New Jan Weitzel 3 participants 4 messages Jul 5, 2011

Subsystems (5)
Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP power management support +1 more subsystems
lore
Share & tools
lore

Jan Weitzel

author
#0 lore raw

PATCH 1/1 ARM: omap4: rename gpmc clock to gpmc_ick

The gpmc clock on omap44xx is called gpmc_ick not gpmc_ck in clock44xx_data.c

Signed-off-by Jan Weitzel <[email protected]>
---
 arch/arm/mach-omap2/gpmc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/gpmc.c +1 -1
index 130034b..34bcd17 100644
@@ -708,7 +708,7 @@ static int __init gpmc_init(void)
 		l = OMAP34XX_GPMC_BASE;
 		gpmc_irq = INT_34XX_GPMC_IRQ;
 	} else if (cpu_is_omap44xx()) {
-		ck = "gpmc_ck";
+		ck = "gpmc_ick";
 		l = OMAP44XX_GPMC_BASE;
 		gpmc_irq = OMAP44XX_IRQ_GPMC;
 	}
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 ARM: omap4: rename gpmc clock to gpmc_ick

+ Benoit

Quoted 4 lines · Jan Weitzel

The gpmc clock on omap44xx is called gpmc_ick not gpmc_ck in clock44xx_data.c

Signed-off-by Jan Weitzel<[email protected]>

This happened after renaming the clock-nodes some time back. Looks good to me as a fix though in long run GPMC should be moved to hwmod to avoid such naming issues

Quoted 17 lines
---
  arch/arm/mach-omap2/gpmc.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/gpmc.c +1 -1
index 130034b..34bcd17 100644
@@ -708,7 +708,7 @@ static int __init gpmc_init(void)
  		l = OMAP34XX_GPMC_BASE;
  		gpmc_irq = INT_34XX_GPMC_IRQ;
  	} else if (cpu_is_omap44xx()) {
-		ck = "gpmc_ck";
+		ck = "gpmc_ick";
  		l = OMAP44XX_GPMC_BASE;
  		gpmc_irq = OMAP44XX_IRQ_GPMC;
  	}
#2 lore raw

PATCH 1/1 ARM: omap4: rename gpmc clock to gpmc_ick

Quoted 10 lines · Santosh Shilimkar

+ Benoit

Quoted 4 lines · Jan Weitzel

The gpmc clock on omap44xx is called gpmc_ick not gpmc_ck in clock44xx_data.c

Signed-off-by Jan Weitzel<[email protected]>

This happened after renaming the clock-nodes some time back. Looks good to me as a fix though in long run GPMC should be moved to hwmod to avoid such naming issues

In fact, Benoit has already done it[1] as part of his last series:
[PATCH v2 0/4] OMAP4: Add modulemode support to hwmod framework (part 2)

Kevin

[1] http://marc.info/?l=linux-omap&m=130955728217211&w=2

#3 lore raw

PATCH 1/1 ARM: omap4: rename gpmc clock to gpmc_ick

Quoted 8 lines · Kevin Hilman
Quoted 6 lines · Santosh Shilimkar

+ Benoit

Quoted 3 lines · Jan Weitzel

The gpmc clock on omap44xx is called gpmc_ick not gpmc_ck in clock44xx_data.c

Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Jan Weitzel<[email protected]>

This happened after renaming the clock-nodes some time back. Looks good to me as a fix though in long run GPMC should be moved to hwmod to avoid such naming issues

In fact, Benoit has already done it[1] as part of his last series:
[PATCH v2 0/4] OMAP4: Add modulemode support to hwmod framework (part 2)

Ohh yes. I remember now about the discussion with him on the GPMC patch which he did as a followup patch to mine similar clock framework patch [1]

Thanks for the link.

Regards
Santosh
[1] https://patchwork.kernel.org/patch/937422/