RealView: Add support for the RealView/PBX platform
Colin Tuckley [Sat, 30 May 2009 12:56:12 +0000 (13:56 +0100)]
This is a RealView platform supporting core tiles with ARM11MPCore,
Cortex-A8 or Cortex-A9 (multicore) processors. It has support for MMC,
CompactFlash, PCI-E.

Signed-off-by: Colin Tuckley <colin.tuckley@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

arch/arm/Kconfig
arch/arm/include/asm/hardware/cache-l2x0.h
arch/arm/mach-realview/Kconfig
arch/arm/mach-realview/Makefile
arch/arm/mach-realview/include/mach/board-pbx.h [new file with mode: 0644]
arch/arm/mach-realview/include/mach/debug-macro.S
arch/arm/mach-realview/include/mach/irqs.h
arch/arm/mach-realview/include/mach/uncompress.h
arch/arm/mach-realview/platsmp.c
arch/arm/mach-realview/realview_pbx.c [new file with mode: 0644]
arch/arm/mm/Kconfig

index a8d88af..cb7b388 100644 (file)
@@ -859,7 +859,7 @@ source "kernel/time/Kconfig"
 
 config SMP
        bool "Symmetric Multi-Processing (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || MACH_REALVIEW_PB11MP)
+       depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX)
        select USE_GENERIC_SMP_HELPERS
        help
          This enables support for systems with more than one CPU. If you have
@@ -916,7 +916,7 @@ config HOTPLUG_CPU
 
 config LOCAL_TIMERS
        bool "Use local timer interrupts"
-       depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP)
+       depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP || MACH_REALVIEW_PBX)
        default y
        help
          Enable support for local timers on SMP platforms, rather then the
index 64f2252..cdb9022 100644 (file)
@@ -24,6 +24,8 @@
 #define L2X0_CACHE_TYPE                        0x004
 #define L2X0_CTRL                      0x100
 #define L2X0_AUX_CTRL                  0x104
+#define L2X0_TAG_LATENCY_CTRL          0x108
+#define L2X0_DATA_LATENCY_CTRL         0x10C
 #define L2X0_EVENT_CNT_CTRL            0x200
 #define L2X0_EVENT_CNT1_CFG            0x204
 #define L2X0_EVENT_CNT0_CFG            0x208
index b6ec106..368b58a 100644 (file)
@@ -58,6 +58,13 @@ config MACH_REALVIEW_PBA8
          PB-A8 is a platform with an on-board Cortex-A8 and has support for
          PCI-E and Compact Flash.
 
+config MACH_REALVIEW_PBX
+       bool "Support RealView/PBX platform"
+       select ARM_GIC
+       select HAVE_PATA_PLATFORM
+       help
+         Include support for the ARM(R) RealView PBX platform.
+
 config REALVIEW_HIGH_PHYS_OFFSET
        bool "High physical base address for the RealView platform"
        depends on !MACH_REALVIEW_PB1176
index 7bea8ff..7df1931 100644 (file)
@@ -7,5 +7,6 @@ obj-$(CONFIG_MACH_REALVIEW_EB)          += realview_eb.o
 obj-$(CONFIG_MACH_REALVIEW_PB11MP)     += realview_pb11mp.o
 obj-$(CONFIG_MACH_REALVIEW_PB1176)     += realview_pb1176.o
 obj-$(CONFIG_MACH_REALVIEW_PBA8)       += realview_pba8.o
+obj-$(CONFIG_MACH_REALVIEW_PBX)                += realview_pbx.o
 obj-$(CONFIG_SMP)                      += platsmp.o headsmp.o localtimer.o
 obj-$(CONFIG_HOTPLUG_CPU)              += hotplug.o
diff --git a/arch/arm/mach-realview/include/mach/board-pbx.h b/arch/arm/mach-realview/include/mach/board-pbx.h
new file mode 100644 (file)
index 0000000..c265093
--- /dev/null
@@ -0,0 +1,203 @@
+/*
+ * arch/arm/mach-realview/include/mach/board-pbx.h
+ *
+ * Copyright (C) 2009 ARM Limited
+ *
+ * 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.
+ *
+ * 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_BOARD_PBX_H
+#define __ASM_ARCH_BOARD_PBX_H
+
+#include <mach/platform.h>
+
+/*
+ * Peripheral addresses
+ */
+#define REALVIEW_PBX_UART0_BASE                        0x10009000      /* UART 0 */
+#define REALVIEW_PBX_UART1_BASE                        0x1000A000      /* UART 1 */
+#define REALVIEW_PBX_UART2_BASE                        0x1000B000      /* UART 2 */
+#define REALVIEW_PBX_UART3_BASE                        0x1000C000      /* UART 3 */
+#define REALVIEW_PBX_SSP_BASE                  0x1000D000      /* Synchronous Serial Port */
+#define REALVIEW_PBX_WATCHDOG0_BASE            0x1000F000      /* Watchdog 0 */
+#define REALVIEW_PBX_WATCHDOG_BASE             0x10010000      /* watchdog interface */
+#define REALVIEW_PBX_TIMER0_1_BASE             0x10011000      /* Timer 0 and 1 */
+#define REALVIEW_PBX_TIMER2_3_BASE             0x10012000      /* Timer 2 and 3 */
+#define REALVIEW_PBX_GPIO0_BASE                        0x10013000      /* GPIO port 0 */
+#define REALVIEW_PBX_RTC_BASE                  0x10017000      /* Real Time Clock */
+#define REALVIEW_PBX_TIMER4_5_BASE             0x10018000      /* Timer 4/5 */
+#define REALVIEW_PBX_TIMER6_7_BASE             0x10019000      /* Timer 6/7 */
+#define REALVIEW_PBX_SCTL_BASE                 0x1001A000      /* System Controller */
+#define REALVIEW_PBX_CLCD_BASE                 0x10020000      /* CLCD */
+#define REALVIEW_PBX_ONB_SRAM_BASE             0x10060000      /* On-board SRAM */
+#define REALVIEW_PBX_DMC_BASE                  0x100E0000      /* DMC configuration */
+#define REALVIEW_PBX_SMC_BASE                  0x100E1000      /* SMC configuration */
+#define REALVIEW_PBX_CAN_BASE                  0x100E2000      /* CAN bus */
+#define REALVIEW_PBX_GIC_CPU_BASE              0x1E000000      /* Generic interrupt controller CPU interface */
+#define REALVIEW_PBX_FLASH0_BASE               0x40000000
+#define REALVIEW_PBX_FLASH0_SIZE               SZ_64M
+#define REALVIEW_PBX_FLASH1_BASE               0x44000000
+#define REALVIEW_PBX_FLASH1_SIZE               SZ_64M
+#define REALVIEW_PBX_ETH_BASE                  0x4E000000      /* Ethernet */
+#define REALVIEW_PBX_USB_BASE                  0x4F000000      /* USB */
+#define REALVIEW_PBX_GIC_DIST_BASE             0x1E001000      /* Generic interrupt controller distributor */
+#define REALVIEW_PBX_LT_BASE                   0xC0000000      /* Logic Tile expansion */
+#define REALVIEW_PBX_SDRAM6_BASE               0x70000000      /* SDRAM bank 6 256MB */
+#define REALVIEW_PBX_SDRAM7_BASE               0x80000000      /* SDRAM bank 7 256MB */
+
+/*
+ * Tile-specific addresses
+ */
+#define REALVIEW_PBX_TILE_SCU_BASE             0x1F000000      /* SCU registers */
+#define REALVIEW_PBX_TILE_GIC_CPU_BASE         0x1F000100      /* Private Generic interrupt controller CPU interface */
+#define REALVIEW_PBX_TILE_TWD_BASE             0x1F000600
+#define REALVIEW_PBX_TILE_TWD_PERCPU_BASE      0x1F000700
+#define REALVIEW_PBX_TILE_TWD_SIZE             0x00000100
+#define REALVIEW_PBX_TILE_GIC_DIST_BASE                0x1F001000      /* Private Generic interrupt controller distributor */
+#define REALVIEW_PBX_TILE_L220_BASE            0x1F002000      /* L220 registers */
+
+#define REALVIEW_PBX_SYS_PLD_CTRL1             0x74
+
+/*
+ * PBX PCI regions
+ */
+#define REALVIEW_PBX_PCI_BASE                  0x90040000      /* PCI-X Unit base */
+#define REALVIEW_PBX_PCI_IO_BASE               0x90050000      /* IO Region on AHB */
+#define REALVIEW_PBX_PCI_MEM_BASE              0xA0000000      /* MEM Region on AHB */
+
+#define REALVIEW_PBX_PCI_BASE_SIZE             0x10000         /* 16 Kb */
+#define REALVIEW_PBX_PCI_IO_SIZE               0x1000          /* 4 Kb */
+#define REALVIEW_PBX_PCI_MEM_SIZE              0x20000000      /* 512 MB */
+
+/*
+ * Irqs
+ */
+#define IRQ_PBX_GIC_START                      32
+
+/* L220
+#define IRQ_PBX_L220_EVENT     (IRQ_PBX_GIC_START + 29)
+#define IRQ_PBX_L220_SLAVE     (IRQ_PBX_GIC_START + 30)
+#define IRQ_PBX_L220_DECODE    (IRQ_PBX_GIC_START + 31)
+*/
+
+/*
+ * PB-X on-board gic irq sources
+ */
+#define IRQ_PBX_WATCHDOG       (IRQ_PBX_GIC_START + 0) /* Watchdog timer */
+#define IRQ_PBX_SOFT           (IRQ_PBX_GIC_START + 1) /* Software interrupt */
+#define IRQ_PBX_COMMRx         (IRQ_PBX_GIC_START + 2) /* Debug Comm Rx interrupt */
+#define IRQ_PBX_COMMTx         (IRQ_PBX_GIC_START + 3) /* Debug Comm Tx interrupt */
+#define IRQ_PBX_TIMER0_1       (IRQ_PBX_GIC_START + 4) /* Timer 0/1 (default timer) */
+#define IRQ_PBX_TIMER2_3       (IRQ_PBX_GIC_START + 5) /* Timer 2/3 */
+#define IRQ_PBX_GPIO0          (IRQ_PBX_GIC_START + 6) /* GPIO 0 */
+#define IRQ_PBX_GPIO1          (IRQ_PBX_GIC_START + 7) /* GPIO 1 */
+#define IRQ_PBX_GPIO2          (IRQ_PBX_GIC_START + 8) /* GPIO 2 */
+                                                               /* 9 reserved */
+#define IRQ_PBX_RTC            (IRQ_PBX_GIC_START + 10)        /* Real Time Clock */
+#define IRQ_PBX_SSP            (IRQ_PBX_GIC_START + 11)        /* Synchronous Serial Port */
+#define IRQ_PBX_UART0          (IRQ_PBX_GIC_START + 12)        /* UART 0 on development chip */
+#define IRQ_PBX_UART1          (IRQ_PBX_GIC_START + 13)        /* UART 1 on development chip */
+#define IRQ_PBX_UART2          (IRQ_PBX_GIC_START + 14)        /* UART 2 on development chip */
+#define IRQ_PBX_UART3          (IRQ_PBX_GIC_START + 15)        /* UART 3 on development chip */
+#define IRQ_PBX_SCI            (IRQ_PBX_GIC_START + 16)        /* Smart Card Interface */
+#define IRQ_PBX_MMCI0A         (IRQ_PBX_GIC_START + 17)        /* Multimedia Card 0A */
+#define IRQ_PBX_MMCI0B         (IRQ_PBX_GIC_START + 18)        /* Multimedia Card 0B */
+#define IRQ_PBX_AACI           (IRQ_PBX_GIC_START + 19)        /* Audio Codec */
+#define IRQ_PBX_KMI0           (IRQ_PBX_GIC_START + 20)        /* Keyboard/Mouse port 0 */
+#define IRQ_PBX_KMI1           (IRQ_PBX_GIC_START + 21)        /* Keyboard/Mouse port 1 */
+#define IRQ_PBX_CHARLCD                (IRQ_PBX_GIC_START + 22)        /* Character LCD */
+#define IRQ_PBX_CLCD           (IRQ_PBX_GIC_START + 23)        /* CLCD controller */
+#define IRQ_PBX_DMAC           (IRQ_PBX_GIC_START + 24)        /* DMA controller */
+#define IRQ_PBX_PWRFAIL                (IRQ_PBX_GIC_START + 25)        /* Power failure */
+#define IRQ_PBX_PISMO          (IRQ_PBX_GIC_START + 26)        /* PISMO interface */
+#define IRQ_PBX_DoC            (IRQ_PBX_GIC_START + 27)        /* Disk on Chip memory controller */
+#define IRQ_PBX_ETH            (IRQ_PBX_GIC_START + 28)        /* Ethernet controller */
+#define IRQ_PBX_USB            (IRQ_PBX_GIC_START + 29)        /* USB controller */
+#define IRQ_PBX_TSPEN          (IRQ_PBX_GIC_START + 30)        /* Touchscreen pen */
+#define IRQ_PBX_TSKPAD         (IRQ_PBX_GIC_START + 31)        /* Touchscreen keypad */
+
+#define IRQ_PBX_PMU_SCU0        (IRQ_PBX_GIC_START + 32)        /* SCU PMU Interrupts (11mp) */
+#define IRQ_PBX_PMU_SCU1        (IRQ_PBX_GIC_START + 33)
+#define IRQ_PBX_PMU_SCU2        (IRQ_PBX_GIC_START + 34)
+#define IRQ_PBX_PMU_SCU3        (IRQ_PBX_GIC_START + 35)
+#define IRQ_PBX_PMU_SCU4        (IRQ_PBX_GIC_START + 36)
+#define IRQ_PBX_PMU_SCU5        (IRQ_PBX_GIC_START + 37)
+#define IRQ_PBX_PMU_SCU6        (IRQ_PBX_GIC_START + 38)
+#define IRQ_PBX_PMU_SCU7        (IRQ_PBX_GIC_START + 39)
+
+#define IRQ_PBX_WATCHDOG1       (IRQ_PBX_GIC_START + 40)        /* Watchdog1 timer */
+#define IRQ_PBX_TIMER4_5        (IRQ_PBX_GIC_START + 41)        /* Timer 0/1 (default timer) */
+#define IRQ_PBX_TIMER6_7        (IRQ_PBX_GIC_START + 42)        /* Timer 2/3 */
+/* ... */
+#define IRQ_PBX_PMU_CPU3        (IRQ_PBX_GIC_START + 44)        /* CPU PMU Interrupts */
+#define IRQ_PBX_PMU_CPU2        (IRQ_PBX_GIC_START + 45)
+#define IRQ_PBX_PMU_CPU1        (IRQ_PBX_GIC_START + 46)
+#define IRQ_PBX_PMU_CPU0        (IRQ_PBX_GIC_START + 47)
+
+/* ... */
+#define IRQ_PBX_PCI0           (IRQ_PBX_GIC_START + 50)
+#define IRQ_PBX_PCI1           (IRQ_PBX_GIC_START + 51)
+#define IRQ_PBX_PCI2           (IRQ_PBX_GIC_START + 52)
+#define IRQ_PBX_PCI3           (IRQ_PBX_GIC_START + 53)
+
+#define IRQ_PBX_SMC            -1
+#define IRQ_PBX_SCTL           -1
+
+#define NR_GIC_PBX             1
+
+/*
+ * Only define NR_IRQS if less than NR_IRQS_PBX
+ */
+#define NR_IRQS_PBX            (IRQ_PBX_GIC_START + 96)
+
+#if defined(CONFIG_MACH_REALVIEW_PBX)
+
+#if !defined(NR_IRQS) || (NR_IRQS < NR_IRQS_PBX)
+#undef NR_IRQS
+#define NR_IRQS                        NR_IRQS_PBX
+#endif
+
+#if !defined(MAX_GIC_NR) || (MAX_GIC_NR < NR_GIC_PBX)
+#undef MAX_GIC_NR
+#define MAX_GIC_NR             NR_GIC_PBX
+#endif
+
+#endif /* CONFIG_MACH_REALVIEW_PBX */
+
+/*
+ * Core tile identification (REALVIEW_SYS_PROCID)
+ */
+#define REALVIEW_PBX_PROC_MASK          0xFF000000
+#define REALVIEW_PBX_PROC_ARM7TDMI      0x00000000
+#define REALVIEW_PBX_PROC_ARM9          0x02000000
+#define REALVIEW_PBX_PROC_ARM11         0x04000000
+#define REALVIEW_PBX_PROC_ARM11MP       0x06000000
+#define REALVIEW_PBX_PROC_A9MP          0x0C000000
+#define REALVIEW_PBX_PROC_A8            0x0E000000
+
+#define check_pbx_proc(proc_type)                                            \
+       ((readl(__io_address(REALVIEW_SYS_PROCID)) & REALVIEW_PBX_PROC_MASK) \
+       == proc_type)
+
+#ifdef CONFIG_MACH_REALVIEW_PBX
+#define core_tile_pbx11mp()     check_pbx_proc(REALVIEW_PBX_PROC_ARM11MP)
+#define core_tile_pbxa9mp()     check_pbx_proc(REALVIEW_PBX_PROC_A9MP)
+#define core_tile_pbxa8()       check_pbx_proc(REALVIEW_PBX_PROC_A8)
+#else
+#define core_tile_pbx11mp()     0
+#define core_tile_pbxa9mp()     0
+#define core_tile_pbxa8()       0
+#endif
+
+#endif /* __ASM_ARCH_BOARD_PBX_H */
index 92dbcb9..932d8af 100644 (file)
@@ -12,7 +12,8 @@
 
 #if defined(CONFIG_MACH_REALVIEW_EB) || \
     defined(CONFIG_MACH_REALVIEW_PB11MP) || \
-    defined(CONFIG_MACH_REALVIEW_PBA8)
+    defined(CONFIG_MACH_REALVIEW_PBA8) || \
+    defined(CONFIG_MACH_REALVIEW_PBX)
 #ifndef DEBUG_LL_UART_OFFSET
 #define DEBUG_LL_UART_OFFSET   0x00009000
 #elif DEBUG_LL_UART_OFFSET != 0x00009000
index fe5cb98..e9e3826 100644 (file)
@@ -26,6 +26,7 @@
 #include <mach/board-pb11mp.h>
 #include <mach/board-pb1176.h>
 #include <mach/board-pba8.h>
+#include <mach/board-pbx.h>
 
 #define IRQ_LOCALTIMER         29
 #define IRQ_LOCALWDOG          30
index 415d634..8305037 100644 (file)
@@ -24,6 +24,7 @@
 #include <mach/board-pb11mp.h>
 #include <mach/board-pb1176.h>
 #include <mach/board-pba8.h>
+#include <mach/board-pbx.h>
 
 #define AMBA_UART_DR(base)     (*(volatile unsigned char *)((base) + 0x00))
 #define AMBA_UART_LCRH(base)   (*(volatile unsigned char *)((base) + 0x2c))
@@ -43,6 +44,8 @@ static inline unsigned long get_uart_base(void)
                return REALVIEW_PB1176_UART0_BASE;
        else if (machine_is_realview_pba8())
                return REALVIEW_PBA8_UART0_BASE;
+       else if (machine_is_realview_pbx())
+               return REALVIEW_PBX_UART0_BASE;
        else
                return 0;
 }
index 30a9c68..e3bd934 100644 (file)
@@ -22,6 +22,7 @@
 
 #include <mach/board-eb.h>
 #include <mach/board-pb11mp.h>
+#include <mach/board-pbx.h>
 #include <mach/scu.h>
 
 #include "core.h"
@@ -40,6 +41,9 @@ static void __iomem *scu_base_addr(void)
                return __io_address(REALVIEW_EB11MP_SCU_BASE);
        else if (machine_is_realview_pb11mp())
                return __io_address(REALVIEW_TC11MP_SCU_BASE);
+       else if (machine_is_realview_pbx() &&
+                (core_tile_pbx11mp() || core_tile_pbxa9mp()))
+               return __io_address(REALVIEW_PBX_TILE_SCU_BASE);
        else
                return (void __iomem *)0;
 }
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
new file mode 100644 (file)
index 0000000..1fe294d
--- /dev/null
@@ -0,0 +1,335 @@
+/*
+ *  arch/arm/mach-realview/realview_pbx.c
+ *
+ *  Copyright (C) 2009 ARM Limited
+ *  Copyright (C) 2000 Deep Blue Solutions Ltd
+ *
+ * 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.
+ *
+ * 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 <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/sysdev.h>
+#include <linux/amba/bus.h>
+#include <linux/io.h>
+
+#include <asm/irq.h>
+#include <asm/leds.h>
+#include <asm/mach-types.h>
+#include <asm/hardware/gic.h>
+#include <asm/hardware/cache-l2x0.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/mmc.h>
+#include <asm/mach/time.h>
+
+#include <mach/hardware.h>
+#include <mach/board-pbx.h>
+#include <mach/irqs.h>
+
+#include "core.h"
+
+static struct map_desc realview_pbx_io_desc[] __initdata = {
+       {
+               .virtual        = IO_ADDRESS(REALVIEW_SYS_BASE),
+               .pfn            = __phys_to_pfn(REALVIEW_SYS_BASE),
+               .length         = SZ_4K,
+               .type           = MT_DEVICE,
+       }, {
+               .virtual        = IO_ADDRESS(REALVIEW_PBX_GIC_CPU_BASE),
+               .pfn            = __phys_to_pfn(REALVIEW_PBX_GIC_CPU_BASE),
+               .length         = SZ_4K,
+               .type           = MT_DEVICE,
+       }, {
+               .virtual        = IO_ADDRESS(REALVIEW_PBX_GIC_DIST_BASE),
+               .pfn            = __phys_to_pfn(REALVIEW_PBX_GIC_DIST_BASE),
+               .length         = SZ_4K,
+               .type           = MT_DEVICE,
+       }, {
+               .virtual        = IO_ADDRESS(REALVIEW_SCTL_BASE),
+               .pfn            = __phys_to_pfn(REALVIEW_SCTL_BASE),
+               .length         = SZ_4K,
+               .type           = MT_DEVICE,
+       }, {
+               .virtual        = IO_ADDRESS(REALVIEW_PBX_TIMER0_1_BASE),
+               .pfn            = __phys_to_pfn(REALVIEW_PBX_TIMER0_1_BASE),
+               .length         = SZ_4K,
+               .type           = MT_DEVICE,
+       }, {
+               .virtual        = IO_ADDRESS(REALVIEW_PBX_TIMER2_3_BASE),
+               .pfn            = __phys_to_pfn(REALVIEW_PBX_TIMER2_3_BASE),
+               .length         = SZ_4K,
+               .type           = MT_DEVICE,
+       },
+#ifdef CONFIG_PCI
+       {
+               .virtual        = PCIX_UNIT_BASE,
+               .pfn            = __phys_to_pfn(REALVIEW_PBX_PCI_BASE),
+               .length         = REALVIEW_PBX_PCI_BASE_SIZE,
+               .type           = MT_DEVICE,
+       },
+#endif
+#ifdef CONFIG_DEBUG_LL
+       {
+               .virtual        = IO_ADDRESS(REALVIEW_PBX_UART0_BASE),
+               .pfn            = __phys_to_pfn(REALVIEW_PBX_UART0_BASE),
+               .length         = SZ_4K,
+               .type           = MT_DEVICE,
+       },
+#endif
+};
+
+static struct map_desc realview_local_io_desc[] __initdata = {
+       {
+               .virtual        = IO_ADDRESS(REALVIEW_PBX_TILE_GIC_CPU_BASE),
+               .pfn            = __phys_to_pfn(REALVIEW_PBX_TILE_GIC_CPU_BASE),
+               .length         = SZ_4K,
+               .type           = MT_DEVICE,
+       }, {
+               .virtual        = IO_ADDRESS(REALVIEW_PBX_TILE_GIC_DIST_BASE),
+               .pfn            = __phys_to_pfn(REALVIEW_PBX_TILE_GIC_DIST_BASE),
+               .length         = SZ_4K,
+               .type           = MT_DEVICE,
+       }, {
+               .virtual        = IO_ADDRESS(REALVIEW_PBX_TILE_L220_BASE),
+               .pfn            = __phys_to_pfn(REALVIEW_PBX_TILE_L220_BASE),
+               .length         = SZ_8K,
+               .type           = MT_DEVICE,
+       }
+};
+
+static void __init realview_pbx_map_io(void)
+{
+       iotable_init(realview_pbx_io_desc, ARRAY_SIZE(realview_pbx_io_desc));
+       if (core_tile_pbx11mp() || core_tile_pbxa9mp())
+               iotable_init(realview_local_io_desc, ARRAY_SIZE(realview_local_io_desc));
+}
+
+/*
+ * RealView PBXCore AMBA devices
+ */
+
+#define GPIO2_IRQ              { IRQ_PBX_GPIO2, NO_IRQ }
+#define GPIO2_DMA              { 0, 0 }
+#define GPIO3_IRQ              { IRQ_PBX_GPIO3, NO_IRQ }
+#define GPIO3_DMA              { 0, 0 }
+#define AACI_IRQ               { IRQ_PBX_AACI, NO_IRQ }
+#define AACI_DMA               { 0x80, 0x81 }
+#define MMCI0_IRQ              { IRQ_PBX_MMCI0A, IRQ_PBX_MMCI0B }
+#define MMCI0_DMA              { 0x84, 0 }
+#define KMI0_IRQ               { IRQ_PBX_KMI0, NO_IRQ }
+#define KMI0_DMA               { 0, 0 }
+#define KMI1_IRQ               { IRQ_PBX_KMI1, NO_IRQ }
+#define KMI1_DMA               { 0, 0 }
+#define PBX_SMC_IRQ            { NO_IRQ, NO_IRQ }
+#define PBX_SMC_DMA            { 0, 0 }
+#define MPMC_IRQ               { NO_IRQ, NO_IRQ }
+#define MPMC_DMA               { 0, 0 }
+#define PBX_CLCD_IRQ           { IRQ_PBX_CLCD, NO_IRQ }
+#define PBX_CLCD_DMA           { 0, 0 }
+#define DMAC_IRQ               { IRQ_PBX_DMAC, NO_IRQ }
+#define DMAC_DMA               { 0, 0 }
+#define SCTL_IRQ               { NO_IRQ, NO_IRQ }
+#define SCTL_DMA               { 0, 0 }
+#define PBX_WATCHDOG_IRQ       { IRQ_PBX_WATCHDOG, NO_IRQ }
+#define PBX_WATCHDOG_DMA       { 0, 0 }
+#define PBX_GPIO0_IRQ          { IRQ_PBX_GPIO0, NO_IRQ }
+#define PBX_GPIO0_DMA          { 0, 0 }
+#define GPIO1_IRQ              { IRQ_PBX_GPIO1, NO_IRQ }
+#define GPIO1_DMA              { 0, 0 }
+#define PBX_RTC_IRQ            { IRQ_PBX_RTC, NO_IRQ }
+#define PBX_RTC_DMA            { 0, 0 }
+#define SCI_IRQ                        { IRQ_PBX_SCI, NO_IRQ }
+#define SCI_DMA                        { 7, 6 }
+#define PBX_UART0_IRQ          { IRQ_PBX_UART0, NO_IRQ }
+#define PBX_UART0_DMA          { 15, 14 }
+#define PBX_UART1_IRQ          { IRQ_PBX_UART1, NO_IRQ }
+#define PBX_UART1_DMA          { 13, 12 }
+#define PBX_UART2_IRQ          { IRQ_PBX_UART2, NO_IRQ }
+#define PBX_UART2_DMA          { 11, 10 }
+#define PBX_UART3_IRQ          { IRQ_PBX_UART3, NO_IRQ }
+#define PBX_UART3_DMA          { 0x86, 0x87 }
+#define PBX_SSP_IRQ            { IRQ_PBX_SSP, NO_IRQ }
+#define PBX_SSP_DMA            { 9, 8 }
+
+/* FPGA Primecells */
+AMBA_DEVICE(aaci,      "fpga:04",      AACI,           NULL);
+AMBA_DEVICE(mmc0,      "fpga:05",      MMCI0,          &realview_mmc0_plat_data);
+AMBA_DEVICE(kmi0,      "fpga:06",      KMI0,           NULL);
+AMBA_DEVICE(kmi1,      "fpga:07",      KMI1,           NULL);
+AMBA_DEVICE(uart3,     "fpga:09",      PBX_UART3,      NULL);
+
+/* DevChip Primecells */
+AMBA_DEVICE(smc,       "dev:00",       PBX_SMC,        NULL);
+AMBA_DEVICE(sctl,      "dev:e0",       SCTL,           NULL);
+AMBA_DEVICE(wdog,      "dev:e1",       PBX_WATCHDOG,   NULL);
+AMBA_DEVICE(gpio0,     "dev:e4",       PBX_GPIO0,      NULL);
+AMBA_DEVICE(gpio1,     "dev:e5",       GPIO1,          NULL);
+AMBA_DEVICE(gpio2,     "dev:e6",       GPIO2,          NULL);
+AMBA_DEVICE(rtc,       "dev:e8",       PBX_RTC,        NULL);
+AMBA_DEVICE(sci0,      "dev:f0",       SCI,            NULL);
+AMBA_DEVICE(uart0,     "dev:f1",       PBX_UART0,      NULL);
+AMBA_DEVICE(uart1,     "dev:f2",       PBX_UART1,      NULL);
+AMBA_DEVICE(uart2,     "dev:f3",       PBX_UART2,      NULL);
+AMBA_DEVICE(ssp0,      "dev:f4",       PBX_SSP,        NULL);
+
+/* Primecells on the NEC ISSP chip */
+AMBA_DEVICE(clcd,      "issp:20",      PBX_CLCD,       &clcd_plat_data);
+AMBA_DEVICE(dmac,      "issp:30",      DMAC,           NULL);
+
+static struct amba_device *amba_devs[] __initdata = {
+       &dmac_device,
+       &uart0_device,
+       &uart1_device,
+       &uart2_device,
+       &uart3_device,
+       &smc_device,
+       &clcd_device,
+       &sctl_device,
+       &wdog_device,
+       &gpio0_device,
+       &gpio1_device,
+       &gpio2_device,
+       &rtc_device,
+       &sci0_device,
+       &ssp0_device,
+       &aaci_device,
+       &mmc0_device,
+       &kmi0_device,
+       &kmi1_device,
+};
+
+/*
+ * RealView PB-X platform devices
+ */
+static struct resource realview_pbx_flash_resources[] = {
+       [0] = {
+               .start          = REALVIEW_PBX_FLASH0_BASE,
+               .end            = REALVIEW_PBX_FLASH0_BASE + REALVIEW_PBX_FLASH0_SIZE - 1,
+               .flags          = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start          = REALVIEW_PBX_FLASH1_BASE,
+               .end            = REALVIEW_PBX_FLASH1_BASE + REALVIEW_PBX_FLASH1_SIZE - 1,
+               .flags          = IORESOURCE_MEM,
+       },
+};
+
+static struct resource realview_pbx_smsc911x_resources[] = {
+       [0] = {
+               .start          = REALVIEW_PBX_ETH_BASE,
+               .end            = REALVIEW_PBX_ETH_BASE + SZ_64K - 1,
+               .flags          = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start          = IRQ_PBX_ETH,
+               .end            = IRQ_PBX_ETH,
+               .flags          = IORESOURCE_IRQ,
+       },
+};
+
+static struct resource realview_pbx_isp1761_resources[] = {
+       [0] = {
+               .start          = REALVIEW_PBX_USB_BASE,
+               .end            = REALVIEW_PBX_USB_BASE + SZ_128K - 1,
+               .flags          = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start          = IRQ_PBX_USB,
+               .end            = IRQ_PBX_USB,
+               .flags          = IORESOURCE_IRQ,
+       },
+};
+
+static void __init gic_init_irq(void)
+{
+       /* ARM PBX on-board GIC */
+       if (core_tile_pbx11mp() || core_tile_pbxa9mp()) {
+               gic_cpu_base_addr = __io_address(REALVIEW_PBX_TILE_GIC_CPU_BASE);
+               gic_dist_init(0, __io_address(REALVIEW_PBX_TILE_GIC_DIST_BASE),
+                             29);
+               gic_cpu_init(0, __io_address(REALVIEW_PBX_TILE_GIC_CPU_BASE));
+       } else {
+               gic_cpu_base_addr = __io_address(REALVIEW_PBX_GIC_CPU_BASE);
+               gic_dist_init(0, __io_address(REALVIEW_PBX_GIC_DIST_BASE),
+                             IRQ_PBX_GIC_START);
+               gic_cpu_init(0, __io_address(REALVIEW_PBX_GIC_CPU_BASE));
+       }
+}
+
+static void __init realview_pbx_timer_init(void)
+{
+       timer0_va_base = __io_address(REALVIEW_PBX_TIMER0_1_BASE);
+       timer1_va_base = __io_address(REALVIEW_PBX_TIMER0_1_BASE) + 0x20;
+       timer2_va_base = __io_address(REALVIEW_PBX_TIMER2_3_BASE);
+       timer3_va_base = __io_address(REALVIEW_PBX_TIMER2_3_BASE) + 0x20;
+
+#ifdef CONFIG_LOCAL_TIMERS
+       if (core_tile_pbx11mp() || core_tile_pbxa9mp())
+               twd_base = __io_address(REALVIEW_PBX_TILE_TWD_BASE);
+#endif
+       realview_timer_init(IRQ_PBX_TIMER0_1);
+}
+
+static struct sys_timer realview_pbx_timer = {
+       .init           = realview_pbx_timer_init,
+};
+
+static void __init realview_pbx_init(void)
+{
+       int i;
+
+#ifdef CONFIG_CACHE_L2X0
+       if (core_tile_pbxa9mp()) {
+               void __iomem *l2x0_base =
+                       __io_address(REALVIEW_PBX_TILE_L220_BASE);
+
+               /* set RAM latencies to 1 cycle for eASIC */
+               writel(0, l2x0_base + L2X0_TAG_LATENCY_CTRL);
+               writel(0, l2x0_base + L2X0_DATA_LATENCY_CTRL);
+
+               /* 16KB way size, 8-way associativity, parity disabled
+                * Bits:  .. 0 0 0 0 1 00 1 0 1 001 0 000 0 .... .... .... */
+               l2x0_init(l2x0_base, 0x02520000, 0xc0000fff);
+       }
+#endif
+
+       realview_flash_register(realview_pbx_flash_resources,
+                               ARRAY_SIZE(realview_pbx_flash_resources));
+       realview_eth_register(NULL, realview_pbx_smsc911x_resources);
+       platform_device_register(&realview_i2c_device);
+       platform_device_register(&realview_cf_device);
+       realview_usb_register(realview_pbx_isp1761_resources);
+
+       for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
+               struct amba_device *d = amba_devs[i];
+               amba_device_register(d, &iomem_resource);
+       }
+
+#ifdef CONFIG_LEDS
+       leds_event = realview_leds_event;
+#endif
+}
+
+MACHINE_START(REALVIEW_PBX, "ARM-RealView PBX")
+       /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
+       .phys_io        = REALVIEW_PBX_UART0_BASE,
+       .io_pg_offst    = (IO_ADDRESS(REALVIEW_PBX_UART0_BASE) >> 18) & 0xfffc,
+       .boot_params    = PHYS_OFFSET + 0x00000100,
+       .map_io         = realview_pbx_map_io,
+       .init_irq       = gic_init_irq,
+       .timer          = &realview_pbx_timer,
+       .init_machine   = realview_pbx_init,
+MACHINE_END
index 2097956..76bbcde 100644 (file)
@@ -391,7 +391,7 @@ config CPU_FEROCEON_OLD_ID
 
 # ARMv6
 config CPU_V6
-       bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB
+       bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX
        select CPU_32v6
        select CPU_ABRT_EV6
        select CPU_PABRT_NOIFAR
@@ -416,7 +416,7 @@ config CPU_32v6K
 
 # ARMv7
 config CPU_V7
-       bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB
+       bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX
        select CPU_32v6K
        select CPU_32v7
        select CPU_ABRT_EV7
@@ -747,7 +747,7 @@ config CACHE_FEROCEON_L2_WRITETHROUGH
 config CACHE_L2X0
        bool "Enable the L2x0 outer cache controller"
        depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \
-                  REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31
+                  REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX
        default y
        select OUTER_CACHE
        help