Commit 346e34ab authored by Hartley Sweeten's avatar Hartley Sweeten Committed by Russell King
Browse files

ARM: 5879/1: ep93xx: define magic numbers for pll1 and pll2 



Add defines for the pll register magic numbers that determine if
the pll's are bypassed and if pll2 is enabled.  Rename the clock
set registers to more closely match the datasheet.  Also, remove
the unnecessary braces since each conditional statement is a single
statement.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarRyan Mallon <ryan@bluewatersys.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1fbd972a

arch/arm/mach-ep93xx/clock.c

+12 −8
Original line number Diff line number Diff line
@@ -449,25 +449,29 @@ static int __init ep93xx_clock_init(void) 
	u32 value;

	int i;



	value = __raw_readl(EP93XX_SYSCON_CLOCK_SET1);

	if (!(value & 0x00800000)) {			/* PLL1 bypassed?  */

	/* Determine the bootloader configured pll1 rate */

	value = __raw_readl(EP93XX_SYSCON_CLKSET1);

	if (!(value & EP93XX_SYSCON_CLKSET1_NBYP1))

		clk_pll1.rate = clk_xtali.rate;

	} else {

	else

		clk_pll1.rate = calc_pll_rate(value);

	}



	/* Initialize the pll1 derived clocks */

	clk_f.rate = clk_pll1.rate / fclk_divisors[(value >> 25) & 0x7];

	clk_h.rate = clk_pll1.rate / hclk_divisors[(value >> 20) & 0x7];

	clk_p.rate = clk_h.rate / pclk_divisors[(value >> 18) & 0x3];

	ep93xx_dma_clock_init();



	/* Determine the bootloader configured pll2 rate */

	value = __raw_readl(EP93XX_SYSCON_CLOCK_SET2);

	if (!(value & 0x00080000)) {			/* PLL2 bypassed?  */

	if (!(value & EP93XX_SYSCON_CLKSET2_NBYP2))

		clk_pll2.rate = clk_xtali.rate;

	} else if (value & 0x00040000) {		/* PLL2 enabled?  */

	else if (value & EP93XX_SYSCON_CLKSET2_PLL2_EN)

		clk_pll2.rate = calc_pll_rate(value);

	} else {

	else

		clk_pll2.rate = 0;

	}



	/* Initialize the pll2 derived clocks */

	clk_usb_host.rate = clk_pll2.rate / (((value >> 28) & 0xf) + 1);



	pr_info("PLL1 running at %ld MHz, PLL2 at %ld MHz\n",

arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h

+5 −2
Original line number Diff line number Diff line
@@ -167,8 +167,11 @@ 
#define EP93XX_SYSCON_PWRCNT_DMA_M2P1	(1<<16)

#define EP93XX_SYSCON_HALT		EP93XX_SYSCON_REG(0x08)

#define EP93XX_SYSCON_STANDBY		EP93XX_SYSCON_REG(0x0c)

#define EP93XX_SYSCON_CLOCK_SET1	EP93XX_SYSCON_REG(0x20)

#define EP93XX_SYSCON_CLOCK_SET2	EP93XX_SYSCON_REG(0x24)

#define EP93XX_SYSCON_CLKSET1		EP93XX_SYSCON_REG(0x20)

#define EP93XX_SYSCON_CLKSET1_NBYP1	(1<<23)

#define EP93XX_SYSCON_CLKSET2		EP93XX_SYSCON_REG(0x24)

#define EP93XX_SYSCON_CLKSET2_NBYP2	(1<<19)

#define EP93XX_SYSCON_CLKSET2_PLL2_EN	(1<<18)

#define EP93XX_SYSCON_DEVCFG		EP93XX_SYSCON_REG(0x80)

#define EP93XX_SYSCON_DEVCFG_SWRST	(1<<31)

#define EP93XX_SYSCON_DEVCFG_D1ONG	(1<<30)

CRA Git | Maintained and supported by SUSTech CRA and CCSE