[PATCH V2 1/3] arm: lpc32xx: add tsc-device

[PATCH V2 1/3] arm: lpc32xx: add tsc-device

[Wolfram Sang]

Fix the clock name, too.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
---
 arch/arm/mach-lpc32xx/clock.c  |    2 +-
 arch/arm/mach-lpc32xx/common.c |   21 +++++++++++++++++++++
 arch/arm/mach-lpc32xx/common.h |    1 +
 3 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-lpc32xx/clock.c b/arch/arm/mach-lpc32xx/clock.c
index da0e649..1e02751 100644
--- a/arch/arm/mach-lpc32xx/clock.c
+++ b/arch/arm/mach-lpc32xx/clock.c
@@ -1077,7 +1077,7 @@ static struct clk_lookup lookups[] = {
 	_REGISTER_CLOCK("lpc32xx-nand.0", "nand_ck", clk_nand)
 	_REGISTER_CLOCK("tbd", "i2s0_ck", clk_i2s0)
 	_REGISTER_CLOCK("tbd", "i2s1_ck", clk_i2s1)
-	_REGISTER_CLOCK("lpc32xx-ts", NULL, clk_tsc)
+	_REGISTER_CLOCK("ts-lpc32xx", NULL, clk_tsc)
 	_REGISTER_CLOCK("dev:mmc0", "MCLK", clk_mmc)
 	_REGISTER_CLOCK("lpc-net.0", NULL, clk_net)
 	_REGISTER_CLOCK("dev:clcd", NULL, clk_lcd)
diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c
index ee24dc2..6880b47 100644
--- a/arch/arm/mach-lpc32xx/common.c
+++ b/arch/arm/mach-lpc32xx/common.c
@@ -95,6 +95,27 @@ struct platform_device lpc32xx_i2c2_device = {
 	},
 };
 
+/* TSC (Touch Screen Controller) */
+
+static struct resource lpc32xx_tsc_resources[] = {
+	{
+		.start = LPC32XX_ADC_BASE,
+		.end = LPC32XX_ADC_BASE + SZ_4K - 1,
+		.flags = IORESOURCE_MEM,
+	}, {
+		.start = IRQ_LPC32XX_TS_IRQ,
+		.end = IRQ_LPC32XX_TS_IRQ,
+		.flags = IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device lpc32xx_tsc_device = {
+	.name =  "ts-lpc32xx",
+	.id = -1,
+	.num_resources = ARRAY_SIZE(lpc32xx_tsc_resources),
+	.resource = lpc32xx_tsc_resources,
+};
+
 /*
  * Returns the unique ID for the device
  */
diff --git a/arch/arm/mach-lpc32xx/common.h b/arch/arm/mach-lpc32xx/common.h
index f82211f..e81243c 100644
--- a/arch/arm/mach-lpc32xx/common.h
+++ b/arch/arm/mach-lpc32xx/common.h
@@ -28,6 +28,7 @@ extern struct platform_device lpc32xx_watchdog_device;
 extern struct platform_device lpc32xx_i2c0_device;
 extern struct platform_device lpc32xx_i2c1_device;
 extern struct platform_device lpc32xx_i2c2_device;
+extern struct platform_device lpc32xx_tsc_device;
 
 /*
  * Other arch specific structures and functions
-- 
1.7.2.5

[PATCH V2 2/3] arm: lpc32xx: add rtc-device

[Wolfram Sang]

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
---
 arch/arm/mach-lpc32xx/common.c |   21 +++++++++++++++++++++
 arch/arm/mach-lpc32xx/common.h |    1 +
 2 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c
index 6880b47..205b2db 100644
--- a/arch/arm/mach-lpc32xx/common.c
+++ b/arch/arm/mach-lpc32xx/common.c
@@ -116,6 +116,27 @@ struct platform_device lpc32xx_tsc_device = {
 	.resource = lpc32xx_tsc_resources,
 };
 
+/* RTC */
+
+static struct resource lpc32xx_rtc_resources[] = {
+	{
+		.start = LPC32XX_RTC_BASE,
+		.end = LPC32XX_RTC_BASE + SZ_4K - 1,
+		.flags = IORESOURCE_MEM,
+	},{
+		.start = IRQ_LPC32XX_RTC,
+		.end = IRQ_LPC32XX_RTC,
+		.flags = IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device lpc32xx_rtc_device = {
+	.name =  "rtc-lpc32xx",
+	.id = -1,
+	.num_resources = ARRAY_SIZE(lpc32xx_rtc_resources),
+	.resource = lpc32xx_rtc_resources,
+};
+
 /*
  * Returns the unique ID for the device
  */
diff --git a/arch/arm/mach-lpc32xx/common.h b/arch/arm/mach-lpc32xx/common.h
index e81243c..5583f52 100644
--- a/arch/arm/mach-lpc32xx/common.h
+++ b/arch/arm/mach-lpc32xx/common.h
@@ -29,6 +29,7 @@ extern struct platform_device lpc32xx_i2c0_device;
 extern struct platform_device lpc32xx_i2c1_device;
 extern struct platform_device lpc32xx_i2c2_device;
 extern struct platform_device lpc32xx_tsc_device;
+extern struct platform_device lpc32xx_rtc_device;
 
 /*
  * Other arch specific structures and functions
-- 
1.7.2.5

[PATCH V2 3/3] arm: lpc32xx: clock: use bool logic instead of binary

[Wolfram Sang]

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
---
 arch/arm/mach-lpc32xx/clock.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-lpc32xx/clock.c b/arch/arm/mach-lpc32xx/clock.c
index 1e02751..7218237 100644
--- a/arch/arm/mach-lpc32xx/clock.c
+++ b/arch/arm/mach-lpc32xx/clock.c
@@ -396,7 +396,7 @@ static int local_usbpll_enable(struct clk *clk, int enable)
 		__raw_writel(reg, LPC32XX_CLKPWR_USB_CTRL);
 
 		/* Wait for PLL lock */
-		while ((timeout > jiffies) & (ret == -ENODEV)) {
+		while ((timeout > jiffies) && (ret == -ENODEV)) {
 			reg = __raw_readl(LPC32XX_CLKPWR_USB_CTRL);
 			if (reg & LPC32XX_CLKPWR_USBCTRL_PLL_STS)
 				ret = 0;
-- 
1.7.2.5

[PATCH V2 1/3] arm: lpc32xx: add tsc-device

[Kevin Wells]

> Subject: [PATCH V2 1/3] arm: lpc32xx: add tsc-device
> 
> Fix the clock name, too.
> 
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>

These 3 patches look good and work/build fine. Thanks again!
Tested-by: Kevin Wells <Kevin.wells@nxp.com>

> ---
>  arch/arm/mach-lpc32xx/clock.c  |    2 +-
>  arch/arm/mach-lpc32xx/common.c |   21 +++++++++++++++++++++

[PATCH V2 1/3] arm: lpc32xx: add tsc-device

[Wolfram Sang]

> These 3 patches look good and work/build fine. Thanks again!
> Tested-by: Kevin Wells <Kevin.wells@nxp.com>

Uhm, aren't you pushing lpc32xx to Russell anymore?

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110402/815e86c6/attachment.sig>

[PATCH V2 1/3] arm: lpc32xx: add tsc-device

[Kevin Wells]

> > These 3 patches look good and work/build fine. Thanks again!
> > Tested-by: Kevin Wells <Kevin.wells@nxp.com>
> 
> Uhm, aren't you pushing lpc32xx to Russell anymore?

Yes, I'll get these up this week. Thanks again,
Kevin

> 
> --
> Pengutronix e.K.                           | Wolfram Sang                |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |

GIT pull request - lpc32xx core updates

[Kevin Wells]

Hi Russell,

Can you please pull these reviewed updates for the LPC32xx?

  git://git.lpclinux.com/linux-2.6-lpc for_rmk_32xx_04_05

Wolfram Sang (3):
      arm: lpc32xx: add tsc-device
      arm: lpc32xx: add rtc-device
      arm: lpc32xx: clock: use bool logic instead of binary

 arch/arm/mach-lpc32xx/clock.c  |    4 +-
 arch/arm/mach-lpc32xx/common.c |   42 ++++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-lpc32xx/common.h |    2 +
 3 files changed, 46 insertions(+), 2 deletions(-)

thanks,
Kevin Wells
NXP Semicon1
ductors

GIT pull request - lpc32xx core updates

[Wolfram Sang]

Hi Kevin,

On Wed, Apr 06, 2011 at 12:33:43AM +0200, Kevin Wells wrote:
> 
> Hi Russell,
> 
> Can you please pull these reviewed updates for the LPC32xx?
> 
>   git://git.lpclinux.com/linux-2.6-lpc for_rmk_32xx_04_05
> 
> Wolfram Sang (3):
>       arm: lpc32xx: add tsc-device
>       arm: lpc32xx: add rtc-device
>       arm: lpc32xx: clock: use bool logic instead of binary
> 
>  arch/arm/mach-lpc32xx/clock.c  |    4 +-
>  arch/arm/mach-lpc32xx/common.c |   42 ++++++++++++++++++++++++++++++++++++++++
>  arch/arm/mach-lpc32xx/common.h |    2 +
>  3 files changed, 46 insertions(+), 2 deletions(-)

Could you try again for the next merge-window? :)

Regards,

   Wolfram

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110620/ab48e23f/attachment.sig>