Skip to contentSkip to conversation

ARM: add initial support for Picochip picoXcell SoC

RFC PATCH New Jamie Iles 2 participants 29 messages Nov 23, 2010 – Dec 8, 2010

Subsystems (2)
lore
Share & tools
lore

Jamie Iles

author
#0 lore raw

Hi,

This patch series adds support for the Picochip picoXcell series of femotcell SoC's. There are currently two device families - PC3X2 and PC3X3. Both include an ARM1176JZ-S, 100Mb Ethernet controller, 2xDMA controllers, eFuses, crypto offload engines and Picochip's array processor the picoArray. This patch series adds support for the base chip support including timers, gpio, pin muxing, clocks and pm and also the PC7302 development board that can take either PC3X2 or PC3X3 devices.

This patch series is based off of linux-next (next-20101122) and also requires the following patches:

- 8250: add a UPIO_DWAPB32 for 32 bit accesses (v2):
http://marc.info/?l=linux-serial&m=129043658715199&w=2
- debug-8250: add a 32 bit mode:
http://marc.info/?l=linux-arm-kernel&m=129044061221371&w=2

Jamie Iles (13):
picoxcell: add support for picoXcell
picoxcell: add support for AXI bus snoopers
picoxcell: add support for the system timers
picoxcell: add a pin muxing infrastructure
picoxcell: add gpio infrastructure
picoxcell: add support for system clks
picoxcell: add common SoC devices
picoxcell: add cpufreq support
picoxcell: add support for pm
picoxcell: add chained GPIO IRQ handlers
picoxcell: add support for pc3x2 devices
picoxcell: add support for pc3x3 devices
picoxcell: add support for the PC7302 development board

 arch/arm/Kconfig                                   |   17 +
 arch/arm/Makefile                                  |    1 +
 arch/arm/configs/pc7302_defconfig                  |  102 ++
 arch/arm/mach-picoxcell/Kconfig                    |   38 +
 arch/arm/mach-picoxcell/Makefile                   |   11 +
 arch/arm/mach-picoxcell/Makefile.boot              |    3 +
 arch/arm/mach-picoxcell/axi2cfg.c                  |  168 +++
 arch/arm/mach-picoxcell/board_pc7302.c             |  184 +++
 arch/arm/mach-picoxcell/clk.c                      |  140 +++
 arch/arm/mach-picoxcell/cpufreq.c                  |  145 +++
 arch/arm/mach-picoxcell/devices.c                  |   77 ++
 arch/arm/mach-picoxcell/gpio.c                     |  726 +++++++++++
 arch/arm/mach-picoxcell/include/mach/clkdev.h      |   69 ++
 arch/arm/mach-picoxcell/include/mach/debug-macro.S |   18 +
 arch/arm/mach-picoxcell/include/mach/entry-macro.S |   19 +
 arch/arm/mach-picoxcell/include/mach/gpio.h        |  189 +++
 arch/arm/mach-picoxcell/include/mach/hardware.h    |   29 +
 arch/arm/mach-picoxcell/include/mach/io.h          |   32 +
 arch/arm/mach-picoxcell/include/mach/irqs.h        |   89 ++
 arch/arm/mach-picoxcell/include/mach/memory.h      |   27 +
 .../include/mach/picoxcell/axi2cfg.h               |  171 +++
 .../mach-picoxcell/include/mach/picoxcell/gpio.h   |   48 +
 .../include/mach/picoxcell/picoxcell.h             |   61 +
 .../mach-picoxcell/include/mach/picoxcell/timer.h  |   36 +
 .../mach-picoxcell/include/mach/picoxcell/wdog.h   |   43 +
 arch/arm/mach-picoxcell/include/mach/platform.h    |   32 +
 arch/arm/mach-picoxcell/include/mach/system.h      |   51 +
 arch/arm/mach-picoxcell/include/mach/timex.h       |   26 +
 arch/arm/mach-picoxcell/include/mach/uncompress.h  |   56 +
 arch/arm/mach-picoxcell/include/mach/vmalloc.h     |   18 +
 arch/arm/mach-picoxcell/mux.c                      |  302 +++++
 arch/arm/mach-picoxcell/mux.h                      |   97 ++
 arch/arm/mach-picoxcell/pc3x2.c                    |  453 +++++++
 arch/arm/mach-picoxcell/pc3x3.c                    | 1256 ++++++++++++++++++++
 arch/arm/mach-picoxcell/picoxcell_core.c           |  371 ++++++
 arch/arm/mach-picoxcell/picoxcell_core.h           |   42 +
 arch/arm/mach-picoxcell/pm.c                       |  146 +++
 arch/arm/mach-picoxcell/soc.h                      |   62 +
 arch/arm/mach-picoxcell/time.c                     |  206 ++++
 39 files changed, 5561 insertions(+), 0 deletions(-)
author
#1 lore raw

RFC PATCH 1/13 picoxcell: add support for picoXcell

picoXcell is a family of femtocell SoC devices from Picochip [1] with an ARM subsystem. The devices have an ARM1176JZ-S core and a DSP processor array. Currently there are two sub families - PC3X2 and PC3X3. The latter includes extra power and performance control along with extra peripherals.

This initial patch adds the hardware definitions and a framework for adding device variants.

1. http://www.picochip.com

---
 arch/arm/Kconfig                                   |   17 ++
 arch/arm/Makefile                                  |    1 +
 arch/arm/mach-picoxcell/Kconfig                    |    4 +
 arch/arm/mach-picoxcell/Makefile                   |    1 +
 arch/arm/mach-picoxcell/Makefile.boot              |    3 +
 arch/arm/mach-picoxcell/axi2cfg.c                  |  168 +++++++++++++++++
 arch/arm/mach-picoxcell/include/mach/debug-macro.S |   18 ++
 arch/arm/mach-picoxcell/include/mach/entry-macro.S |   19 ++
 arch/arm/mach-picoxcell/include/mach/hardware.h    |   29 +++
 arch/arm/mach-picoxcell/include/mach/io.h          |   32 +++
 arch/arm/mach-picoxcell/include/mach/irqs.h        |   89 +++++++++
 arch/arm/mach-picoxcell/include/mach/memory.h      |   27 +++
 .../include/mach/picoxcell/axi2cfg.h               |  171 +++++++++++++++++
 .../mach-picoxcell/include/mach/picoxcell/gpio.h   |   48 +++++
 .../include/mach/picoxcell/picoxcell.h             |   61 ++++++
 .../mach-picoxcell/include/mach/picoxcell/timer.h  |   36 ++++
 .../mach-picoxcell/include/mach/picoxcell/wdog.h   |   43 +++++
 arch/arm/mach-picoxcell/include/mach/platform.h    |   32 +++
 arch/arm/mach-picoxcell/include/mach/system.h      |   51 +++++
 arch/arm/mach-picoxcell/include/mach/timex.h       |   26 +++
 arch/arm/mach-picoxcell/include/mach/uncompress.h  |   56 ++++++
 arch/arm/mach-picoxcell/include/mach/vmalloc.h     |   18 ++
 arch/arm/mach-picoxcell/picoxcell_core.c           |  199 ++++++++++++++++++++
 arch/arm/mach-picoxcell/picoxcell_core.h           |   21 ++
 arch/arm/mach-picoxcell/soc.h                      |   60 ++++++
 25 files changed, 1230 insertions(+), 0 deletions(-)
arch/arm/Kconfig +17 -0
index 81c71da..9c252da 100644
@@ -502,6 +502,21 @@ config ARCH_ORION5X
 	  Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
 	  Orion-2 (5281), Orion-1-90 (6183).
 
+config ARCH_PICOXCELL
+	bool "Picochip picoXcell"
+	select ARM_VIC
+	select HAS_TLS_REG
+	select GENERIC_TIME
+	select GENERIC_CLOCKEVENTS
+	select GENERIC_GPIO
+	select ARCH_REQUIRE_GPIOLIB
+	select COMMON_CLKDEV
+	select TICK_ONESHOT
+	select CPU_V6
+	help
+	  This enables support for systems based on the Picochip picoXcell
+	  family of Femtocell devices.
+
 config ARCH_MMP
 	bool "Marvell PXA168/910/MMP2"
 	depends on MMU
@@ -924,6 +939,8 @@ source "arch/arm/mach-omap2/Kconfig"
 
 source "arch/arm/mach-orion5x/Kconfig"
 
+source "arch/arm/mach-picoxcell/Kconfig"
+
 source "arch/arm/mach-pxa/Kconfig"
 source "arch/arm/plat-pxa/Kconfig"
 
arch/arm/Makefile +1 -0
index b87aed0..b47baa8 100644
@@ -166,6 +166,7 @@ machine-$(CONFIG_ARCH_OMAP2)		:= omap2
 machine-$(CONFIG_ARCH_OMAP3)		:= omap2
 machine-$(CONFIG_ARCH_OMAP4)		:= omap2
 machine-$(CONFIG_ARCH_ORION5X)		:= orion5x
+machine-$(CONFIG_ARCH_PICOXCELL)	:= picoxcell
 machine-$(CONFIG_ARCH_PNX4008)		:= pnx4008
 machine-$(CONFIG_ARCH_PXA)		:= pxa
 machine-$(CONFIG_ARCH_REALVIEW)		:= realview
arch/arm/mach-picoxcell/Kconfig new file +4 -0
new file mode 100644
index 0000000..3daba53
@@ -0,0 +1,4 @@
+menu "PICOXCELL platform type"
+	depends on ARCH_PICOXCELL
+
+endmenu
arch/arm/mach-picoxcell/Makefile new file +1 -0
new file mode 100644
index 0000000..7246a6a
@@ -0,0 +1 @@
+obj-y				:= picoxcell_core.o axi2cfg.o
arch/arm/mach-picoxcell/Makefile.boot new file +3 -0
new file mode 100644
index 0000000..67039c3
@@ -0,0 +1,3 @@
+   zreladdr-y	:= 0x00008000
+params_phys-y	:= 0x00000100
+initrd_phys-y	:= 0x00800000
arch/arm/mach-picoxcell/axi2cfg.c new file +168 -0

168 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/debug-macro.S new file +18 -0
new file mode 100644
index 0000000..5cbab63
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2010 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.
+ *
+*/
+
+		.macro	addruart, rp, rv
+		mov	\rv, #0x00230000
+		orr	\rp, \rv, #0x80000000
+		orr	\rv, \rv, #0xFE000000
+		.endm
+
+#define UART_SHIFT 2
+#define DEBUG_8250_ACCESS_32
+#include <asm/hardware/debug-8250.S>
arch/arm/mach-picoxcell/include/mach/entry-macro.S new file +19 -0
new file mode 100644
index 0000000..4dcda96
@@ -0,0 +1,19 @@
+/*
+ * entry-macro.S
+ *
+ * Copyright (c) 2010 Picochip Ltd., Jamie Iles
+ *
+ * Low-level IRQ helper macros for picoXcell platforms
+ *
+ * This file is licensed under  the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+#include <mach/hardware.h>
+#include <mach/io.h>
+#include <mach/irqs.h>
+
+#define VA_VIC0		IO_ADDRESS(PICOXCELL_VIC0_BASE)
+#define VA_VIC1		IO_ADDRESS(PICOXCELL_VIC1_BASE)
+
+#include <asm/entry-macro-vic2.S>
arch/arm/mach-picoxcell/include/mach/hardware.h new file +29 -0
new file mode 100644
index 0000000..7c203d3
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2010 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef __ASM_ARCH_HARDWARE_H
+#define __ASM_ARCH_HARDWARE_H
+
+#include <mach/picoxcell/axi2cfg.h>
+#include <mach/picoxcell/gpio.h>
+#include <mach/picoxcell/picoxcell.h>
+#include <mach/picoxcell/timer.h>
+#include <mach/picoxcell/wdog.h>
+
+#endif
arch/arm/mach-picoxcell/include/mach/io.h new file +32 -0
new file mode 100644
index 0000000..8b30bf1
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010 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 as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef __ASM_ARM_ARCH_IO_H
+#define __ASM_ARM_ARCH_IO_H
+
+#ifdef __ASSEMBLY__
+# define IO_ADDRESS(x)		    (((x) & 0x00ffffff) | 0xfe000000)
+#else /* __ASSEMBLY__ */
+# define PHYS_TO_IO(x)		    (((x) & 0x00ffffff) | 0xfe000000)
+# define IO_ADDRESS(x)		    __typesafe_io(PHYS_TO_IO((x)))
+# define IO_SPACE_LIMIT		    0xffffffff
+# define __io(a)		    __typesafe_io(a)
+# define __mem_pci(a)		    (a)
+# define iomem_ptr(a)		    (void __iomem __force *)(PHYS_TO_IO((a)))
+#endif /* __ASSEMBLY__ */
+
+#endif /* __ASM_ARM_ARCH_IO_H */
arch/arm/mach-picoxcell/include/mach/irqs.h new file +89 -0

89 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/memory.h new file +27 -0
new file mode 100644
index 0000000..47b8ba1
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2010 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 as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef __ASM_ARCH_MEMORY_H
+#define __ASM_ARCH_MEMORY_H
+
+/*
+ * Physical DRAM offset.
+ */
+#define PHYS_OFFSET	UL(0x00000000)
+
+#endif
+
arch/arm/mach-picoxcell/include/mach/picoxcell/axi2cfg.h new file +171 -0

171 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/picoxcell/gpio.h new file +48 -0

48 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/picoxcell/picoxcell.h new file +61 -0

61 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/picoxcell/timer.h new file +36 -0
new file mode 100644
index 0000000..3daf6b2
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010 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 as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef PICOXCELL_TIMER_H
+#define PICOXCELL_TIMER_H
+
+/* The spacing between individual timers. */
+#define TIMER_SPACING			    0x14
+
+#define TIMER_LOAD_COUNT_REG_OFFSET	    0x00
+#define TIMER_CONTROL_REG_OFFSET	    0x08
+#define TIMER_EOI_REG_OFFSET		    0x0c
+
+#define TIMERS_EOI_REG_OFFSET		    0xa4
+
+#define TIMER_ENABLE			    0x00000001
+#define TIMER_MODE			    0x00000002
+#define TIMER_INTERRUPT_MASK		    0x00000004
+
+#define RTCLK_CCV_REG_OFFSET		    0x00
+
+#endif /* PICOXCELL_TIMER_H */
arch/arm/mach-picoxcell/include/mach/picoxcell/wdog.h new file +43 -0

43 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/platform.h new file +32 -0
new file mode 100644
index 0000000..ef7900f
@@ -0,0 +1,32 @@
+/*
+ * platform.h
+ *
+ * Copyright (c) 2010 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 as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef __ARCH_PICOXCELL_PLATFORM_H
+#define __ARCH_PICOXCELL_PLATFORM_H
+
+/* Physical address of the Flash in the ARM sub-system memory map */
+#define PICOXCELL_FLASH_BASE	    0x40000000
+
+/* The clock frequency for the UARTs */
+#define PICOXCELL_BASE_BAUD	    3686400	/* 3.6864 MHz */
+
+/* The clock frequency for the timers on the various boards */
+#define PICOXCELL_TIMER_FREQ	    200000000	/* 200 MHz */
+
+#endif /* __ARCH_PICOXCELL_PLATFORM_H */
arch/arm/mach-picoxcell/include/mach/system.h new file +51 -0

51 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/timex.h new file +26 -0
new file mode 100644
index 0000000..57740c5
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2010 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 as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef __TIMEX_H__
+#define __TIMEX_H__
+
+#include <mach/platform.h>
+
+#define CLOCK_TICK_RATE		PICOXCELL_TIMER_FREQ
+
+#endif /* __TIMEX_H__ */
+
arch/arm/mach-picoxcell/include/mach/uncompress.h new file +56 -0

56 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/vmalloc.h new file +18 -0
new file mode 100644
index 0000000..a40cfa3
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2010 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 as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#define VMALLOC_END		(PAGE_OFFSET + 0x18000000)
arch/arm/mach-picoxcell/picoxcell_core.c new file +199 -0

199 lines not on this page · raw message

arch/arm/mach-picoxcell/picoxcell_core.h new file +21 -0
new file mode 100644
index 0000000..5b27e52
@@ -0,0 +1,21 @@
+/*
+ * linux/arch/arm/mach-picoxcell/picoxcell_core.h
+ *
+ * Copyright (c) 2010 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
+ */
+#ifndef __ASM_ARCH_PICOXCELL_CORE_H__
+#define __ASM_ARCH_PICOXCELL_CORE_H__
+
+struct picoxcell_soc;
+
+extern void __init picoxcell_core_init(void);
+extern void __init picoxcell_init_irq(void);
+extern void __init picoxcell_map_io(void);
+
+#endif /* __ASM_ARCH_PICOXCELL_CORE_H__ */
arch/arm/mach-picoxcell/soc.h new file +60 -0

60 lines not on this page · raw message

Signature · 1 line
1.7.2.3
author
#2 lore raw

PATCH 1/1 picoxcell: add support for picoXcell

picoXcell is a family of femtocell SoC devices from Picochip [1] with an ARM subsystem. The devices have an ARM1176JZ-S core and a DSP processor array. Currently there are two sub families - PC3X2 and PC3X3. The latter includes extra power and performance control along with extra peripherals.

This initial patch adds the hardware definitions and a framework for adding device variants.

v2:
- Define VMALLOC_END as a fixed address rather than relative to PAGE_OFFSET
- Reduce the number of static IO mappings
- Put the picoXcell entry in the correct place in arch/arm/Kconfig

1. http://www.picochip.com

---
 arch/arm/Kconfig                                   |   17 ++
 arch/arm/Makefile                                  |    1 +
 arch/arm/mach-picoxcell/Kconfig                    |    4 +
 arch/arm/mach-picoxcell/Makefile                   |    1 +
 arch/arm/mach-picoxcell/Makefile.boot              |    3 +
 arch/arm/mach-picoxcell/axi2cfg.c                  |  168 ++++++++++++++++++
 arch/arm/mach-picoxcell/include/mach/debug-macro.S |   18 ++
 arch/arm/mach-picoxcell/include/mach/entry-macro.S |   19 ++
 arch/arm/mach-picoxcell/include/mach/hardware.h    |   29 +++
 arch/arm/mach-picoxcell/include/mach/io.h          |   32 ++++
 arch/arm/mach-picoxcell/include/mach/irqs.h        |   89 +++++++++
 arch/arm/mach-picoxcell/include/mach/memory.h      |   27 +++
 .../include/mach/picoxcell/axi2cfg.h               |  171 ++++++++++++++++++
 .../mach-picoxcell/include/mach/picoxcell/gpio.h   |   48 +++++
 .../include/mach/picoxcell/picoxcell.h             |   61 +++++++
 .../mach-picoxcell/include/mach/picoxcell/timer.h  |   36 ++++
 .../mach-picoxcell/include/mach/picoxcell/wdog.h   |   43 +++++
 arch/arm/mach-picoxcell/include/mach/platform.h    |   32 ++++
 arch/arm/mach-picoxcell/include/mach/system.h      |   51 ++++++
 arch/arm/mach-picoxcell/include/mach/timex.h       |   26 +++
 arch/arm/mach-picoxcell/include/mach/uncompress.h  |   56 ++++++
 arch/arm/mach-picoxcell/include/mach/vmalloc.h     |   18 ++
 arch/arm/mach-picoxcell/picoxcell_core.c           |  187 ++++++++++++++++++++
 arch/arm/mach-picoxcell/picoxcell_core.h           |   21 +++
 arch/arm/mach-picoxcell/soc.h                      |   59 ++++++
 25 files changed, 1217 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-picoxcell/Kconfig
 create mode 100644 arch/arm/mach-picoxcell/Makefile
 create mode 100644 arch/arm/mach-picoxcell/Makefile.boot
 create mode 100644 arch/arm/mach-picoxcell/axi2cfg.c
 create mode 100644 arch/arm/mach-picoxcell/include/mach/debug-macro.S
 create mode 100644 arch/arm/mach-picoxcell/include/mach/entry-macro.S
 create mode 100644 arch/arm/mach-picoxcell/include/mach/hardware.h
 create mode 100644 arch/arm/mach-picoxcell/include/mach/io.h
 create mode 100644 arch/arm/mach-picoxcell/include/mach/irqs.h
 create mode 100644 arch/arm/mach-picoxcell/include/mach/memory.h
 create mode 100644 arch/arm/mach-picoxcell/include/mach/picoxcell/axi2cfg.h
 create mode 100644 arch/arm/mach-picoxcell/include/mach/picoxcell/gpio.h
 create mode 100644 arch/arm/mach-picoxcell/include/mach/picoxcell/picoxcell.h
 create mode 100644 arch/arm/mach-picoxcell/include/mach/picoxcell/timer.h
 create mode 100644 arch/arm/mach-picoxcell/include/mach/picoxcell/wdog.h
 create mode 100644 arch/arm/mach-picoxcell/include/mach/platform.h
 create mode 100644 arch/arm/mach-picoxcell/include/mach/system.h
 create mode 100644 arch/arm/mach-picoxcell/include/mach/timex.h
 create mode 100644 arch/arm/mach-picoxcell/include/mach/uncompress.h
 create mode 100644 arch/arm/mach-picoxcell/include/mach/vmalloc.h
 create mode 100644 arch/arm/mach-picoxcell/picoxcell_core.c
 create mode 100644 arch/arm/mach-picoxcell/picoxcell_core.h
 create mode 100644 arch/arm/mach-picoxcell/soc.h
arch/arm/Kconfig +17 -0
index 81c71da..3806af0 100644
@@ -579,6 +579,21 @@ config ARCH_PNX4008
 	help
 	  This enables support for Philips PNX4008 mobile platform.
 
+config ARCH_PICOXCELL
+	bool "Picochip picoXcell"
+	select ARM_VIC
+	select HAS_TLS_REG
+	select GENERIC_TIME
+	select GENERIC_CLOCKEVENTS
+	select GENERIC_GPIO
+	select ARCH_REQUIRE_GPIOLIB
+	select COMMON_CLKDEV
+	select TICK_ONESHOT
+	select CPU_V6
+	help
+	  This enables support for systems based on the Picochip picoXcell
+	  family of Femtocell devices.
+
 config ARCH_PXA
 	bool "PXA2xx/PXA3xx-based"
 	depends on MMU
@@ -924,6 +939,8 @@ source "arch/arm/mach-omap2/Kconfig"
 
 source "arch/arm/mach-orion5x/Kconfig"
 
+source "arch/arm/mach-picoxcell/Kconfig"
+
 source "arch/arm/mach-pxa/Kconfig"
 source "arch/arm/plat-pxa/Kconfig"
 
arch/arm/Makefile +1 -0
index b87aed0..b47baa8 100644
@@ -166,6 +166,7 @@ machine-$(CONFIG_ARCH_OMAP2)		:= omap2
 machine-$(CONFIG_ARCH_OMAP3)		:= omap2
 machine-$(CONFIG_ARCH_OMAP4)		:= omap2
 machine-$(CONFIG_ARCH_ORION5X)		:= orion5x
+machine-$(CONFIG_ARCH_PICOXCELL)	:= picoxcell
 machine-$(CONFIG_ARCH_PNX4008)		:= pnx4008
 machine-$(CONFIG_ARCH_PXA)		:= pxa
 machine-$(CONFIG_ARCH_REALVIEW)		:= realview
arch/arm/mach-picoxcell/Kconfig new file +4 -0
new file mode 100644
index 0000000..3daba53
@@ -0,0 +1,4 @@
+menu "PICOXCELL platform type"
+	depends on ARCH_PICOXCELL
+
+endmenu
arch/arm/mach-picoxcell/Makefile new file +1 -0
new file mode 100644
index 0000000..7246a6a
@@ -0,0 +1 @@
+obj-y				:= picoxcell_core.o axi2cfg.o
arch/arm/mach-picoxcell/Makefile.boot new file +3 -0
new file mode 100644
index 0000000..67039c3
@@ -0,0 +1,3 @@
+   zreladdr-y	:= 0x00008000
+params_phys-y	:= 0x00000100
+initrd_phys-y	:= 0x00800000
arch/arm/mach-picoxcell/axi2cfg.c new file +168 -0

168 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/debug-macro.S new file +18 -0
new file mode 100644
index 0000000..5cbab63
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2010 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.
+ *
+*/
+
+		.macro	addruart, rp, rv
+		mov	\rv, #0x00230000
+		orr	\rp, \rv, #0x80000000
+		orr	\rv, \rv, #0xFE000000
+		.endm
+
+#define UART_SHIFT 2
+#define DEBUG_8250_ACCESS_32
+#include <asm/hardware/debug-8250.S>
arch/arm/mach-picoxcell/include/mach/entry-macro.S new file +19 -0
new file mode 100644
index 0000000..4dcda96
@@ -0,0 +1,19 @@
+/*
+ * entry-macro.S
+ *
+ * Copyright (c) 2010 Picochip Ltd., Jamie Iles
+ *
+ * Low-level IRQ helper macros for picoXcell platforms
+ *
+ * This file is licensed under  the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+#include <mach/hardware.h>
+#include <mach/io.h>
+#include <mach/irqs.h>
+
+#define VA_VIC0		IO_ADDRESS(PICOXCELL_VIC0_BASE)
+#define VA_VIC1		IO_ADDRESS(PICOXCELL_VIC1_BASE)
+
+#include <asm/entry-macro-vic2.S>
arch/arm/mach-picoxcell/include/mach/hardware.h new file +29 -0
new file mode 100644
index 0000000..7c203d3
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2010 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef __ASM_ARCH_HARDWARE_H
+#define __ASM_ARCH_HARDWARE_H
+
+#include <mach/picoxcell/axi2cfg.h>
+#include <mach/picoxcell/gpio.h>
+#include <mach/picoxcell/picoxcell.h>
+#include <mach/picoxcell/timer.h>
+#include <mach/picoxcell/wdog.h>
+
+#endif
arch/arm/mach-picoxcell/include/mach/io.h new file +32 -0
new file mode 100644
index 0000000..3d61379
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010 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 as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef __ASM_ARM_ARCH_IO_H
+#define __ASM_ARM_ARCH_IO_H
+
+#define PHYS_TO_IO(x)		(((x) & 0x00ffffff) | 0xfe000000)
+#ifdef __ASSEMBLY__
+# define IO_ADDRESS(x)		PHYS_TO_IO((x))
+#else /* __ASSEMBLY__ */
+# define IO_ADDRESS(x)		__typesafe_io(PHYS_TO_IO((x)))
+# define IO_SPACE_LIMIT		0xffffffff
+# define __io(a)		__typesafe_io(a)
+# define __mem_pci(a)		(a)
+# define iomem_ptr(a)		(void __iomem __force *)(PHYS_TO_IO((a)))
+#endif /* __ASSEMBLY__ */
+
+#endif /* __ASM_ARM_ARCH_IO_H */
arch/arm/mach-picoxcell/include/mach/irqs.h new file +89 -0

89 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/memory.h new file +27 -0
new file mode 100644
index 0000000..47b8ba1
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2010 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 as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef __ASM_ARCH_MEMORY_H
+#define __ASM_ARCH_MEMORY_H
+
+/*
+ * Physical DRAM offset.
+ */
+#define PHYS_OFFSET	UL(0x00000000)
+
+#endif
+
arch/arm/mach-picoxcell/include/mach/picoxcell/axi2cfg.h new file +171 -0

171 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/picoxcell/gpio.h new file +48 -0

48 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/picoxcell/picoxcell.h new file +61 -0

61 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/picoxcell/timer.h new file +36 -0
new file mode 100644
index 0000000..3daf6b2
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010 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 as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef PICOXCELL_TIMER_H
+#define PICOXCELL_TIMER_H
+
+/* The spacing between individual timers. */
+#define TIMER_SPACING			    0x14
+
+#define TIMER_LOAD_COUNT_REG_OFFSET	    0x00
+#define TIMER_CONTROL_REG_OFFSET	    0x08
+#define TIMER_EOI_REG_OFFSET		    0x0c
+
+#define TIMERS_EOI_REG_OFFSET		    0xa4
+
+#define TIMER_ENABLE			    0x00000001
+#define TIMER_MODE			    0x00000002
+#define TIMER_INTERRUPT_MASK		    0x00000004
+
+#define RTCLK_CCV_REG_OFFSET		    0x00
+
+#endif /* PICOXCELL_TIMER_H */
arch/arm/mach-picoxcell/include/mach/picoxcell/wdog.h new file +43 -0

43 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/platform.h new file +32 -0
new file mode 100644
index 0000000..ef7900f
@@ -0,0 +1,32 @@
+/*
+ * platform.h
+ *
+ * Copyright (c) 2010 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 as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef __ARCH_PICOXCELL_PLATFORM_H
+#define __ARCH_PICOXCELL_PLATFORM_H
+
+/* Physical address of the Flash in the ARM sub-system memory map */
+#define PICOXCELL_FLASH_BASE	    0x40000000
+
+/* The clock frequency for the UARTs */
+#define PICOXCELL_BASE_BAUD	    3686400	/* 3.6864 MHz */
+
+/* The clock frequency for the timers on the various boards */
+#define PICOXCELL_TIMER_FREQ	    200000000	/* 200 MHz */
+
+#endif /* __ARCH_PICOXCELL_PLATFORM_H */
arch/arm/mach-picoxcell/include/mach/system.h new file +51 -0

51 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/timex.h new file +26 -0
new file mode 100644
index 0000000..57740c5
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2010 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 as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef __TIMEX_H__
+#define __TIMEX_H__
+
+#include <mach/platform.h>
+
+#define CLOCK_TICK_RATE		PICOXCELL_TIMER_FREQ
+
+#endif /* __TIMEX_H__ */
+
arch/arm/mach-picoxcell/include/mach/uncompress.h new file +56 -0

56 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/vmalloc.h new file +18 -0
new file mode 100644
index 0000000..09a7f75
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2010 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 as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#define VMALLOC_END		0xFE000000UL
arch/arm/mach-picoxcell/picoxcell_core.c new file +187 -0

187 lines not on this page · raw message

arch/arm/mach-picoxcell/picoxcell_core.h new file +21 -0
new file mode 100644
index 0000000..5b27e52
@@ -0,0 +1,21 @@
+/*
+ * linux/arch/arm/mach-picoxcell/picoxcell_core.h
+ *
+ * Copyright (c) 2010 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
+ */
+#ifndef __ASM_ARCH_PICOXCELL_CORE_H__
+#define __ASM_ARCH_PICOXCELL_CORE_H__
+
+struct picoxcell_soc;
+
+extern void __init picoxcell_core_init(void);
+extern void __init picoxcell_init_irq(void);
+extern void __init picoxcell_map_io(void);
+
+#endif /* __ASM_ARCH_PICOXCELL_CORE_H__ */
arch/arm/mach-picoxcell/soc.h new file +59 -0

59 lines not on this page · raw message

Signature · 1 line
1.7.2.3
#3 lore raw

RFC PATCH 1/13 picoxcell: add support for picoXcell

In reply to Jamie Iles
Quoted 45 lines · Jamie Iles

picoXcell is a family of femtocell SoC devices from Picochip [1] with an ARM subsystem. The devices have an ARM1176JZ-S core and a DSP processor array. Currently there are two sub families - PC3X2 and PC3X3. The latter includes extra power and performance control along with extra peripherals.

This initial patch adds the hardware definitions and a framework for adding device variants.

1. http://www.picochip.com

---
 arch/arm/Kconfig                                   |   17 ++
 arch/arm/Makefile                                  |    1 +
 arch/arm/mach-picoxcell/Kconfig                    |    4 +
 arch/arm/mach-picoxcell/Makefile                   |    1 +
 arch/arm/mach-picoxcell/Makefile.boot              |    3 +
 arch/arm/mach-picoxcell/axi2cfg.c                  |  168 +++++++++++++++++
 arch/arm/mach-picoxcell/include/mach/debug-macro.S |   18 ++
 arch/arm/mach-picoxcell/include/mach/entry-macro.S |   19 ++
 arch/arm/mach-picoxcell/include/mach/hardware.h    |   29 +++
 arch/arm/mach-picoxcell/include/mach/io.h          |   32 +++
 arch/arm/mach-picoxcell/include/mach/irqs.h        |   89 +++++++++
 arch/arm/mach-picoxcell/include/mach/memory.h      |   27 +++
 .../include/mach/picoxcell/axi2cfg.h               |  171 +++++++++++++++++
 .../mach-picoxcell/include/mach/picoxcell/gpio.h   |   48 +++++
 .../include/mach/picoxcell/picoxcell.h             |   61 ++++++
 .../mach-picoxcell/include/mach/picoxcell/timer.h  |   36 ++++
 .../mach-picoxcell/include/mach/picoxcell/wdog.h   |   43 +++++
 arch/arm/mach-picoxcell/include/mach/platform.h    |   32 +++
 arch/arm/mach-picoxcell/include/mach/system.h      |   51 +++++
 arch/arm/mach-picoxcell/include/mach/timex.h       |   26 +++
 arch/arm/mach-picoxcell/include/mach/uncompress.h  |   56 ++++++
 arch/arm/mach-picoxcell/include/mach/vmalloc.h     |   18 ++
 arch/arm/mach-picoxcell/picoxcell_core.c           |  199 ++++++++++++++++++++
 arch/arm/mach-picoxcell/picoxcell_core.h           |   21 ++
 arch/arm/mach-picoxcell/soc.h                      |   60 ++++++
 25 files changed, 1230 insertions(+), 0 deletions(-)
arch/arm/Kconfig +0 -0
index 81c71da..9c252da 100644

arch/arm/Kconfig config ARCH_ORION5X · line 508

Quoted 7 lines
arch/arm/Kconfig +4 -0
@@ -502,6 +502,21 @@ config ARCH_ORION5X
 	  Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
 	  Orion-2 (5281), Orion-1-90 (6183).
 
+config ARCH_PICOXCELL
+	bool "Picochip picoXcell"
+	select ARM_VIC
+	select HAS_TLS_REG

This no longer exists.

arch/arm/Kconfig config ARCH_ORION5X · line 509

Quoted 1 line
arch/arm/Kconfig +1 -0
+	select GENERIC_TIME

Doesn't exist anymore.

arch/arm/Kconfig config ARCH_ORION5X · line 513

Quoted 4 lines
arch/arm/Kconfig +4 -0
+	select GENERIC_CLOCKEVENTS
+	select GENERIC_GPIO
+	select ARCH_REQUIRE_GPIOLIB
+	select COMMON_CLKDEV

Now called CLKDEV_LOOKUP.

arch/arm/Kconfig config ARCH_ORION5X · line 518

Quoted 5 lines
arch/arm/Kconfig +5 -0
+#ifdef __ASSEMBLY__
+# define IO_ADDRESS(x)		    (((x) & 0x00ffffff) | 0xfe000000)
+#else /* __ASSEMBLY__ */
+# define PHYS_TO_IO(x)		    (((x) & 0x00ffffff) | 0xfe000000)
+# define IO_ADDRESS(x)		    __typesafe_io(PHYS_TO_IO((x)))

Not really what __typesafe_io is meant for - please use an explicit cast instead.

arch/arm/Kconfig config ARCH_ORION5X · line 521

Quoted 3 lines
arch/arm/Kconfig +3 -0
+#ifndef __ASSEMBLY__
+
+#include <linux/init.h>

You don't actually need this...

Quoted 29 lines
arch/arm/Kconfig +29 -0
+
+/*
+ * axi2cfg_config_read - Read a number of 16 bit words from a picoArray axi2cfg.
+ *
+ * Returns the number of words read on success, negative errno on failure.
+ *
+ * @axi2cfg_base: The base address of the upper axi2cfg.
+ * @aeid: The CAEID of the AE to read from.
+ * @ae_addr: The address to begin reading from within the AE.
+ * @buf: The buffer to store the results in.
+ * @count: The number of 16 bit words to read.
+ */
+extern int axi2cfg_config_read(u16 aeid, u16 ae_addr, u16 *buf, u16 count);
+
+/*
+ * axi2cfg_config_write - Write a number of 16 bit words to a picoArray axi2cfg.
+ *
+ * @axi2cfg_base: The base address of the upper axi2cfg.
+ * @aeid: The CAEID of the AE to write to.
+ * @ae_addr: The address to begin writing to within the AE.
+ * @buf: The buffer to read the words from.
+ * @count: The number of 16 bit words to write.
+ */
+extern void axi2cfg_config_write(u16 aeid, u16 ae_addr, const u16 *buf,
+				 u16 count);
+
+/*
+ * ax2cfg_write_buf - Write a series of configuration words to the AXI2CFG
+ *	config write port.

arch/arm/Kconfig config ARCH_ORION5X

Quoted 10 lines
arch/arm/Kconfig +10 -0
+ *
+ * @buf: The buffer to write.
+ * @nr_words: The number of 32 bit words to write.
+ */
+extern void axi2cfg_write_buf(const u32 *buf, unsigned nr_words);
+
+/*
+ * axi2cfg_init - initialize the AXI2CFG hardware.
+ */
+extern void __init axi2cfg_init(void);

As you don't need to tell the compiler which section functions are located.

arch/arm/Kconfig

Quoted 2 lines
arch/arm/Kconfig +2 -0
+/* The clock frequency for the timers on the various boards */
+#define PICOXCELL_TIMER_FREQ	    200000000	/* 200 MHz */

I'd sugges this goes in timex.h, to avoid including this file unnecessarily.

Quoted 14 lines
arch/arm/mach-picoxcell/include/mach/uncompress.h new file +8 -0
new file mode 100644
index 0000000..ccaf3d5
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2010 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 as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *

arch/arm/mach-picoxcell/include/mach/uncompress.h line 18

Quoted 10 lines
arch/arm/mach-picoxcell/include/mach/uncompress.h new file +10 -0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <asm/processor.h>

Should be after linux/ includes.

arch/arm/mach-picoxcell/include/mach/uncompress.h line 19

Quoted 1 line
arch/arm/mach-picoxcell/include/mach/uncompress.h new file +1 -0
+#define VMALLOC_END		(PAGE_OFFSET + 0x18000000)

Shouldn't be defined in terms of PAGE_OFFSET as this symbol can move.

author
#4 lore raw

RFC PATCH 1/13 picoxcell: add support for picoXcell

Hi Russell,

Thanks for taking the time to review these patches; much appreciated. I agree with all of your comments and will respin this patch soon.

Jamie

author
#5 lore raw

RFC PATCH 2/13 picoxcell: add support for AXI bus snoopers

In reply to Jamie Iles

The picoXcell devices have a number of peripherals that may perform master accesses to the AXI bus, but if incorrectly programmed can generate a bus error. The AXI2CFG block has bus snoopers that monitor the bus for errors from other masters and raises an interrupt if detected. These errors are typically irrecoverable so panic if we see them.

---
 arch/arm/mach-picoxcell/picoxcell_core.c |   89 ++++++++++++++++++++++++++++++
 1 files changed, 89 insertions(+), 0 deletions(-)
arch/arm/mach-picoxcell/picoxcell_core.c +89 -0
index 4469a78..07eaa9b 100644
@@ -71,6 +71,7 @@ static ssize_t part_show(struct sys_device *sysdev,
 			 struct sysdev_attribute *attr, char *buf)
 {
 	const char *part = picoxcell_get_partname();
+
 	return snprintf(buf, PAGE_SIZE, "%s\n", part);
 }
 static SYSDEV_ATTR(part, 0444, part_show, NULL);
@@ -178,6 +179,91 @@ void __init picoxcell_map_io(void)
 		soc->init_io();
 }
 
+/*
+ * AXI Bus Read / Write Error Handling
+ *
+ * Some of the peripherals on the AXI bus can generate aborts. For example, a
+ * DMAC trying to DMA from the EBI. This isn't supported and will generate an
+ * error response. This can't be recovered from so we report the error and
+ * panic.
+ *
+ * Given a bit number in the AXI2Cfg snoop AXI error IRQ post mask register,
+ * give the textual name of the operation that generated the error.
+ */
+static const char *axi_bus_error_name(int bit)
+{
+	static const char *snoop_err_names[32] = {
+		[0]	= "dmac1_channel0 (read)",
+		[1]	= "dmac1_channel1 (read)",
+		[2]	= "dmac1_channel2 (read)",
+		[3]	= "dmac1_channel3 (read)",
+		[4]	= "dmac2_channel0 (read)",
+		[5]	= "dmac2_channel1 (read)",
+		[6]	= "dmac2_channel2 (read)",
+		[7]	= "dmac2_channel3 (read)",
+		[8]	= "emac (read)",
+		[9]	= "cipher (read)",
+		[10]	= "srtp (read)",
+		[11]	= "ipsec (read)",
+		[12]	= "dmac1_channel0 (write)",
+		[13]	= "dmac1_channel1 (write)",
+		[14]	= "dmac1_channel2 (write)",
+		[15]	= "dmac1_channel3 (write)",
+		[16]	= "dmac2_channel0 (write)",
+		[17]	= "dmac2_channel1 (write)",
+		[18]	= "dmac2_channel2 (write)",
+		[19]	= "dmac2_channel3 (write)",
+		[20]	= "emac (write)",
+		[21]	= "cipher (write)",
+		[22]	= "srtp (write)",
+		[23]	= "ipsec (write)",
+	};
+
+	return snoop_err_names[bit] ?: "<INVALID SNOOP ERROR>";
+}
+
+/* AXI Bus write errors */
+static irqreturn_t picoxcell_axi_bus_error_interrupt(int irq, void *dev_id)
+{
+	/*
+	 * If we ever get one of these interrupts then we are in big trouble,
+	 * they should never happen. The error condition is non recoverable.
+	 */
+	unsigned long axi_error =
+		axi2cfg_readl(AXI2CFG_AXI_ERR_STATE_REG_OFFSET);
+	int bit;
+
+	for_each_set_bit(bit, &axi_error, 32) {
+		pr_emerg("AXI bus error [%s] detected\n",
+			 axi_bus_error_name(bit));
+	}
+	panic("unable to handle AXI bus error");
+
+	return IRQ_HANDLED;
+}
+
+static struct irqaction picoxcell_axi_error_irq = {
+	.name	    = "picoxcell axi bus error",
+	.flags	    = IRQF_DISABLED,
+	.handler    = picoxcell_axi_bus_error_interrupt,
+};
+
+/* Initialise AXI Bus error handling */
+static void __init picoxcell_axi_bus_error_init(void)
+{
+	/* Setup the irq handler for AXI read and write errors. */
+	setup_irq(IRQ_AXI_RD_ERR, &picoxcell_axi_error_irq);
+	setup_irq(IRQ_AXI_WR_ERR, &picoxcell_axi_error_irq);
+
+	/* Make sure no AXI errors are masked */
+	axi2cfg_writel(AXI2CFG_AXI_ERR_MASK_NONE,
+		       AXI2CFG_AXI_ERR_MASK_REG_OFFSET);
+
+	/* Enable interrupts for all AXI Read & Write errors */
+	axi2cfg_writel(AXI2CFG_AXI_ERR_ENABLE_ALL,
+		       AXI2CFG_AXI_ERR_ENABLE_REG_OFFSET);
+}
+
 void __init picoxcell_core_init(void)
 {
 	struct picoxcell_soc *soc = picoxcell_get_soc();
@@ -196,4 +282,7 @@ void __init picoxcell_core_init(void)
 
 	/* Add the arch debugfs entry. */
 	picoxcell_debugfs_init();
+
+	/* Add handlers for the AXI bus snooping. */
+	picoxcell_axi_bus_error_init();
 }
Signature · 1 line
1.7.2.3
#6 lore raw

RFC PATCH 2/13 picoxcell: add support for AXI bus snoopers

arch/arm/mach-picoxcell/picoxcell_core.c static ssize_t part_show(struct sys_device *sysdev, · line 76

Quoted 11 lines · Jamie Iles
arch/arm/mach-picoxcell/picoxcell_core.c +1 -0
index 4469a78..07eaa9b 100644
@@ -71,6 +71,7 @@ static ssize_t part_show(struct sys_device *sysdev,
 			 struct sysdev_attribute *attr, char *buf)
 {
 	const char *part = picoxcell_get_partname();
+
 	return snprintf(buf, PAGE_SIZE, "%s\n", part);
 }

Shouldn't this be in the first patch?

author
#7 lore raw

RFC PATCH 2/13 picoxcell: add support for AXI bus snoopers

Quoted 14 lines · Russell King - ARM Linux

arch/arm/mach-picoxcell/picoxcell_core.c static ssize_t part_show(struct sys_device *sysdev, · line 76

Quoted 11 lines · Jamie Iles
arch/arm/mach-picoxcell/picoxcell_core.c +1 -0
index 4469a78..07eaa9b 100644
@@ -71,6 +71,7 @@ static ssize_t part_show(struct sys_device *sysdev,
 			 struct sysdev_attribute *attr, char *buf)
 {
 	const char *part = picoxcell_get_partname();
+
 	return snprintf(buf, PAGE_SIZE, "%s\n", part);
 }

Shouldn't this be in the first patch?

Indeed, not sure how I missed that.

Jamie

author
#8 lore raw

RFC PATCH 3/13 picoxcell: add support for the system timers

In reply to Jamie Iles

The picoXcell devices have 4 timers capable of generating interrupts when they reach a predefined value and restarting and a freerunning RTC. Use one of the interrupt capable timers as the clockevent_device and the RTC for the clocksource and sched_clock().

---
 arch/arm/mach-picoxcell/Makefile         |    3 +-
 arch/arm/mach-picoxcell/picoxcell_core.h |    2 +
 arch/arm/mach-picoxcell/time.c           |  206 ++++++++++++++++++++++++++++++
 3 files changed, 210 insertions(+), 1 deletions(-)
arch/arm/mach-picoxcell/Makefile +2 -1
index 7246a6a..726c61f 100644
@@ -1 +1,2 @@
-obj-y				:= picoxcell_core.o axi2cfg.o
+obj-y				:= picoxcell_core.o axi2cfg.o \
+				   time.o
\ No newline at end of file
arch/arm/mach-picoxcell/picoxcell_core.h +2 -0
index 5b27e52..941d1a6 100644
@@ -13,9 +13,11 @@
 #define __ASM_ARCH_PICOXCELL_CORE_H__
 
 struct picoxcell_soc;
+struct sys_timer;
 
 extern void __init picoxcell_core_init(void);
 extern void __init picoxcell_init_irq(void);
 extern void __init picoxcell_map_io(void);
+extern struct sys_timer picoxcell_sys_timer;
 
 #endif /* __ASM_ARCH_PICOXCELL_CORE_H__ */
arch/arm/mach-picoxcell/time.c new file +206 -0

206 lines not on this page · raw message

Signature · 1 line
1.7.2.3
author
#9 lore raw

RFC PATCH v2 1/1 picoxcell: add support for the system timers

The picoXcell devices have 4 timers capable of generating interrupts when they reach a predefined value and restarting and a freerunning RTC. Use one of the interrupt capable timers as the clockevent_device and the RTC for the clocksource and sched_clock().

v2:
- use clocksource_register_hz() and clockevents_calc_mult_shift() rather than specifying .mult and .shift.
- extend sched_clock from 32 bits in the RTC to 63 with cnt32_to_63() to give us a longer period before wrapping.

---
 arch/arm/mach-picoxcell/Makefile         |    3 +-
 arch/arm/mach-picoxcell/picoxcell_core.h |    2 +
 arch/arm/mach-picoxcell/time.c           |  206 ++++++++++++++++++++++++++++++
 3 files changed, 210 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/mach-picoxcell/time.c
arch/arm/mach-picoxcell/Makefile +2 -1
index 7246a6a..726c61f 100644
@@ -1 +1,2 @@
-obj-y				:= picoxcell_core.o axi2cfg.o
+obj-y				:= picoxcell_core.o axi2cfg.o \
+				   time.o
\ No newline at end of file
arch/arm/mach-picoxcell/picoxcell_core.h +2 -0
index 5b27e52..941d1a6 100644
@@ -13,9 +13,11 @@
 #define __ASM_ARCH_PICOXCELL_CORE_H__
 
 struct picoxcell_soc;
+struct sys_timer;
 
 extern void __init picoxcell_core_init(void);
 extern void __init picoxcell_init_irq(void);
 extern void __init picoxcell_map_io(void);
+extern struct sys_timer picoxcell_sys_timer;
 
 #endif /* __ASM_ARCH_PICOXCELL_CORE_H__ */
arch/arm/mach-picoxcell/time.c new file +206 -0

206 lines not on this page · raw message

Signature · 1 line
1.7.2.3
#10 lore raw

RFC PATCH v2 1/1 picoxcell: add support for the system timers

arch/arm/mach-picoxcell/time.c line 91

Quoted 11 lines · Jamie Iles
arch/arm/mach-picoxcell/time.c new file +11 -0
+static irqreturn_t timer_interrupt(int irq, void *dev_id)
+{
+	struct timer_instance *timer = &timers[TIMER_ID_CLOCKEVENT];
+
+	/* If we are in oneshot mode, we need to stop receiving interrupts. */
+	if (CLOCK_EVT_MODE_ONESHOT == clockevent_picoxcell.mode) {
+		unsigned long val = readl(timer->base +
+					  TIMER_CONTROL_REG_OFFSET);
+		val |= TIMER_INTERRUPT_MASK;
+		writel(val, timer->base + TIMER_CONTROL_REG_OFFSET);
+	}

It's normal not to emulate behaviours here which the hardware doesn't support - that's the point of the generic clockevents/clocksource layers. They're there to handle whatever the hardware can support and turn it into something the kernel wants.

arch/arm/mach-picoxcell/time.c line 192

Quoted 11 lines
arch/arm/mach-picoxcell/time.c new file +11 -0
+/*
+ * Overwrite weak default sched_clock with something more precise.
+ *
+ * On picoXcell we have a RTC that clocks at 200MHz so a multiply by 5 gives
+ * us a nanosecond count.
+ */
+unsigned long long notrace sched_clock(void)
+{
+#define CYCLES_TO_NSEC_MULT	(NSEC_PER_SEC / CLOCK_TICK_RATE)
+	return cnt32_to_63(readl(IO_ADDRESS(PICOXCELL_RTCLK_BASE) +
+				 RTCLK_CCV_REG_OFFSET)) * CYCLES_TO_NSEC_MULT;

Have you read the comments in include/linux/cnt32_to_63.h, or thought about the '63' part of the name ?

author
#11 lore raw

RFC PATCH v2 1/1 picoxcell: add support for the system timers

Quoted 17 lines · Russell King - ARM Linux

arch/arm/mach-picoxcell/time.c line 91

Quoted 11 lines · Jamie Iles
arch/arm/mach-picoxcell/time.c new file +11 -0
+static irqreturn_t timer_interrupt(int irq, void *dev_id)
+{
+	struct timer_instance *timer = &timers[TIMER_ID_CLOCKEVENT];
+
+	/* If we are in oneshot mode, we need to stop receiving interrupts. */
+	if (CLOCK_EVT_MODE_ONESHOT == clockevent_picoxcell.mode) {
+		unsigned long val = readl(timer->base +
+					  TIMER_CONTROL_REG_OFFSET);
+		val |= TIMER_INTERRUPT_MASK;
+		writel(val, timer->base + TIMER_CONTROL_REG_OFFSET);
+	}

It's normal not to emulate behaviours here which the hardware doesn't support - that's the point of the generic clockevents/clocksource layers. They're there to handle whatever the hardware can support and turn it into something the kernel wants.

Ok, I underestimated clockevents and how NO_HZ works and thought that we'd keep on receiving too many interrupts but that's not the case! I'll fix up the next revision to remove this hack.

Quoted 6 lines
Quoted 6 lines

+/*
+ * Overwrite weak default sched_clock with something more precise.
+ *
+ * On picoXcell we have a RTC that clocks at 200MHz so a multiply by 5 gives
+ * us a nanosecond count.
+ */

Quoted 8 lines

arch/arm/mach-picoxcell/time.c line 192

Quoted 5 lines
arch/arm/mach-picoxcell/time.c new file +5 -0
+unsigned long long notrace sched_clock(void)
+{
+#define CYCLES_TO_NSEC_MULT	(NSEC_PER_SEC / CLOCK_TICK_RATE)
+	return cnt32_to_63(readl(IO_ADDRESS(PICOXCELL_RTCLK_BASE) +
+				 RTCLK_CCV_REG_OFFSET)) * CYCLES_TO_NSEC_MULT;

Have you read the comments in include/linux/cnt32_to_63.h, or thought about the '63' part of the name ?

Sadly not, this was one I'd taken from the mailing list for mach-tegra as we were missing a sched_clock() implementation before. Since then I've had a go at taking Linus' sched_clock() implementation for plat-nomadik and using that to increase the wrap period which I'll roll into the next revision.

Jamie

author
#12 lore raw

RFC PATCH 4/13 picoxcell: add a pin muxing infrastructure

In reply to Jamie Iles

picoXcell devices have two types of GPIO pins - ARM and SDGPIO (the latter are in the picoArray domain) and some of these pins are also shared with peripherals. Provide an API for configuring the multiplexing of each pin and a userspace sysfs interface so they can be reprogrammed at runtime. Some of the peripherals that use the pins are driven by the DSP array and so the kernel won't know how to configure these pins so this is left to the userspace application.

---
 arch/arm/mach-picoxcell/Makefile         |    3 +-
 arch/arm/mach-picoxcell/mux.c            |  302 ++++++++++++++++++++++++++++++
 arch/arm/mach-picoxcell/mux.h            |   97 ++++++++++
 arch/arm/mach-picoxcell/picoxcell_core.c |    3 +
 4 files changed, 404 insertions(+), 1 deletions(-)
arch/arm/mach-picoxcell/Makefile +2 -1
index 726c61f..5e9a7cd 100644
@@ -1,2 +1,3 @@
 obj-y				:= picoxcell_core.o axi2cfg.o \
-				   time.o
\ No newline at end of file
+				   time.o \
+				   mux.o
arch/arm/mach-picoxcell/mux.c new file +302 -0

302 lines not on this page · raw message

arch/arm/mach-picoxcell/mux.h new file +97 -0

97 lines not on this page · raw message

arch/arm/mach-picoxcell/picoxcell_core.c +3 -0
index 07eaa9b..8f2cc46 100644
@@ -283,6 +283,9 @@ void __init picoxcell_core_init(void)
 	/* Add the arch debugfs entry. */
 	picoxcell_debugfs_init();
 
+	/* Initialise the pin muxing and gpio infrastructure. */
+	picoxcell_muxing_init(soc);
+
 	/* Add handlers for the AXI bus snooping. */
 	picoxcell_axi_bus_error_init();
 }
Signature · 1 line
1.7.2.3
author
#13 lore raw

RFC PATCH 5/13 picoxcell: add gpio infrastructure

In reply to Jamie Iles

Add a gpio infrastructure for picoXcell devices. This adds support for both the ARM GPIO peripheral and the SDGPIO pins that are in the picoArray domain and accessed through the AXI2CFG. This implements a set of gpiolib chips and also adds an extension to use the sigma-delta capabilities of the SDGPIO pins in kernelspace.

---
 arch/arm/mach-picoxcell/Makefile            |    3 +-
 arch/arm/mach-picoxcell/gpio.c              |  726 +++++++++++++++++++++++++++
 arch/arm/mach-picoxcell/include/mach/gpio.h |  187 +++++++
 arch/arm/mach-picoxcell/picoxcell_core.c    |    5 +
 4 files changed, 920 insertions(+), 1 deletions(-)
arch/arm/mach-picoxcell/Makefile +2 -1
index 5e9a7cd..f6b3765 100644
@@ -1,3 +1,4 @@
 obj-y				:= picoxcell_core.o axi2cfg.o \
 				   time.o \
-				   mux.o
+				   mux.o \
+				   gpio.o
arch/arm/mach-picoxcell/gpio.c new file +726 -0

726 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/gpio.h new file +187 -0

187 lines not on this page · raw message

arch/arm/mach-picoxcell/picoxcell_core.c +5 -0
index 8f2cc46..fe2a147 100644
@@ -8,6 +8,7 @@
  * All enquiries to support at picochip.com
  */
 #include <linux/debugfs.h>
+#include <linux/gpio.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/irq.h>
@@ -286,6 +287,10 @@ void __init picoxcell_core_init(void)
 	/* Initialise the pin muxing and gpio infrastructure. */
 	picoxcell_muxing_init(soc);
 
+	picoxcell_gpio_init(soc->armgpio_pins, soc->nr_armgpio,
+			    soc->armgpio_base, soc->sdgpio_pins,
+			    soc->nr_sdgpio, soc->sdgpio_base);
+
 	/* Add handlers for the AXI bus snooping. */
 	picoxcell_axi_bus_error_init();
 }
Signature · 1 line
1.7.2.3
author
#14 lore raw

RFC PATCH v2 5/13 picoxcell: add gpio infrastructure

Add a gpio infrastructure for picoXcell devices. This adds support for both the ARM GPIO peripheral and the SDGPIO pins that are in the picoArray domain and accessed through the AXI2CFG. This implements a set of gpiolib chips and also adds an extension to use the sigma-delta capabilities of the SDGPIO pins in kernelspace.

v2:
- Fixup the picoxcell gpio driver to use struct irq_data rather than irq numbers in the handlers and accessing irq_desc directly.
- Fixup a typo in the set_type function where we didn't check correctly for IRQ_TYPE_EDGE_FALLING.

---
 arch/arm/mach-picoxcell/Makefile            |    3 +-
 arch/arm/mach-picoxcell/gpio.c              |  723 +++++++++++++++++++++++++++
 arch/arm/mach-picoxcell/include/mach/gpio.h |  187 +++++++
 arch/arm/mach-picoxcell/picoxcell_core.c    |    5 +
 4 files changed, 917 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/mach-picoxcell/gpio.c
 create mode 100644 arch/arm/mach-picoxcell/include/mach/gpio.h
arch/arm/mach-picoxcell/Makefile +2 -1
index 5e9a7cd..f6b3765 100644
@@ -1,3 +1,4 @@
 obj-y				:= picoxcell_core.o axi2cfg.o \
 				   time.o \
-				   mux.o
+				   mux.o \
+				   gpio.o
arch/arm/mach-picoxcell/gpio.c new file +723 -0

723 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/gpio.h new file +187 -0

187 lines not on this page · raw message

arch/arm/mach-picoxcell/picoxcell_core.c +5 -0
index 967f1d2..73bb8df 100644
@@ -8,6 +8,7 @@
  * All enquiries to support at picochip.com
  */
 #include <linux/debugfs.h>
+#include <linux/gpio.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/irq.h>
@@ -274,6 +275,10 @@ void __init picoxcell_core_init(void)
 	/* Initialise the pin muxing and gpio infrastructure. */
 	picoxcell_muxing_init(soc);
 
+	picoxcell_gpio_init(soc->armgpio_pins, soc->nr_armgpio,
+			    soc->armgpio_base, soc->sdgpio_pins,
+			    soc->nr_sdgpio, soc->sdgpio_base);
+
 	/* Add handlers for the AXI bus snooping. */
 	picoxcell_axi_bus_error_init();
 }
Signature · 1 line
1.7.2.3
author
#15 lore raw

RFC PATCH 6/13 picoxcell: add support for system clks

In reply to Jamie Iles

The different picoXcell device variants have different numbers of clocks and different capabilities (PC3X2 doesn't have any gateable or controllable clocks). Add the infrastructure necessary for device variants to provide their own clock implementation.

---
 arch/arm/mach-picoxcell/Makefile              |    3 +-
 arch/arm/mach-picoxcell/clk.c                 |  140 +++++++++++++++++++++++++
 arch/arm/mach-picoxcell/include/mach/clkdev.h |   69 ++++++++++++
 arch/arm/mach-picoxcell/picoxcell_core.c      |    4 +
 4 files changed, 215 insertions(+), 1 deletions(-)
arch/arm/mach-picoxcell/Makefile +2 -1
index f6b3765..8d8b4e8 100644
@@ -1,4 +1,5 @@
 obj-y				:= picoxcell_core.o axi2cfg.o \
 				   time.o \
 				   mux.o \
-				   gpio.o
+				   gpio.o \
+				   clk.o
arch/arm/mach-picoxcell/clk.c new file +140 -0

140 lines not on this page · raw message

arch/arm/mach-picoxcell/include/mach/clkdev.h new file +69 -0

69 lines not on this page · raw message

arch/arm/mach-picoxcell/picoxcell_core.c +4 -0
index fe2a147..450b3fad 100644
@@ -18,6 +18,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach-types.h>
 
+#include <mach/clkdev.h>
 #include <mach/hardware.h>
 
 #include "mux.h"
@@ -152,6 +153,7 @@ static void __init picoxcell_debugfs_init(void)
 		arch_debugfs_dir = NULL;
 		return;
 	}
+	picoxcell_clk_debugfs_init();
 }
 
 static struct map_desc __initdata picoxcell_io_desc[] = {
@@ -284,6 +286,8 @@ void __init picoxcell_core_init(void)
 	/* Add the arch debugfs entry. */
 	picoxcell_debugfs_init();
 
+	soc->init_clocks();
+
 	/* Initialise the pin muxing and gpio infrastructure. */
 	picoxcell_muxing_init(soc);
 
Signature · 1 line
1.7.2.3
#16 lore raw

RFC PATCH 6/13 picoxcell: add support for system clks

Quoted 4 lines · Jamie Iles

The different picoXcell device variants have different numbers of clocks and different capabilities (PC3X2 doesn't have any gateable or controllable clocks). Add the infrastructure necessary for device variants to provide their own clock implementation.

Fro the looks of this, you only allow one lookup per clk? That's rather sub-optimal, and could cause you problems in the future when you may want to have aliases to cater for differences in the SoC clock layout.

author
#17 lore raw

RFC PATCH 6/13 picoxcell: add support for system clks

Quoted 10 lines · Russell King - ARM Linux
Quoted 4 lines · Jamie Iles

The different picoXcell device variants have different numbers of clocks and different capabilities (PC3X2 doesn't have any gateable or controllable clocks). Add the infrastructure necessary for device variants to provide their own clock implementation.

Fro the looks of this, you only allow one lookup per clk? That's rather sub-optimal, and could cause you problems in the future when you may want to have aliases to cater for differences in the SoC clock layout.

Hmm, I hadn't thought of that. The number of clocks in our chips appears to be rapidly multiplying so that seems like a very good idea.

I guess for PC3X2 where we don't have any gateable or controllable clocks that means I can create one virtual clock then add a number of aliases where drivers require a struct clk.

Thanks,

Jamie

author
#18 lore raw

RFC PATCH 7/13 picoxcell: add common SoC devices

In reply to Jamie Iles

Add the devices common to all picoXcell variants (UART and PMU). Other peripherals such as DMA, SPI, fuses and EMAC will be added later with driver support.

---
 arch/arm/mach-picoxcell/Makefile         |    3 +-
 arch/arm/mach-picoxcell/devices.c        |   77 ++++++++++++++++++++++++++++++
 arch/arm/mach-picoxcell/picoxcell_core.c |    3 +
 arch/arm/mach-picoxcell/picoxcell_core.h |    1 +
 4 files changed, 83 insertions(+), 1 deletions(-)
arch/arm/mach-picoxcell/Makefile +2 -1
index 8d8b4e8..371698f 100644
@@ -2,4 +2,5 @@ obj-y				:= picoxcell_core.o axi2cfg.o \
 				   time.o \
 				   mux.o \
 				   gpio.o \
-				   clk.o
+				   clk.o \
+				   devices.o
arch/arm/mach-picoxcell/devices.c new file +77 -0

77 lines not on this page · raw message

arch/arm/mach-picoxcell/picoxcell_core.c +3 -0
index 450b3fad..7c51e0f 100644
@@ -297,4 +297,7 @@ void __init picoxcell_core_init(void)
 
 	/* Add handlers for the AXI bus snooping. */
 	picoxcell_axi_bus_error_init();
+
+	/* Register the devices. */
+	picoxcell_add_devices();
 }
arch/arm/mach-picoxcell/picoxcell_core.h +1 -0
index 941d1a6..9647b7a 100644
@@ -19,5 +19,6 @@ extern void __init picoxcell_core_init(void);
 extern void __init picoxcell_init_irq(void);
 extern void __init picoxcell_map_io(void);
 extern struct sys_timer picoxcell_sys_timer;
+extern void __init picoxcell_add_devices(void);
 
 #endif /* __ASM_ARCH_PICOXCELL_CORE_H__ */
Signature · 1 line
1.7.2.3
author
#19 lore raw

RFC PATCH v2 1/1 picoxcell: add common SoC devices

Add the devices common to all picoXcell variants (UART and PMU). Other peripherals such as DMA, SPI, fuses and EMAC will be added later with driver support.

v2:

	- split the UARTs into two separate platform devices and use
	  PLAT8250_* as the IDs
---
 arch/arm/mach-picoxcell/Makefile         |    3 +-
 arch/arm/mach-picoxcell/devices.c        |  118 ++++++++++++++++++++++++++++++
 arch/arm/mach-picoxcell/picoxcell_core.c |    3 +
 arch/arm/mach-picoxcell/picoxcell_core.h |    1 +
 4 files changed, 124 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/mach-picoxcell/devices.c
arch/arm/mach-picoxcell/Makefile +2 -1
index 8d8b4e8..371698f 100644
@@ -2,4 +2,5 @@ obj-y				:= picoxcell_core.o axi2cfg.o \
 				   time.o \
 				   mux.o \
 				   gpio.o \
-				   clk.o
+				   clk.o \
+				   devices.o
arch/arm/mach-picoxcell/devices.c new file +118 -0

118 lines not on this page · raw message

arch/arm/mach-picoxcell/picoxcell_core.c +3 -0
index db79ba7..9f977fa 100644
@@ -285,4 +285,7 @@ void __init picoxcell_core_init(void)
 
 	/* Add handlers for the AXI bus snooping. */
 	picoxcell_axi_bus_error_init();
+
+	/* Register the devices. */
+	picoxcell_add_devices();
 }
arch/arm/mach-picoxcell/picoxcell_core.h +1 -0
index 941d1a6..9647b7a 100644
@@ -19,5 +19,6 @@ extern void __init picoxcell_core_init(void);
 extern void __init picoxcell_init_irq(void);
 extern void __init picoxcell_map_io(void);
 extern struct sys_timer picoxcell_sys_timer;
+extern void __init picoxcell_add_devices(void);
 
 #endif /* __ASM_ARCH_PICOXCELL_CORE_H__ */
Signature · 1 line
1.7.2.3
author
#20 lore raw

RFC PATCH 8/13 picoxcell: add cpufreq support

In reply to Jamie Iles

PC3X3 devices have a PLL to control the ARM core speed. Add a cpufreq driver so that we can run at optimum speed and power.

---
 arch/arm/mach-picoxcell/Makefile         |    1 +
 arch/arm/mach-picoxcell/cpufreq.c        |  145 ++++++++++++++++++++++++++++++
 arch/arm/mach-picoxcell/picoxcell_core.c |    3 +
 arch/arm/mach-picoxcell/picoxcell_core.h |    9 ++
 4 files changed, 158 insertions(+), 0 deletions(-)
arch/arm/mach-picoxcell/Makefile +1 -0
index 371698f..6249ee8 100644
@@ -4,3 +4,4 @@ obj-y				:= picoxcell_core.o axi2cfg.o \
 				   gpio.o \
 				   clk.o \
 				   devices.o
+obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o
arch/arm/mach-picoxcell/cpufreq.c new file +145 -0

145 lines not on this page · raw message

arch/arm/mach-picoxcell/picoxcell_core.c +3 -0
index 7c51e0f..f3e0279 100644
@@ -300,4 +300,7 @@ void __init picoxcell_core_init(void)
 
 	/* Register the devices. */
 	picoxcell_add_devices();
+
+	if (picoxcell_has_feature(PICOXCELL_FEATURE_CPUFREQ))
+		WARN_ON(picoxcell_cpufreq_init());
 }
arch/arm/mach-picoxcell/picoxcell_core.h +9 -0
index 9647b7a..f6d90bf 100644
@@ -21,4 +21,13 @@ extern void __init picoxcell_map_io(void);
 extern struct sys_timer picoxcell_sys_timer;
 extern void __init picoxcell_add_devices(void);
 
+# ifdef CONFIG_CPU_FREQ
+extern int __init picoxcell_cpufreq_init(void);
+# else /* CONFIG_CPU_FREQ */
+static inline int picoxcell_cpufreq_init(void)
+{
+	return 0;
+}
+# endif /* CONFIG_CPU_FREQ */
+
 #endif /* __ASM_ARCH_PICOXCELL_CORE_H__ */
Signature · 1 line
1.7.2.3
author
#21 lore raw

RFC PATCH 9/13 picoxcell: add support for pm

In reply to Jamie Iles

PC3X3 devices support clock gating so provide support for PM on these devices. We only support standby modes as we can't gate the ARM clock or memory controllers.

---
 arch/arm/mach-picoxcell/Makefile         |    1 +
 arch/arm/mach-picoxcell/picoxcell_core.c |    2 +
 arch/arm/mach-picoxcell/picoxcell_core.h |    9 ++
 arch/arm/mach-picoxcell/pm.c             |  146 ++++++++++++++++++++++++++++++
 4 files changed, 158 insertions(+), 0 deletions(-)
arch/arm/mach-picoxcell/Makefile +1 -0
index 6249ee8..09ae582 100644
@@ -5,3 +5,4 @@ obj-y				:= picoxcell_core.o axi2cfg.o \
 				   clk.o \
 				   devices.o
 obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o
+obj-$(CONFIG_PM)		+= pm.o
arch/arm/mach-picoxcell/picoxcell_core.c +2 -0
index f3e0279..8c1195b 100644
@@ -303,4 +303,6 @@ void __init picoxcell_core_init(void)
 
 	if (picoxcell_has_feature(PICOXCELL_FEATURE_CPUFREQ))
 		WARN_ON(picoxcell_cpufreq_init());
+	if (picoxcell_has_feature(PICOXCELL_FEATURE_PM))
+		WARN_ON(picoxcell_pm_init());
 }
arch/arm/mach-picoxcell/picoxcell_core.h +9 -0
index f6d90bf..3a673cf 100644
@@ -30,4 +30,13 @@ static inline int picoxcell_cpufreq_init(void)
 }
 # endif /* CONFIG_CPU_FREQ */
 
+# ifdef CONFIG_PM
+extern int __init picoxcell_pm_init(void);
+# else /* CONFIG_PM */
+static inline int picoxcell_pm_init(void)
+{
+	return 0;
+}
+# endif /* CONFIG_PM */
+
 #endif /* __ASM_ARCH_PICOXCELL_CORE_H__ */
arch/arm/mach-picoxcell/pm.c new file +146 -0

146 lines not on this page · raw message

Signature · 1 line
1.7.2.3
author
#22 lore raw

RFC PATCH 10/13 picoxcell: add chained GPIO IRQ handlers

In reply to Jamie Iles

The 8 bits of port A on the ARM GPIO of all devices are capable of generating interrupts. Provide chained handlers so that these pins can be used as interrupts and the sensitivity and polarity can be set.

---
 arch/arm/mach-picoxcell/include/mach/gpio.h |    2 +
 arch/arm/mach-picoxcell/picoxcell_core.c    |   41 +++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 0 deletions(-)
arch/arm/mach-picoxcell/include/mach/gpio.h +2 -0
index ce55c3d..8955e20 100644
@@ -152,6 +152,8 @@ enum {
 
 #ifdef __KERNEL__
 
+extern struct irq_chip armgpio_irqchip;
+
 static inline int gpio_get_value(unsigned gpio)
 {
 	return __gpio_get_value(gpio);
arch/arm/mach-picoxcell/picoxcell_core.c +41 -0

59 lines not on this page · raw message

Signature · 1 line
1.7.2.3
author
#23 lore raw

RFC PATCH 11/13 picoxcell: add support for pc3x2 devices

In reply to Jamie Iles

PC3X2 is the first supported device family of picoXcell and this patch defines the virtual clocks to allow drivers to work, the pin muxing options, timer locations and the GPIO definitions.

---
 arch/arm/mach-picoxcell/Kconfig          |    7 +
 arch/arm/mach-picoxcell/Makefile         |    1 +
 arch/arm/mach-picoxcell/pc3x2.c          |  453 ++++++++++++++++++++++++++++++
 arch/arm/mach-picoxcell/picoxcell_core.c |   13 +-
 arch/arm/mach-picoxcell/soc.h            |    1 +
 5 files changed, 474 insertions(+), 1 deletions(-)
arch/arm/mach-picoxcell/Kconfig +7 -0
index 3daba53..5141202 100644
@@ -1,4 +1,11 @@
 menu "PICOXCELL platform type"
 	depends on ARCH_PICOXCELL
 
+config PICOXCELL_PC3X2
+	bool "Support PC3x2 devices"
+	default y
+	help
+	  Include support for picoChip PC3x2 family of devices. This
+	  includes PC302 and PC312.
+
 endmenu
arch/arm/mach-picoxcell/Makefile +1 -0
index 09ae582..ab5dec1 100644
@@ -6,3 +6,4 @@ obj-y				:= picoxcell_core.o axi2cfg.o \
 				   devices.o
 obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o
 obj-$(CONFIG_PM)		+= pm.o
+obj-$(CONFIG_PICOXCELL_PC3X2)	+= pc3x2.o
arch/arm/mach-picoxcell/pc3x2.c new file +453 -0

453 lines not on this page · raw message

arch/arm/mach-picoxcell/picoxcell_core.c +12 -1
index 8386c83..5b5f0c6 100644
@@ -43,6 +43,10 @@ struct picoxcell_soc *picoxcell_get_soc(void)
 	unsigned long device_id = readl(IO_ADDRESS(PICOXCELL_AXI2CFG_BASE +
 					AXI2CFG_DEVICE_ID_REG_OFFSET));
 	switch (device_id) {
+	case 0x8003:
+	case 0x8007:
+		return &pc3x2_soc;
+
 	default:
 		panic("unsupported device type %lx", device_id);
 	}
@@ -91,7 +95,14 @@ void __init picoxcell_init_irq(void)
 static const char *picoxcell_get_partname(void)
 {
 	unsigned long dev_id = axi2cfg_readl(AXI2CFG_DEVICE_ID_REG_OFFSET);
-	const char *part = "<unknown>";
+	const char *part;
+
+	if (0x8003 == dev_id)
+		part = "pc302";
+	else if (0x8007 == dev_id)
+		part = "pc312";
+	else
+		part = "<unknown>";
 
 	return part;
 }
arch/arm/mach-picoxcell/soc.h +1 -0
index 784d714..ec30eef 100644
@@ -49,6 +49,7 @@ struct picoxcell_soc {
 };
 
 extern struct picoxcell_soc *picoxcell_get_soc(void);
+extern struct picoxcell_soc pc3x2_soc;
 
 static inline int picoxcell_has_feature(enum picoxcell_features feat)
 {
Signature · 1 line
1.7.2.3
author
#24 lore raw

RFC PATCH 12/13 picoxcell: add support for pc3x3 devices

In reply to Jamie Iles

PC3X3 is the second supported device family of picoXcell and this patch defines the virtual clocks to allow drivers to work, the pin muxing options, timer locations and the GPIO definitions. This also implements the PLL control for the ARM PLL.

---
 arch/arm/mach-picoxcell/Kconfig          |   18 +
 arch/arm/mach-picoxcell/Makefile         |    1 +
 arch/arm/mach-picoxcell/pc3x3.c          | 1256 ++++++++++++++++++++++++++++++
 arch/arm/mach-picoxcell/picoxcell_core.c |   11 +
 arch/arm/mach-picoxcell/soc.h            |    1 +
 5 files changed, 1287 insertions(+), 0 deletions(-)
arch/arm/mach-picoxcell/Kconfig +18 -0
index 5141202..671cadc 100644
@@ -8,4 +8,22 @@ config PICOXCELL_PC3X2
 	  Include support for picoChip PC3x2 family of devices. This
 	  includes PC302 and PC312.
 
+config PICOXCELL_PC3X3
+	bool "Support PC3x3 devices"
+	default y
+	select ARCH_HAS_CPUFREQ
+	help
+	  Include support for picoChip PC3x3 family of devices. This includes
+	  PC313, PC323 and PC333.
+
+config PC3X3_STOP_WDT_IN_SUSPEND
+	bool "Stop WDT in PM suspend"
+	depends on PICOCHIP_PC3X3
+	default y
+	help
+	  If you say yes here, then when the platform is put into suspend mode,
+	  the watchdog timer will be paused. Saying no will cause the watchdog
+	  to keep running. If you say no here, make sure that the watchdog uses
+	  the pretimeout mode and mark the watchdog as a wakeup source.
+
 endmenu
arch/arm/mach-picoxcell/Makefile +1 -0
index ab5dec1..d95b2b2 100644
@@ -7,3 +7,4 @@ obj-y				:= picoxcell_core.o axi2cfg.o \
 obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o
 obj-$(CONFIG_PM)		+= pm.o
 obj-$(CONFIG_PICOXCELL_PC3X2)	+= pc3x2.o
+obj-$(CONFIG_PICOXCELL_PC3X3)	+= pc3x3.o
arch/arm/mach-picoxcell/pc3x3.c new file +1256 -0

1,256 lines not on this page · raw message

arch/arm/mach-picoxcell/picoxcell_core.c +11 -0
index 5b5f0c6..b670f6c 100644
@@ -47,6 +47,11 @@ struct picoxcell_soc *picoxcell_get_soc(void)
 	case 0x8007:
 		return &pc3x2_soc;
 
+	case 0x20:
+	case 0x21:
+	case 0x22:
+		return &pc3x3_soc;
+
 	default:
 		panic("unsupported device type %lx", device_id);
 	}
@@ -101,6 +106,12 @@ static const char *picoxcell_get_partname(void)
 		part = "pc302";
 	else if (0x8007 == dev_id)
 		part = "pc312";
+	else if (0x20 == dev_id)
+		part = "pc313";
+	else if (0x21 == dev_id)
+		part = "pc323";
+	else if (0x22 == dev_id)
+		part = "pc333";
 	else
 		part = "<unknown>";
 
arch/arm/mach-picoxcell/soc.h +1 -0
index ec30eef..67b79f2 100644
@@ -50,6 +50,7 @@ struct picoxcell_soc {
 
 extern struct picoxcell_soc *picoxcell_get_soc(void);
 extern struct picoxcell_soc pc3x2_soc;
+extern struct picoxcell_soc pc3x3_soc;
 
 static inline int picoxcell_has_feature(enum picoxcell_features feat)
 {
Signature · 1 line
1.7.2.3
author
#25 lore raw

RFC PATCH v2 1/1 picoxcell: add support for pc3x3 devices

PC3X3 is the second supported device family of picoXcell and this patch defines the virtual clocks to allow drivers to work, the pin muxing options, timer locations and the GPIO definitions. This also implements the PLL control for the ARM PLL.

v2:
- remove device specific IO mappings as the only peripherals not accessed through ioremap() share a common address space in all devices.

---
 arch/arm/mach-picoxcell/Kconfig          |   18 +
 arch/arm/mach-picoxcell/Makefile         |    1 +
 arch/arm/mach-picoxcell/pc3x3.c          | 1235 ++++++++++++++++++++++++++++++
 arch/arm/mach-picoxcell/picoxcell_core.c |   11 +
 arch/arm/mach-picoxcell/soc.h            |    1 +
 5 files changed, 1266 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-picoxcell/pc3x3.c
arch/arm/mach-picoxcell/Kconfig +18 -0
index 5141202..671cadc 100644
@@ -8,4 +8,22 @@ config PICOXCELL_PC3X2
 	  Include support for picoChip PC3x2 family of devices. This
 	  includes PC302 and PC312.
 
+config PICOXCELL_PC3X3
+	bool "Support PC3x3 devices"
+	default y
+	select ARCH_HAS_CPUFREQ
+	help
+	  Include support for picoChip PC3x3 family of devices. This includes
+	  PC313, PC323 and PC333.
+
+config PC3X3_STOP_WDT_IN_SUSPEND
+	bool "Stop WDT in PM suspend"
+	depends on PICOCHIP_PC3X3
+	default y
+	help
+	  If you say yes here, then when the platform is put into suspend mode,
+	  the watchdog timer will be paused. Saying no will cause the watchdog
+	  to keep running. If you say no here, make sure that the watchdog uses
+	  the pretimeout mode and mark the watchdog as a wakeup source.
+
 endmenu
arch/arm/mach-picoxcell/Makefile +1 -0
index ab5dec1..d95b2b2 100644
@@ -7,3 +7,4 @@ obj-y				:= picoxcell_core.o axi2cfg.o \
 obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o
 obj-$(CONFIG_PM)		+= pm.o
 obj-$(CONFIG_PICOXCELL_PC3X2)	+= pc3x2.o
+obj-$(CONFIG_PICOXCELL_PC3X3)	+= pc3x3.o
arch/arm/mach-picoxcell/pc3x3.c new file +1235 -0

1,235 lines not on this page · raw message

arch/arm/mach-picoxcell/picoxcell_core.c +11 -0
index eb4e797..2dc4b99 100644
@@ -47,6 +47,11 @@ struct picoxcell_soc *picoxcell_get_soc(void)
 	case 0x8007:
 		return &pc3x2_soc;
 
+	case 0x20:
+	case 0x21:
+	case 0x22:
+		return &pc3x3_soc;
+
 	default:
 		panic("unsupported device type %lx", device_id);
 	}
@@ -101,6 +106,12 @@ static const char *picoxcell_get_partname(void)
 		part = "pc302";
 	else if (0x8007 == dev_id)
 		part = "pc312";
+	else if (0x20 == dev_id)
+		part = "pc313";
+	else if (0x21 == dev_id)
+		part = "pc323";
+	else if (0x22 == dev_id)
+		part = "pc333";
 	else
 		part = "<unknown>";
 
arch/arm/mach-picoxcell/soc.h +1 -0
index fccd278..4b4d92f 100644
@@ -49,6 +49,7 @@ struct picoxcell_soc {
 
 extern struct picoxcell_soc *picoxcell_get_soc(void);
 extern struct picoxcell_soc pc3x2_soc;
+extern struct picoxcell_soc pc3x3_soc;
 
 static inline int picoxcell_has_feature(enum picoxcell_features feat)
 {
Signature · 1 line
1.7.2.3
author
#26 lore raw

RFC PATCH 13/13 picoxcell: add support for the PC7302 development board

In reply to Jamie Iles

The PC7302 development board is capable of taking both PC3X2 and PC3X3 devices and features NOR flash, NAND flash, SPI NOR flash a serial console, 100Mb Ethernet and a number of picoArray peripherals.

This patch provides initial support for running on the PC7302 board.

---
 arch/arm/configs/pc7302_defconfig      |  102 ++++++++++++++++++
 arch/arm/mach-picoxcell/Kconfig        |    9 ++
 arch/arm/mach-picoxcell/Makefile       |    1 +
 arch/arm/mach-picoxcell/board_pc7302.c |  184 ++++++++++++++++++++++++++++++++
 4 files changed, 296 insertions(+), 0 deletions(-)
arch/arm/configs/pc7302_defconfig new file +102 -0
new file mode 100644
index 0000000..23a2c72
@@ -0,0 +1,102 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_RELAY=y
+CONFIG_EMBEDDED=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=y
+CONFIG_KPROBES=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_LBDAF is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARCH_PICOXCELL=y
+CONFIG_CPU_32v6K=y
+CONFIG_ARM_ERRATA_411920=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PREEMPT=y
+CONFIG_AEABI=y
+CONFIG_UACCESS_WITH_MEMCPY=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_FPE_NWFPE=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_IPV6 is not set
+# CONFIG_WIRELESS is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_MTD=y
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_GPIO=y
+CONFIG_MTD_UBI=y
+# CONFIG_BLK_DEV is not set
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO is not set
+# CONFIG_VT is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=32
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_HW_RANDOM is not set
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HWMON is not set
+# CONFIG_MFD_SUPPORT is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_DNOTIFY is not set
+CONFIG_TMPFS=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_UBIFS_FS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_ROOT_NFS=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_BKL is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_FTRACE is not set
+CONFIG_DEBUG_USER=y
+CONFIG_DEBUG_ERRORS=y
+CONFIG_DEBUG_LL=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_CCITT=y
+CONFIG_LIBCRC32C=y
arch/arm/mach-picoxcell/Kconfig +9 -0
index 671cadc..e00e14b 100644
@@ -16,6 +16,15 @@ config PICOXCELL_PC3X3
 	  Include support for picoChip PC3x3 family of devices. This includes
 	  PC313, PC323 and PC333.
 
+config BOARD_PC7302
+	bool "Support PC7302 Board"
+	depends on PICOXCELL_PC3X2 || PICOXCELL_PC3X3
+	default y
+	help
+          Include support for the picoChip PC7302 platform. This platform is
+	  can take any of the PC3X2 or PC3X3 devices and includes SPI NOR
+	  flash, parallel NOR flash and NAND flash.
+
 config PC3X3_STOP_WDT_IN_SUSPEND
 	bool "Stop WDT in PM suspend"
 	depends on PICOCHIP_PC3X3
arch/arm/mach-picoxcell/Makefile +1 -0
index d95b2b2..0138d96 100644
@@ -8,3 +8,4 @@ obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o
 obj-$(CONFIG_PM)		+= pm.o
 obj-$(CONFIG_PICOXCELL_PC3X2)	+= pc3x2.o
 obj-$(CONFIG_PICOXCELL_PC3X3)	+= pc3x3.o
+obj-$(CONFIG_BOARD_PC7302)	+= board_pc7302.o
arch/arm/mach-picoxcell/board_pc7302.c new file +184 -0

184 lines not on this page · raw message

Signature · 1 line
1.7.2.3
author
#27 lore raw

RFC PATCH v2 10/13 picoxcell: add chained GPIO IRQ handlers

In reply to Jamie Iles

The 8 bits of port A on the ARM GPIO of all devices are capable of generating interrupts. Provide chained handlers so that these pins can be used as interrupts and the sensitivity and polarity can be set.

v2:
- Use the generic IRQ handlers rather than using the irq_desc.

---
 arch/arm/mach-picoxcell/include/mach/gpio.h |    2 +
 arch/arm/mach-picoxcell/picoxcell_core.c    |   39 +++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 0 deletions(-)
arch/arm/mach-picoxcell/include/mach/gpio.h +2 -0
index ce55c3d..8955e20 100644
@@ -152,6 +152,8 @@ enum {
 
 #ifdef __KERNEL__
 
+extern struct irq_chip armgpio_irqchip;
+
 static inline int gpio_get_value(unsigned gpio)
 {
 	return __gpio_get_value(gpio);
arch/arm/mach-picoxcell/picoxcell_core.c +39 -0
index 8da0c34..1685df8 100644
@@ -25,6 +25,18 @@
 #include "picoxcell_core.h"
 #include "soc.h"
 
+static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
+{
+	unsigned real_irq = (irq - IRQ_GPIO0 + __IRQ_GPIO0);
+	/*
+	 * We have 8 GPIO pins that can generate interrupts and each one has
+	 * it's own interrupt bit in the VIC. All we need to do is do a
+	 * one-to-one translation from the virtual IRQ number to the real one
+	 * and call the handler.
+	 */
+	generic_handle_irq(real_irq);
+}
+
 struct picoxcell_soc *picoxcell_get_soc(void)
 {
 	unsigned long device_id = readl(IO_ADDRESS(PICOXCELL_AXI2CFG_BASE +
@@ -37,6 +49,11 @@ struct picoxcell_soc *picoxcell_get_soc(void)
 
 void __init picoxcell_init_irq(void)
 {
+#define GPIO_INT_EN_REG	    IO_ADDRESS(PICOXCELL_GPIO_BASE + \
+				       GPIO_INT_EN_REG_OFFSET)
+#define GPIO_EOI_REG	    IO_ADDRESS(PICOXCELL_GPIO_BASE + \
+				       GPIO_PORT_A_EOI_REG_OFFSET)
+	unsigned i;
 	u32 vic0_resume_sources =
 		(1 << (IRQ_AXI2PICO8 & 31)) |
 		(1 << (IRQ_EMAC & 31)) |
@@ -45,6 +62,28 @@ void __init picoxcell_init_irq(void)
 	vic_init(IO_ADDRESS(PICOXCELL_VIC0_BASE), 32, 0xFFFFFFFE,
 		 vic0_resume_sources);
 	vic_init(IO_ADDRESS(PICOXCELL_VIC1_BASE), 0, 0x7FF, 0);
+
+	/*
+	 * We want to enable/disable interrupts for the GPIO pins through the
+	 * GPIO block itself. To do this we install a chained handler. If a
+	 * user requests one of the __IRQ_GPIOn interrupts then the GPIO block
+	 * won't get configured.  We provide these interrupts below as virtual
+	 * ones that will configure the GPIO block and enable the source in
+	 * the VIC.
+	 *
+	 * The chained handler simply converts from the virtual IRQ handler to
+	 * the real interrupt source and calls the GPIO IRQ handler.
+	 */
+	writel(0, GPIO_INT_EN_REG);
+	writel(~0, GPIO_EOI_REG);
+	for (i = IRQ_GPIO0; i <= IRQ_GPIO7; ++i) {
+		set_irq_chip(i, &armgpio_irqchip);
+		set_irq_handler(i, handle_level_irq);
+		set_irq_flags(i, IRQF_VALID);
+	}
+
+	for (i = __IRQ_GPIO0; i <= __IRQ_GPIO7; ++i)
+		set_irq_chained_handler(i, gpio_irq_handler);
 }
 
 static const char *picoxcell_get_partname(void)
Signature · 1 line
1.7.2.3
author
#28 lore raw
In reply to Jamie Iles
Quoted 10 lines · Jamie Iles

Hi,

This patch series adds support for the Picochip picoXcell series of femotcell SoC's. There are currently two device families - PC3X2 and PC3X3. Both include an ARM1176JZ-S, 100Mb Ethernet controller, 2xDMA controllers, eFuses, crypto offload engines and Picochip's array processor the picoArray. This patch series adds support for the base chip support including timers, gpio, pin muxing, clocks and pm and also the PC7302 development board that can take either PC3X2 or PC3X3 devices.

Quoted 7 lines

This patch series is based off of linux-next (next-20101122) and also requires the following patches:

- 8250: add a UPIO_DWAPB32 for 32 bit accesses (v2):
http://marc.info/?l=linux-serial&m=129043658715199&w=2
- debug-8250: add a 32 bit mode:
http://marc.info/?l=linux-arm-kernel&m=129044061221371&w=2

Does anyone have any comments on this patch series?

Thanks,

Jamie