[PATCH 0/5] Misc picoxcell features for 3.3

[PATCH 0/5] Misc picoxcell features for 3.3

[Jamie Iles]

Here are a few minor picoxcell features for 3.3 to implement a restart method
for the machine using Russell's new infrastructure and a couple of minor
cleanups.

Jamie Iles (5):
  ARM: picoxcell: remove mach/memory.h
  ARM: picoxcell: don't reserve irq_descs
  ARM: picoxcell: move io mappings to common.c
  MAINTAINERS: add maintainer entry for Picochip picoxcell
  ARM: picoxcell: implement watchdog restart

 MAINTAINERS                                   |    8 ++++
 arch/arm/mach-picoxcell/Makefile              |    1 -
 arch/arm/mach-picoxcell/common.c              |   46 ++++++++++++++++++++++++-
 arch/arm/mach-picoxcell/common.h              |    1 -
 arch/arm/mach-picoxcell/include/mach/irqs.h   |    9 +----
 arch/arm/mach-picoxcell/include/mach/memory.h |    1 -
 arch/arm/mach-picoxcell/io.c                  |   32 -----------------
 7 files changed, 55 insertions(+), 43 deletions(-)
 delete mode 100644 arch/arm/mach-picoxcell/include/mach/memory.h
 delete mode 100644 arch/arm/mach-picoxcell/io.c

-- 
1.7.5.4

[PATCH 1/5] ARM: picoxcell: remove mach/memory.h

[Jamie Iles]

mach/memory.h is no longer required for simple platforms so remove it
for picoxcell.

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
---
 arch/arm/mach-picoxcell/include/mach/memory.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
 delete mode 100644 arch/arm/mach-picoxcell/include/mach/memory.h

diff --git a/arch/arm/mach-picoxcell/include/mach/memory.h b/arch/arm/mach-picoxcell/include/mach/memory.h
deleted file mode 100644
index 40a8c17..0000000
--- a/arch/arm/mach-picoxcell/include/mach/memory.h
+++ /dev/null
@@ -1 +0,0 @@
-/* empty */
-- 
1.7.5.4

[PATCH 2/5] ARM: picoxcell: don't reserve irq_descs

[Jamie Iles]

All irq_desc's are now dynamically allocated so we don't need to
statically reserve them.

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
---
 arch/arm/mach-picoxcell/common.c            |    1 -
 arch/arm/mach-picoxcell/include/mach/irqs.h |    9 ++-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c
index ad871bd..7d91165 100644
--- a/arch/arm/mach-picoxcell/common.c
+++ b/arch/arm/mach-picoxcell/common.c
@@ -45,7 +45,6 @@ static void __init picoxcell_init_irq(void)
 
 DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")
 	.map_io		= picoxcell_map_io,
-	.nr_irqs	= ARCH_NR_IRQS,
 	.init_irq	= picoxcell_init_irq,
 	.handle_irq	= vic_handle_irq,
 	.timer		= &picoxcell_timer,
diff --git a/arch/arm/mach-picoxcell/include/mach/irqs.h b/arch/arm/mach-picoxcell/include/mach/irqs.h
index 4d13ed9..59eac1e 100644
--- a/arch/arm/mach-picoxcell/include/mach/irqs.h
+++ b/arch/arm/mach-picoxcell/include/mach/irqs.h
@@ -1,8 +1,6 @@
 /*
  * Copyright (c) 2011 Picochip Ltd., Jamie Iles
  *
- * This file contains the hardware definitions of the picoXcell SoC devices.
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -16,10 +14,7 @@
 #ifndef __MACH_IRQS_H
 #define __MACH_IRQS_H
 
-#define ARCH_NR_IRQS			64
-#define NR_IRQS				(128 + ARCH_NR_IRQS)
-
-#define IRQ_VIC0_BASE			0
-#define IRQ_VIC1_BASE			32
+/* We dynamically allocate our irq_desc's. */
+#define NR_IRQS				0
 
 #endif /* __MACH_IRQS_H */
-- 
1.7.5.4

[PATCH 2/5] ARM: picoxcell: don't reserve irq_descs

[Rob Herring]

On 12/12/2011 03:46 PM, Jamie Iles wrote:
> All irq_desc's are now dynamically allocated so we don't need to
> statically reserve them.
> 
> Signed-off-by: Jamie Iles <jamie@jamieiles.com>
> ---
>  arch/arm/mach-picoxcell/common.c            |    1 -
>  arch/arm/mach-picoxcell/include/mach/irqs.h |    9 ++-------
>  2 files changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c
> index ad871bd..7d91165 100644
> --- a/arch/arm/mach-picoxcell/common.c
> +++ b/arch/arm/mach-picoxcell/common.c
> @@ -45,7 +45,6 @@ static void __init picoxcell_init_irq(void)
>  
>  DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")
>  	.map_io		= picoxcell_map_io,
> -	.nr_irqs	= ARCH_NR_IRQS,

You should probably should set this to NR_IRQS_LEGACY (16) to skip irq 0
and ISA irqs.

>  	.init_irq	= picoxcell_init_irq,
>  	.handle_irq	= vic_handle_irq,
>  	.timer		= &picoxcell_timer,
> diff --git a/arch/arm/mach-picoxcell/include/mach/irqs.h b/arch/arm/mach-picoxcell/include/mach/irqs.h
> index 4d13ed9..59eac1e 100644
> --- a/arch/arm/mach-picoxcell/include/mach/irqs.h
> +++ b/arch/arm/mach-picoxcell/include/mach/irqs.h
> @@ -1,8 +1,6 @@
>  /*
>   * Copyright (c) 2011 Picochip Ltd., Jamie Iles
>   *
> - * This file contains the hardware definitions of the picoXcell SoC devices.
> - *
>   * This program is free software; you can redistribute it and/or modify
>   * it under the terms of the GNU General Public License as published by
>   * the Free Software Foundation; either version 2 of the License, or
> @@ -16,10 +14,7 @@
>  #ifndef __MACH_IRQS_H
>  #define __MACH_IRQS_H
>  
> -#define ARCH_NR_IRQS			64
> -#define NR_IRQS				(128 + ARCH_NR_IRQS)
> -
> -#define IRQ_VIC0_BASE			0
> -#define IRQ_VIC1_BASE			32
> +/* We dynamically allocate our irq_desc's. */
> +#define NR_IRQS				0

Are you selecting SPARSE_IRQ?

Rob

[PATCH 2/5] ARM: picoxcell: don't reserve irq_descs

[Jamie Iles]

Hi Rob,

On Mon, Dec 12, 2011 at 04:39:38PM -0600, Rob Herring wrote:
> On 12/12/2011 03:46 PM, Jamie Iles wrote:
> > All irq_desc's are now dynamically allocated so we don't need to
> > statically reserve them.
> > 
> > Signed-off-by: Jamie Iles <jamie@jamieiles.com>
> > ---
> >  arch/arm/mach-picoxcell/common.c            |    1 -
> >  arch/arm/mach-picoxcell/include/mach/irqs.h |    9 ++-------
> >  2 files changed, 2 insertions(+), 8 deletions(-)
> > 
> > diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c
> > index ad871bd..7d91165 100644
> > --- a/arch/arm/mach-picoxcell/common.c
> > +++ b/arch/arm/mach-picoxcell/common.c
> > @@ -45,7 +45,6 @@ static void __init picoxcell_init_irq(void)
> >  
> >  DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")
> >  	.map_io		= picoxcell_map_io,
> > -	.nr_irqs	= ARCH_NR_IRQS,
> 
> You should probably should set this to NR_IRQS_LEGACY (16) to skip irq 0
> and ISA irqs.

OK, that seems reasonable.  This platform won't ever have ISA support 
but I guess it's still worth it?

> >  	.init_irq	= picoxcell_init_irq,
> >  	.handle_irq	= vic_handle_irq,
> >  	.timer		= &picoxcell_timer,
> > diff --git a/arch/arm/mach-picoxcell/include/mach/irqs.h b/arch/arm/mach-picoxcell/include/mach/irqs.h
> > index 4d13ed9..59eac1e 100644
> > --- a/arch/arm/mach-picoxcell/include/mach/irqs.h
> > +++ b/arch/arm/mach-picoxcell/include/mach/irqs.h
> > @@ -1,8 +1,6 @@
> >  /*
> >   * Copyright (c) 2011 Picochip Ltd., Jamie Iles
> >   *
> > - * This file contains the hardware definitions of the picoXcell SoC devices.
> > - *
> >   * This program is free software; you can redistribute it and/or modify
> >   * it under the terms of the GNU General Public License as published by
> >   * the Free Software Foundation; either version 2 of the License, or
> > @@ -16,10 +14,7 @@
> >  #ifndef __MACH_IRQS_H
> >  #define __MACH_IRQS_H
> >  
> > -#define ARCH_NR_IRQS			64
> > -#define NR_IRQS				(128 + ARCH_NR_IRQS)
> > -
> > -#define IRQ_VIC0_BASE			0
> > -#define IRQ_VIC1_BASE			32
> > +/* We dynamically allocate our irq_desc's. */
> > +#define NR_IRQS				0
> 
> Are you selecting SPARSE_IRQ?

Not in the patch, but I did have it enabled locally.  I'll respin this 
patch to select SPARSE_IRQ for picoxcell.

Thanks,

Jamie

[PATCH 3/5] ARM: picoxcell: move io mappings to common.c

[Jamie Iles]

Now that we have lost our machine specific ioremap() we just have one
mapping that covers all peripherals.  Move this to common.c to simplify
things a little.

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
---
 arch/arm/mach-picoxcell/Makefile |    1 -
 arch/arm/mach-picoxcell/common.c |   13 +++++++++++++
 arch/arm/mach-picoxcell/common.h |    1 -
 arch/arm/mach-picoxcell/io.c     |   32 --------------------------------
 4 files changed, 13 insertions(+), 34 deletions(-)
 delete mode 100644 arch/arm/mach-picoxcell/io.c

diff --git a/arch/arm/mach-picoxcell/Makefile b/arch/arm/mach-picoxcell/Makefile
index c550b63..e5ec4a8 100644
--- a/arch/arm/mach-picoxcell/Makefile
+++ b/arch/arm/mach-picoxcell/Makefile
@@ -1,3 +1,2 @@
 obj-y	:= common.o
 obj-y	+= time.o
-obj-y	+= io.o
diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c
index 7d91165..88c53e0 100644
--- a/arch/arm/mach-picoxcell/common.c
+++ b/arch/arm/mach-picoxcell/common.c
@@ -16,12 +16,25 @@
 
 #include <asm/mach/arch.h>
 #include <asm/hardware/vic.h>
+#include <asm/mach/map.h>
 
 #include <mach/map.h>
 #include <mach/picoxcell_soc.h>
 
 #include "common.h"
 
+static struct map_desc io_map __initdata = {
+	.virtual	= PHYS_TO_IO(PICOXCELL_PERIPH_BASE),
+	.pfn		= __phys_to_pfn(PICOXCELL_PERIPH_BASE),
+	.length		= PICOXCELL_PERIPH_LENGTH,
+	.type		= MT_DEVICE,
+};
+
+static void __init picoxcell_map_io(void)
+{
+	iotable_init(&io_map, 1);
+}
+
 static void __init picoxcell_init_machine(void)
 {
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
diff --git a/arch/arm/mach-picoxcell/common.h b/arch/arm/mach-picoxcell/common.h
index 5263f0f..83d55ab 100644
--- a/arch/arm/mach-picoxcell/common.h
+++ b/arch/arm/mach-picoxcell/common.h
@@ -13,6 +13,5 @@
 #include <asm/mach/time.h>
 
 extern struct sys_timer picoxcell_timer;
-extern void picoxcell_map_io(void);
 
 #endif /* __PICOXCELL_COMMON_H__ */
diff --git a/arch/arm/mach-picoxcell/io.c b/arch/arm/mach-picoxcell/io.c
deleted file mode 100644
index 39e9b9e..0000000
--- a/arch/arm/mach-picoxcell/io.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2011 Picochip Ltd., Jamie Iles
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * All enquiries to support at picochip.com
- */
-#include <linux/io.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/of.h>
-
-#include <asm/mach/map.h>
-
-#include <mach/map.h>
-#include <mach/picoxcell_soc.h>
-
-#include "common.h"
-
-void __init picoxcell_map_io(void)
-{
-	struct map_desc io_map = {
-		.virtual	= PHYS_TO_IO(PICOXCELL_PERIPH_BASE),
-		.pfn		= __phys_to_pfn(PICOXCELL_PERIPH_BASE),
-		.length		= PICOXCELL_PERIPH_LENGTH,
-		.type		= MT_DEVICE,
-	};
-
-	iotable_init(&io_map, 1);
-}
-- 
1.7.5.4

[PATCH 4/5] MAINTAINERS: add maintainer entry for Picochip picoxcell

[Jamie Iles]

Add maintainer entry for the picoxcell machine support and associated
drivers.

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
---
 MAINTAINERS |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 071a996..543f5a5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5114,6 +5114,14 @@ L:	linux-mtd at lists.infradead.org
 S:	Maintained
 F:	drivers/mtd/devices/phram.c
 
+PICOXCELL SUPPORT
+M:	Jamie Iles <jamie@jamieiles.com>
+L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
+T:	git git://github.com/jamieiles/linux-2.6-ji.git
+S:	Supported
+F:	arch/arm/mach-picoxcell
+F:	drivers/*/picoxcell*
+
 PIN CONTROL SUBSYSTEM
 M:	Linus Walleij <linus.walleij@linaro.org>
 S:	Maintained
-- 
1.7.5.4

[PATCH 4/5] MAINTAINERS: add maintainer entry for Picochip picoxcell

[Joe Perches]

On Mon, 2011-12-12 at 21:46 +0000, Jamie Iles wrote:
> Add maintainer entry for the picoxcell machine support and associated
> drivers.
[]
> diff --git a/MAINTAINERS b/MAINTAINERS
[]
> @@ -5114,6 +5114,14 @@ L:	linux-mtd at lists.infradead.org
>  S:	Maintained
>  F:	drivers/mtd/devices/phram.c
>  
> +PICOXCELL SUPPORT
> +M:	Jamie Iles <jamie@jamieiles.com>
> +L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
> +T:	git git://github.com/jamieiles/linux-2.6-ji.git
> +S:	Supported
> +F:	arch/arm/mach-picoxcell
> +F:	drivers/*/picoxcell*

This wildcard matches only 1 directory depth level.

To match "drivers/char/hw_random/picoxcell-rng.c"
you also need to have:

F:	drivers/*/*/picoxcell*

[PATCH 4/5] MAINTAINERS: add maintainer entry for Picochip picoxcell

[Jamie Iles]

On Mon, Dec 12, 2011 at 02:28:28PM -0800, Joe Perches wrote:
> On Mon, 2011-12-12 at 21:46 +0000, Jamie Iles wrote:
> > Add maintainer entry for the picoxcell machine support and associated
> > drivers.
> []
> > diff --git a/MAINTAINERS b/MAINTAINERS
> []
> > @@ -5114,6 +5114,14 @@ L:	linux-mtd at lists.infradead.org
> >  S:	Maintained
> >  F:	drivers/mtd/devices/phram.c
> >  
> > +PICOXCELL SUPPORT
> > +M:	Jamie Iles <jamie@jamieiles.com>
> > +L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
> > +T:	git git://github.com/jamieiles/linux-2.6-ji.git
> > +S:	Supported
> > +F:	arch/arm/mach-picoxcell
> > +F:	drivers/*/picoxcell*
> 
> This wildcard matches only 1 directory depth level.
> 
> To match "drivers/char/hw_random/picoxcell-rng.c"
> you also need to have:
> 
> F:	drivers/*/*/picoxcell*

Thanks Joe, I'll update accordingly.

Jamie

[PATCH 5/5] ARM: picoxcell: implement watchdog restart

[Jamie Iles]

Allow the platform to be restarted by triggering the watchdog to expire
with the shortest possible expiry.  This should reset the CPU core and
all on-chip peripherals.

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
---
 arch/arm/mach-picoxcell/common.c |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c
index 88c53e0..6b39256 100644
--- a/arch/arm/mach-picoxcell/common.c
+++ b/arch/arm/mach-picoxcell/common.c
@@ -7,6 +7,7 @@
  *
  * All enquiries to support at picochip.com
  */
+#include <linux/delay.h>
 #include <linux/irq.h>
 #include <linux/irqdomain.h>
 #include <linux/of.h>
@@ -23,6 +24,22 @@
 
 #include "common.h"
 
+#define WDT_CTRL_REG_EN_MASK	(1 << 0)
+#define WDT_CTRL_REG_OFFS	(0x00)
+#define WDT_TIMEOUT_REG_OFFS	(0x04)
+static void __iomem *wdt_regs;
+
+static void picoxcell_setup_restart(void)
+{
+	struct device_node *np = of_find_compatible_node(NULL, NULL,
+							 "snps,dw-apb-wdg");
+	if (WARN(!np, "unable to setup watchdog restart"))
+		return;
+
+	wdt_regs = of_iomap(np, 0);
+	WARN(!wdt_regs, "failed to remap watchdog regs");
+}
+
 static struct map_desc io_map __initdata = {
 	.virtual	= PHYS_TO_IO(PICOXCELL_PERIPH_BASE),
 	.pfn		= __phys_to_pfn(PICOXCELL_PERIPH_BASE),
@@ -38,6 +55,7 @@ static void __init picoxcell_map_io(void)
 static void __init picoxcell_init_machine(void)
 {
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+	picoxcell_setup_restart();
 }
 
 static const char *picoxcell_dt_match[] = {
@@ -56,6 +74,19 @@ static void __init picoxcell_init_irq(void)
 	of_irq_init(vic_of_match);
 }
 
+static void picoxcell_wdt_restart(char mode, const char *cmd)
+{
+	/*
+	 * Configure the watchdog to reset with the shortest possible timeout
+	 * and give it chance to do the reset.
+	 */
+	if (wdt_regs) {
+		__raw_writel(WDT_CTRL_REG_EN_MASK, wdt_regs + WDT_CTRL_REG_OFFS);
+		__raw_writel(0, wdt_regs + WDT_TIMEOUT_REG_OFFS);
+		mdelay(500);
+	}
+}
+
 DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")
 	.map_io		= picoxcell_map_io,
 	.init_irq	= picoxcell_init_irq,
@@ -63,4 +94,5 @@ DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")
 	.timer		= &picoxcell_timer,
 	.init_machine	= picoxcell_init_machine,
 	.dt_compat	= picoxcell_dt_match,
+	.restart	= picoxcell_wdt_restart,
 MACHINE_END
-- 
1.7.5.4