Skip to contentSkip to conversation

LPC32XX arch updates from developer comments

PATCH New wellsk40 at gmail.com 4 participants 25 messages Feb 2, 2010 – Feb 4, 2010 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): LPC32XX architecture files (updated)

#1 lore raw

This patch series fixes (mostly) non-technical issues with sparse, type checking, and naming conventions. This patchset builds on the previously send patchset.

#2 lore raw

PATCH 1/16 ARM: LPC32XX: clock lookups array should not be tagged __initdata

In reply to a message not in the archive

From: Kevin Wells <[email protected]>

struct clk looksup[] should not be tagged with the __initdata attribute so system functions after bootup can use the clkdev support.

---
 arch/arm/mach-lpc32xx/clock.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-lpc32xx/clock.c +1 -1
index 615c091..d404b67 100644
@@ -959,7 +959,7 @@ EXPORT_SYMBOL(clk_get_parent);
 		.clk = &(c), \
 	},
 
-static struct clk_lookup lookups[] __initdata = {
+static struct clk_lookup lookups[] = {
 	_REGISTER_CLOCK(NULL, "osc_32KHz", osc_32KHz)
 	_REGISTER_CLOCK(NULL, "osc_pll397", osc_pll397)
 	_REGISTER_CLOCK(NULL, "osc_main", osc_main)
Signature · 1 line
1.6.6
#3 lore raw

PATCH 1/16 ARM: LPC32XX: clock lookups array should not be tagged __initdata

Quoted 5 lines · On Tue, Feb 02, 2010 at 03:59:13PM -0800, wellsk40 at gmail.com wrote:

From: Kevin Wells <[email protected]>

struct clk looksup[] should not be tagged with the __initdata attribute so system functions after bootup can use the clkdev support.

Can you roll this into your previous patch set please?

#4 lore raw

PATCH 1/16 ARM: LPC32XX: clock lookups array should not be tagged __initdata

Quoted 9 lines · On Tue, Feb 02, 2010 at 03:59:13PM -0800, wellsk40 at gmail.com wrote:
Quoted 5 lines

From: Kevin Wells <[email protected]>

struct clk looksup[] should not be tagged with the __initdata attribute so system functions after bootup can use the clkdev support.

Can you roll this into your previous patch set please?

Hi Russell,

I'll fix the many more comments from the reviews and put up another (hopefully last) set of patches that are sparse and bisect safe and hopefully review safe. I would like to get these in patch tracker if all goes good.

thanks,
Kevin

#5 lore raw

PATCH 1/16 ARM: LPC32XX: clock lookups array should not be tagged __initdata

Hey Kevin,

Quoted 7 lines · Kevin Wells
Quoted 7 lines · On Tue, Feb 02, 2010 at 03:59:13PM -0800, wellsk40 at gmail.com wrote:
Quoted 5 lines

From: Kevin Wells <[email protected]>

struct clk looksup[] should not be tagged with the __initdata attribute so system functions after bootup can use the clkdev support.

s/looksup/lookups/

Quoted 9 lines
Quoted 2 lines

Can you roll this into your previous patch set please?

Hi Russell,

I'll fix the many more comments from the reviews and put up another (hopefully last) set of patches that are sparse and bisect safe and hopefully review safe. I would like to get these in patch tracker if all goes good.

Can you please make sure to have all mails in one thread? That would make it easier for me to find them all.

Thanks
Uwe

Signature · 2 lines
Pengutronix e.K.                              | Uwe Kleine-K?nig            |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |
#6 lore raw

PATCH 2/16 ARM: LPC32XX: removed extra include statement

In reply to a message not in the archive

From: Kevin Wells <[email protected]>

The include of <mach/irqs.h> isn't needed in the entry-macro.S file.

---
 arch/arm/mach-lpc32xx/include/mach/entry-macro.S |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/mach-lpc32xx/include/mach/entry-macro.S +0 -1
index c0313ae..ba1bdd6 100644
@@ -22,7 +22,6 @@
 
 #include <mach/hardware.h>
 #include <mach/platform.h>
-#include <mach/irqs.h>
 
 	.macro	disable_fiq
 	.endm
Signature · 1 line
1.6.6
#7 lore raw

PATCH 2/16 ARM: LPC32XX: removed extra include statement

Quoted 4 lines · On Tue, Feb 02, 2010 at 03:59:14PM -0800, wellsk40 at gmail.com wrote:

From: Kevin Wells <[email protected]>

The include of <mach/irqs.h> isn't needed in the entry-macro.S file.

Ditto.

#8 lore raw

PATCH 3/16 ARM: LPC32XX: Added LPC32XX identifier to high level macro names

In reply to a message not in the archive

From: Kevin Wells <[email protected]>

Arch specific macro names used for system base addresses, clock rates, and sizing have been updated to include the LPC32XX identifier. This may help prevent potential conflicts with Linux identifiers in the future.

---
 arch/arm/mach-lpc32xx/clock.c                    |   18 ++--
 arch/arm/mach-lpc32xx/common.c                   |   34 +++---
 arch/arm/mach-lpc32xx/common.h                   |    2 +-
 arch/arm/mach-lpc32xx/gpiolib.c                  |    2 +-
 arch/arm/mach-lpc32xx/include/mach/debug-macro.S |    8 +-
 arch/arm/mach-lpc32xx/include/mach/entry-macro.S |    6 +-
 arch/arm/mach-lpc32xx/include/mach/platform.h    |  140 +++++++++++-----------
 arch/arm/mach-lpc32xx/include/mach/uncompress.h  |   14 +-
 arch/arm/mach-lpc32xx/irq.c                      |   31 +++---
 arch/arm/mach-lpc32xx/phy3250.c                  |   22 ++--
 arch/arm/mach-lpc32xx/pm.c                       |    6 +-
 arch/arm/mach-lpc32xx/serial.c                   |   34 +++---
 arch/arm/mach-lpc32xx/suspend.S                  |    4 +-
 arch/arm/mach-lpc32xx/timer.c                    |    8 +-
 14 files changed, 163 insertions(+), 166 deletions(-)
arch/arm/mach-lpc32xx/clock.c +9 -9
index d404b67..eb522a5 100644
@@ -110,11 +110,11 @@ static struct clk clk_usbpll;
  */
 const u32 pll_postdivs[4] = {1, 2, 4, 8};
 
-#define USB_OTG_IOBASE io_p2v(USB_BASE)
+#define USB_OTG_IOBASE io_p2v(LPC32XX_USB_BASE)
 
 /* 32KHz clock has a fixed rate and is not stoppable */
 static struct clk osc_32KHz = {
-	.rate		= CLOCK_OSC_FREQ,
+	.rate		= LPC32XX_CLOCK_OSC_FREQ,
 };
 
 static int local_pll397_enable(struct clk *clk, int enable)
@@ -132,7 +132,7 @@ static int local_pll397_enable(struct clk *clk, int enable)
 		/* Enable PLL397 */
 		reg &= ~CLKPWR_SYSCTRL_PLL397_DIS;
 		writel(reg, CLKPWR_PLL397_CTRL(CLKPWR_IOBASE));
-		clk->rate = CLOCK_OSC_FREQ * 397;
+		clk->rate = LPC32XX_CLOCK_OSC_FREQ * 397;
 
 		/* Wait for PLL397 lock */
 		while (((readl(CLKPWR_PLL397_CTRL(CLKPWR_IOBASE)) &
@@ -163,7 +163,7 @@ static int local_oscmain_enable(struct clk *clk, int enable)
 		/* Enable main oscillator */
 		reg &= ~CLKPWR_MOSC_DISABLE;
 		writel(reg, CLKPWR_MAIN_OSC_CTRL(CLKPWR_IOBASE));
-		clk->rate = MAIN_OSC_FREQ;
+		clk->rate = LPC32XX_MAIN_OSC_FREQ;
 
 		/* Wait for main oscillator to start */
 		while (((readl(CLKPWR_MAIN_OSC_CTRL(CLKPWR_IOBASE)) &
@@ -182,12 +182,12 @@ static int local_oscmain_enable(struct clk *clk, int enable)
 static struct clk osc_pll397 = {
 	.parent		= &osc_32KHz,
 	.enable		= &local_pll397_enable,
-	.rate		= CLOCK_OSC_FREQ * 397,
+	.rate		= LPC32XX_CLOCK_OSC_FREQ * 397,
 };
 
 static struct clk osc_main = {
 	.enable		= &local_oscmain_enable,
-	.rate		= MAIN_OSC_FREQ,
+	.rate		= LPC32XX_MAIN_OSC_FREQ,
 };
 
 static struct clk clk_sys;
@@ -757,7 +757,7 @@ static u32 clcd_get_rate(struct clk *clk)
 		return 0;
 
 	rate = clk_get_rate(clk->parent);
-	tmp = readl((io_p2v(LCD_BASE)) + CLCD_TIM2);
+	tmp = readl((io_p2v(LPC32XX_LCD_BASE)) + CLCD_TIM2);
 
 	/* Only supports internal clocking */
 	if (tmp & TIM2_BCD)
@@ -773,7 +773,7 @@ static int clcd_set_rate(struct clk *clk, u32 rate)
 {
 	u32 tmp, prate, div;
 
-	tmp = readl((io_p2v(LCD_BASE)) + CLCD_TIM2);
+	tmp = readl((io_p2v(LPC32XX_LCD_BASE)) + CLCD_TIM2);
 	prate = clk_get_rate(clk->parent);
 
 	if (rate == prate) {
@@ -791,7 +791,7 @@ static int clcd_set_rate(struct clk *clk, u32 rate)
 		tmp &= ~TIM2_BCD;
 		tmp |= (div & 0x1F);
 		tmp |= (((div >> 5) & 0x1F) << 27);
-		writel(tmp, ((io_p2v(LCD_BASE)) + CLCD_TIM2));
+		writel(tmp, ((io_p2v(LPC32XX_LCD_BASE)) + CLCD_TIM2));
 		local_onoff_enable(clk, 1);
 	}
 
arch/arm/mach-lpc32xx/common.c +17 -17
index 77c98b4..f4e2113 100644
@@ -36,15 +36,15 @@
 #include <mach/platform.h>
 #include "common.h"
 
-#define WDT_IOBASE io_p2v(WDTIM_BASE)
+#define WDT_IOBASE io_p2v(LPC32XX_WDTIM_BASE)
 
 /*
  * Watchdog timer
  */
 static struct resource watchdog_resources[] = {
 	[0] = {
-		.start = WDTIM_BASE,
-		.end = WDTIM_BASE + SZ_4K - 1,
+		.start = LPC32XX_WDTIM_BASE,
+		.end = LPC32XX_WDTIM_BASE + SZ_4K - 1,
 		.flags = IORESOURCE_MEM,
 	},
 };
@@ -61,19 +61,19 @@ struct platform_device watchdog_device = {
  */
 static struct i2c_pnx_data i2c0_data = {
 	.name = I2C_CHIP_NAME "0",
-	.base = I2C1_BASE,
+	.base = LPC32XX_I2C1_BASE,
 	.irq = IRQ_I2C_1,
 };
 
 static struct i2c_pnx_data i2c1_data = {
 	.name = I2C_CHIP_NAME "1",
-	.base = I2C2_BASE,
+	.base = LPC32XX_I2C2_BASE,
 	.irq = IRQ_I2C_2,
 };
 
 static struct i2c_pnx_data i2c2_data = {
 	.name = "USB-I2C",
-	.base = OTG_I2C_BASE,
+	.base = LPC32XX_OTG_I2C_BASE,
 	.irq = IRQ_USB_I2C,
 };
 
@@ -238,26 +238,26 @@ u32 clk_get_pclk_div(void)
 
 static struct map_desc lpc32xx_io_desc[] __initdata = {
 	{
-		.virtual	= io_p2v(AHB0_START),
-		.pfn		= __phys_to_pfn(AHB0_START),
-		.length		= AHB0_SIZE,
+		.virtual	= io_p2v(LPC32XX_AHB0_START),
+		.pfn		= __phys_to_pfn(LPC32XX_AHB0_START),
+		.length		= LPC32XX_AHB0_SIZE,
 		.type		= MT_DEVICE
 	},
 	{
-		.virtual	= io_p2v(AHB1_START),
-		.pfn		= __phys_to_pfn(AHB1_START),
-		.length		= AHB1_SIZE,
+		.virtual	= io_p2v(LPC32XX_AHB1_START),
+		.pfn		= __phys_to_pfn(LPC32XX_AHB1_START),
+		.length		= LPC32XX_AHB1_SIZE,
 		.type		= MT_DEVICE
 	},
 	{
-		.virtual	= io_p2v(FABAPB_START),
-		.pfn		= __phys_to_pfn(FABAPB_START),
-		.length		= FABAPB_SIZE,
+		.virtual	= io_p2v(LPC32XX_FABAPB_START),
+		.pfn		= __phys_to_pfn(LPC32XX_FABAPB_START),
+		.length		= LPC32XX_FABAPB_SIZE,
 		.type		= MT_DEVICE
 	},
 	{
-		.virtual	= io_p2v(IRAM_BASE),
-		.pfn		= __phys_to_pfn(IRAM_BASE),
+		.virtual	= io_p2v(LPC32XX_IRAM_BASE),
+		.pfn		= __phys_to_pfn(LPC32XX_IRAM_BASE),
 		.length		= CONFIG_ARCH_LPC32XX_IRAM_SIZE,
 		.type		= MT_DEVICE
 	},
arch/arm/mach-lpc32xx/common.h +1 -1
index ab8d2b2..08fdfba 100644
@@ -25,7 +25,7 @@
 
 #include <linux/platform_device.h>
 
-#define CLKPWR_IOBASE io_p2v(CLK_PM_BASE)
+#define CLKPWR_IOBASE io_p2v(LPC32XX_CLK_PM_BASE)
 
 /*
  * Arch specific platform device structures
arch/arm/mach-lpc32xx/gpiolib.c +1 -1
index 30cf252..803c48f 100644
@@ -29,7 +29,7 @@
 #include <mach/hardware.h>
 #include <mach/platform.h>
 
-#define GPIOBASE io_p2v(GPIO_BASE)
+#define GPIOBASE io_p2v(LPC32XX_GPIO_BASE)
 
 struct gpio_regs {
 	void __iomem *inp_state;
arch/arm/mach-lpc32xx/include/mach/debug-macro.S +4 -4
index 641daba..e03a1b7 100644
@@ -29,19 +29,19 @@
 */
 
 #ifdef CONFIG_ARCH_LPC32XX_DEBUGO_U3
-#define UARTDB_BASE UART3_BASE
+#define UARTDB_BASE LPC32XX_UART3_BASE
 #endif
 
 #ifdef CONFIG_ARCH_LPC32XX_DEBUGO_U4
-#define UARTDB_BASE UART4_BASE
+#define UARTDB_BASE LPC32XX_UART4_BASE
 #endif
 
 #ifdef CONFIG_ARCH_LPC32XX_DEBUGO_U5
-#define UARTDB_BASE UART5_BASE
+#define UARTDB_BASE LPC32XX_UART5_BASE
 #endif
 
 #ifdef CONFIG_ARCH_LPC32XX_DEBUGO_U6
-#define UARTDB_BASE UART6_BASE
+#define UARTDB_BASE LPC32XX_UART6_BASE
 #endif
 
 	.macro	addruart,rx
arch/arm/mach-lpc32xx/include/mach/entry-macro.S +3 -3
index ba1bdd6..01331f1 100644
@@ -38,7 +38,7 @@
  */
 	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp
 	/* Get MIC status first */
-	ldr	\base, =IO_ADDRESS(MIC_BASE)
+	ldr	\base, =IO_ADDRESS(LPC32XX_MIC_BASE)
 	ldr	\irqstat, [\base, #INTC_STAT]
 	and	\irqstat, \irqstat, #0xFFFFFFFC
 	mov	\tmp, #0
@@ -48,7 +48,7 @@
 	bne	1000f
 
 	/* SIC1 interrupts start at offset 32 */
-	ldr	\base, =IO_ADDRESS(SIC1_BASE)
+	ldr	\base, =IO_ADDRESS(LPC32XX_SIC1_BASE)
 	ldr	\irqstat, [\base, #INTC_STAT]
 	mov	\tmp, #32
 
@@ -57,7 +57,7 @@
 	bne	1000f
 
 	/* SIC2 interrupts start at offset 64 */
-	ldr	\base, =IO_ADDRESS(SIC2_BASE)
+	ldr	\base, =IO_ADDRESS(LPC32XX_SIC2_BASE)
 	ldr	\irqstat, [\base, #INTC_STAT]
 	mov	\tmp, #64
 
arch/arm/mach-lpc32xx/include/mach/platform.h +69 -71

179 lines not on this page · raw message

arch/arm/mach-lpc32xx/include/mach/uncompress.h +7 -7
index a00ecc5..94c29a8 100644
@@ -34,15 +34,15 @@
  * High speed UART uncompress output support
 */
 #ifdef CONFIG_ARCH_LPC32XX_UNCOMP_HSU1
-#define HS_UARTX_BASE	(HS_UART1_BASE)
+#define HS_UARTX_BASE	(LPC32XX_HS_UART1_BASE)
 #endif
 
 #ifdef CONFIG_ARCH_LPC32XX_UNCOMP_HSU2
-#define HS_UARTX_BASE	(HS_UART2_BASE)
+#define HS_UARTX_BASE	(LPC32XX_HS_UART2_BASE)
 #endif
 
 #ifdef CONFIG_ARCH_LPC32XX_UNCOMP_HSU7
-#define HS_UARTX_BASE	(HS_UART7_BASE)
+#define HS_UARTX_BASE	(LPC32XX_HS_UART7_BASE)
 #endif
 
 #define HSUART_FIFO	(HS_UARTX_BASE + 0x00)
@@ -72,19 +72,19 @@ static inline void flush(void)
 #define UART_STATUS_TX_MT	(1 << 6)
 
 #ifdef CONFIG_ARCH_LPC32XX_UNCOMP_U3
-#define UARTX_BASE	(UART3_BASE)
+#define UARTX_BASE	(LPC32XX_UART3_BASE)
 #endif
 
 #ifdef CONFIG_ARCH_LPC32XX_UNCOMP_U4
-#define UARTX_BASE	(UART4_BASE)
+#define UARTX_BASE	(LPC32XX_UART4_BASE)
 #endif
 
 #ifdef CONFIG_ARCH_LPC32XX_UNCOMP_U5
-#define UARTX_BASE	(UART5_BASE)
+#define UARTX_BASE	(LPC32XX_UART5_BASE)
 #endif
 
 #ifdef CONFIG_ARCH_LPC32XX_UNCOMP_U6
-#define UARTX_BASE	(UART6_BASE)
+#define UARTX_BASE	(LPC32XX_UART6_BASE)
 #endif
 
 #define UART_DATA	(UARTX_BASE + 0x00)
arch/arm/mach-lpc32xx/irq.c +15 -16
index 8a1b57d..3e45d32 100644
@@ -51,13 +51,13 @@ static void get_controller(unsigned int irq, unsigned int *base,
 	unsigned int *irqbit)
 {
 	if (irq < 32) {
-		*base = io_p2v(MIC_BASE);
+		*base = io_p2v(LPC32XX_MIC_BASE);
 		*irqbit = 1 << irq;
 	} else if (irq < 64) {
-		*base = io_p2v(SIC1_BASE);
+		*base = io_p2v(LPC32XX_SIC1_BASE);
 		*irqbit = 1 << (irq - 32);
 	} else {
-		*base = io_p2v(SIC2_BASE);
+		*base = io_p2v(LPC32XX_SIC2_BASE);
 		*irqbit = 1 << (irq - 64);
 	}
 }
@@ -197,19 +197,19 @@ void __init lpc32xx_init_irq(void)
 	unsigned int i, vloc;
 
 	/* Setup MIC */
-	vloc = io_p2v(MIC_BASE);
+	vloc = io_p2v(LPC32XX_MIC_BASE);
 	writel(0, (vloc + INTC_MASK));
 	writel(MIC_APR_DEFAULT, (vloc + INTC_POLAR));
 	writel(MIC_ATR_DEFAULT, (vloc + INTC_ACT_TYPE));
 
 	/* Setup SIC1 */
-	vloc = io_p2v(SIC1_BASE);
+	vloc = io_p2v(LPC32XX_SIC1_BASE);
 	writel(0, (vloc + INTC_MASK));
 	writel(SIC1_APR_DEFAULT, (vloc + INTC_POLAR));
 	writel(SIC1_ATR_DEFAULT, (vloc + INTC_ACT_TYPE));
 
 	/* Setup SIC2 */
-	vloc = io_p2v(SIC2_BASE);
+	vloc = io_p2v(LPC32XX_SIC2_BASE);
 	writel(0, (vloc + INTC_MASK));
 	writel(SIC2_APR_DEFAULT, (vloc + INTC_POLAR));
 	writel(SIC2_ATR_DEFAULT, (vloc + INTC_ACT_TYPE));
@@ -221,17 +221,16 @@ void __init lpc32xx_init_irq(void)
 	}
 
 	/* Set default mappings */
-	lpc32xx_set_default_mappings(io_p2v(MIC_BASE), MIC_APR_DEFAULT,
+	lpc32xx_set_default_mappings(io_p2v(LPC32XX_MIC_BASE), MIC_APR_DEFAULT,
 		MIC_ATR_DEFAULT, 0);
-	lpc32xx_set_default_mappings(io_p2v(SIC1_BASE), SIC1_APR_DEFAULT,
-		SIC1_ATR_DEFAULT, 32);
-	lpc32xx_set_default_mappings(io_p2v(SIC2_BASE), SIC2_APR_DEFAULT,
-		SIC2_ATR_DEFAULT, 64);
+	lpc32xx_set_default_mappings(io_p2v(LPC32XX_SIC1_BASE),
+		SIC1_APR_DEFAULT, SIC1_ATR_DEFAULT, 32);
+	lpc32xx_set_default_mappings(io_p2v(LPC32XX_SIC2_BASE),
+		SIC2_APR_DEFAULT, SIC2_ATR_DEFAULT, 64);
 
 	/* mask all interrupts except SUBIRQA and SUBFIQ */
-	writel((1 << IRQ_SUB1IRQ) | (1 << IRQ_SUB2IRQ) |
-			(1 << IRQ_SUB1FIQ) | (1 << IRQ_SUB2FIQ),
-		(io_p2v(MIC_BASE) + INTC_MASK));
-	writel(0, (io_p2v(SIC1_BASE) + INTC_MASK));
-	writel(0, (io_p2v(SIC2_BASE) + INTC_MASK));
+	writel((1 << IRQ_SUB1IRQ) | (1 << IRQ_SUB2IRQ) | (1 << IRQ_SUB1FIQ) |
+		(1 << IRQ_SUB2FIQ), (io_p2v(LPC32XX_MIC_BASE) + INTC_MASK));
+	writel(0, (io_p2v(LPC32XX_SIC1_BASE) + INTC_MASK));
+	writel(0, (io_p2v(LPC32XX_SIC2_BASE) + INTC_MASK));
 }
arch/arm/mach-lpc32xx/phy3250.c +11 -11
index aa29aa6..4ee9714 100644
@@ -87,9 +87,9 @@ static int lpc32xx_clcd_setup(struct clcd_fb *fb)
 
 	fb->fb.screen_base = (void *) NULL;
 #ifdef CONFIG_MACH_LPC32XX_IRAM_FOR_CLCD
-	if (PANEL_SIZE <= LPC32XX_IRAM_SIZE) {
-		fb->fb.screen_base = (void *) io_p2v(IRAM_BASE);
-		fb->fb.fix.smem_start = (dma_addr_t) IRAM_BASE;
+	if (PANEL_SIZE <= CONFIG_ARCH_LPC32XX_IRAM_SIZE) {
+		fb->fb.screen_base = (void *) io_p2v(LPC32XX_IRAM_BASE);
+		fb->fb.fix.smem_start = (dma_addr_t) LPC32XX_IRAM_BASE;
 	}
 #endif
 
@@ -118,7 +118,7 @@ static int lpc32xx_clcd_setup(struct clcd_fb *fb)
 static int lpc32xx_clcd_mmap(struct clcd_fb *fb, struct vm_area_struct *vma)
 {
 #ifdef CONFIG_MACH_LPC32XX_IRAM_FOR_CLCD
-	if (PANEL_SIZE <= LPC32XX_IRAM_SIZE) {
+	if (PANEL_SIZE <= CONFIG_ARCH_LPC32XX_IRAM_SIZE) {
 		vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 		if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
 			(vma->vm_end - vma->vm_start), vma->vm_page_prot)) {
@@ -138,7 +138,7 @@ static int lpc32xx_clcd_mmap(struct clcd_fb *fb, struct vm_area_struct *vma)
 static void lpc32xx_clcd_remove(struct clcd_fb *fb)
 {
 #ifdef CONFIG_MACH_LPC32XX_IRAM_FOR_CLCD
-	if (PANEL_SIZE > LPC32XX_IRAM_SIZE)
+	if (PANEL_SIZE > CONFIG_ARCH_LPC32XX_IRAM_SIZE)
 		dma_free_writecombine(&fb->dev->dev, fb->fb.fix.smem_len,
 			fb->fb.screen_base, fb->fb.fix.smem_start);
 
@@ -186,8 +186,8 @@ static struct amba_device clcd_device = {
 		.platform_data		= &lpc32xx_clcd_data,
 	},
 	.res				= {
-		.start			= LCD_BASE,
-		.end			= (LCD_BASE + SZ_4K - 1),
+		.start			= LPC32XX_LCD_BASE,
+		.end			= (LPC32XX_LCD_BASE + SZ_4K - 1),
 		.flags			= IORESOURCE_MEM,
 	},
 	.dma_mask			= ~0,
@@ -234,8 +234,8 @@ static struct amba_device ssp0_device = {
 		.platform_data		= &lpc32xx_ssp0_data,
 	},
 	.res				= {
-		.start			= SSP0_BASE,
-		.end			= (SSP0_BASE + SZ_4K - 1),
+		.start			= LPC32XX_SSP0_BASE,
+		.end			= (LPC32XX_SSP0_BASE + SZ_4K - 1),
 		.flags			= IORESOURCE_MEM,
 	},
 	.dma_mask			= ~0,
@@ -414,8 +414,8 @@ arch_initcall(lpc32xx_display_uid);
 
 MACHINE_START(PHY3250, "Phytec 3250 board with the LPC3250 Microcontroller")
 	/* Maintainer: Kevin Wells, NXP Semiconductors */
-	.phys_io	= UART5_BASE,
-	.io_pg_offst	= ((io_p2v(UART5_BASE))>>18) & 0xfffc,
+	.phys_io	= LPC32XX_UART5_BASE,
+	.io_pg_offst	= ((io_p2v(LPC32XX_UART5_BASE))>>18) & 0xfffc,
 	.boot_params	= 0x80000100,
 	.map_io		= lpc32xx_map_io,
 	.init_irq	= lpc32xx_init_irq,
arch/arm/mach-lpc32xx/pm.c +3 -3
index 8535e99..5f0a805 100644
@@ -90,7 +90,7 @@
 #include "clock.h"
 #include "pm.h"
 
-#define TEMP_IRAM_AREA  io_p2v(IRAM_BASE)
+#define TEMP_IRAM_AREA  io_p2v(LPC32XX_IRAM_BASE)
 
 static void *iram_swap_area;
 
@@ -151,8 +151,8 @@ static int __init lpc32xx_pm_init(void)
 {
 	/* Setup SDRAM self-refresh clock to automatically
 	   disable on start of self-refresh */
-	writel(readl(io_p2v(EMC_BASE) + EMC_DYN_MEM_CTRL_OFS) | EMC_SRMMC,
-		io_p2v(EMC_BASE) + EMC_DYN_MEM_CTRL_OFS);
+	writel(readl(io_p2v(LPC32XX_EMC_BASE) + EMC_DYN_MEM_CTRL_OFS) |
+		EMC_SRMMC, io_p2v(LPC32XX_EMC_BASE) + EMC_DYN_MEM_CTRL_OFS);
 
 	/* Allocate some space for temporary IRAM storage */
 	iram_swap_area = kmalloc(lpc32xx_sys_suspend_sz, GFP_ATOMIC);
arch/arm/mach-lpc32xx/serial.c +17 -17
index 1c15121..e4479ba 100644
@@ -38,10 +38,10 @@
 static struct plat_serial8250_port serial_std_platform_data[] = {
 #ifdef CONFIG_ARCH_LPC32XX_UART5_ENABLE
 	{
-		.membase        = (void *) io_p2v(UART5_BASE),
-		.mapbase        = UART5_BASE,
+		.membase        = (void *) io_p2v(LPC32XX_UART5_BASE),
+		.mapbase        = LPC32XX_UART5_BASE,
 		.irq		= IRQ_UART_IIR5,
-		.uartclk	= MAIN_OSC_FREQ,
+		.uartclk	= LPC32XX_MAIN_OSC_FREQ,
 		.regshift	= 2,
 		.iotype		= UPIO_MEM32,
 		.flags		= UPF_BOOT_AUTOCONF | UPF_BUGGY_UART |
@@ -50,10 +50,10 @@ static struct plat_serial8250_port serial_std_platform_data[] = {
 #endif
 #ifdef CONFIG_ARCH_LPC32XX_UART3_ENABLE
 	{
-		.membase	= (void *) io_p2v(UART3_BASE),
-		.mapbase        = UART3_BASE,
+		.membase	= (void *) io_p2v(LPC32XX_UART3_BASE),
+		.mapbase        = LPC32XX_UART3_BASE,
 		.irq		= IRQ_UART_IIR3,
-		.uartclk	= MAIN_OSC_FREQ,
+		.uartclk	= LPC32XX_MAIN_OSC_FREQ,
 		.regshift	= 2,
 		.iotype		= UPIO_MEM32,
 		.flags		= UPF_BOOT_AUTOCONF | UPF_BUGGY_UART |
@@ -62,10 +62,10 @@ static struct plat_serial8250_port serial_std_platform_data[] = {
 #endif
 #ifdef CONFIG_ARCH_LPC32XX_UART4_ENABLE
 	{
-		.membase	= (void *) io_p2v(UART4_BASE),
-		.mapbase        = UART4_BASE,
+		.membase	= (void *) io_p2v(LPC32XX_UART4_BASE),
+		.mapbase        = LPC32XX_UART4_BASE,
 		.irq		= IRQ_UART_IIR4,
-		.uartclk	= MAIN_OSC_FREQ,
+		.uartclk	= LPC32XX_MAIN_OSC_FREQ,
 		.regshift	= 2,
 		.iotype		= UPIO_MEM32,
 		.flags		= UPF_BOOT_AUTOCONF | UPF_BUGGY_UART |
@@ -74,10 +74,10 @@ static struct plat_serial8250_port serial_std_platform_data[] = {
 #endif
 #ifdef CONFIG_ARCH_LPC32XX_UART6_ENABLE
 	{
-		.membase	= (void *) io_p2v(UART6_BASE),
-		.mapbase        = UART6_BASE,
+		.membase	= (void *) io_p2v(LPC32XX_UART6_BASE),
+		.mapbase        = LPC32XX_UART6_BASE,
 		.irq		= IRQ_UART_IIR6,
-		.uartclk	= MAIN_OSC_FREQ,
+		.uartclk	= LPC32XX_MAIN_OSC_FREQ,
 		.regshift	= 2,
 		.iotype		= UPIO_MEM32,
 		.flags		= UPF_BOOT_AUTOCONF | UPF_BUGGY_UART |
@@ -169,7 +169,7 @@ void __init lpc32xx_serial_init(void)
 	}
 
 	/* This needs to be done after all UART clocks are setup */
-	writel(clkmodes, UARTCTL_CLKMODE(io_p2v(UART_CTRL_BASE)));
+	writel(clkmodes, UARTCTL_CLKMODE(io_p2v(LPC32XX_UART_CTRL_BASE)));
 	for (i = 0; i < ARRAY_SIZE(uartinit_data) - 1; i++) {
 		/* Force a flush of the RX FIFOs to work around a HW bug */
 		puart = serial_std_platform_data[i].membase;
@@ -182,18 +182,18 @@ void __init lpc32xx_serial_init(void)
 	}
 
 	/* IrDA pulsing support on UART6. This only enables the IrDA mux */
-	tmp = readl(UARTCTL_CTRL(io_p2v(UART_CTRL_BASE)));
+	tmp = readl(UARTCTL_CTRL(io_p2v(LPC32XX_UART_CTRL_BASE)));
 #ifdef CONFIG_ARCH_LPC32XX_UART6_IRDAMODE
 	tmp &= ~UART_UART6_IRDAMOD_BYPASS;
 #else
 	tmp |= UART_UART6_IRDAMOD_BYPASS;
 #endif
-	writel(tmp, UARTCTL_CTRL(io_p2v(UART_CTRL_BASE)));
+	writel(tmp, UARTCTL_CTRL(io_p2v(LPC32XX_UART_CTRL_BASE)));
 
 	/* Disable UART5->USB transparent mode or USB won't work */
-	tmp = readl(UARTCTL_CTRL(io_p2v(UART_CTRL_BASE)));
+	tmp = readl(UARTCTL_CTRL(io_p2v(LPC32XX_UART_CTRL_BASE)));
 	tmp &= ~UART_U5_ROUTE_TO_USB;
-	writel(tmp, UARTCTL_CTRL(io_p2v(UART_CTRL_BASE)));
+	writel(tmp, UARTCTL_CTRL(io_p2v(LPC32XX_UART_CTRL_BASE)));
 
 	platform_add_devices(lpc32xx_serial_devs,
 		ARRAY_SIZE(lpc32xx_serial_devs));
arch/arm/mach-lpc32xx/suspend.S +2 -2
index 075708b..aa06be8 100644
@@ -143,8 +143,8 @@ ENTRY(lpc32xx_sys_suspend)
 	ldmfd	r0!, {r1 - r7, sp, pc}
 
 reg_bases:
-	.long	IO_ADDRESS(CLK_PM_BASE)
-	.long	IO_ADDRESS(EMC_BASE)
+	.long	IO_ADDRESS(LPC32XX_CLK_PM_BASE)
+	.long	IO_ADDRESS(LPC32XX_EMC_BASE)
 
 tmp_stack:
 	.long	0, 0, 0, 0, 0, 0, 0, 0, 0
arch/arm/mach-lpc32xx/timer.c +4 -4
index 9c06346..c5fa62d 100644
@@ -35,8 +35,8 @@
 #include <mach/platform.h>
 #include "common.h"
 
-#define TIMER0_IOBASE io_p2v(TIMER0_BASE)
-#define TIMER1_IOBASE io_p2v(TIMER1_BASE)
+#define TIMER0_IOBASE io_p2v(LPC32XX_TIMER0_BASE)
+#define TIMER1_IOBASE io_p2v(LPC32XX_TIMER1_BASE)
 
 static cycle_t lpc32xx_clksrc_read(struct clocksource *cs)
 {
@@ -141,9 +141,9 @@ static void __init lpc32xx_timer_init(void)
 	   it to compute the PLL frequency and the PCLK divider to get the base
 	   timer rates. This rate is needed to compute the tick rate. */
 	if (clk_is_sysclk_mainosc() != 0)
-		clkrate = MAIN_OSC_FREQ;
+		clkrate = LPC32XX_MAIN_OSC_FREQ;
 	else
-		clkrate = 397 * CLOCK_OSC_FREQ;
+		clkrate = 397 * LPC32XX_CLOCK_OSC_FREQ;
 
 	/* Get ARM HCLKPLL register and convert it into a frequency*/
 	pllreg = readl(CLKPWR_HCLKPLL_CTRL(CLKPWR_IOBASE)) & 0x1FFFF;
Signature · 1 line
1.6.6
#9 lore raw

PATCH 4/16 ARM: LPC32XX: Added LXP32XX identified to CLKPWR register field macros

In reply to a message not in the archive

From: Kevin Wells <[email protected]>

The CLKPWR macros and associated code have been updated with the LPC32XX identifier.

---
 arch/arm/mach-lpc32xx/clock.c                 |  222 +++++-----
 arch/arm/mach-lpc32xx/common.c                |   18 +-
 arch/arm/mach-lpc32xx/include/mach/platform.h |  612 ++++++++++++------------
 arch/arm/mach-lpc32xx/phy3250.c               |   51 ++-
 arch/arm/mach-lpc32xx/pm_events.c             |  340 +++++++-------
 arch/arm/mach-lpc32xx/serial.c                |   10 +-
 arch/arm/mach-lpc32xx/suspend.S               |   56 ++-
 arch/arm/mach-lpc32xx/timer.c                 |    8 +-
 8 files changed, 668 insertions(+), 649 deletions(-)
arch/arm/mach-lpc32xx/clock.c +113 -109
index eb522a5..befe6fa 100644
@@ -122,26 +122,26 @@ static int local_pll397_enable(struct clk *clk, int enable)
 	u32 reg;
 	unsigned long timeout = 1 + msecs_to_jiffies(10);
 
-	reg = readl(CLKPWR_PLL397_CTRL(CLKPWR_IOBASE));
+	reg = readl(LPC32XX_CLKPWR_PLL397_CTRL(CLKPWR_IOBASE));
 
 	if (enable == 0) 	{
-		reg |= CLKPWR_SYSCTRL_PLL397_DIS;
-		writel(reg, CLKPWR_PLL397_CTRL(CLKPWR_IOBASE));
+		reg |= LPC32XX_CLKPWR_SYSCTRL_PLL397_DIS;
+		writel(reg, LPC32XX_CLKPWR_PLL397_CTRL(CLKPWR_IOBASE));
 		clk->rate = 0;
 	} else {
 		/* Enable PLL397 */
-		reg &= ~CLKPWR_SYSCTRL_PLL397_DIS;
-		writel(reg, CLKPWR_PLL397_CTRL(CLKPWR_IOBASE));
+		reg &= ~LPC32XX_CLKPWR_SYSCTRL_PLL397_DIS;
+		writel(reg, LPC32XX_CLKPWR_PLL397_CTRL(CLKPWR_IOBASE));
 		clk->rate = LPC32XX_CLOCK_OSC_FREQ * 397;
 
 		/* Wait for PLL397 lock */
-		while (((readl(CLKPWR_PLL397_CTRL(CLKPWR_IOBASE)) &
-			CLKPWR_SYSCTRL_PLL397_STS) == 0) &&
+		while (((readl(LPC32XX_CLKPWR_PLL397_CTRL(CLKPWR_IOBASE)) &
+			LPC32XX_CLKPWR_SYSCTRL_PLL397_STS) == 0) &&
 			(timeout > jiffies))
 			cpu_relax();
 
-		if ((readl(CLKPWR_PLL397_CTRL(CLKPWR_IOBASE)) &
-			CLKPWR_SYSCTRL_PLL397_STS) == 0)
+		if ((readl(LPC32XX_CLKPWR_PLL397_CTRL(CLKPWR_IOBASE)) &
+			LPC32XX_CLKPWR_SYSCTRL_PLL397_STS) == 0)
 			return -ENODEV;
 	}
 
@@ -153,26 +153,26 @@ static int local_oscmain_enable(struct clk *clk, int enable)
 	u32 reg;
 	unsigned long timeout = 1 + msecs_to_jiffies(10);
 
-	reg = readl(CLKPWR_MAIN_OSC_CTRL(CLKPWR_IOBASE));
+	reg = readl(LPC32XX_CLKPWR_MAIN_OSC_CTRL(CLKPWR_IOBASE));
 
 	if (enable == 0) {
-		reg |= CLKPWR_MOSC_DISABLE;
-		writel(reg, CLKPWR_MAIN_OSC_CTRL(CLKPWR_IOBASE));
+		reg |= LPC32XX_CLKPWR_MOSC_DISABLE;
+		writel(reg, LPC32XX_CLKPWR_MAIN_OSC_CTRL(CLKPWR_IOBASE));
 		clk->rate = 0;
 	} else {
 		/* Enable main oscillator */
-		reg &= ~CLKPWR_MOSC_DISABLE;
-		writel(reg, CLKPWR_MAIN_OSC_CTRL(CLKPWR_IOBASE));
+		reg &= ~LPC32XX_CLKPWR_MOSC_DISABLE;
+		writel(reg, LPC32XX_CLKPWR_MAIN_OSC_CTRL(CLKPWR_IOBASE));
 		clk->rate = LPC32XX_MAIN_OSC_FREQ;
 
 		/* Wait for main oscillator to start */
-		while (((readl(CLKPWR_MAIN_OSC_CTRL(CLKPWR_IOBASE)) &
-			CLKPWR_MOSC_DISABLE) != 0) &&
+		while (((readl(LPC32XX_CLKPWR_MAIN_OSC_CTRL(CLKPWR_IOBASE)) &
+			LPC32XX_CLKPWR_MOSC_DISABLE) != 0) &&
 			(timeout > jiffies))
 			cpu_relax();
 
-		if ((readl(CLKPWR_MAIN_OSC_CTRL(CLKPWR_IOBASE)) &
-			CLKPWR_MOSC_DISABLE) != 0)
+		if ((readl(LPC32XX_CLKPWR_MAIN_OSC_CTRL(CLKPWR_IOBASE)) &
+			LPC32XX_CLKPWR_MOSC_DISABLE) != 0)
 			return -ENODEV;
 	}
 
@@ -200,13 +200,13 @@ static u32 local_clk_pll_setup(struct clk_pll_setup *PllSetup)
 	u32 tv, tmp = 0;
 
 	if (PllSetup->analog_on != 0)
-		tmp |= CLKPWR_HCLKPLL_POWER_UP;
+		tmp |= LPC32XX_CLKPWR_HCLKPLL_POWER_UP;
 	if (PllSetup->cco_bypass_b15 != 0)
-		tmp |= CLKPWR_HCLKPLL_CCO_BYPASS;
+		tmp |= LPC32XX_CLKPWR_HCLKPLL_CCO_BYPASS;
 	if (PllSetup->direct_output_b14 != 0)
-		tmp |= CLKPWR_HCLKPLL_POSTDIV_BYPASS;
+		tmp |= LPC32XX_CLKPWR_HCLKPLL_POSTDIV_BYPASS;
 	if (PllSetup->fdbk_div_ctrl_b13 != 0)
-		tmp |= CLKPWR_HCLKPLL_FDBK_SEL_FCLK;
+		tmp |= LPC32XX_CLKPWR_HCLKPLL_FDBK_SEL_FCLK;
 
 	switch (PllSetup->pll_p) {
 	case 1:
@@ -229,9 +229,9 @@ static u32 local_clk_pll_setup(struct clk_pll_setup *PllSetup)
 		return 0;
 	}
 
-	tmp |= CLKPWR_HCLKPLL_POSTDIV_2POW(tv);
-	tmp |= CLKPWR_HCLKPLL_PREDIV_PLUS1(PllSetup->pll_n - 1);
-	tmp |= CLKPWR_HCLKPLL_PLLM(PllSetup->pll_m - 1);
+	tmp |= LPC32XX_CLKPWR_HCLKPLL_POSTDIV_2POW(tv);
+	tmp |= LPC32XX_CLKPWR_HCLKPLL_PREDIV_PLUS1(PllSetup->pll_n - 1);
+	tmp |= LPC32XX_CLKPWR_HCLKPLL_PLLM(PllSetup->pll_m - 1);
 
 	return tmp;
 }
@@ -244,7 +244,7 @@ static void local_update_armpll_rate(void)
 	u32 clkin, pllreg;
 
 	clkin = clk_armpll.parent->rate;
-	pllreg = readl(CLKPWR_HCLKPLL_CTRL(CLKPWR_IOBASE)) & 0x1FFFF;
+	pllreg = readl(LPC32XX_CLKPWR_HCLKPLL_CTRL(CLKPWR_IOBASE)) & 0x1FFFF;
 
 	clk_armpll.rate = clk_get_pllrate_from_reg(clkin, pllreg);
 }
@@ -381,9 +381,9 @@ static void local_update_usbpll_rate(void)
 	u32 clkin, pllreg;
 
 	clkin = (u32) clk_get_rate(&clk_usbpll);
-	pllreg = readl(CLKPWR_USB_CTRL(CLKPWR_IOBASE)) & 0x1FFFF;
+	pllreg = readl(LPC32XX_CLKPWR_USB_CTRL(CLKPWR_IOBASE)) & 0x1FFFF;
 
-	if ((pllreg & CLKPWR_USBCTRL_PLL_PWRUP) == 0)
+	if ((pllreg & LPC32XX_CLKPWR_USBCTRL_PLL_PWRUP) == 0)
 		clk_usbpll.rate = 0;
 	else
 		clk_usbpll.rate = clk_get_pllrate_from_reg(clkin,
@@ -397,9 +397,9 @@ static u32 local_clk_usbpll_setup(struct clk_pll_setup *pHCLKPllSetup)
 {
 	u32 reg, tmp = local_clk_pll_setup(pHCLKPllSetup);
 
-	reg = readl(CLKPWR_USB_CTRL(CLKPWR_IOBASE)) & ~0x1FFFF;
+	reg = readl(LPC32XX_CLKPWR_USB_CTRL(CLKPWR_IOBASE)) & ~0x1FFFF;
 	reg |= tmp;
-	writel(reg, CLKPWR_USB_CTRL(CLKPWR_IOBASE));
+	writel(reg, LPC32XX_CLKPWR_USB_CTRL(CLKPWR_IOBASE));
 
 	return clk_check_pll_setup(clk_usbpll.parent->rate,
 		pHCLKPllSetup);
@@ -410,25 +410,26 @@ static int local_usbpll_enable(struct clk *clk, int enable)
 	u32 reg;
 	int ret = -ENODEV, qj = (jiffies / 4);
 
-	reg = readl(CLKPWR_USB_CTRL(CLKPWR_IOBASE));
+	reg = readl(LPC32XX_CLKPWR_USB_CTRL(CLKPWR_IOBASE));
 
 	if (enable == 0) {
-		reg &= ~(CLKPWR_USBCTRL_CLK_EN1 | CLKPWR_USBCTRL_CLK_EN2);
-		writel(reg, CLKPWR_USB_CTRL(CLKPWR_IOBASE));
-	} else if (reg & CLKPWR_USBCTRL_PLL_PWRUP) {
-		reg |= CLKPWR_USBCTRL_CLK_EN1;
-		writel(reg, CLKPWR_USB_CTRL(CLKPWR_IOBASE));
+		reg &= ~(LPC32XX_CLKPWR_USBCTRL_CLK_EN1 |
+			LPC32XX_CLKPWR_USBCTRL_CLK_EN2);
+		writel(reg, LPC32XX_CLKPWR_USB_CTRL(CLKPWR_IOBASE));
+	} else if (reg & LPC32XX_CLKPWR_USBCTRL_PLL_PWRUP) {
+		reg |= LPC32XX_CLKPWR_USBCTRL_CLK_EN1;
+		writel(reg, LPC32XX_CLKPWR_USB_CTRL(CLKPWR_IOBASE));
 
 		/* Wait for PLL lock */
 		while (qj < jiffies) {
-			reg = readl(CLKPWR_USB_CTRL(CLKPWR_IOBASE));
-			if (reg & CLKPWR_USBCTRL_PLL_STS)
+			reg = readl(LPC32XX_CLKPWR_USB_CTRL(CLKPWR_IOBASE));
+			if (reg & LPC32XX_CLKPWR_USBCTRL_PLL_STS)
 				ret = 0;
 		}
 
 		if (ret == 0) {
-			reg |= CLKPWR_USBCTRL_CLK_EN2;
-			writel(reg, CLKPWR_USB_CTRL(CLKPWR_IOBASE));
+			reg |= LPC32XX_CLKPWR_USBCTRL_CLK_EN2;
+			writel(reg, LPC32XX_CLKPWR_USB_CTRL(CLKPWR_IOBASE));
 		}
 	}
 
@@ -450,25 +451,25 @@ static int local_usbpll_set_rate(struct clk *clk, u32 rate)
 		return 0;
 
 	clkin = clk->parent->rate;
-	usbdiv = readl(CLKPWR_USBCLK_PDIV(CLKPWR_IOBASE)) + 1;
+	usbdiv = readl(LPC32XX_CLKPWR_USBCLK_PDIV(CLKPWR_IOBASE)) + 1;
 	clkin = clkin / usbdiv;
 
 	/* Try to find a good rate setup */
 	if (local_clk_find_pll_cfg(clkin, rate, &pllsetup) == 0)
 		return -EINVAL;
 
-	reg = readl(CLKPWR_USB_CTRL(CLKPWR_IOBASE));
-	reg |= CLKPWR_USBCTRL_CLK_EN1;
-	writel(reg, CLKPWR_USB_CTRL(CLKPWR_IOBASE));
+	reg = readl(LPC32XX_CLKPWR_USB_CTRL(CLKPWR_IOBASE));
+	reg |= LPC32XX_CLKPWR_USBCTRL_CLK_EN1;
+	writel(reg, LPC32XX_CLKPWR_USB_CTRL(CLKPWR_IOBASE));
 
 	pllsetup.analog_on = 1;
 	local_clk_usbpll_setup(&pllsetup);
 
 	clk->rate = clk_check_pll_setup(clkin, &pllsetup);
 
-	reg = readl(CLKPWR_USB_CTRL(CLKPWR_IOBASE));
-	reg |= CLKPWR_USBCTRL_CLK_EN2;
-	writel(reg, CLKPWR_USB_CTRL(CLKPWR_IOBASE));
+	reg = readl(LPC32XX_CLKPWR_USB_CTRL(CLKPWR_IOBASE));
+	reg |= LPC32XX_CLKPWR_USBCTRL_CLK_EN2;
+	writel(reg, LPC32XX_CLKPWR_USB_CTRL(CLKPWR_IOBASE));
 
 	return 0;
 }
@@ -482,8 +483,8 @@ static struct clk clk_usbpll = {
 static u32 clk_get_hclk_div(void)
 {
 	static const u32 hclkdivs[4] = {1, 2, 4, 4};
-	return hclkdivs[CLKPWR_HCLKDIV_DIV_2POW(
-		readl(CLKPWR_HCLK_DIV(CLKPWR_IOBASE)))];
+	return hclkdivs[LPC32XX_CLKPWR_HCLKDIV_DIV_2POW(
+		readl(LPC32XX_CLKPWR_HCLK_DIV(CLKPWR_IOBASE)))];
 }
 
 static struct clk clk_hclk = {
@@ -514,86 +515,86 @@ static int local_onoff_enable(struct clk *clk, int enable)
 static struct clk clk_timer0 = {
 	.parent		= &clk_pclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_TIMERS_PWMS_CLK_CTRL_1(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_TMRPWMCLK_TIMER0_EN,
+	.enable_reg	= LPC32XX_CLKPWR_TIMERS_PWMS_CLK_CTRL_1(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_TMRPWMCLK_TIMER0_EN,
 };
 static struct clk clk_timer1 = {
 	.parent		= &clk_pclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_TIMERS_PWMS_CLK_CTRL_1(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_TMRPWMCLK_TIMER1_EN,
+	.enable_reg	= LPC32XX_CLKPWR_TIMERS_PWMS_CLK_CTRL_1(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_TMRPWMCLK_TIMER1_EN,
 };
 static struct clk clk_timer2 = {
 	.parent		= &clk_pclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_TIMERS_PWMS_CLK_CTRL_1(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_TMRPWMCLK_TIMER2_EN,
+	.enable_reg	= LPC32XX_CLKPWR_TIMERS_PWMS_CLK_CTRL_1(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_TMRPWMCLK_TIMER2_EN,
 };
 static struct clk clk_timer3 = {
 	.parent		= &clk_pclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_TIMERS_PWMS_CLK_CTRL_1(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_TMRPWMCLK_TIMER3_EN,
+	.enable_reg	= LPC32XX_CLKPWR_TIMERS_PWMS_CLK_CTRL_1(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_TMRPWMCLK_TIMER3_EN,
 };
 static struct clk clk_wdt = {
 	.parent		= &clk_pclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_TIMER_CLK_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_PWMCLK_WDOG_EN,
+	.enable_reg	= LPC32XX_CLKPWR_TIMER_CLK_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_PWMCLK_WDOG_EN,
 };
 static struct clk clk_vfp9 = {
 	.parent		= &clk_pclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_DEBUG_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_VFP_CLOCK_ENABLE_BIT,
+	.enable_reg	= LPC32XX_CLKPWR_DEBUG_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_VFP_CLOCK_ENABLE_BIT,
 };
 static struct clk clk_dma = {
 	.parent		= &clk_hclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_DMA_CLK_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_DMACLKCTRL_CLK_EN,
+	.enable_reg	= LPC32XX_CLKPWR_DMA_CLK_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_DMACLKCTRL_CLK_EN,
 };
 
 static struct clk clk_uart3 = {
 	.parent		= &clk_pclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_UART_CLK_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_UARTCLKCTRL_UART3_EN,
+	.enable_reg	= LPC32XX_CLKPWR_UART_CLK_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_UARTCLKCTRL_UART3_EN,
 };
 
 static struct clk clk_uart4 = {
 	.parent		= &clk_pclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_UART_CLK_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_UARTCLKCTRL_UART4_EN,
+	.enable_reg	= LPC32XX_CLKPWR_UART_CLK_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_UARTCLKCTRL_UART4_EN,
 };
 
 static struct clk clk_uart5 = {
 	.parent		= &clk_pclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_UART_CLK_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_UARTCLKCTRL_UART5_EN,
+	.enable_reg	= LPC32XX_CLKPWR_UART_CLK_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_UARTCLKCTRL_UART5_EN,
 };
 
 static struct clk clk_uart6 = {
 	.parent		= &clk_pclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_UART_CLK_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_UARTCLKCTRL_UART6_EN,
+	.enable_reg	= LPC32XX_CLKPWR_UART_CLK_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_UARTCLKCTRL_UART6_EN,
 };
 
 static struct clk clk_i2c0 = {
 	.parent		= &clk_hclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_I2C_CLK_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_I2CCLK_I2C1CLK_EN,
+	.enable_reg	= LPC32XX_CLKPWR_I2C_CLK_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_I2CCLK_I2C1CLK_EN,
 };
 
 static struct clk clk_i2c1 = {
 	.parent		= &clk_hclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_I2C_CLK_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_I2CCLK_I2C2CLK_EN,
+	.enable_reg	= LPC32XX_CLKPWR_I2C_CLK_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_I2CCLK_I2C2CLK_EN,
 };
 
 static struct clk clk_i2c2 = {
@@ -606,49 +607,50 @@ static struct clk clk_i2c2 = {
 static struct clk clk_ssp0 = {
 	.parent		= &clk_hclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_SSP_CLK_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_SSPCTRL_SSPCLK0_EN,
+	.enable_reg	= LPC32XX_CLKPWR_SSP_CLK_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_SSPCTRL_SSPCLK0_EN,
 };
 static struct clk clk_ssp1 = {
 	.parent		= &clk_hclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_SSP_CLK_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_SSPCTRL_SSPCLK1_EN,
+	.enable_reg	= LPC32XX_CLKPWR_SSP_CLK_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_SSPCTRL_SSPCLK1_EN,
 };
 
 static struct clk clk_kscan = {
 	.parent		= &osc_32KHz,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_KEY_CLK_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_KEYCLKCTRL_CLK_EN,
+	.enable_reg	= LPC32XX_CLKPWR_KEY_CLK_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_KEYCLKCTRL_CLK_EN,
 };
 
 static struct clk clk_nand = {
 	.parent		= &clk_hclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_NAND_CLK_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_NANDCLK_SLCCLK_EN,
+	.enable_reg	= LPC32XX_CLKPWR_NAND_CLK_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_NANDCLK_SLCCLK_EN,
 };
 
 static struct clk clk_i2s0 = {
 	.parent		= &clk_hclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_I2S_CLK_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_I2SCTRL_I2SCLK0_EN,
+	.enable_reg	= LPC32XX_CLKPWR_I2S_CLK_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_I2SCTRL_I2SCLK0_EN,
 };
 static struct clk clk_i2s1 = {
 	.parent		= &clk_hclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_I2S_CLK_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_I2SCTRL_I2SCLK1_EN,
+	.enable_reg	= LPC32XX_CLKPWR_I2S_CLK_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_I2SCTRL_I2SCLK1_EN,
 };
 
 static struct clk clk_net = {
 	.parent		= &clk_hclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_MACCLK_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= (CLKPWR_MACCTRL_DMACLK_EN |
-		CLKPWR_MACCTRL_MMIOCLK_EN | CLKPWR_MACCTRL_HRCCLK_EN),
+	.enable_reg	= LPC32XX_CLKPWR_MACCLK_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= (LPC32XX_CLKPWR_MACCTRL_DMACLK_EN |
+		LPC32XX_CLKPWR_MACCTRL_MMIOCLK_EN |
+		LPC32XX_CLKPWR_MACCTRL_HRCCLK_EN),
 };
 
 static struct clk clk_rtc = {
@@ -659,8 +661,8 @@ static struct clk clk_rtc = {
 static struct clk clk_usbd = {
 	.parent		= &clk_usbpll,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_USB_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_USBCTRL_HCLK_EN,
+	.enable_reg	= LPC32XX_CLKPWR_USB_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_USBCTRL_HCLK_EN,
 };
 
 static int tsc_onoff_enable(struct clk *clk, int enable)
@@ -668,9 +670,9 @@ static int tsc_onoff_enable(struct clk *clk, int enable)
 	u32 tmp;
 
 	/* Make sure 32KHz clock is the selected clock */
-	tmp = readl(CLKPWR_ADC_CLK_CTRL_1(CLKPWR_IOBASE));
-	tmp &= ~CLKPWR_ADCCTRL1_PCLK_SEL;
-	writel(tmp, CLKPWR_ADC_CLK_CTRL_1(CLKPWR_IOBASE));
+	tmp = readl(LPC32XX_CLKPWR_ADC_CLK_CTRL_1(CLKPWR_IOBASE));
+	tmp &= ~LPC32XX_CLKPWR_ADCCTRL1_PCLK_SEL;
+	writel(tmp, LPC32XX_CLKPWR_ADC_CLK_CTRL_1(CLKPWR_IOBASE));
 
 	if (enable == 0)
 		writel(0, clk->enable_reg);
@@ -683,22 +685,24 @@ static int tsc_onoff_enable(struct clk *clk, int enable)
 static struct clk clk_tsc = {
 	.parent		= &osc_32KHz,
 	.enable		= &tsc_onoff_enable,
-	.enable_reg	= CLKPWR_ADC_CLK_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_ADC32CLKCTRL_CLK_EN,
+	.enable_reg	= LPC32XX_CLKPWR_ADC_CLK_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_ADC32CLKCTRL_CLK_EN,
 };
 
 static int mmc_onoff_enable(struct clk *clk, int enable)
 {
 	u32 tmp;
 
-	tmp = readl(CLKPWR_MS_CTRL(CLKPWR_IOBASE)) &
-		~(CLKPWR_MSCARD_SDCARD_EN|CLKPWR_MSCARD_SDCARD_DIV(15));
+	tmp = readl(LPC32XX_CLKPWR_MS_CTRL(CLKPWR_IOBASE)) &
+		~(LPC32XX_CLKPWR_MSCARD_SDCARD_EN |
+		LPC32XX_CLKPWR_MSCARD_SDCARD_DIV(15));
 
 	/* If rate is 0, disable clock */
 	if (enable != 0)
-		tmp |= CLKPWR_MSCARD_SDCARD_EN | CLKPWR_MSCARD_SDCARD_DIV(1);
+		tmp |= LPC32XX_CLKPWR_MSCARD_SDCARD_EN |
+			LPC32XX_CLKPWR_MSCARD_SDCARD_DIV(1);
 
-	writel(tmp, CLKPWR_MS_CTRL(CLKPWR_IOBASE));
+	writel(tmp, LPC32XX_CLKPWR_MS_CTRL(CLKPWR_IOBASE));
 
 	return 0;
 }
@@ -707,8 +711,8 @@ static u32 mmc_get_rate(struct clk *clk)
 {
 	u32 div, tmp, rate;
 
-	div = readl(CLKPWR_MS_CTRL(CLKPWR_IOBASE));
-	tmp = div & CLKPWR_MSCARD_SDCARD_EN;
+	div = readl(LPC32XX_CLKPWR_MS_CTRL(CLKPWR_IOBASE));
+	tmp = div & LPC32XX_CLKPWR_MSCARD_SDCARD_EN;
 
 	if (!tmp)
 		return 0;
@@ -742,16 +746,16 @@ static struct clk clk_mmc = {
 	.set_rate	= &mmc_set_rate,
 	.get_rate	= &mmc_get_rate,
 	.enable		= &mmc_onoff_enable,
-	.enable_reg	= CLKPWR_MS_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_MSCARD_SDCARD_EN,
+	.enable_reg	= LPC32XX_CLKPWR_MS_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_MSCARD_SDCARD_EN,
 };
 
 static u32 clcd_get_rate(struct clk *clk)
 {
 	u32 tmp, div, rate;
 
-	tmp = readl(CLKPWR_LCDCLK_CTRL(CLKPWR_IOBASE)) &
-		CLKPWR_LCDCTRL_CLK_EN;
+	tmp = readl(LPC32XX_CLKPWR_LCDCLK_CTRL(CLKPWR_IOBASE)) &
+		LPC32XX_CLKPWR_LCDCTRL_CLK_EN;
 
 	if (!tmp)
 		return 0;
@@ -802,8 +806,8 @@ static struct clk clk_lcd = {
 	.set_rate	= &clcd_set_rate,
 	.get_rate	= &clcd_get_rate,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= CLKPWR_LCDCLK_CTRL(CLKPWR_IOBASE),
-	.enable_mask	= CLKPWR_LCDCTRL_CLK_EN,
+	.enable_reg	= LPC32XX_CLKPWR_LCDCLK_CTRL(CLKPWR_IOBASE),
+	.enable_mask	= LPC32XX_CLKPWR_LCDCTRL_CLK_EN,
 };
 
 static inline void clk_lock(void)
arch/arm/mach-lpc32xx/common.c +9 -9
index f4e2113..2a97ce0 100644
@@ -109,7 +109,7 @@ void lpc32xx_get_uid(u32 devid[4])
 	int i;
 
 	for (i = 0; i < 4; i++)
-		devid[i] = readl(CLKPWR_DEVID(CLKPWR_IOBASE, i << 2));
+		devid[i] = readl(LPC32XX_CLKPWR_DEVID(CLKPWR_IOBASE, i << 2));
 }
 
 /*
@@ -118,8 +118,8 @@ void lpc32xx_get_uid(u32 devid[4])
  */
 int clk_is_sysclk_mainosc(void)
 {
-	if ((readl(CLKPWR_SYSCLK_CTRL(CLKPWR_IOBASE)) &
-		CLKPWR_SYSCTRL_SYSCLKMUX) == 0)
+	if ((readl(LPC32XX_CLKPWR_SYSCLK_CTRL(CLKPWR_IOBASE)) &
+		LPC32XX_CLKPWR_SYSCTRL_SYSCLKMUX) == 0)
 		return 1;
 
 	return 0;
@@ -131,8 +131,8 @@ int clk_is_sysclk_mainosc(void)
 void lpc32xx_watchdog_reset(void)
 {
 	/* Make sure WDT clocks are enabled */
-	writel(CLKPWR_PWMCLK_WDOG_EN,
-		CLKPWR_TIMER_CLK_CTRL(CLKPWR_IOBASE));
+	writel(LPC32XX_CLKPWR_PWMCLK_WDOG_EN,
+		LPC32XX_CLKPWR_TIMER_CLK_CTRL(CLKPWR_IOBASE));
 
 	/* Instand assert of RESETOUT_N with pulse length 1mS */
 	writel(13000, WDT_IOBASE + 0x18);
@@ -217,11 +217,11 @@ u32 clk_get_pllrate_from_reg(u32 inputclk, u32 regval)
 	pllcfg.cco_bypass_b15 = 0;
 	pllcfg.direct_output_b14 = 0;
 	pllcfg.fdbk_div_ctrl_b13 = 0;
-	if ((regval & CLKPWR_HCLKPLL_CCO_BYPASS) != 0)
+	if ((regval & LPC32XX_CLKPWR_HCLKPLL_CCO_BYPASS) != 0)
 		pllcfg.cco_bypass_b15 = 1;
-	if ((regval & CLKPWR_HCLKPLL_POSTDIV_BYPASS) != 0)
+	if ((regval & LPC32XX_CLKPWR_HCLKPLL_POSTDIV_BYPASS) != 0)
 		pllcfg.direct_output_b14 = 1;
-	if ((regval & CLKPWR_HCLKPLL_FDBK_SEL_FCLK) != 0)
+	if ((regval & LPC32XX_CLKPWR_HCLKPLL_FDBK_SEL_FCLK) != 0)
 		pllcfg.fdbk_div_ctrl_b13 = 1;
 	pllcfg.pll_m = 1 + ((regval >> 1) & 0xFF);
 	pllcfg.pll_n = 1 + ((regval >> 9) & 0x3);
@@ -232,7 +232,7 @@ u32 clk_get_pllrate_from_reg(u32 inputclk, u32 regval)
 
 u32 clk_get_pclk_div(void)
 {
-	return 1 + ((readl(CLKPWR_HCLK_DIV(CLKPWR_IOBASE)) >> 2) &
+	return 1 + ((readl(LPC32XX_CLKPWR_HCLK_DIV(CLKPWR_IOBASE)) >> 2) &
 		0x1F);
 }
 
arch/arm/mach-lpc32xx/include/mach/platform.h +306 -306

761 lines not on this page · raw message

arch/arm/mach-lpc32xx/phy3250.c +27 -24

79 lines not on this page · raw message

arch/arm/mach-lpc32xx/pm_events.c +172 -168

534 lines not on this page · raw message

arch/arm/mach-lpc32xx/serial.c +5 -5
index e4479ba..def5003 100644
@@ -98,28 +98,28 @@ static struct uartinit uartinit_data[] __initdata = {
 	{
 		.uart_ck_name = "uart5_ck",
 		.ck_mode_mask = UART_CLKMODE_LOAD(UART_CLKMODE_ON, 5),
-		.pdiv_clk_reg = CLKPWR_UART5_CLK_CTRL(CLKPWR_IOBASE),
+		.pdiv_clk_reg = LPC32XX_CLKPWR_UART5_CLK_CTRL(CLKPWR_IOBASE),
 	},
 #endif
 #ifdef CONFIG_ARCH_LPC32XX_UART3_ENABLE
 	{
 		.uart_ck_name = "uart3_ck",
 		.ck_mode_mask = UART_CLKMODE_LOAD(UART_CLKMODE_ON, 3),
-		.pdiv_clk_reg = CLKPWR_UART3_CLK_CTRL(CLKPWR_IOBASE),
+		.pdiv_clk_reg = LPC32XX_CLKPWR_UART3_CLK_CTRL(CLKPWR_IOBASE),
 	},
 #endif
 #ifdef CONFIG_ARCH_LPC32XX_UART4_ENABLE
 	{
 		.uart_ck_name = "uart4_ck",
 		.ck_mode_mask = UART_CLKMODE_LOAD(UART_CLKMODE_ON, 4),
-		.pdiv_clk_reg = CLKPWR_UART4_CLK_CTRL(CLKPWR_IOBASE),
+		.pdiv_clk_reg = LPC32XX_CLKPWR_UART4_CLK_CTRL(CLKPWR_IOBASE),
 	},
 #endif
 #ifdef CONFIG_ARCH_LPC32XX_UART6_ENABLE
 	{
 		.uart_ck_name = "uart6_ck",
 		.ck_mode_mask = UART_CLKMODE_LOAD(UART_CLKMODE_ON, 6),
-		.pdiv_clk_reg = CLKPWR_UART6_CLK_CTRL(CLKPWR_IOBASE),
+		.pdiv_clk_reg = LPC32XX_CLKPWR_UART6_CLK_CTRL(CLKPWR_IOBASE),
 	},
 #endif
 };
@@ -144,7 +144,7 @@ void __init lpc32xx_serial_init(void)
 	int i;
 
 	/* UART clocks are off, let clock driver manage them */
-	__raw_writel(0, CLKPWR_UART_CLK_CTRL(CLKPWR_IOBASE));
+	__raw_writel(0, LPC32XX_CLKPWR_UART_CLK_CTRL(CLKPWR_IOBASE));
 
 	for (i = 0; i < ARRAY_SIZE(uartinit_data); i++) {
 		clk = clk_get(NULL, uartinit_data[i].uart_ck_name);
arch/arm/mach-lpc32xx/suspend.S +32 -24

99 lines not on this page · raw message

arch/arm/mach-lpc32xx/timer.c +4 -4
index c5fa62d..35f58e2 100644
@@ -132,9 +132,9 @@ static void __init lpc32xx_timer_init(void)
 	u32 clkrate, pllreg;
 
 	/* Enable timer clock */
-	writel(
-		(CLKPWR_TMRPWMCLK_TIMER0_EN | CLKPWR_TMRPWMCLK_TIMER1_EN),
-		CLKPWR_TIMERS_PWMS_CLK_CTRL_1(CLKPWR_IOBASE));
+	writel(LPC32XX_CLKPWR_TMRPWMCLK_TIMER0_EN |
+		LPC32XX_CLKPWR_TMRPWMCLK_TIMER1_EN,
+		LPC32XX_CLKPWR_TIMERS_PWMS_CLK_CTRL_1(CLKPWR_IOBASE));
 
 	/* The clock driver isn't initialized@this point. So determine if
 	   the SYSCLK is driven from the PLL397 or main oscillator and then use
@@ -146,7 +146,7 @@ static void __init lpc32xx_timer_init(void)
 		clkrate = 397 * LPC32XX_CLOCK_OSC_FREQ;
 
 	/* Get ARM HCLKPLL register and convert it into a frequency*/
-	pllreg = readl(CLKPWR_HCLKPLL_CTRL(CLKPWR_IOBASE)) & 0x1FFFF;
+	pllreg = readl(LPC32XX_CLKPWR_HCLKPLL_CTRL(CLKPWR_IOBASE)) & 0x1FFFF;
 	clkrate = clk_get_pllrate_from_reg(clkrate, pllreg);
 
 	/* Get PCLK divider and divide ARM PLL clock by it to get timer rate */
Signature · 1 line
1.6.6
#10 lore raw

PATCH 5/16 ARM: LPC32XX: Added LPC32XX identifier to INTC register field macros

In reply to a message not in the archive

From: Kevin Wells <[email protected]>

The INTC macros and associated code have been updated with the LPC32XX identifier.

---
 arch/arm/mach-lpc32xx/include/mach/entry-macro.S |    6 +-
 arch/arm/mach-lpc32xx/include/mach/platform.h    |   12 ++--
 arch/arm/mach-lpc32xx/irq.c                      |   69 +++++++++++-----------
 3 files changed, 44 insertions(+), 43 deletions(-)
arch/arm/mach-lpc32xx/include/mach/entry-macro.S +3 -3
index 01331f1..25f2adc 100644
@@ -39,7 +39,7 @@
 	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp
 	/* Get MIC status first */
 	ldr	\base, =IO_ADDRESS(LPC32XX_MIC_BASE)
-	ldr	\irqstat, [\base, #INTC_STAT]
+	ldr	\irqstat, [\base, #LPC32XX_INTC_STAT]
 	and	\irqstat, \irqstat, #0xFFFFFFFC
 	mov	\tmp, #0
 
@@ -49,7 +49,7 @@
 
 	/* SIC1 interrupts start at offset 32 */
 	ldr	\base, =IO_ADDRESS(LPC32XX_SIC1_BASE)
-	ldr	\irqstat, [\base, #INTC_STAT]
+	ldr	\irqstat, [\base, #LPC32XX_INTC_STAT]
 	mov	\tmp, #32
 
 	/* Drop through to SIC2 if SIC1 is not pending */
@@ -58,7 +58,7 @@
 
 	/* SIC2 interrupts start at offset 64 */
 	ldr	\base, =IO_ADDRESS(LPC32XX_SIC2_BASE)
-	ldr	\irqstat, [\base, #INTC_STAT]
+	ldr	\irqstat, [\base, #LPC32XX_INTC_STAT]
 	mov	\tmp, #64
 
 	/* Safety check only, exit if no status on MIC, SIC1, SIC2 */
arch/arm/mach-lpc32xx/include/mach/platform.h +6 -6
index 7e9ade1..099db8a 100644
@@ -588,12 +588,12 @@
 /*
  * Interrupt controller register offsets
  */
-#define INTC_MASK		0x00
-#define INTC_RAW_STAT		0x04
-#define INTC_STAT		0x08
-#define INTC_POLAR		0x0C
-#define INTC_ACT_TYPE		0x10
-#define INTC_TYPE		0x14
+#define LPC32XX_INTC_MASK			0x00
+#define LPC32XX_INTC_RAW_STAT			0x04
+#define LPC32XX_INTC_STAT			0x08
+#define LPC32XX_INTC_POLAR			0x0C
+#define LPC32XX_INTC_ACT_TYPE			0x10
+#define LPC32XX_INTC_TYPE			0x14
 
 /*
  *
arch/arm/mach-lpc32xx/irq.c +35 -34

134 lines not on this page · raw message

Signature · 1 line
1.6.6
#11 lore raw

PATCH 6/16 ARM: LPC32XX: Added LPC32XX identifier to TIMER register field macros

In reply to a message not in the archive

From: Kevin Wells <[email protected]>

The TIMER macros and associated code have been updated with the LPC32XX identifier.

---
 arch/arm/mach-lpc32xx/include/mach/platform.h |   48 ++++++++++++------------
 arch/arm/mach-lpc32xx/timer.c                 |   34 ++++++++++--------
 2 files changed, 43 insertions(+), 39 deletions(-)
arch/arm/mach-lpc32xx/include/mach/platform.h +24 -24
index 099db8a..1ee148c 100644
@@ -600,42 +600,42 @@
  * Timer/counter register offsets
  *
  */
-#define TIMER_IR(x)			((x) + 0x00)
-#define TIMER_TCR(x)			((x) + 0x04)
-#define TIMER_TC(x)			((x) + 0x08)
-#define TIMER_PR(x)			((x) + 0x0C)
-#define TIMER_PC(x)			((x) + 0x10)
-#define TIMER_MCR(x)			((x) + 0x14)
-#define TIMER_MR0(x)			((x) + 0x18)
-#define TIMER_MR1(x)			((x) + 0x1C)
-#define TIMER_MR2(x)			((x) + 0x20)
-#define TIMER_MR3(x)			((x) + 0x24)
-#define TIMER_CCR(x)			((x) + 0x28)
-#define TIMER_CR0(x)			((x) + 0x2C)
-#define TIMER_CR1(x)			((x) + 0x30)
-#define TIMER_CR2(x)			((x) + 0x34)
-#define TIMER_CR3(x)			((x) + 0x38)
-#define TIMER_EMR(x)			((x) + 0x3C)
-#define TIMER_CTCR(x)			((x) + 0x70)
+#define LCP32XX_TIMER_IR(x)			((x) + 0x00)
+#define LCP32XX_TIMER_TCR(x)			((x) + 0x04)
+#define LCP32XX_TIMER_TC(x)			((x) + 0x08)
+#define LCP32XX_TIMER_PR(x)			((x) + 0x0C)
+#define LCP32XX_TIMER_PC(x)			((x) + 0x10)
+#define LCP32XX_TIMER_MCR(x)			((x) + 0x14)
+#define LCP32XX_TIMER_MR0(x)			((x) + 0x18)
+#define LCP32XX_TIMER_MR1(x)			((x) + 0x1C)
+#define LCP32XX_TIMER_MR2(x)			((x) + 0x20)
+#define LCP32XX_TIMER_MR3(x)			((x) + 0x24)
+#define LCP32XX_TIMER_CCR(x)			((x) + 0x28)
+#define LCP32XX_TIMER_CR0(x)			((x) + 0x2C)
+#define LCP32XX_TIMER_CR1(x)			((x) + 0x30)
+#define LCP32XX_TIMER_CR2(x)			((x) + 0x34)
+#define LCP32XX_TIMER_CR3(x)			((x) + 0x38)
+#define LCP32XX_TIMER_EMR(x)			((x) + 0x3C)
+#define LCP32XX_TIMER_CTCR(x)			((x) + 0x70)
 
 /*
  * ir register definitions
  */
-#define TIMER_CNTR_MTCH_BIT(n)		(1 << ((n) & 0x3))
-#define TIMER_CNTR_CAPT_BIT(n)		(1 << (4 + ((n) & 0x3)))
+#define LCP32XX_TIMER_CNTR_MTCH_BIT(n)		(1 << ((n) & 0x3))
+#define LCP32XX_TIMER_CNTR_CAPT_BIT(n)		(1 << (4 + ((n) & 0x3)))
 
 /*
  * tcr register definitions
  */
-#define TIMER_CNTR_TCR_EN		0x1
-#define TIMER_CNTR_TCR_RESET		0x2
+#define LCP32XX_TIMER_CNTR_TCR_EN		0x1
+#define LCP32XX_TIMER_CNTR_TCR_RESET		0x2
 
 /*
  * mcr register definitions
  */
-#define TIMER_CNTR_MCR_MTCH(n)		(0x1 << ((n) * 3))
-#define TIMER_CNTR_MCR_RESET(n)		(0x1 << (((n) * 3) + 1))
-#define TIMER_CNTR_MCR_STOP(n)		(0x1 << (((n) * 3) + 2))
+#define LCP32XX_TIMER_CNTR_MCR_MTCH(n)		(0x1 << ((n) * 3))
+#define LCP32XX_TIMER_CNTR_MCR_RESET(n)		(0x1 << (((n) * 3) + 1))
+#define LCP32XX_TIMER_CNTR_MCR_STOP(n)		(0x1 << (((n) * 3) + 2))
 
 /*
  *
arch/arm/mach-lpc32xx/timer.c +19 -15
index 35f58e2..cd79017 100644
@@ -40,7 +40,7 @@
 
 static cycle_t lpc32xx_clksrc_read(struct clocksource *cs)
 {
-	return (cycle_t)readl(TIMER_TC(TIMER1_IOBASE));
+	return (cycle_t)readl(LCP32XX_TIMER_TC(TIMER1_IOBASE));
 }
 
 static struct clocksource lpc32xx_clksrc = {
@@ -62,9 +62,9 @@ static int lpc32xx_clkevt_next_event(unsigned long delta,
 
 	local_irq_save(flags);
 
-	writel(TIMER_CNTR_TCR_RESET, TIMER_TCR(TIMER0_IOBASE));
-	writel(delta, TIMER_PR(TIMER0_IOBASE));
-	writel(TIMER_CNTR_TCR_EN, TIMER_TCR(TIMER0_IOBASE));
+	writel(LCP32XX_TIMER_CNTR_TCR_RESET, LCP32XX_TIMER_TCR(TIMER0_IOBASE));
+	writel(delta, LCP32XX_TIMER_PR(TIMER0_IOBASE));
+	writel(LCP32XX_TIMER_CNTR_TCR_EN, LCP32XX_TIMER_TCR(TIMER0_IOBASE));
 
 	local_irq_restore(flags);
 
@@ -86,7 +86,7 @@ static void lpc32xx_clkevt_mode(enum clock_event_mode mode,
 		 * disable the timer to wait for the first call to
 		 * set_next_event().
 		 */
-		writel(0, TIMER_TCR(TIMER0_IOBASE));
+		writel(0, LCP32XX_TIMER_TCR(TIMER0_IOBASE));
 		break;
 
 	case CLOCK_EVT_MODE_UNUSED:
@@ -109,7 +109,8 @@ static irqreturn_t lpc32xx_timer_interrupt(int irq, void *dev_id)
 	struct clock_event_device *evt = &lpc32xx_clkevt;
 
 	/* Clear match */
-	writel(TIMER_CNTR_MTCH_BIT(0), TIMER_IR(TIMER0_IOBASE));
+	writel(LCP32XX_TIMER_CNTR_MTCH_BIT(0),
+		LCP32XX_TIMER_IR(TIMER0_IOBASE));
 
 	evt->event_handler(evt);
 
@@ -153,11 +154,14 @@ static void __init lpc32xx_timer_init(void)
 	clkrate = clkrate / clk_get_pclk_div();
 
 	/* Initial timer setup */
-	writel(0, TIMER_TCR(TIMER0_IOBASE));
-	writel(TIMER_CNTR_MTCH_BIT(0), TIMER_IR(TIMER0_IOBASE));
-	writel(1, TIMER_MR0(TIMER0_IOBASE));
-	writel(TIMER_CNTR_MCR_MTCH(0) | TIMER_CNTR_MCR_STOP(0) |
-	    TIMER_CNTR_MCR_RESET(0), TIMER_MCR(TIMER0_IOBASE));
+	writel(0, LCP32XX_TIMER_TCR(TIMER0_IOBASE));
+	writel(LCP32XX_TIMER_CNTR_MTCH_BIT(0),
+		LCP32XX_TIMER_IR(TIMER0_IOBASE));
+	writel(1, LCP32XX_TIMER_MR0(TIMER0_IOBASE));
+	writel(LCP32XX_TIMER_CNTR_MCR_MTCH(0) |
+		LCP32XX_TIMER_CNTR_MCR_STOP(0) |
+		LCP32XX_TIMER_CNTR_MCR_RESET(0),
+		LCP32XX_TIMER_MCR(TIMER0_IOBASE));
 
 	/* Setup tick interrupt */
 	setup_irq(IRQ_TIMER0, &lpc32xx_timer_irq);
@@ -172,10 +176,10 @@ static void __init lpc32xx_timer_init(void)
 	clockevents_register_device(&lpc32xx_clkevt);
 
 	/* Use timer1 as clock source. */
-	writel(TIMER_CNTR_TCR_RESET, TIMER_TCR(TIMER1_IOBASE));
-	writel(0, TIMER_PR(TIMER1_IOBASE));
-	writel(0, TIMER_MCR(TIMER1_IOBASE));
-	writel(TIMER_CNTR_TCR_EN, TIMER_TCR(TIMER1_IOBASE));
+	writel(LCP32XX_TIMER_CNTR_TCR_RESET, LCP32XX_TIMER_TCR(TIMER1_IOBASE));
+	writel(0, LCP32XX_TIMER_PR(TIMER1_IOBASE));
+	writel(0, LCP32XX_TIMER_MCR(TIMER1_IOBASE));
+	writel(LCP32XX_TIMER_CNTR_TCR_EN, LCP32XX_TIMER_TCR(TIMER1_IOBASE));
 	lpc32xx_clksrc.mult = clocksource_hz2mult(clkrate,
 		lpc32xx_clksrc.shift);
 	clocksource_register(&lpc32xx_clksrc);
Signature · 1 line
1.6.6
#12 lore raw

PATCH 7/16 ARM: LPC32XX: Added LPC32XX identifier to UART register field macros

In reply to a message not in the archive

From: Kevin Wells <[email protected]>

The UART macros and associated code have been updated with the LPC32XX identifier.

---
 arch/arm/mach-lpc32xx/include/mach/platform.h |   56 ++++++++++++------------
 arch/arm/mach-lpc32xx/serial.c                |   37 +++++++++-------
 2 files changed, 49 insertions(+), 44 deletions(-)
arch/arm/mach-lpc32xx/include/mach/platform.h +28 -28
index 1ee148c..9de37ee 100644
@@ -642,48 +642,48 @@
  * Standard UART register offsets
  *
  */
-#define UART_DLL_FIFO(x)		((x) + 0x00)
-#define UART_DLM_IER(x)			((x) + 0x04)
-#define UART_IIR_FCR(x)			((x) + 0x08)
-#define UART_LCR_(x)			((x) + 0x0C)
-#define UART_MODEM_CTRL(x)		((x) + 0x10)
-#define UART_LSR_(x)			((x) + 0x14)
-#define UART_MODEM_STATUS(x)		((x) + 0x18)
-#define UART_RXLEV(x)			((x) + 0x1C)
+#define LPC32XX_UART_DLL_FIFO(x)		((x) + 0x00)
+#define LPC32XX_UART_DLM_IER(x)			((x) + 0x04)
+#define LPC32XX_UART_IIR_FCR(x)			((x) + 0x08)
+#define LPC32XX_UART_LCR_(x)			((x) + 0x0C)
+#define LPC32XX_UART_MODEM_CTRL(x)		((x) + 0x10)
+#define LPC32XX_UART_LSR_(x)			((x) + 0x14)
+#define LPC32XX_UART_MODEM_STATUS(x)		((x) + 0x18)
+#define LPC32XX_UART_RXLEV(x)			((x) + 0x1C)
 
 /*
  *
  * UART control structure offsets
  *
  */
-#define UARTCTL_CTRL(x)			((x) + 0x00)
-#define UARTCTL_CLKMODE(x)		((x) + 0x04)
-#define UARTCTL_CLOOP(x)		((x) + 0x08)
+#define LPC32XX_UARTCTL_CTRL(x)			((x) + 0x00)
+#define LPC32XX_UARTCTL_CLKMODE(x)		((x) + 0x04)
+#define LPC32XX_UARTCTL_CLOOP(x)		((x) + 0x08)
 
 /*
  * ctrl register definitions
  */
-#define UART_U3_MD_CTRL_EN		_BIT(11)
-#define UART_IRRX6_INV_EN		_BIT(10)
-#define UART_HDPX_EN			_BIT(9)
-#define UART_UART6_IRDAMOD_BYPASS	_BIT(5)
-#define RT_IRTX6_INV_EN			_BIT(4)
-#define RT_IRTX6_INV_MIR_EN		_BIT(3)
-#define RT_RX_IRPULSE_3_16_115K		_BIT(2)
-#define RT_TX_IRPULSE_3_16_115K		_BIT(1)
-#define UART_U5_ROUTE_TO_USB		_BIT(0)
+#define LPC32XX_UART_U3_MD_CTRL_EN		_BIT(11)
+#define LPC32XX_UART_IRRX6_INV_EN		_BIT(10)
+#define LPC32XX_UART_HDPX_EN			_BIT(9)
+#define LPC32XX_UART_UART6_IRDAMOD_BYPASS	_BIT(5)
+#define LPC32XX_RT_IRTX6_INV_EN			_BIT(4)
+#define LPC32XX_RT_IRTX6_INV_MIR_EN		_BIT(3)
+#define LPC32XX_RT_RX_IRPULSE_3_16_115K		_BIT(2)
+#define LPC32XX_RT_TX_IRPULSE_3_16_115K		_BIT(1)
+#define LPC32XX_UART_U5_ROUTE_TO_USB		_BIT(0)
 
 /*
  * clkmode register definitions
  */
-#define UART_ENABLED_CLOCKS(n)		(((n) >> 16) & 0x7F)
-#define UART_ENABLED_CLOCK(n, u)	(((n) >> (16 + (u))) & 0x1)
-#define UART_ENABLED_CLKS_ANY		_BIT(14)
-#define UART_CLKMODE_OFF		0x0
-#define UART_CLKMODE_ON			0x1
-#define UART_CLKMODE_AUTO		0x2
-#define UART_CLKMODE_MASK(u)		(0x3 << ((((u) - 3) * 2) + 4))
-#define UART_CLKMODE_LOAD(m, u)		((m) << ((((u) - 3) * 2) + 4))
+#define LPC32XX_UART_ENABLED_CLOCKS(n)		(((n) >> 16) & 0x7F)
+#define LPC32XX_UART_ENABLED_CLOCK(n, u)	(((n) >> (16 + (u))) & 0x1)
+#define LPC32XX_UART_ENABLED_CLKS_ANY		_BIT(14)
+#define LPC32XX_UART_CLKMODE_OFF		0x0
+#define LPC32XX_UART_CLKMODE_ON			0x1
+#define LPC32XX_UART_CLKMODE_AUTO		0x2
+#define LPC32XX_UART_CLKMODE_MASK(u)		(0x3 << ((((u) - 3) * 2) + 4))
+#define LPC32XX_UART_CLKMODE_LOAD(m, u)		((m) << ((((u) - 3) * 2) + 4))
 
 /*
  *
arch/arm/mach-lpc32xx/serial.c +21 -16
index def5003..3a0acfd 100644
@@ -97,28 +97,32 @@ static struct uartinit uartinit_data[] __initdata = {
 #ifdef CONFIG_ARCH_LPC32XX_UART5_ENABLE
 	{
 		.uart_ck_name = "uart5_ck",
-		.ck_mode_mask = UART_CLKMODE_LOAD(UART_CLKMODE_ON, 5),
+		.ck_mode_mask =
+			LPC32XX_UART_CLKMODE_LOAD(LPC32XX_UART_CLKMODE_ON, 5),
 		.pdiv_clk_reg = LPC32XX_CLKPWR_UART5_CLK_CTRL(CLKPWR_IOBASE),
 	},
 #endif
 #ifdef CONFIG_ARCH_LPC32XX_UART3_ENABLE
 	{
 		.uart_ck_name = "uart3_ck",
-		.ck_mode_mask = UART_CLKMODE_LOAD(UART_CLKMODE_ON, 3),
+		.ck_mode_mask =
+			LPC32XX_UART_CLKMODE_LOAD(LPC32XX_UART_CLKMODE_ON, 3),
 		.pdiv_clk_reg = LPC32XX_CLKPWR_UART3_CLK_CTRL(CLKPWR_IOBASE),
 	},
 #endif
 #ifdef CONFIG_ARCH_LPC32XX_UART4_ENABLE
 	{
 		.uart_ck_name = "uart4_ck",
-		.ck_mode_mask = UART_CLKMODE_LOAD(UART_CLKMODE_ON, 4),
+		.ck_mode_mask =
+			LPC32XX_UART_CLKMODE_LOAD(LPC32XX_UART_CLKMODE_ON, 4),
 		.pdiv_clk_reg = LPC32XX_CLKPWR_UART4_CLK_CTRL(CLKPWR_IOBASE),
 	},
 #endif
 #ifdef CONFIG_ARCH_LPC32XX_UART6_ENABLE
 	{
 		.uart_ck_name = "uart6_ck",
-		.ck_mode_mask = UART_CLKMODE_LOAD(UART_CLKMODE_ON, 6),
+		.ck_mode_mask =
+			LPC32XX_UART_CLKMODE_LOAD(LPC32XX_UART_CLKMODE_ON, 6),
 		.pdiv_clk_reg = LPC32XX_CLKPWR_UART6_CLK_CTRL(CLKPWR_IOBASE),
 	},
 #endif
@@ -169,31 +173,32 @@ void __init lpc32xx_serial_init(void)
 	}
 
 	/* This needs to be done after all UART clocks are setup */
-	writel(clkmodes, UARTCTL_CLKMODE(io_p2v(LPC32XX_UART_CTRL_BASE)));
+	writel(clkmodes,
+		LPC32XX_UARTCTL_CLKMODE(io_p2v(LPC32XX_UART_CTRL_BASE)));
 	for (i = 0; i < ARRAY_SIZE(uartinit_data) - 1; i++) {
 		/* Force a flush of the RX FIFOs to work around a HW bug */
 		puart = serial_std_platform_data[i].membase;
-		writel(0xC1, UART_IIR_FCR(puart));
-		writel(0x00, UART_DLL_FIFO(puart));
+		writel(0xC1, LPC32XX_UART_IIR_FCR(puart));
+		writel(0x00, LPC32XX_UART_DLL_FIFO(puart));
 		clkmodes = 64;
 		while (clkmodes--)
-			tmp = readl(UART_DLL_FIFO(puart));
-		writel(0, UART_IIR_FCR(puart));
+			tmp = readl(LPC32XX_UART_DLL_FIFO(puart));
+		writel(0, LPC32XX_UART_IIR_FCR(puart));
 	}
 
 	/* IrDA pulsing support on UART6. This only enables the IrDA mux */
-	tmp = readl(UARTCTL_CTRL(io_p2v(LPC32XX_UART_CTRL_BASE)));
+	tmp = readl(LPC32XX_UARTCTL_CTRL(io_p2v(LPC32XX_UART_CTRL_BASE)));
 #ifdef CONFIG_ARCH_LPC32XX_UART6_IRDAMODE
-	tmp &= ~UART_UART6_IRDAMOD_BYPASS;
+	tmp &= ~LPC32XX_UART_UART6_IRDAMOD_BYPASS;
 #else
-	tmp |= UART_UART6_IRDAMOD_BYPASS;
+	tmp |= LPC32XX_UART_UART6_IRDAMOD_BYPASS;
 #endif
-	writel(tmp, UARTCTL_CTRL(io_p2v(LPC32XX_UART_CTRL_BASE)));
+	writel(tmp, LPC32XX_UARTCTL_CTRL(io_p2v(LPC32XX_UART_CTRL_BASE)));
 
 	/* Disable UART5->USB transparent mode or USB won't work */
-	tmp = readl(UARTCTL_CTRL(io_p2v(LPC32XX_UART_CTRL_BASE)));
-	tmp &= ~UART_U5_ROUTE_TO_USB;
-	writel(tmp, UARTCTL_CTRL(io_p2v(LPC32XX_UART_CTRL_BASE)));
+	tmp = readl(LPC32XX_UARTCTL_CTRL(io_p2v(LPC32XX_UART_CTRL_BASE)));
+	tmp &= ~LPC32XX_UART_U5_ROUTE_TO_USB;
+	writel(tmp, LPC32XX_UARTCTL_CTRL(io_p2v(LPC32XX_UART_CTRL_BASE)));
 
 	platform_add_devices(lpc32xx_serial_devs,
 		ARRAY_SIZE(lpc32xx_serial_devs));
Signature · 1 line
1.6.6
#13 lore raw

PATCH 8/16 ARM: LPC32XX: Added LPC32XX identifier to GPIO register field macros

In reply to a message not in the archive

From: Kevin Wells <[email protected]>

The GPIO macros and associated code have been updated with the LPC32XX identifier.

---
 arch/arm/mach-lpc32xx/gpiolib.c               |   96 +++++++++++++++----------
 arch/arm/mach-lpc32xx/include/mach/gpio.h     |   26 ++++----
 arch/arm/mach-lpc32xx/include/mach/platform.h |   78 ++++++++++----------
 arch/arm/mach-lpc32xx/phy3250.c               |    8 +-
 4 files changed, 114 insertions(+), 94 deletions(-)
arch/arm/mach-lpc32xx/gpiolib.c +58 -38
index 803c48f..beed7eb 100644
@@ -42,12 +42,12 @@ struct gpio_regs {
 /*
  * GPIO names
  */
-static char *gpio_p0_names[GPIO_P0_MAX] = {
+static char *gpio_p0_names[LPC32XX_GPIO_P0_MAX] = {
 	"p0.0", "p0.1", "p0.2", "p0.3",
 	"p0.4", "p0.5", "p0.6", "p0.7"
 };
 
-static char *gpio_p1_names[GPIO_P1_MAX] = {
+static char *gpio_p1_names[LPC32XX_GPIO_P1_MAX] = {
 	"p1.0", "p1.1", "p1.2", "p1.3",
 	"p1.4", "p1.5", "p1.6", "p1.7",
 	"p1.8", "p1.9", "p1.10", "p1.11",
@@ -56,19 +56,19 @@ static char *gpio_p1_names[GPIO_P1_MAX] = {
 	"p1.20", "p1.21", "p1.22", "p1.23",
 };
 
-static char *gpio_p2_names[GPIO_P2_MAX] = {
+static char *gpio_p2_names[LPC32XX_GPIO_P2_MAX] = {
 	"p2.0", "p2.1", "p2.2", "p2.3",
 	"p2.4", "p2.5", "p2.6", "p2.7",
 	"p2.8", "p2.9", "p2.10", "p2.11",
 	"p2.12"
 };
 
-static char *gpio_p3_names[GPIO_P3_MAX] = {
+static char *gpio_p3_names[LPC32XX_GPIO_P3_MAX] = {
 	"gpi000", "gpio01", "gpio02", "gpio03",
 	"gpio04", "gpio05"
 };
 
-static char *gpi_p3_names[GPI_P3_MAX] = {
+static char *gpi_p3_names[LPC32XX_GPI_P3_MAX] = {
 	"gpi00", "gpi01", "gpi02", "gpi03",
 	"gpi04", "gpi05", "gpi06", "gpi07",
 	"gpi08", "gpi09", "na",    "na",
@@ -78,7 +78,7 @@ static char *gpi_p3_names[GPI_P3_MAX] = {
 	"gpi24", "gpi25", "gpi26", "gpi27"
 };
 
-static char *gpo_p3_names[GPO_P3_MAX] = {
+static char *gpo_p3_names[LPC32XX_GPO_P3_MAX] = {
 	"gpo00", "gpo01", "gpo02", "gpo03",
 	"gpo04", "gpo05", "gpo06", "gpo07",
 	"gpo08", "gpo09", "gpo10", "gpo11",
@@ -89,32 +89,52 @@ static char *gpo_p3_names[GPO_P3_MAX] = {
 
 static struct gpio_regs gpio_grp_regs[] = {
 	{
-		.inp_state	= (void __iomem *) GPIO_P0_INP_STATE(GPIOBASE),
-		.outp_set	= (void __iomem *) GPIO_P0_OUTP_SET(GPIOBASE),
-		.outp_clr	= (void __iomem *) GPIO_P0_OUTP_CLR(GPIOBASE),
-		.dir_set	= (void __iomem *) GPIO_P0_DIR_SET(GPIOBASE),
-		.dir_clr	= (void __iomem *) GPIO_P0_DIR_CLR(GPIOBASE),
+		.inp_state	=
+			(void __iomem *) LPC32XX_GPIO_P0_INP_STATE(GPIOBASE),
+		.outp_set	=
+			(void __iomem *) LPC32XX_GPIO_P0_OUTP_SET(GPIOBASE),
+		.outp_clr	=
+			(void __iomem *) LPC32XX_GPIO_P0_OUTP_CLR(GPIOBASE),
+		.dir_set	=
+			(void __iomem *) LPC32XX_GPIO_P0_DIR_SET(GPIOBASE),
+		.dir_clr	=
+			(void __iomem *) LPC32XX_GPIO_P0_DIR_CLR(GPIOBASE),
 	},
 	{
-		.inp_state	= (void __iomem *) GPIO_P1_INP_STATE(GPIOBASE),
-		.outp_set	= (void __iomem *) GPIO_P1_OUTP_SET(GPIOBASE),
-		.outp_clr	= (void __iomem *) GPIO_P1_OUTP_CLR(GPIOBASE),
-		.dir_set	= (void __iomem *) GPIO_P1_DIR_SET(GPIOBASE),
-		.dir_clr	= (void __iomem *) GPIO_P1_DIR_CLR(GPIOBASE),
+		.inp_state	=
+			(void __iomem *) LPC32XX_GPIO_P1_INP_STATE(GPIOBASE),
+		.outp_set	=
+			(void __iomem *) LPC32XX_GPIO_P1_OUTP_SET(GPIOBASE),
+		.outp_clr	=
+			(void __iomem *) LPC32XX_GPIO_P1_OUTP_CLR(GPIOBASE),
+		.dir_set	=
+			(void __iomem *) LPC32XX_GPIO_P1_DIR_SET(GPIOBASE),
+		.dir_clr	=
+			(void __iomem *) LPC32XX_GPIO_P1_DIR_CLR(GPIOBASE),
 	},
 	{
-		.inp_state	= (void __iomem *) GPIO_P2_INP_STATE(GPIOBASE),
-		.outp_set	= (void __iomem *) GPIO_P2_OUTP_SET(GPIOBASE),
-		.outp_clr	= (void __iomem *) GPIO_P2_OUTP_CLR(GPIOBASE),
-		.dir_set	= (void __iomem *) GPIO_P2_DIR_SET(GPIOBASE),
-		.dir_clr	= (void __iomem *) GPIO_P2_DIR_CLR(GPIOBASE),
+		.inp_state	=
+			(void __iomem *) LPC32XX_GPIO_P2_INP_STATE(GPIOBASE),
+		.outp_set	=
+			(void __iomem *) LPC32XX_GPIO_P2_OUTP_SET(GPIOBASE),
+		.outp_clr	=
+			(void __iomem *) LPC32XX_GPIO_P2_OUTP_CLR(GPIOBASE),
+		.dir_set	=
+			(void __iomem *) LPC32XX_GPIO_P2_DIR_SET(GPIOBASE),
+		.dir_clr	=
+			(void __iomem *) LPC32XX_GPIO_P2_DIR_CLR(GPIOBASE),
 	},
 	{
-		.inp_state	= (void __iomem *) GPIO_P3_INP_STATE(GPIOBASE),
-		.outp_set	= (void __iomem *) GPIO_P3_OUTP_SET(GPIOBASE),
-		.outp_clr	= (void __iomem *) GPIO_P3_OUTP_CLR(GPIOBASE),
-		.dir_set	= (void __iomem *) GPIO_P2_DIR_SET(GPIOBASE),
-		.dir_clr	= (void __iomem *) GPIO_P2_DIR_CLR(GPIOBASE),
+		.inp_state	=
+			(void __iomem *) LPC32XX_GPIO_P3_INP_STATE(GPIOBASE),
+		.outp_set	=
+			(void __iomem *) LPC32XX_GPIO_P3_OUTP_SET(GPIOBASE),
+		.outp_clr	=
+			(void __iomem *) LPC32XX_GPIO_P3_OUTP_CLR(GPIOBASE),
+		.dir_set	=
+			(void __iomem *) LPC32XX_GPIO_P2_DIR_SET(GPIOBASE),
+		.dir_clr	=
+			(void __iomem *) LPC32XX_GPIO_P2_DIR_CLR(GPIOBASE),
 	},
 };
 
@@ -329,8 +349,8 @@ static struct lpc32xx_gpio_chip lpc32xx_gpiochip[] = {
 			.direction_output	= lpc32xx_gpio_dir_output_p012,
 			.set			= lpc32xx_gpio_set_value_p012,
 			.request		= lpc32xx_gpio_request,
-			.base			= GPIO_P0_GRP,
-			.ngpio			= GPIO_P0_MAX,
+			.base			= LPC32XX_GPIO_P0_GRP,
+			.ngpio			= LPC32XX_GPIO_P0_MAX,
 			.names			= gpio_p0_names,
 			.can_sleep		= 0,
 		},
@@ -344,8 +364,8 @@ static struct lpc32xx_gpio_chip lpc32xx_gpiochip[] = {
 			.direction_output	= lpc32xx_gpio_dir_output_p012,
 			.set			= lpc32xx_gpio_set_value_p012,
 			.request		= lpc32xx_gpio_request,
-			.base			= GPIO_P1_GRP,
-			.ngpio			= GPIO_P1_MAX,
+			.base			= LPC32XX_GPIO_P1_GRP,
+			.ngpio			= LPC32XX_GPIO_P1_MAX,
 			.names			= gpio_p1_names,
 			.can_sleep		= 0,
 		},
@@ -359,8 +379,8 @@ static struct lpc32xx_gpio_chip lpc32xx_gpiochip[] = {
 			.direction_output	= lpc32xx_gpio_dir_output_p012,
 			.set			= lpc32xx_gpio_set_value_p012,
 			.request		= lpc32xx_gpio_request,
-			.base			= GPIO_P2_GRP,
-			.ngpio			= GPIO_P2_MAX,
+			.base			= LPC32XX_GPIO_P2_GRP,
+			.ngpio			= LPC32XX_GPIO_P2_MAX,
 			.names			= gpio_p2_names,
 			.can_sleep		= 0,
 		},
@@ -374,8 +394,8 @@ static struct lpc32xx_gpio_chip lpc32xx_gpiochip[] = {
 			.direction_output	= lpc32xx_gpio_dir_output_p3,
 			.set			= lpc32xx_gpio_set_value_p3,
 			.request		= lpc32xx_gpio_request,
-			.base			= GPIO_P3_GRP,
-			.ngpio			= GPIO_P3_MAX,
+			.base			= LPC32XX_GPIO_P3_GRP,
+			.ngpio			= LPC32XX_GPIO_P3_MAX,
 			.names			= gpio_p3_names,
 			.can_sleep		= 0,
 		},
@@ -387,8 +407,8 @@ static struct lpc32xx_gpio_chip lpc32xx_gpiochip[] = {
 			.direction_input	= lpc32xx_gpio_dir_in_always,
 			.get			= lpc32xx_gpi_get_value,
 			.request		= lpc32xx_gpio_request,
-			.base			= GPI_P3_GRP,
-			.ngpio			= GPI_P3_MAX,
+			.base			= LPC32XX_GPI_P3_GRP,
+			.ngpio			= LPC32XX_GPI_P3_MAX,
 			.names			= gpi_p3_names,
 			.can_sleep		= 0,
 		},
@@ -400,8 +420,8 @@ static struct lpc32xx_gpio_chip lpc32xx_gpiochip[] = {
 			.direction_output	= lpc32xx_gpio_dir_out_always,
 			.set			= lpc32xx_gpo_set_value,
 			.request		= lpc32xx_gpio_request,
-			.base			= GPO_P3_GRP,
-			.ngpio			= GPO_P3_MAX,
+			.base			= LPC32XX_GPO_P3_GRP,
+			.ngpio			= LPC32XX_GPO_P3_MAX,
 			.names			= gpo_p3_names,
 			.can_sleep		= 0,
 		},
arch/arm/mach-lpc32xx/include/mach/gpio.h +13 -13
index 8df2198..e95b113 100644
@@ -34,23 +34,23 @@
  * GPIO pins: 8xP0 group, 24xP1 group, 13xP2 group, 6xP3 group
  */
 
-#define GPIO_P0_MAX 8
-#define GPIO_P1_MAX 24
-#define GPIO_P2_MAX 13
-#define GPIO_P3_MAX 6
-#define GPI_P3_MAX 28
-#define GPO_P3_MAX 24
+#define LPC32XX_GPIO_P0_MAX 8
+#define LPC32XX_GPIO_P1_MAX 24
+#define LPC32XX_GPIO_P2_MAX 13
+#define LPC32XX_GPIO_P3_MAX 6
+#define LPC32XX_GPI_P3_MAX 28
+#define LPC32XX_GPO_P3_MAX 24
 
-#define GPIO_P0_GRP 0
-#define GPIO_P1_GRP (GPIO_P0_GRP + GPIO_P0_MAX)
-#define GPIO_P2_GRP (GPIO_P1_GRP + GPIO_P1_MAX)
-#define GPIO_P3_GRP (GPIO_P2_GRP + GPIO_P2_MAX)
-#define GPI_P3_GRP (GPIO_P3_GRP + GPIO_P3_MAX)
-#define GPO_P3_GRP (GPI_P3_GRP + GPI_P3_MAX)
+#define LPC32XX_GPIO_P0_GRP 0
+#define LPC32XX_GPIO_P1_GRP (LPC32XX_GPIO_P0_GRP + LPC32XX_GPIO_P0_MAX)
+#define LPC32XX_GPIO_P2_GRP (LPC32XX_GPIO_P1_GRP + LPC32XX_GPIO_P1_MAX)
+#define LPC32XX_GPIO_P3_GRP (LPC32XX_GPIO_P2_GRP + LPC32XX_GPIO_P2_MAX)
+#define LPC32XX_GPI_P3_GRP (LPC32XX_GPIO_P3_GRP + LPC32XX_GPIO_P3_MAX)
+#define LPC32XX_GPO_P3_GRP (LPC32XX_GPI_P3_GRP + LPC32XX_GPI_P3_MAX)
 
 /*
  * A specific GPIO can be selected with this macro
- * ie, GPIO_05 can be selected with LPC32XX_GPIO(GPIO_P3_GRP, 5)
+ * ie, GPIO_05 can be selected with LPC32XX_GPIO(LPC32XX_GPIO_P3_GRP, 5)
  * See the LPC32x0 User's guide for GPIO group numbers
  */
 #define LPC32XX_GPIO(x, y) ((x) + (y))
arch/arm/mach-lpc32xx/include/mach/platform.h +39 -39

83 lines not on this page · raw message

arch/arm/mach-lpc32xx/phy3250.c +4 -4
index 0612994..80958b9 100644
@@ -48,10 +48,10 @@
 /*
  * Mapped GPIOLIB GPIOs
  */
-#define SPI0_CS_GPIO	LPC32XX_GPIO(GPIO_P3_GRP, 5)
-#define LCD_POWER_GPIO	LPC32XX_GPIO(GPO_P3_GRP, 0)
-#define BKL_POWER_GPIO	LPC32XX_GPIO(GPO_P3_GRP, 4)
-#define LED_GPIO	LPC32XX_GPIO(GPO_P3_GRP, 1)
+#define SPI0_CS_GPIO	LPC32XX_GPIO(LPC32XX_GPIO_P3_GRP, 5)
+#define LCD_POWER_GPIO	LPC32XX_GPIO(LPC32XX_GPO_P3_GRP, 0)
+#define BKL_POWER_GPIO	LPC32XX_GPIO(LPC32XX_GPO_P3_GRP, 4)
+#define LED_GPIO	LPC32XX_GPIO(LPC32XX_GPO_P3_GRP, 1)
 
 /*
  * AMBA LCD controller
Signature · 1 line
1.6.6
#14 lore raw

PATCH 9/16 ARM: LPC32XX: LPC32XX macro name changes and local macro use

In reply to a message not in the archive

From: Kevin Wells <[email protected]>

Added the LPC32XX prefix to local macro names. Added several new local macros for register offsets.

---
 arch/arm/mach-lpc32xx/suspend.S |   83 ++++++++++++++++++++-------------------
 1 files changed, 43 insertions(+), 40 deletions(-)
arch/arm/mach-lpc32xx/suspend.S +43 -40
index 1d35b34..eea6ddc 100644
@@ -26,19 +26,22 @@
 #include <mach/hardware.h>
 
 /* Using named register defines makes the code easier to follow */
-#define WORK1_REG		r0
-#define WORK2_REG		r1
-#define SAVED_HCLK_DIV_REG	r2
-#define SAVED_HCLK_PLL_REG	r3
-#define SAVED_DRAM_CLKCTRL_REG	r4
-#define SAVED_PWR_CTRL_REG	r5
-#define CLKPWRBASE_REG		r6
-#define EMCBASE_REG		r7
-
-#define EMC_STATUS_OFFS		0x04
-#define EMC_STATUS_BUSY		0x1
-#define EMC_STATUS_SELF_RFSH	0x4
-
+#define WORK1_REG			r0
+#define WORK2_REG			r1
+#define SAVED_HCLK_DIV_REG		r2
+#define SAVED_HCLK_PLL_REG		r3
+#define SAVED_DRAM_CLKCTRL_REG		r4
+#define SAVED_PWR_CTRL_REG		r5
+#define CLKPWRBASE_REG			r6
+#define EMCBASE_REG			r7
+
+#define LPC32XX_EMC_STATUS_OFFS		0x04
+#define LPC32XX_EMC_STATUS_BUSY		0x1
+#define LPC32XX_EMC_STATUS_SELF_RFSH	0x4
+
+#define LPC32XX_CLKPWR_PWR_CTRL_OFFS	0x44
+#define LPC32XX_CLKPWR_HCLK_DIV_OFFS	0x40
+#define LPC32XX_CLKPWR_HCLKPLL_CTRL_OFFS 0x58
 	.text
 
 ENTRY(lpc32xx_sys_suspend)
@@ -52,57 +55,57 @@ ENTRY(lpc32xx_sys_suspend)
 	ldr	EMCBASE_REG, [WORK1_REG, #4]
 
 	ldr	SAVED_PWR_CTRL_REG, [CLKPWRBASE_REG,\
-		#LPC32XX_CLKPWR_PWR_CTRL(0)]
+		#LPC32XX_CLKPWR_PWR_CTRL_OFFS]
 	orr	WORK1_REG, SAVED_PWR_CTRL_REG, #LPC32XX_CLKPWR_SDRAM_SELF_RFSH
 
 	@ Wait for SDRAM busy status to go busy and then idle
 	@ This guarantees a small windows where DRAM isn't busy
 1:
-	ldr	WORK2_REG, [EMCBASE_REG, #EMC_STATUS_OFFS]
-	and	WORK2_REG, WORK2_REG, #EMC_STATUS_BUSY
-	cmp	WORK2_REG, #EMC_STATUS_BUSY
+	ldr	WORK2_REG, [EMCBASE_REG, #LPC32XX_EMC_STATUS_OFFS]
+	and	WORK2_REG, WORK2_REG, #LPC32XX_EMC_STATUS_BUSY
+	cmp	WORK2_REG, #LPC32XX_EMC_STATUS_BUSY
 	bne	1b @ Branch while idle
 2:
-	ldr	WORK2_REG, [EMCBASE_REG, #EMC_STATUS_OFFS]
-	and	WORK2_REG, WORK2_REG, #EMC_STATUS_BUSY
-	cmp	WORK2_REG, #EMC_STATUS_BUSY
+	ldr	WORK2_REG, [EMCBASE_REG, #LPC32XX_EMC_STATUS_OFFS]
+	and	WORK2_REG, WORK2_REG, #LPC32XX_EMC_STATUS_BUSY
+	cmp	WORK2_REG, #LPC32XX_EMC_STATUS_BUSY
 	beq	2b @ Branch until idle
 
 	@ Setup self-refresh with support for manual exit of
 	@ self-refresh mode
-	str	WORK1_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_PWR_CTRL(0)]
+	str	WORK1_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_PWR_CTRL_OFFS]
 	orr	WORK2_REG, WORK1_REG, #LPC32XX_CLKPWR_UPD_SDRAM_SELF_RFSH
-	str	WORK2_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_PWR_CTRL(0)]
-	str	WORK1_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_PWR_CTRL(0)]
+	str	WORK2_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_PWR_CTRL_OFFS]
+	str	WORK1_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_PWR_CTRL_OFFS]
 
 	@ Wait for self-refresh acknowledge, clocks to the DRAM device
 	@ will automatically stop on start of self-refresh
 3:
-	ldr	WORK2_REG, [EMCBASE_REG, #EMC_STATUS_OFFS]
-	and	WORK2_REG, WORK2_REG, #EMC_STATUS_SELF_RFSH
-	cmp	WORK2_REG, #EMC_STATUS_SELF_RFSH
+	ldr	WORK2_REG, [EMCBASE_REG, #LPC32XX_EMC_STATUS_OFFS]
+	and	WORK2_REG, WORK2_REG, #LPC32XX_EMC_STATUS_SELF_RFSH
+	cmp	WORK2_REG, #LPC32XX_EMC_STATUS_SELF_RFSH
 	bne	3b @ Branch until self-refresh mode starts
 
 	@ Enter direct-run mode from run mode
 	bic	WORK1_REG, WORK1_REG, #LPC32XX_CLKPWR_SELECT_RUN_MODE
-	str	WORK1_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_PWR_CTRL(0)]
+	str	WORK1_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_PWR_CTRL_OFFS]
 
 	@ Safe disable of DRAM clock in EMC block, prevents DDR sync
 	@ issues on restart
 	ldr	SAVED_HCLK_DIV_REG, [CLKPWRBASE_REG,\
-		#LPC32XX_CLKPWR_HCLK_DIV(0)]
+		#LPC32XX_CLKPWR_HCLK_DIV_OFFS]
 	and	WORK2_REG, SAVED_HCLK_DIV_REG, #0xFFFFFE7F
-	str	WORK2_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_HCLK_DIV(0)]
+	str	WORK2_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_HCLK_DIV_OFFS]
 
 	@ Save HCLK PLL state and disable HCLK PLL
 	ldr	SAVED_HCLK_PLL_REG, [CLKPWRBASE_REG,\
-		#LPC32XX_CLKPWR_HCLKPLL_CTRL(0)]
+		#LPC32XX_CLKPWR_HCLKPLL_CTRL_OFFS]
 	bic	WORK2_REG, SAVED_HCLK_PLL_REG, #LPC32XX_CLKPWR_HCLKPLL_POWER_UP
-	str	WORK2_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_HCLKPLL_CTRL(0)]
+	str	WORK2_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_HCLKPLL_CTRL_OFFS]
 
 	@ Enter stop mode until an enabled event occurs
 	orr	WORK1_REG, WORK1_REG, #LPC32XX_CLKPWR_STOP_MODE_CTRL
-	str	WORK1_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_PWR_CTRL(0)]
+	str	WORK1_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_PWR_CTRL_OFFS]
 	nop
 	nop
 	nop
@@ -118,32 +121,32 @@ ENTRY(lpc32xx_sys_suspend)
 
 	@ Restore original HCLK PLL value and wait for PLL lock
 	str	SAVED_HCLK_PLL_REG, [CLKPWRBASE_REG,\
-		#LPC32XX_CLKPWR_HCLKPLL_CTRL(0)]
+		#LPC32XX_CLKPWR_HCLKPLL_CTRL_OFFS]
 4:
-	ldr	WORK2_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_HCLKPLL_CTRL(0)]
+	ldr	WORK2_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_HCLKPLL_CTRL_OFFS]
 	and	WORK2_REG, WORK2_REG, #LPC32XX_CLKPWR_HCLKPLL_PLL_STS
 	bne	4b
 
 	@ Re-enter run mode with self-refresh flag cleared, but no DRAM
 	@ update yet. DRAM is still in self-refresh
 	str	SAVED_PWR_CTRL_REG, [CLKPWRBASE_REG,\
-		#LPC32XX_CLKPWR_PWR_CTRL(0)]
+		#LPC32XX_CLKPWR_PWR_CTRL_OFFS]
 
 	@ Restore original DRAM clock mode to restore DRAM clocks
 	str	SAVED_HCLK_DIV_REG, [CLKPWRBASE_REG,\
-		#LPC32XX_CLKPWR_HCLK_DIV(0)]
+		#LPC32XX_CLKPWR_HCLK_DIV_OFFS]
 
 	@ Clear self-refresh mode
 	orr	WORK1_REG, SAVED_PWR_CTRL_REG,\
 		#LPC32XX_CLKPWR_UPD_SDRAM_SELF_RFSH
-	str	WORK1_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_PWR_CTRL(0)]
+	str	WORK1_REG, [CLKPWRBASE_REG, #LPC32XX_CLKPWR_PWR_CTRL_OFFS]
 	str	SAVED_PWR_CTRL_REG, [CLKPWRBASE_REG,\
-		#LPC32XX_CLKPWR_PWR_CTRL(0)]
+		#LPC32XX_CLKPWR_PWR_CTRL_OFFS]
 
 	@ Wait for EMC to clear self-refresh mode
 5:
-	ldr	WORK2_REG, [EMCBASE_REG, #EMC_STATUS_OFFS]
-	and	WORK2_REG, WORK2_REG, #EMC_STATUS_SELF_RFSH
+	ldr	WORK2_REG, [EMCBASE_REG, #LPC32XX_EMC_STATUS_OFFS]
+	and	WORK2_REG, WORK2_REG, #LPC32XX_EMC_STATUS_SELF_RFSH
 	bne	5b @ Branch until self-refresh has exited
 
 	@ restore regs and return
Signature · 1 line
1.6.6
#15 lore raw

PATCH 10/16 ARM: LPC32XX: Converted most register types to void __iomem *

In reply to a message not in the archive

From: Kevin Wells <[email protected]>

Most defined registers addresses used for readl/writel were untyped. These have been changed to (void __iomem *).

---
 arch/arm/mach-lpc32xx/clock.c                 |    2 +-
 arch/arm/mach-lpc32xx/clock.h                 |    2 +-
 arch/arm/mach-lpc32xx/gpiolib.c               |   60 ++-----
 arch/arm/mach-lpc32xx/include/mach/platform.h |  233 +++++++++++++------------
 arch/arm/mach-lpc32xx/pm_events.c             |  161 +++++++++---------
 arch/arm/mach-lpc32xx/serial.c                |    2 +-
 6 files changed, 221 insertions(+), 239 deletions(-)
arch/arm/mach-lpc32xx/clock.c +1 -1
index befe6fa..1b8616f 100644
@@ -600,7 +600,7 @@ static struct clk clk_i2c1 = {
 static struct clk clk_i2c2 = {
 	.parent		= &clk_pclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= USB_OTG_IOBASE + 0xFF4,
+	.enable_reg	= (void __iomem *) (USB_OTG_IOBASE + 0xFF4),
 	.enable_mask	= 0x4,
 };
 
arch/arm/mach-lpc32xx/clock.h +1 -1
index f37f245..619c332 100644
@@ -34,7 +34,7 @@ struct clk {
 	u32 (*get_rate) (struct clk *clk);
 
 	/* Register address and bit mask for simple clocks */
-	u32 enable_reg;
+	void __iomem *enable_reg;
 	u32 enable_mask;
 };
 
arch/arm/mach-lpc32xx/gpiolib.c +20 -40

72 lines not on this page · raw message

arch/arm/mach-lpc32xx/include/mach/platform.h +118 -115

268 lines not on this page · raw message

arch/arm/mach-lpc32xx/pm_events.c +80 -81

408 lines not on this page · raw message

arch/arm/mach-lpc32xx/serial.c +1 -1
index 3a0acfd..a2b8e12 100644
@@ -90,7 +90,7 @@ static struct plat_serial8250_port serial_std_platform_data[] = {
 struct uartinit {
 	char *uart_ck_name;
 	u32 ck_mode_mask;
-	u32 pdiv_clk_reg;
+	void __iomem *pdiv_clk_reg;
 };
 
 static struct uartinit uartinit_data[] __initdata = {
Signature · 1 line
1.6.6
#16 lore raw

PATCH 10/16 ARM: LPC32XX: Converted most register types to void __iomem *

Quoted 4 lines · On Tue, Feb 02, 2010 at 03:59:22PM -0800, wellsk40 at gmail.com wrote:

From: Kevin Wells <[email protected]>

Most defined registers addresses used for readl/writel were untyped. These have been changed to (void __iomem *).

Just arrange for io_p2v() to return a void __iomem pointer instead of adding all these casts. Virtual addresses should where-ever possible be pointer like rather than integer like.

#17 lore raw

PATCH 10/16 ARM: LPC32XX: Converted most register types to void __iomem *

In reply to wellsk40 at gmail.com

arch/arm/mach-lpc32xx/include/mach/platform.h line 26

Quoted 9 lines · On Tue, Feb 02, 2010 at 03:59:22PM -0800, wellsk40 at gmail.com wrote:
arch/arm/mach-lpc32xx/include/mach/platform.h +1 -0
index adc932b..93541f4 100644
@@ -23,6 +23,8 @@
 #ifndef __ASM_ARCH_PLATFORM_H
 #define __ASM_ARCH_PLATFORM_H
 
+#define IOMEM(x, y)			(__force void __iomem *)((x) + (y))

Hmm, I'd prefer if this wasn't soo different from the definitions found in other platforms - so maybe one day we can move this to the arch level.

The best definition for it is:

#define IOMEM(x) ((void __iomem *)(unsigned long)(x))

which I believe avoids sparse complaints without having to resort to __force.

#18 lore raw

PATCH 11/16 ARM: LPC32XX: Converted interrupt registers to void __iomem *

In reply to a message not in the archive

From: Kevin Wells <[email protected]>

Added register access macros (similar to other register accesses). Updated irq handler to use new access macros.

---
 arch/arm/mach-lpc32xx/include/mach/entry-macro.S |    6 +-
 arch/arm/mach-lpc32xx/include/mach/platform.h    |   12 ++--
 arch/arm/mach-lpc32xx/irq.c                      |   66 +++++++++++-----------
 3 files changed, 42 insertions(+), 42 deletions(-)
arch/arm/mach-lpc32xx/include/mach/entry-macro.S +3 -3
index 25f2adc..9626bac 100644
@@ -39,7 +39,7 @@
 	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp
 	/* Get MIC status first */
 	ldr	\base, =IO_ADDRESS(LPC32XX_MIC_BASE)
-	ldr	\irqstat, [\base, #LPC32XX_INTC_STAT]
+	ldr	\irqstat, [\base, #8]
 	and	\irqstat, \irqstat, #0xFFFFFFFC
 	mov	\tmp, #0
 
@@ -49,7 +49,7 @@
 
 	/* SIC1 interrupts start at offset 32 */
 	ldr	\base, =IO_ADDRESS(LPC32XX_SIC1_BASE)
-	ldr	\irqstat, [\base, #LPC32XX_INTC_STAT]
+	ldr	\irqstat, [\base, #8]
 	mov	\tmp, #32
 
 	/* Drop through to SIC2 if SIC1 is not pending */
@@ -58,7 +58,7 @@
 
 	/* SIC2 interrupts start at offset 64 */
 	ldr	\base, =IO_ADDRESS(LPC32XX_SIC2_BASE)
-	ldr	\irqstat, [\base, #LPC32XX_INTC_STAT]
+	ldr	\irqstat, [\base, #8]
 	mov	\tmp, #64
 
 	/* Safety check only, exit if no status on MIC, SIC1, SIC2 */
arch/arm/mach-lpc32xx/include/mach/platform.h +6 -6
index 93541f4..66c6072 100644
@@ -591,12 +591,12 @@
 /*
  * Interrupt controller register offsets
  */
-#define LPC32XX_INTC_MASK			0x00
-#define LPC32XX_INTC_RAW_STAT			0x04
-#define LPC32XX_INTC_STAT			0x08
-#define LPC32XX_INTC_POLAR			0x0C
-#define LPC32XX_INTC_ACT_TYPE			0x10
-#define LPC32XX_INTC_TYPE			0x14
+#define LPC32XX_INTC_MASK(x)			IOMEM((x), 0x00)
+#define LPC32XX_INTC_RAW_STAT(x)		IOMEM((x), 0x04)
+#define LPC32XX_INTC_STAT(x)			IOMEM((x), 0x08)
+#define LPC32XX_INTC_POLAR(x)			IOMEM((x), 0x0C)
+#define LPC32XX_INTC_ACT_TYPE(x)		IOMEM((x), 0x10)
+#define LPC32XX_INTC_TYPE(x)			IOMEM((x), 0x14)
 
 /*
  *
arch/arm/mach-lpc32xx/irq.c +33 -33

131 lines not on this page · raw message

Signature · 1 line
1.6.6
#19 lore raw

PATCH 11/16 ARM: LPC32XX: Converted interrupt registers to void __iomem *

Hello Kevin,

Quoted 17 lines · On Tue, Feb 02, 2010 at 03:59:23PM -0800, wellsk40 at gmail.com wrote:

From: Kevin Wells <[email protected]>

Added register access macros (similar to other register accesses). Updated irq handler to use new access macros.

---
 arch/arm/mach-lpc32xx/include/mach/entry-macro.S |    6 +-
 arch/arm/mach-lpc32xx/include/mach/platform.h    |   12 ++--
 arch/arm/mach-lpc32xx/irq.c                      |   66 +++++++++++-----------
 3 files changed, 42 insertions(+), 42 deletions(-)
arch/arm/mach-lpc32xx/include/mach/entry-macro.S +0 -0
index 25f2adc..9626bac 100644

arch/arm/mach-lpc32xx/include/mach/entry-macro.S line 42

Quoted 5 lines
arch/arm/mach-lpc32xx/include/mach/entry-macro.S +1 -1
@@ -39,7 +39,7 @@
 	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp
 	/* Get MIC status first */
 	ldr	\base, =IO_ADDRESS(LPC32XX_MIC_BASE)
-	ldr	\irqstat, [\base, #LPC32XX_INTC_STAT]
+	ldr	\irqstat, [\base, #8]

I consider this a step back. What about

	ldr	\irqstat, [\base, #(LPC32XX_INTC_STAT - LPC32XX_MIC_BASE)]

?

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                              | Uwe Kleine-K?nig            |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |
#20 lore raw

PATCH 12/16 ARM: LPC32XX: Watchdog reset type and sparse fixes

In reply to a message not in the archive

From: Kevin Wells <[email protected]>

Changed the type used with the watchdog reset writel() function to use void __iomem *

---
 arch/arm/mach-lpc32xx/common.c |    7 ++++---
 arch/arm/mach-lpc32xx/common.h |    2 ++
 arch/arm/mach-lpc32xx/irq.c    |    1 +
 3 files changed, 7 insertions(+), 3 deletions(-)
arch/arm/mach-lpc32xx/common.c +4 -3
index 2a97ce0..1efa3d1 100644
@@ -36,7 +36,8 @@
 #include <mach/platform.h>
 #include "common.h"
 
-#define WDT_IOBASE io_p2v(LPC32XX_WDTIM_BASE)
+#define WDT_IOACCESS(x)	(__force void __iomem *)\
+	io_p2v(LPC32XX_WDTIM_BASE + (x))
 
 /*
  * Watchdog timer
@@ -135,8 +136,8 @@ void lpc32xx_watchdog_reset(void)
 		LPC32XX_CLKPWR_TIMER_CLK_CTRL(CLKPWR_IOBASE));
 
 	/* Instand assert of RESETOUT_N with pulse length 1mS */
-	writel(13000, WDT_IOBASE + 0x18);
-	writel(0x70, WDT_IOBASE + 0xC);
+	writel(13000, WDT_IOACCESS(0x18));
+	writel(0x70, WDT_IOACCESS(0xC));
 }
 
 /*
arch/arm/mach-lpc32xx/common.h +2 -0
index 08fdfba..42c758e 100644
@@ -73,4 +73,6 @@ extern void lpc32xx_get_uid(u32 devid[4]);
 extern void printascii(const char *);
 #endif
 
+extern void lpc32xx_watchdog_reset(void);
+
 #endif
arch/arm/mach-lpc32xx/irq.c +1 -0
index 3266856..a3ea5cc 100644
@@ -30,6 +30,7 @@
 #include <mach/irqs.h>
 #include <mach/hardware.h>
 #include <mach/platform.h>
+#include "common.h"
 
 /*
  * Default value represeting the Activation polarity of all internal
Signature · 1 line
1.6.6
#21 lore raw

PATCH 13/16 ARM: LPC32XX: Various fixes with readl/writel types

In reply to a message not in the archive

From: Kevin Wells <[email protected]>

Fixed types used for readl/writel that would generate sparse warnings.

---
 arch/arm/mach-lpc32xx/clock.c   |   12 +++++++-----
 arch/arm/mach-lpc32xx/phy3250.c |   16 +++++++++-------
 arch/arm/mach-lpc32xx/pm.c      |    6 +++---
 arch/arm/mach-lpc32xx/serial.c  |   14 +++++++++-----
 4 files changed, 28 insertions(+), 20 deletions(-)
arch/arm/mach-lpc32xx/clock.c +7 -5
index 1b8616f..e51e801 100644
@@ -102,6 +102,8 @@
 #include "clock.h"
 #include "common.h"
 
+#define LCD_REG(x) (__force void __iomem *) (io_p2v(LPC32XX_LCD_BASE) + (x))
+
 static struct clk clk_armpll;
 static struct clk clk_usbpll;
 
@@ -600,7 +602,7 @@ static struct clk clk_i2c1 = {
 static struct clk clk_i2c2 = {
 	.parent		= &clk_pclk,
 	.enable		= &local_onoff_enable,
-	.enable_reg	= (void __iomem *) (USB_OTG_IOBASE + 0xFF4),
+	.enable_reg	= (__force void __iomem *) (USB_OTG_IOBASE + 0xFF4),
 	.enable_mask	= 0x4,
 };
 
@@ -761,7 +763,7 @@ static u32 clcd_get_rate(struct clk *clk)
 		return 0;
 
 	rate = clk_get_rate(clk->parent);
-	tmp = readl((io_p2v(LPC32XX_LCD_BASE)) + CLCD_TIM2);
+	tmp = readl(LCD_REG(CLCD_TIM2));
 
 	/* Only supports internal clocking */
 	if (tmp & TIM2_BCD)
@@ -777,7 +779,7 @@ static int clcd_set_rate(struct clk *clk, u32 rate)
 {
 	u32 tmp, prate, div;
 
-	tmp = readl((io_p2v(LPC32XX_LCD_BASE)) + CLCD_TIM2);
+	tmp = readl(LCD_REG(CLCD_TIM2));
 	prate = clk_get_rate(clk->parent);
 
 	if (rate == prate) {
@@ -795,7 +797,7 @@ static int clcd_set_rate(struct clk *clk, u32 rate)
 		tmp &= ~TIM2_BCD;
 		tmp |= (div & 0x1F);
 		tmp |= (((div >> 5) & 0x1F) << 27);
-		writel(tmp, ((io_p2v(LPC32XX_LCD_BASE)) + CLCD_TIM2));
+		writel(tmp, LCD_REG(CLCD_TIM2));
 		local_onoff_enable(clk, 1);
 	}
 
@@ -1000,7 +1002,7 @@ static struct clk_lookup lookups[] = {
 	_REGISTER_CLOCK("lpc32xx_rtc", NULL, clk_rtc)
 };
 
-int __init clk_init(void)
+static int __init clk_init(void)
 {
 	int i;
 
arch/arm/mach-lpc32xx/phy3250.c +9 -7
index 80958b9..bd59aa9 100644
@@ -85,17 +85,18 @@ static int lpc32xx_clcd_setup(struct clcd_fb *fb)
 {
 	dma_addr_t dma;
 
-	fb->fb.screen_base = (void *) NULL;
+	fb->fb.screen_base = (char __iomem *) NULL;
 #ifdef CONFIG_MACH_LPC32XX_IRAM_FOR_CLCD
 	if (PANEL_SIZE <= CONFIG_ARCH_LPC32XX_IRAM_SIZE) {
-		fb->fb.screen_base = (void *) io_p2v(LPC32XX_IRAM_BASE);
+		fb->fb.screen_base = (char __iomem *) io_p2v(LPC32XX_IRAM_BASE);
 		fb->fb.fix.smem_start = (dma_addr_t) LPC32XX_IRAM_BASE;
 	}
 #endif
 
 	if (fb->fb.screen_base == NULL) {
-		fb->fb.screen_base = dma_alloc_writecombine(&fb->dev->dev,
-			PANEL_SIZE, &dma, GFP_KERNEL);
+		fb->fb.screen_base = (__force char __iomem *)
+			dma_alloc_writecombine(&fb->dev->dev, PANEL_SIZE,
+			&dma, GFP_KERNEL);
 		fb->fb.fix.smem_start = dma;
 	}
 
@@ -130,7 +131,7 @@ static int lpc32xx_clcd_mmap(struct clcd_fb *fb, struct vm_area_struct *vma)
 #endif
 
 	return dma_mmap_writecombine(&fb->dev->dev, vma,
-				     fb->fb.screen_base,
+				     (__force void *) fb->fb.screen_base,
 				     fb->fb.fix.smem_start,
 				     fb->fb.fix.smem_len);
 }
@@ -140,11 +141,12 @@ static void lpc32xx_clcd_remove(struct clcd_fb *fb)
 #ifdef CONFIG_MACH_LPC32XX_IRAM_FOR_CLCD
 	if (PANEL_SIZE > CONFIG_ARCH_LPC32XX_IRAM_SIZE)
 		dma_free_writecombine(&fb->dev->dev, fb->fb.fix.smem_len,
-			fb->fb.screen_base, fb->fb.fix.smem_start);
+			(__force void *) fb->fb.screen_base,
+			fb->fb.fix.smem_start);
 
 #else
 	dma_free_writecombine(&fb->dev->dev, fb->fb.fix.smem_len,
-		fb->fb.screen_base, fb->fb.fix.smem_start);
+		(__force void *) fb->fb.screen_base, fb->fb.fix.smem_start);
 #endif
 }
 
arch/arm/mach-lpc32xx/pm.c +3 -3
index 5f0a805..0be1a47 100644
@@ -146,13 +146,13 @@ static struct platform_suspend_ops lpc32xx_pm_ops = {
 
 #define EMC_DYN_MEM_CTRL_OFS 0x20
 #define EMC_SRMMC           (1 << 3)
-
+#define EMC_CTRL_REG (__force void __iomem *)\
+	(io_p2v(LPC32XX_EMC_BASE) + EMC_DYN_MEM_CTRL_OFS)
 static int __init lpc32xx_pm_init(void)
 {
 	/* Setup SDRAM self-refresh clock to automatically
 	   disable on start of self-refresh */
-	writel(readl(io_p2v(LPC32XX_EMC_BASE) + EMC_DYN_MEM_CTRL_OFS) |
-		EMC_SRMMC, io_p2v(LPC32XX_EMC_BASE) + EMC_DYN_MEM_CTRL_OFS);
+	writel(readl(EMC_CTRL_REG) | EMC_SRMMC, EMC_CTRL_REG);
 
 	/* Allocate some space for temporary IRAM storage */
 	iram_swap_area = kmalloc(lpc32xx_sys_suspend_sz, GFP_ATOMIC);
arch/arm/mach-lpc32xx/serial.c +9 -5
index a2b8e12..96d6d1b 100644
@@ -38,7 +38,8 @@
 static struct plat_serial8250_port serial_std_platform_data[] = {
 #ifdef CONFIG_ARCH_LPC32XX_UART5_ENABLE
 	{
-		.membase        = (void *) io_p2v(LPC32XX_UART5_BASE),
+		.membase        =
+			(__force void __iomem *) io_p2v(LPC32XX_UART5_BASE),
 		.mapbase        = LPC32XX_UART5_BASE,
 		.irq		= IRQ_UART_IIR5,
 		.uartclk	= LPC32XX_MAIN_OSC_FREQ,
@@ -50,7 +51,8 @@ static struct plat_serial8250_port serial_std_platform_data[] = {
 #endif
 #ifdef CONFIG_ARCH_LPC32XX_UART3_ENABLE
 	{
-		.membase	= (void *) io_p2v(LPC32XX_UART3_BASE),
+		.membase	=
+			(__force void __iomem *) io_p2v(LPC32XX_UART3_BASE),
 		.mapbase        = LPC32XX_UART3_BASE,
 		.irq		= IRQ_UART_IIR3,
 		.uartclk	= LPC32XX_MAIN_OSC_FREQ,
@@ -62,7 +64,8 @@ static struct plat_serial8250_port serial_std_platform_data[] = {
 #endif
 #ifdef CONFIG_ARCH_LPC32XX_UART4_ENABLE
 	{
-		.membase	= (void *) io_p2v(LPC32XX_UART4_BASE),
+		.membase	=
+			(__force void __iomem *) io_p2v(LPC32XX_UART4_BASE),
 		.mapbase        = LPC32XX_UART4_BASE,
 		.irq		= IRQ_UART_IIR4,
 		.uartclk	= LPC32XX_MAIN_OSC_FREQ,
@@ -74,7 +77,8 @@ static struct plat_serial8250_port serial_std_platform_data[] = {
 #endif
 #ifdef CONFIG_ARCH_LPC32XX_UART6_ENABLE
 	{
-		.membase	= (void *) io_p2v(LPC32XX_UART6_BASE),
+		.membase	=
+			(__force void __iomem *) io_p2v(LPC32XX_UART6_BASE),
 		.mapbase        = LPC32XX_UART6_BASE,
 		.irq		= IRQ_UART_IIR6,
 		.uartclk	= LPC32XX_MAIN_OSC_FREQ,
@@ -144,7 +148,7 @@ void __init lpc32xx_serial_init(void)
 {
 	u32 tmp, clkmodes = 0;
 	struct clk *clk;
-	void *puart;
+	void __iomem *puart;
 	int i;
 
 	/* UART clocks are off, let clock driver manage them */
Signature · 1 line
1.6.6
#22 lore raw

PATCH 13/16 ARM: LPC32XX: Various fixes with readl/writel types

arch/arm/mach-lpc32xx/phy3250.c static int lpc32xx_clcd_setup(struct clcd_fb *fb) · line 99

Quoted 6 lines · On Tue, Feb 02, 2010 at 03:59:25PM -0800, wellsk40 at gmail.com wrote:
arch/arm/mach-lpc32xx/phy3250.c +3 -2
 	if (fb->fb.screen_base == NULL) {
-		fb->fb.screen_base = dma_alloc_writecombine(&fb->dev->dev,
-			PANEL_SIZE, &dma, GFP_KERNEL);
+		fb->fb.screen_base = (__force char __iomem *)
+			dma_alloc_writecombine(&fb->dev->dev, PANEL_SIZE,
+			&dma, GFP_KERNEL);

There are times when putting up with sparse complaints is the right thing to do, and this is one situation where that is true.

arch/arm/mach-lpc32xx/phy3250.c static int lpc32xx_clcd_mmap(struct clcd_fb *fb, struct vm_area_struct *vma) · line 134

Quoted 9 lines
arch/arm/mach-lpc32xx/phy3250.c +1 -1
 		fb->fb.fix.smem_start = dma;
 	}
@@ -130,7 +131,7 @@ static int lpc32xx_clcd_mmap(struct clcd_fb *fb, struct vm_area_struct *vma)
 #endif
 
 	return dma_mmap_writecombine(&fb->dev->dev, vma,
-				     fb->fb.screen_base,
+				     (__force void *) fb->fb.screen_base,

Same here.

arch/arm/mach-lpc32xx/phy3250.c static void lpc32xx_clcd_remove(struct clcd_fb *fb) · line 145

Quoted 10 lines
arch/arm/mach-lpc32xx/phy3250.c +2 -1
 				     fb->fb.fix.smem_start,
 				     fb->fb.fix.smem_len);
 }
@@ -140,11 +141,12 @@ static void lpc32xx_clcd_remove(struct clcd_fb *fb)
 #ifdef CONFIG_MACH_LPC32XX_IRAM_FOR_CLCD
 	if (PANEL_SIZE > CONFIG_ARCH_LPC32XX_IRAM_SIZE)
 		dma_free_writecombine(&fb->dev->dev, fb->fb.fix.smem_len,
-			fb->fb.screen_base, fb->fb.fix.smem_start);
+			(__force void *) fb->fb.screen_base,
+			fb->fb.fix.smem_start);

and here.

arch/arm/mach-lpc32xx/phy3250.c static void lpc32xx_clcd_remove(struct clcd_fb *fb) · line 149

Quoted 5 lines
arch/arm/mach-lpc32xx/phy3250.c +1 -1
 #else
 	dma_free_writecombine(&fb->dev->dev, fb->fb.fix.smem_len,
-		fb->fb.screen_base, fb->fb.fix.smem_start);
+		(__force void *) fb->fb.screen_base, fb->fb.fix.smem_start);

and here.

#23 lore raw

PATCH 14/16 ARM: LPC32XX: Several small sparse warning fixed

In reply to a message not in the archive

From: Kevin Wells <[email protected]>

Removed and extra "extern" and added an additional include to define a function prototype. (sparse warnings)

---
 arch/arm/mach-lpc32xx/gpiolib.c   |    1 +
 arch/arm/mach-lpc32xx/pm_events.c |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-lpc32xx/gpiolib.c +1 -0
index 13930d4..05556bd 100644
@@ -28,6 +28,7 @@
 
 #include <mach/hardware.h>
 #include <mach/platform.h>
+#include "common.h"
 
 #define GPIOBASE io_p2v(LPC32XX_GPIO_BASE)
 
arch/arm/mach-lpc32xx/pm_events.c +1 -2
index 835207d..671736c 100644
@@ -370,8 +370,7 @@ void lpc32xx_event_disable(enum lpc32xx_events event_id)
 		events[event_id].reg);
 }
 
-extern int lpc32xx_event_set(enum lpc32xx_events event_id,
-	int high_edge)
+int lpc32xx_event_set(enum lpc32xx_events event_id, int high_edge)
 {
 	u32 tmp;
 
Signature · 1 line
1.6.6
#24 lore raw

PATCH 15/16 ARM: LPC32XX: Updated device IRQ names with LPC32XX identifier

In reply to a message not in the archive

From: Kevin Wells <[email protected]>

Added _LCP32XX identifier to IRQ names used in the arch area to identify device specific IRQs.

---
 arch/arm/mach-lpc32xx/common.c            |    6 +-
 arch/arm/mach-lpc32xx/include/mach/irqs.h |  158 ++++++++++++++--------------
 arch/arm/mach-lpc32xx/irq.c               |    4 +-
 arch/arm/mach-lpc32xx/phy3250.c           |    4 +-
 arch/arm/mach-lpc32xx/serial.c            |    8 +-
 arch/arm/mach-lpc32xx/timer.c             |    2 +-
 6 files changed, 91 insertions(+), 91 deletions(-)
arch/arm/mach-lpc32xx/common.c +3 -3
index 1efa3d1..b925c09 100644
@@ -63,19 +63,19 @@ struct platform_device watchdog_device = {
 static struct i2c_pnx_data i2c0_data = {
 	.name = I2C_CHIP_NAME "0",
 	.base = LPC32XX_I2C1_BASE,
-	.irq = IRQ_I2C_1,
+	.irq = IRQ_LPC32XX_I2C_1,
 };
 
 static struct i2c_pnx_data i2c1_data = {
 	.name = I2C_CHIP_NAME "1",
 	.base = LPC32XX_I2C2_BASE,
-	.irq = IRQ_I2C_2,
+	.irq = IRQ_LPC32XX_I2C_2,
 };
 
 static struct i2c_pnx_data i2c2_data = {
 	.name = "USB-I2C",
 	.base = LPC32XX_OTG_I2C_BASE,
-	.irq = IRQ_USB_I2C,
+	.irq = IRQ_LPC32XX_USB_I2C,
 };
 
 struct platform_device i2c0_device = {
arch/arm/mach-lpc32xx/include/mach/irqs.h +79 -79

172 lines not on this page · raw message

arch/arm/mach-lpc32xx/irq.c +2 -2
index a3ea5cc..d583754 100644
@@ -230,8 +230,8 @@ void __init lpc32xx_init_irq(void)
 		SIC2_APR_DEFAULT, SIC2_ATR_DEFAULT, 64);
 
 	/* mask all interrupts except SUBIRQA and SUBFIQ */
-	writel((1 << IRQ_SUB1IRQ) | (1 << IRQ_SUB2IRQ) |
-		(1 << IRQ_SUB1FIQ) | (1 << IRQ_SUB2FIQ),
+	writel((1 << IRQ_LPC32XX_SUB1IRQ) | (1 << IRQ_LPC32XX_SUB2IRQ) |
+		(1 << IRQ_LPC32XX_SUB1FIQ) | (1 << IRQ_LPC32XX_SUB2FIQ),
 		LPC32XX_INTC_MASK(io_p2v(LPC32XX_MIC_BASE)));
 	writel(0, LPC32XX_INTC_MASK(io_p2v(LPC32XX_SIC1_BASE)));
 	writel(0, LPC32XX_INTC_MASK(io_p2v(LPC32XX_SIC2_BASE)));
arch/arm/mach-lpc32xx/phy3250.c +2 -2
index bd59aa9..846bc33 100644
@@ -193,7 +193,7 @@ static struct amba_device clcd_device = {
 		.flags			= IORESOURCE_MEM,
 	},
 	.dma_mask			= ~0,
-	.irq				= {IRQ_LCD, NO_IRQ},
+	.irq				= {IRQ_LPC32XX_LCD, NO_IRQ},
 };
 
 /*
@@ -241,7 +241,7 @@ static struct amba_device ssp0_device = {
 		.flags			= IORESOURCE_MEM,
 	},
 	.dma_mask			= ~0,
-	.irq				= {IRQ_SSP0, NO_IRQ},
+	.irq				= {IRQ_LPC32XX_SSP0, NO_IRQ},
 };
 
 /* AT25 driver registration */
arch/arm/mach-lpc32xx/serial.c +4 -4
index 96d6d1b..07522db 100644
@@ -41,7 +41,7 @@ static struct plat_serial8250_port serial_std_platform_data[] = {
 		.membase        =
 			(__force void __iomem *) io_p2v(LPC32XX_UART5_BASE),
 		.mapbase        = LPC32XX_UART5_BASE,
-		.irq		= IRQ_UART_IIR5,
+		.irq		= IRQ_LPC32XX_UART_IIR5,
 		.uartclk	= LPC32XX_MAIN_OSC_FREQ,
 		.regshift	= 2,
 		.iotype		= UPIO_MEM32,
@@ -54,7 +54,7 @@ static struct plat_serial8250_port serial_std_platform_data[] = {
 		.membase	=
 			(__force void __iomem *) io_p2v(LPC32XX_UART3_BASE),
 		.mapbase        = LPC32XX_UART3_BASE,
-		.irq		= IRQ_UART_IIR3,
+		.irq		= IRQ_LPC32XX_UART_IIR3,
 		.uartclk	= LPC32XX_MAIN_OSC_FREQ,
 		.regshift	= 2,
 		.iotype		= UPIO_MEM32,
@@ -67,7 +67,7 @@ static struct plat_serial8250_port serial_std_platform_data[] = {
 		.membase	=
 			(__force void __iomem *) io_p2v(LPC32XX_UART4_BASE),
 		.mapbase        = LPC32XX_UART4_BASE,
-		.irq		= IRQ_UART_IIR4,
+		.irq		= IRQ_LPC32XX_UART_IIR4,
 		.uartclk	= LPC32XX_MAIN_OSC_FREQ,
 		.regshift	= 2,
 		.iotype		= UPIO_MEM32,
@@ -80,7 +80,7 @@ static struct plat_serial8250_port serial_std_platform_data[] = {
 		.membase	=
 			(__force void __iomem *) io_p2v(LPC32XX_UART6_BASE),
 		.mapbase        = LPC32XX_UART6_BASE,
-		.irq		= IRQ_UART_IIR6,
+		.irq		= IRQ_LPC32XX_UART_IIR6,
 		.uartclk	= LPC32XX_MAIN_OSC_FREQ,
 		.regshift	= 2,
 		.iotype		= UPIO_MEM32,
arch/arm/mach-lpc32xx/timer.c +1 -1
index cd79017..2c53365 100644
@@ -164,7 +164,7 @@ static void __init lpc32xx_timer_init(void)
 		LCP32XX_TIMER_MCR(TIMER0_IOBASE));
 
 	/* Setup tick interrupt */
-	setup_irq(IRQ_TIMER0, &lpc32xx_timer_irq);
+	setup_irq(IRQ_LPC32XX_TIMER0, &lpc32xx_timer_irq);
 
 	/* Setup the clockevent structure. */
 	lpc32xx_clkevt.mult = div_sc(clkrate, NSEC_PER_SEC,
Signature · 1 line
1.6.6
#25 lore raw

PATCH 16/16 ARM: LPC32XX: Fix sparse errors on LCD code

In reply to a message not in the archive

From: Kevin Wells <[email protected]>

Added __force and corrected line length to fix sparse errors and meet coding requirements.

---
 arch/arm/mach-lpc32xx/phy3250.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
arch/arm/mach-lpc32xx/phy3250.c +2 -1
index 846bc33..c7a6d9f 100644
@@ -88,7 +88,8 @@ static int lpc32xx_clcd_setup(struct clcd_fb *fb)
 	fb->fb.screen_base = (char __iomem *) NULL;
 #ifdef CONFIG_MACH_LPC32XX_IRAM_FOR_CLCD
 	if (PANEL_SIZE <= CONFIG_ARCH_LPC32XX_IRAM_SIZE) {
-		fb->fb.screen_base = (char __iomem *) io_p2v(LPC32XX_IRAM_BASE);
+		fb->fb.screen_base = (__force char __iomem *)
+			io_p2v(LPC32XX_IRAM_BASE);
 		fb->fb.fix.smem_start = (dma_addr_t) LPC32XX_IRAM_BASE;
 	}
 #endif
Signature · 1 line
1.6.6