Skip to contentSkip to conversation

ep93xx: fix broken build of clock.c

PATCH New H Hartley Sweeten 2 participants 2 messages Feb 22, 2010 – Feb 23, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ep93xx: fix broken build of clock.c

Patch 5879/1: ep93xx: define magic numbers for pll1 and pll2 broke the ep93xx build due to one missing rename of EP93XX_SYSCON_CLOCK_SET2. The correct name should be EP93XX_SYSCON_CLKSET2.

---

arch/arm/mach-ep93xx/clock.c +1 -1
index e894ee0..5f80092 100644
@@ -462,7 +462,7 @@ static int __init ep93xx_clock_init(void)
 	ep93xx_dma_clock_init();
 
 	/* Determine the bootloader configured pll2 rate */
-	value = __raw_readl(EP93XX_SYSCON_CLOCK_SET2);
+	value = __raw_readl(EP93XX_SYSCON_CLKSET2);
 	if (!(value & EP93XX_SYSCON_CLKSET2_NBYP2))
 		clk_pll2.rate = clk_xtali.rate;
 	else if (value & EP93XX_SYSCON_CLKSET2_PLL2_EN)
#1 lore raw

PATCH 1/1 ep93xx: fix broken build of clock.c

Quoted 14 lines · H Hartley Sweeten

Patch 5879/1: ep93xx: define magic numbers for pll1 and pll2 broke the ep93xx build due to one missing rename of EP93XX_SYSCON_CLOCK_SET2. The correct name should be EP93XX_SYSCON_CLKSET2.

---

arch/arm/mach-ep93xx/clock.c +0 -0
index e894ee0..5f80092 100644

arch/arm/mach-ep93xx/clock.c static int __init ep93xx_clock_init(void) · line 468

Quoted 8 lines
arch/arm/mach-ep93xx/clock.c +1 -1
@@ -462,7 +462,7 @@ static int __init ep93xx_clock_init(void)
 	ep93xx_dma_clock_init();
 
 	/* Determine the bootloader configured pll2 rate */
-	value = __raw_readl(EP93XX_SYSCON_CLOCK_SET2);
+	value = __raw_readl(EP93XX_SYSCON_CLKSET2);
 	if (!(value & EP93XX_SYSCON_CLKSET2_NBYP2))
 		clk_pll2.rate = clk_xtali.rate;
 	else if (value & EP93XX_SYSCON_CLKSET2_PLL2_EN)

This fixes a build failure, and has been compile and boot tested.

Signature · 7 lines
Bluewater Systems Ltd - ARM Technology Solution Centre

Ryan Mallon         		5 Amuri Park, 404 Barbadoes St
ryan at bluewatersys.com         	PO Box 13 889, Christchurch 8013
http://www.bluewatersys.com	New Zealand
Phone: +64 3 3779127		Freecall: Australia 1800 148 751
Fax:   +64 3 3779135			  USA 1800 261 2934