Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 233de298 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'lpc32xx/core2' of git://git.antcom.de/linux-2.6 into next/soc 

From Roland Stigge <stigge@antcom.de>:
this LPC32xx core update (branch lpc32xx/core2) builds upon the
previously provided lpc32xx/core-fixes. Basically including PWM support
(for the PWM driver from Alexandre already in the pwm tree), and
CPU ID.

* 'lpc32xx/core2' of git://git.antcom.de/linux-2.6

:
  ARM: LPC32xx: Add PWM support
  ARM: LPC32xx: Add PWM clock
  ARM: LPC32xx: Set system serial based on cpu unique id

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5e7c2c2f c49a1830

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -571,6 +571,7 @@ config ARCH_LPC32XX 
	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select USE_OF

	select HAVE_PWM

	help

	  Support for the NXP LPC32XX family of processors

arch/arm/mach-lpc32xx/clock.c

+14 −0
Original line number Diff line number Diff line
@@ -607,6 +607,19 @@ static struct clk clk_dma = { 
	.get_rate	= local_return_parent_rate,

};



static struct clk clk_pwm = {

	.parent		= &clk_pclk,

	.enable		= local_onoff_enable,

	.enable_reg	= LPC32XX_CLKPWR_PWM_CLK_CTRL,

	.enable_mask	= LPC32XX_CLKPWR_PWMCLK_PWM1CLK_EN |

			  LPC32XX_CLKPWR_PWMCLK_PWM1SEL_PCLK |

			  LPC32XX_CLKPWR_PWMCLK_PWM1_DIV(1) |

			  LPC32XX_CLKPWR_PWMCLK_PWM2CLK_EN |

			  LPC32XX_CLKPWR_PWMCLK_PWM2SEL_PCLK |

			  LPC32XX_CLKPWR_PWMCLK_PWM2_DIV(1),

	.get_rate	= local_return_parent_rate,

};



static struct clk clk_uart3 = {

	.parent		= &clk_pclk,

	.enable		= local_onoff_enable,
@@ -1188,6 +1201,7 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_INIT(NULL, "vfp9_ck", &clk_vfp9),

	CLKDEV_INIT("pl08xdmac", NULL, &clk_dma),

	CLKDEV_INIT("4003c000.watchdog", NULL, &clk_wdt),

	CLKDEV_INIT("4005c000.pwm", NULL, &clk_pwm),

	CLKDEV_INIT(NULL, "uart3_ck", &clk_uart3),

	CLKDEV_INIT(NULL, "uart4_ck", &clk_uart4),

	CLKDEV_INIT(NULL, "uart5_ck", &clk_uart5),

arch/arm/mach-lpc32xx/common.c

+8 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/io.h>



#include <asm/mach/map.h>

#include <asm/system_info.h>



#include <mach/hardware.h>

#include <mach/platform.h>
@@ -224,7 +225,7 @@ void lpc23xx_restart(char mode, const char *cmd) 
		;

}



static int __init lpc32xx_display_uid(void)

static int __init lpc32xx_check_uid(void)

{

	u32 uid[4];
@@ -233,6 +234,11 @@ static int __init lpc32xx_display_uid(void) 
	printk(KERN_INFO "LPC32XX unique ID: %08x%08x%08x%08x\n",

		uid[3], uid[2], uid[1], uid[0]);



	if (!system_serial_low && !system_serial_high) {

		system_serial_low = uid[0];

		system_serial_high = uid[1];

	}



	return 1;

}

arch_initcall(lpc32xx_display_uid);
 
arch_initcall(lpc32xx_check_uid);