11 files changed, 934 insertions, 0 deletions

diff --git a/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h b/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
new file mode 100644
index 00000000000..8a2f5a21d4e
--- /dev/null
+++ b/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
@@ -0,0 +1,635 @@
+/*
+ * Copyright 2008 Cavium Networks
+ *
+ * This file 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.
+ */
+
+#ifndef __MACH_BOARD_CNS3XXXH
+#define __MACH_BOARD_CNS3XXXH
+
+/*
+ * Memory map
+ */
+#define CNS3XXX_FLASH_BASE                      0x10000000      /* Flash/SRAM Memory Bank 0 */
+#define CNS3XXX_FLASH_SIZE                      SZ_256M
+
+#define CNS3XXX_DDR2SDRAM_BASE                  0x20000000      /* DDR2 SDRAM Memory */
+
+#define CNS3XXX_SPI_FLASH_BASE                  0x60000000      /* SPI Serial Flash Memory */
+
+#define CNS3XXX_SWITCH_BASE                     0x70000000      /* Switch and HNAT Control */
+#define CNS3XXX_SWITCH_BASE_VIRT                0xFFF00000
+
+#define CNS3XXX_PPE_BASE                        0x70001000      /* HANT */
+#define CNS3XXX_PPE_BASE_VIRT                   0xFFF50000
+
+#define CNS3XXX_EMBEDDED_SRAM_BASE              0x70002000      /* HANT Embedded SRAM */
+#define CNS3XXX_EMBEDDED_SRAM_BASE_VIRT         0xFFF60000
+
+#define CNS3XXX_SSP_BASE                        0x71000000      /* Synchronous Serial Port - SPI/PCM/I2C */
+#define CNS3XXX_SSP_BASE_VIRT                   0xFFF01000
+
+#define CNS3XXX_DMC_BASE                        0x72000000      /* DMC Control (DDR2 SDRAM) */
+#define CNS3XXX_DMC_BASE_VIRT                   0xFFF02000
+
+#define CNS3XXX_SMC_BASE                        0x73000000      /* SMC Control */
+#define CNS3XXX_SMC_BASE_VIRT                   0xFFF03000
+
+#define SMC_MEMC_STATUS_OFFSET                  0x000
+#define SMC_MEMIF_CFG_OFFSET                    0x004
+#define SMC_MEMC_CFG_SET_OFFSET                 0x008
+#define SMC_MEMC_CFG_CLR_OFFSET                 0x00C
+#define SMC_DIRECT_CMD_OFFSET                   0x010
+#define SMC_SET_CYCLES_OFFSET                   0x014
+#define SMC_SET_OPMODE_OFFSET                   0x018
+#define SMC_REFRESH_PERIOD_0_OFFSET             0x020
+#define SMC_REFRESH_PERIOD_1_OFFSET             0x024
+#define SMC_SRAM_CYCLES0_0_OFFSET               0x100
+#define SMC_NAND_CYCLES0_0_OFFSET               0x100
+#define SMC_OPMODE0_0_OFFSET                    0x104
+#define SMC_SRAM_CYCLES0_1_OFFSET               0x120
+#define SMC_NAND_CYCLES0_1_OFFSET               0x120
+#define SMC_OPMODE0_1_OFFSET                    0x124
+#define SMC_USER_STATUS_OFFSET                  0x200
+#define SMC_USER_CONFIG_OFFSET                  0x204
+#define SMC_ECC_STATUS_OFFSET                   0x300
+#define SMC_ECC_MEMCFG_OFFSET                   0x304
+#define SMC_ECC_MEMCOMMAND1_OFFSET              0x308
+#define SMC_ECC_MEMCOMMAND2_OFFSET              0x30C
+#define SMC_ECC_ADDR0_OFFSET                    0x310
+#define SMC_ECC_ADDR1_OFFSET                    0x314
+#define SMC_ECC_VALUE0_OFFSET                   0x318
+#define SMC_ECC_VALUE1_OFFSET                   0x31C
+#define SMC_ECC_VALUE2_OFFSET                   0x320
+#define SMC_ECC_VALUE3_OFFSET                   0x324
+#define SMC_PERIPH_ID_0_OFFSET                  0xFE0
+#define SMC_PERIPH_ID_1_OFFSET                  0xFE4
+#define SMC_PERIPH_ID_2_OFFSET                  0xFE8
+#define SMC_PERIPH_ID_3_OFFSET                  0xFEC
+#define SMC_PCELL_ID_0_OFFSET                   0xFF0
+#define SMC_PCELL_ID_1_OFFSET                   0xFF4
+#define SMC_PCELL_ID_2_OFFSET                   0xFF8
+#define SMC_PCELL_ID_3_OFFSET                   0xFFC
+
+#define CNS3XXX_GPIOA_BASE                      0x74000000      /* GPIO port A */
+#define CNS3XXX_GPIOA_BASE_VIRT                 0xFFF04000
+
+#define CNS3XXX_GPIOB_BASE                      0x74800000      /* GPIO port B */
+#define CNS3XXX_GPIOB_BASE_VIRT                 0xFFF05000
+
+#define CNS3XXX_RTC_BASE                        0x75000000      /* Real Time Clock */
+#define CNS3XXX_RTC_BASE_VIRT                   0xFFF06000
+
+#define RTC_SEC_OFFSET                          0x00
+#define RTC_MIN_OFFSET                          0x04
+#define RTC_HOUR_OFFSET                         0x08
+#define RTC_DAY_OFFSET                          0x0C
+#define RTC_SEC_ALM_OFFSET                      0x10
+#define RTC_MIN_ALM_OFFSET                      0x14
+#define RTC_HOUR_ALM_OFFSET                     0x18
+#define RTC_REC_OFFSET                          0x1C
+#define RTC_CTRL_OFFSET                         0x20
+#define RTC_INTR_STS_OFFSET                     0x34
+
+#define CNS3XXX_MISC_BASE                       0x76000000      /* Misc Control */
+#define CNS3XXX_MISC_BASE_VIRT                  0xFFF07000      /* Misc Control */
+
+#define CNS3XXX_PM_BASE                         0x77000000      /* Power Management Control */
+#define CNS3XXX_PM_BASE_VIRT                    0xFFF08000
+
+#define PM_CLK_GATE_OFFSET                      0x00
+#define PM_SOFT_RST_OFFSET                      0x04
+#define PM_HS_CFG_OFFSET                        0x08
+#define PM_CACTIVE_STA_OFFSET                   0x0C
+#define PM_PWR_STA_OFFSET                       0x10
+#define PM_SYS_CLK_CTRL_OFFSET                  0x14
+#define PM_PLL_LCD_I2S_CTRL_OFFSET              0x18
+#define PM_PLL_HM_PD_OFFSET                     0x1C
+
+#define CNS3XXX_UART0_BASE                      0x78000000      /* UART 0 */
+#define CNS3XXX_UART0_BASE_VIRT                 0xFFF09000
+
+#define CNS3XXX_UART1_BASE                      0x78400000      /* UART 1 */
+#define CNS3XXX_UART1_BASE_VIRT                 0xFFF0A000
+
+#define CNS3XXX_UART2_BASE                      0x78800000      /* UART 2 */
+#define CNS3XXX_UART2_BASE_VIRT                 0xFFF0B000
+
+#define CNS3XXX_DMAC_BASE                       0x79000000      /* Generic DMA Control */
+#define CNS3XXX_DMAC_BASE_VIRT                  0xFFF0D000
+
+#define CNS3XXX_CORESIGHT_BASE                  0x7A000000      /* CoreSight */
+#define CNS3XXX_CORESIGHT_BASE_VIRT             0xFFF0E000
+
+#define CNS3XXX_CRYPTO_BASE                     0x7B000000      /* Crypto */
+#define CNS3XXX_CRYPTO_BASE_VIRT                0xFFF0F000
+
+#define CNS3XXX_I2S_BASE                        0x7C000000      /* I2S */
+#define CNS3XXX_I2S_BASE_VIRT                   0xFFF10000
+
+#define CNS3XXX_TIMER1_2_3_BASE                 0x7C800000      /* Timer */
+#define CNS3XXX_TIMER1_2_3_BASE_VIRT            0xFFF10800
+
+#define TIMER1_COUNTER_OFFSET                   0x00
+#define TIMER1_AUTO_RELOAD_OFFSET               0x04
+#define TIMER1_MATCH_V1_OFFSET                  0x08
+#define TIMER1_MATCH_V2_OFFSET                  0x0C
+
+#define TIMER2_COUNTER_OFFSET                   0x10
+#define TIMER2_AUTO_RELOAD_OFFSET               0x14
+#define TIMER2_MATCH_V1_OFFSET                  0x18
+#define TIMER2_MATCH_V2_OFFSET                  0x1C
+
+#define TIMER1_2_CONTROL_OFFSET                 0x30
+#define TIMER1_2_INTERRUPT_STATUS_OFFSET        0x34
+#define TIMER1_2_INTERRUPT_MASK_OFFSET          0x38
+
+#define TIMER_FREERUN_OFFSET                    0x40
+#define TIMER_FREERUN_CONTROL_OFFSET            0x44
+
+#define CNS3XXX_HCIE_BASE                       0x7D000000      /* HCIE Control */
+#define CNS3XXX_HCIE_BASE_VIRT                  0xFFF30000
+
+#define CNS3XXX_RAID_BASE                       0x7E000000      /* RAID Control */
+#define CNS3XXX_RAID_BASE_VIRT                  0xFFF12000
+
+#define CNS3XXX_AXI_IXC_BASE                    0x7F000000      /* AXI IXC */
+#define CNS3XXX_AXI_IXC_BASE_VIRT               0xFFF13000
+
+#define CNS3XXX_CLCD_BASE                       0x80000000      /* LCD Control */
+#define CNS3XXX_CLCD_BASE_VIRT                  0xFFF14000
+
+#define CNS3XXX_USBOTG_BASE                     0x81000000      /* USB OTG Control */
+#define CNS3XXX_USBOTG_BASE_VIRT                0xFFF15000
+
+#define CNS3XXX_USB_BASE                        0x82000000      /* USB Host Control */
+#define CNS3XXX_USB_BASE_VIRT                   0xFFF16000
+
+#define CNS3XXX_SATA2_BASE                      0x83000000      /* SATA */
+#define CNS3XXX_SATA2_SIZE                      SZ_16M
+#define CNS3XXX_SATA2_BASE_VIRT                 0xFFF17000
+
+#define CNS3XXX_CAMERA_BASE                     0x84000000      /* Camera Interface */
+#define CNS3XXX_CAMERA_BASE_VIRT                0xFFF18000
+
+#define CNS3XXX_SDIO_BASE                       0x85000000      /* SDIO */
+#define CNS3XXX_SDIO_BASE_VIRT                  0xFFF19000
+
+#define CNS3XXX_I2S_TDM_BASE                    0x86000000      /* I2S TDM */
+#define CNS3XXX_I2S_TDM_BASE_VIRT               0xFFF1A000
+
+#define CNS3XXX_2DG_BASE                        0x87000000      /* 2D Graphic Control */
+#define CNS3XXX_2DG_BASE_VIRT                   0xFFF1B000
+
+#define CNS3XXX_USB_OHCI_BASE                   0x88000000      /* USB OHCI */
+#define CNS3XXX_USB_OHCI_BASE_VIRT              0xFFF1C000
+
+#define CNS3XXX_L2C_BASE                        0x92000000      /* L2 Cache Control */
+#define CNS3XXX_L2C_BASE_VIRT                   0xFFF27000
+
+#define CNS3XXX_PCIE0_MEM_BASE                  0xA0000000      /* PCIe Port 0 IO/Memory Space */
+#define CNS3XXX_PCIE0_MEM_BASE_VIRT             0xE0000000
+
+#define CNS3XXX_PCIE0_HOST_BASE                 0xAB000000      /* PCIe Port 0 RC Base */
+#define CNS3XXX_PCIE0_HOST_BASE_VIRT            0xE1000000
+
+#define CNS3XXX_PCIE0_IO_BASE                   0xAC000000      /* PCIe Port 0 */
+#define CNS3XXX_PCIE0_IO_BASE_VIRT              0xE2000000
+
+#define CNS3XXX_PCIE0_CFG0_BASE                 0xAD000000      /* PCIe Port 0 CFG Type 0 */
+#define CNS3XXX_PCIE0_CFG0_BASE_VIRT            0xE3000000
+
+#define CNS3XXX_PCIE0_CFG1_BASE                 0xAE000000      /* PCIe Port 0 CFG Type 1 */
+#define CNS3XXX_PCIE0_CFG1_BASE_VIRT            0xE4000000
+
+#define CNS3XXX_PCIE0_MSG_BASE                  0xAF000000      /* PCIe Port 0 Message Space */
+#define CNS3XXX_PCIE0_MSG_BASE_VIRT             0xE5000000
+
+#define CNS3XXX_PCIE1_MEM_BASE                  0xB0000000      /* PCIe Port 1 IO/Memory Space */
+#define CNS3XXX_PCIE1_MEM_BASE_VIRT             0xE8000000
+
+#define CNS3XXX_PCIE1_HOST_BASE                 0xBB000000      /* PCIe Port 1 RC Base */
+#define CNS3XXX_PCIE1_HOST_BASE_VIRT            0xE9000000
+
+#define CNS3XXX_PCIE1_IO_BASE                   0xBC000000      /* PCIe Port 1 */
+#define CNS3XXX_PCIE1_IO_BASE_VIRT              0xEA000000
+
+#define CNS3XXX_PCIE1_CFG0_BASE                 0xBD000000      /* PCIe Port 1 CFG Type 0 */
+#define CNS3XXX_PCIE1_CFG0_BASE_VIRT            0xEB000000
+
+#define CNS3XXX_PCIE1_CFG1_BASE                 0xBE000000      /* PCIe Port 1 CFG Type 1 */
+#define CNS3XXX_PCIE1_CFG1_BASE_VIRT            0xEC000000
+
+#define CNS3XXX_PCIE1_MSG_BASE                  0xBF000000      /* PCIe Port 1 Message Space */
+#define CNS3XXX_PCIE1_MSG_BASE_VIRT             0xED000000
+
+/*
+ * Testchip peripheral and fpga gic regions
+ */
+#define CNS3XXX_TC11MP_SCU_BASE                 0x90000000      /* IRQ, Test chip */
+#define CNS3XXX_TC11MP_SCU_BASE_VIRT            0xFF000000
+
+#define CNS3XXX_TC11MP_GIC_CPU_BASE             0x90000100      /* Test chip interrupt controller CPU interface */
+#define CNS3XXX_TC11MP_GIC_CPU_BASE_VIRT        0xFF000100
+
+#define CNS3XXX_TC11MP_TWD_BASE                 0x90000600
+#define CNS3XXX_TC11MP_TWD_BASE_VIRT            0xFF000600
+
+#define CNS3XXX_TC11MP_GIC_DIST_BASE            0x90001000      /* Test chip interrupt controller distributor */
+#define CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT       0xFF001000
+
+#define CNS3XXX_TC11MP_L220_BASE                0x92002000      /* L220 registers */
+#define CNS3XXX_TC11MP_L220_BASE_VIRT           0xFF002000
+
+/*
+ * Misc block
+ */
+#define MISC_MEM_MAP(offs) (void __iomem *)(CNS3XXX_MISC_BASE_VIRT + (offs))
+#define MISC_MEM_MAP_VALUE(offset) (*((volatile unsigned int *)(CNS3XXX_MISC_BASE_VIRT + (offset))))
+
+#define MISC_MEMORY_REMAP_REG                   MISC_MEM_MAP_VALUE(0x00)
+#define MISC_CHIP_CONFIG_REG                    MISC_MEM_MAP_VALUE(0x04)
+#define MISC_DEBUG_PROBE_DATA_REG               MISC_MEM_MAP_VALUE(0x08)
+#define MISC_DEBUG_PROBE_SELECTION_REG          MISC_MEM_MAP_VALUE(0x0C)
+#define MISC_IO_PIN_FUNC_SELECTION_REG          MISC_MEM_MAP_VALUE(0x10)
+#define MISC_GPIOA_PIN_ENABLE_REG               MISC_MEM_MAP_VALUE(0x14)
+#define MISC_GPIOB_PIN_ENABLE_REG               MISC_MEM_MAP_VALUE(0x18)
+#define MISC_IO_PAD_DRIVE_STRENGTH_CTRL_A       MISC_MEM_MAP_VALUE(0x1C)
+#define MISC_IO_PAD_DRIVE_STRENGTH_CTRL_B       MISC_MEM_MAP_VALUE(0x20)
+#define MISC_GPIOA_15_0_PULL_CTRL_REG           MISC_MEM_MAP_VALUE(0x24)
+#define MISC_GPIOA_16_31_PULL_CTRL_REG          MISC_MEM_MAP_VALUE(0x28)
+#define MISC_GPIOB_15_0_PULL_CTRL_REG           MISC_MEM_MAP_VALUE(0x2C)
+#define MISC_GPIOB_16_31_PULL_CTRL_REG          MISC_MEM_MAP_VALUE(0x30)
+#define MISC_IO_PULL_CTRL_REG                   MISC_MEM_MAP_VALUE(0x34)
+#define MISC_E_FUSE_31_0_REG                    MISC_MEM_MAP_VALUE(0x40)
+#define MISC_E_FUSE_63_32_REG                   MISC_MEM_MAP_VALUE(0x44)
+#define MISC_E_FUSE_95_64_REG                   MISC_MEM_MAP_VALUE(0x48)
+#define MISC_E_FUSE_127_96_REG                  MISC_MEM_MAP_VALUE(0x4C)
+#define MISC_SOFTWARE_TEST_1_REG                MISC_MEM_MAP_VALUE(0x50)
+#define MISC_SOFTWARE_TEST_2_REG                MISC_MEM_MAP_VALUE(0x54)
+
+#define MISC_SATA_POWER_MODE                    MISC_MEM_MAP_VALUE(0x310)
+
+#define MISC_USB_CFG_REG                        MISC_MEM_MAP_VALUE(0x800)
+#define MISC_USB_STS_REG                        MISC_MEM_MAP_VALUE(0x804)
+#define MISC_USBPHY00_CFG_REG                   MISC_MEM_MAP_VALUE(0x808)
+#define MISC_USBPHY01_CFG_REG                   MISC_MEM_MAP_VALUE(0x80c)
+#define MISC_USBPHY10_CFG_REG                   MISC_MEM_MAP_VALUE(0x810)
+#define MISC_USBPHY11_CFG_REG                   MISC_MEM_MAP_VALUE(0x814)
+
+#define MISC_PCIEPHY_CMCTL(x)                   MISC_MEM_MAP(0x900 + (x) * 0x004)
+#define MISC_PCIEPHY_CTL(x)                     MISC_MEM_MAP(0x940 + (x) * 0x100)
+#define MISC_PCIE_AXIS_AWMISC(x)                MISC_MEM_MAP(0x944 + (x) * 0x100)
+#define MISC_PCIE_AXIS_ARMISC(x)                MISC_MEM_MAP(0x948 + (x) * 0x100)
+#define MISC_PCIE_AXIS_RMISC(x)                 MISC_MEM_MAP(0x94C + (x) * 0x100)
+#define MISC_PCIE_AXIS_BMISC(x)                 MISC_MEM_MAP(0x950 + (x) * 0x100)
+#define MISC_PCIE_AXIM_RMISC(x)                 MISC_MEM_MAP(0x954 + (x) * 0x100)
+#define MISC_PCIE_AXIM_BMISC(x)                 MISC_MEM_MAP(0x958 + (x) * 0x100)
+#define MISC_PCIE_CTRL(x)                       MISC_MEM_MAP(0x95C + (x) * 0x100)
+#define MISC_PCIE_PM_DEBUG(x)                   MISC_MEM_MAP(0x960 + (x) * 0x100)
+#define MISC_PCIE_RFC_DEBUG(x)                  MISC_MEM_MAP(0x964 + (x) * 0x100)
+#define MISC_PCIE_CXPL_DEBUGL(x)                MISC_MEM_MAP(0x968 + (x) * 0x100)
+#define MISC_PCIE_CXPL_DEBUGH(x)                MISC_MEM_MAP(0x96C + (x) * 0x100)
+#define MISC_PCIE_DIAG_DEBUGH(x)                MISC_MEM_MAP(0x970 + (x) * 0x100)
+#define MISC_PCIE_W1CLR(x)                      MISC_MEM_MAP(0x974 + (x) * 0x100)
+#define MISC_PCIE_INT_MASK(x)                   MISC_MEM_MAP(0x978 + (x) * 0x100)
+#define MISC_PCIE_INT_STATUS(x)                 MISC_MEM_MAP(0x97C + (x) * 0x100)
+
+/*
+ * Power management and clock control
+ */
+#define PMU_REG_VALUE(offset) (*((volatile unsigned int *)(CNS3XXX_PM_BASE_VIRT + (offset))))
+
+#define PM_CLK_GATE_REG                                 PMU_REG_VALUE(0x000)
+#define PM_SOFT_RST_REG                                 PMU_REG_VALUE(0x004)
+#define PM_HS_CFG_REG                                   PMU_REG_VALUE(0x008)
+#define PM_CACTIVE_STA_REG                              PMU_REG_VALUE(0x00C)
+#define PM_PWR_STA_REG                                  PMU_REG_VALUE(0x010)
+#define PM_CLK_CTRL_REG                                 PMU_REG_VALUE(0x014)
+#define PM_PLL_LCD_I2S_CTRL_REG                         PMU_REG_VALUE(0x018)
+#define PM_PLL_HM_PD_CTRL_REG                           PMU_REG_VALUE(0x01C)
+#define PM_REGULAT_CTRL_REG                             PMU_REG_VALUE(0x020)
+#define PM_WDT_CTRL_REG                                 PMU_REG_VALUE(0x024)
+#define PM_WU_CTRL0_REG                                 PMU_REG_VALUE(0x028)
+#define PM_WU_CTRL1_REG                                 PMU_REG_VALUE(0x02C)
+#define PM_CSR_REG                                      PMU_REG_VALUE(0x030)
+
+/* PM_CLK_GATE_REG */
+#define PM_CLK_GATE_REG_OFFSET_SDIO                     (25)
+#define PM_CLK_GATE_REG_OFFSET_GPU                      (24)
+#define PM_CLK_GATE_REG_OFFSET_CIM                      (23)
+#define PM_CLK_GATE_REG_OFFSET_LCDC                     (22)
+#define PM_CLK_GATE_REG_OFFSET_I2S                      (21)
+#define PM_CLK_GATE_REG_OFFSET_RAID                     (20)
+#define PM_CLK_GATE_REG_OFFSET_SATA                     (19)
+#define PM_CLK_GATE_REG_OFFSET_PCIE(x)                  (17 + (x))
+#define PM_CLK_GATE_REG_OFFSET_USB_HOST                 (16)
+#define PM_CLK_GATE_REG_OFFSET_USB_OTG                  (15)
+#define PM_CLK_GATE_REG_OFFSET_TIMER                    (14)
+#define PM_CLK_GATE_REG_OFFSET_CRYPTO                   (13)
+#define PM_CLK_GATE_REG_OFFSET_HCIE                     (12)
+#define PM_CLK_GATE_REG_OFFSET_SWITCH                   (11)
+#define PM_CLK_GATE_REG_OFFSET_GPIO                     (10)
+#define PM_CLK_GATE_REG_OFFSET_UART3                    (9)
+#define PM_CLK_GATE_REG_OFFSET_UART2                    (8)
+#define PM_CLK_GATE_REG_OFFSET_UART1                    (7)
+#define PM_CLK_GATE_REG_OFFSET_RTC                      (5)
+#define PM_CLK_GATE_REG_OFFSET_GDMA                     (4)
+#define PM_CLK_GATE_REG_OFFSET_SPI_PCM_I2C              (3)
+#define PM_CLK_GATE_REG_OFFSET_SMC_NFI                  (1)
+#define PM_CLK_GATE_REG_MASK                            (0x03FFFFBA)
+
+/* PM_SOFT_RST_REG */
+#define PM_SOFT_RST_REG_OFFST_WARM_RST_FLAG             (31)
+#define PM_SOFT_RST_REG_OFFST_CPU1                      (29)
+#define PM_SOFT_RST_REG_OFFST_CPU0                      (28)
+#define PM_SOFT_RST_REG_OFFST_SDIO                      (25)
+#define PM_SOFT_RST_REG_OFFST_GPU                       (24)
+#define PM_SOFT_RST_REG_OFFST_CIM                       (23)
+#define PM_SOFT_RST_REG_OFFST_LCDC                      (22)
+#define PM_SOFT_RST_REG_OFFST_I2S                       (21)
+#define PM_SOFT_RST_REG_OFFST_RAID                      (20)
+#define PM_SOFT_RST_REG_OFFST_SATA                      (19)
+#define PM_SOFT_RST_REG_OFFST_PCIE(x)                   (17 + (x))
+#define PM_SOFT_RST_REG_OFFST_USB_HOST                  (16)
+#define PM_SOFT_RST_REG_OFFST_USB_OTG                   (15)
+#define PM_SOFT_RST_REG_OFFST_TIMER                     (14)
+#define PM_SOFT_RST_REG_OFFST_CRYPTO                    (13)
+#define PM_SOFT_RST_REG_OFFST_HCIE                      (12)
+#define PM_SOFT_RST_REG_OFFST_SWITCH                    (11)
+#define PM_SOFT_RST_REG_OFFST_GPIO                      (10)
+#define PM_SOFT_RST_REG_OFFST_UART3                     (9)
+#define PM_SOFT_RST_REG_OFFST_UART2                     (8)
+#define PM_SOFT_RST_REG_OFFST_UART1                     (7)
+#define PM_SOFT_RST_REG_OFFST_RTC                       (5)
+#define PM_SOFT_RST_REG_OFFST_GDMA                      (4)
+#define PM_SOFT_RST_REG_OFFST_SPI_PCM_I2C               (3)
+#define PM_SOFT_RST_REG_OFFST_DMC                       (2)
+#define PM_SOFT_RST_REG_OFFST_SMC_NFI                   (1)
+#define PM_SOFT_RST_REG_OFFST_GLOBAL                    (0)
+#define PM_SOFT_RST_REG_MASK                            (0xF3FFFFBF)
+
+/* PMHS_CFG_REG */
+#define PM_HS_CFG_REG_OFFSET_SDIO                       (25)
+#define PM_HS_CFG_REG_OFFSET_GPU                        (24)
+#define PM_HS_CFG_REG_OFFSET_CIM                        (23)
+#define PM_HS_CFG_REG_OFFSET_LCDC                       (22)
+#define PM_HS_CFG_REG_OFFSET_I2S                        (21)
+#define PM_HS_CFG_REG_OFFSET_RAID                       (20)
+#define PM_HS_CFG_REG_OFFSET_SATA                       (19)
+#define PM_HS_CFG_REG_OFFSET_PCIE1                      (18)
+#define PM_HS_CFG_REG_OFFSET_PCIE0                      (17)
+#define PM_HS_CFG_REG_OFFSET_USB_HOST                   (16)
+#define PM_HS_CFG_REG_OFFSET_USB_OTG                    (15)
+#define PM_HS_CFG_REG_OFFSET_TIMER                      (14)
+#define PM_HS_CFG_REG_OFFSET_CRYPTO                     (13)
+#define PM_HS_CFG_REG_OFFSET_HCIE                       (12)
+#define PM_HS_CFG_REG_OFFSET_SWITCH                     (11)
+#define PM_HS_CFG_REG_OFFSET_GPIO                       (10)
+#define PM_HS_CFG_REG_OFFSET_UART3                      (9)
+#define PM_HS_CFG_REG_OFFSET_UART2                      (8)
+#define PM_HS_CFG_REG_OFFSET_UART1                      (7)
+#define PM_HS_CFG_REG_OFFSET_RTC                        (5)
+#define PM_HS_CFG_REG_OFFSET_GDMA                       (4)
+#define PM_HS_CFG_REG_OFFSET_SPI_PCM_I2S                (3)
+#define PM_HS_CFG_REG_OFFSET_DMC                        (2)
+#define PM_HS_CFG_REG_OFFSET_SMC_NFI                    (1)
+#define PM_HS_CFG_REG_MASK                              (0x03FFFFBE)
+#define PM_HS_CFG_REG_MASK_SUPPORT                      (0x01100806)
+
+/* PM_CACTIVE_STA_REG */
+#define PM_CACTIVE_STA_REG_OFFSET_SDIO                  (25)
+#define PM_CACTIVE_STA_REG_OFFSET_GPU                   (24)
+#define PM_CACTIVE_STA_REG_OFFSET_CIM                   (23)
+#define PM_CACTIVE_STA_REG_OFFSET_LCDC                  (22)
+#define PM_CACTIVE_STA_REG_OFFSET_I2S                   (21)
+#define PM_CACTIVE_STA_REG_OFFSET_RAID                  (20)
+#define PM_CACTIVE_STA_REG_OFFSET_SATA                  (19)
+#define PM_CACTIVE_STA_REG_OFFSET_PCIE1                 (18)
+#define PM_CACTIVE_STA_REG_OFFSET_PCIE0                 (17)
+#define PM_CACTIVE_STA_REG_OFFSET_USB_HOST              (16)
+#define PM_CACTIVE_STA_REG_OFFSET_USB_OTG               (15)
+#define PM_CACTIVE_STA_REG_OFFSET_TIMER                 (14)
+#define PM_CACTIVE_STA_REG_OFFSET_CRYPTO                (13)
+#define PM_CACTIVE_STA_REG_OFFSET_HCIE                  (12)
+#define PM_CACTIVE_STA_REG_OFFSET_SWITCH                (11)
+#define PM_CACTIVE_STA_REG_OFFSET_GPIO                  (10)
+#define PM_CACTIVE_STA_REG_OFFSET_UART3                 (9)
+#define PM_CACTIVE_STA_REG_OFFSET_UART2                 (8)
+#define PM_CACTIVE_STA_REG_OFFSET_UART1                 (7)
+#define PM_CACTIVE_STA_REG_OFFSET_RTC                   (5)
+#define PM_CACTIVE_STA_REG_OFFSET_GDMA                  (4)
+#define PM_CACTIVE_STA_REG_OFFSET_SPI_PCM_I2S           (3)
+#define PM_CACTIVE_STA_REG_OFFSET_DMC                   (2)
+#define PM_CACTIVE_STA_REG_OFFSET_SMC_NFI               (1)
+#define PM_CACTIVE_STA_REG_MASK                         (0x03FFFFBE)
+
+/* PM_PWR_STA_REG */
+#define PM_PWR_STA_REG_REG_OFFSET_SDIO                  (25)
+#define PM_PWR_STA_REG_REG_OFFSET_GPU                   (24)
+#define PM_PWR_STA_REG_REG_OFFSET_CIM                   (23)
+#define PM_PWR_STA_REG_REG_OFFSET_LCDC                  (22)
+#define PM_PWR_STA_REG_REG_OFFSET_I2S                   (21)
+#define PM_PWR_STA_REG_REG_OFFSET_RAID                  (20)
+#define PM_PWR_STA_REG_REG_OFFSET_SATA                  (19)
+#define PM_PWR_STA_REG_REG_OFFSET_PCIE1                 (18)
+#define PM_PWR_STA_REG_REG_OFFSET_PCIE0                 (17)
+#define PM_PWR_STA_REG_REG_OFFSET_USB_HOST              (16)
+#define PM_PWR_STA_REG_REG_OFFSET_USB_OTG               (15)
+#define PM_PWR_STA_REG_REG_OFFSET_TIMER                 (14)
+#define PM_PWR_STA_REG_REG_OFFSET_CRYPTO                (13)
+#define PM_PWR_STA_REG_REG_OFFSET_HCIE                  (12)
+#define PM_PWR_STA_REG_REG_OFFSET_SWITCH                (11)
+#define PM_PWR_STA_REG_REG_OFFSET_GPIO                  (10)
+#define PM_PWR_STA_REG_REG_OFFSET_UART3                 (9)
+#define PM_PWR_STA_REG_REG_OFFSET_UART2                 (8)
+#define PM_PWR_STA_REG_REG_OFFSET_UART1                 (7)
+#define PM_PWR_STA_REG_REG_OFFSET_RTC                   (5)
+#define PM_PWR_STA_REG_REG_OFFSET_GDMA                  (4)
+#define PM_PWR_STA_REG_REG_OFFSET_SPI_PCM_I2S           (3)
+#define PM_PWR_STA_REG_REG_OFFSET_DMC                   (2)
+#define PM_PWR_STA_REG_REG_OFFSET_SMC_NFI               (1)
+#define PM_PWR_STA_REG_REG_MASK                         (0x03FFFFBE)
+
+/* PM_CLK_CTRL_REG */
+#define PM_CLK_CTRL_REG_OFFSET_I2S_MCLK                 (31)
+#define PM_CLK_CTRL_REG_OFFSET_DDR2_CHG_EN              (30)
+#define PM_CLK_CTRL_REG_OFFSET_PCIE_REF1_EN             (29)
+#define PM_CLK_CTRL_REG_OFFSET_PCIE_REF0_EN             (28)
+#define PM_CLK_CTRL_REG_OFFSET_TIMER_SIM_MODE           (27)
+#define PM_CLK_CTRL_REG_OFFSET_I2SCLK_DIV               (24)
+#define PM_CLK_CTRL_REG_OFFSET_I2SCLK_SEL               (22)
+#define PM_CLK_CTRL_REG_OFFSET_CLKOUT_DIV               (20)
+#define PM_CLK_CTRL_REG_OFFSET_CLKOUT_SEL               (16)
+#define PM_CLK_CTRL_REG_OFFSET_MDC_DIV                  (14)
+#define PM_CLK_CTRL_REG_OFFSET_CRYPTO_CLK_SEL           (12)
+#define PM_CLK_CTRL_REG_OFFSET_CPU_PWR_MODE             (9)
+#define PM_CLK_CTRL_REG_OFFSET_PLL_DDR2_SEL             (7)
+#define PM_CLK_CTRL_REG_OFFSET_DIV_IMMEDIATE            (6)
+#define PM_CLK_CTRL_REG_OFFSET_CPU_CLK_DIV              (4)
+#define PM_CLK_CTRL_REG_OFFSET_PLL_CPU_SEL              (0)
+
+#define PM_CPU_CLK_DIV(DIV) { \
+        PM_CLK_CTRL_REG &= ~((0x3) << PM_CLK_CTRL_REG_OFFSET_CPU_CLK_DIV); \
+        PM_CLK_CTRL_REG |= (((DIV)&0x3) << PM_CLK_CTRL_REG_OFFSET_CPU_CLK_DIV); \
+}
+
+#define PM_PLL_CPU_SEL(CPU) { \
+        PM_CLK_CTRL_REG &= ~((0xF) << PM_CLK_CTRL_REG_OFFSET_PLL_CPU_SEL); \
+        PM_CLK_CTRL_REG |= (((CPU)&0xF) << PM_CLK_CTRL_REG_OFFSET_PLL_CPU_SEL); \
+}
+
+/* PM_PLL_LCD_I2S_CTRL_REG */
+#define PM_PLL_LCD_I2S_CTRL_REG_OFFSET_MCLK_SMC_DIV     (22)
+#define PM_PLL_LCD_I2S_CTRL_REG_OFFSET_R_SEL            (17)
+#define PM_PLL_LCD_I2S_CTRL_REG_OFFSET_PLL_LCD_P        (11)
+#define PM_PLL_LCD_I2S_CTRL_REG_OFFSET_PLL_LCD_M        (3)
+#define PM_PLL_LCD_I2S_CTRL_REG_OFFSET_PLL_LCD_S        (0)
+
+/* PM_PLL_HM_PD_CTRL_REG */
+#define PM_PLL_HM_PD_CTRL_REG_OFFSET_SATA_PHY1          (11)
+#define PM_PLL_HM_PD_CTRL_REG_OFFSET_SATA_PHY0          (10)
+#define PM_PLL_HM_PD_CTRL_REG_OFFSET_PLL_I2SCD          (6)
+#define PM_PLL_HM_PD_CTRL_REG_OFFSET_PLL_I2S            (5)
+#define PM_PLL_HM_PD_CTRL_REG_OFFSET_PLL_LCD            (4)
+#define PM_PLL_HM_PD_CTRL_REG_OFFSET_PLL_USB            (3)
+#define PM_PLL_HM_PD_CTRL_REG_OFFSET_PLL_RGMII          (2)
+#define PM_PLL_HM_PD_CTRL_REG_MASK                      (0x00000C7C)
+
+/* PM_WDT_CTRL_REG */
+#define PM_WDT_CTRL_REG_OFFSET_RESET_CPU_ONLY           (0)
+
+/* PM_CSR_REG - Clock Scaling Register*/
+#define PM_CSR_REG_OFFSET_CSR_EN                        (30)
+#define PM_CSR_REG_OFFSET_CSR_NUM                       (0)
+
+#define CNS3XXX_PWR_CLK_EN(BLOCK) (0x1<<PM_CLK_GATE_REG_OFFSET_##BLOCK)
+
+/* Software reset*/
+#define CNS3XXX_PWR_SOFTWARE_RST(BLOCK) (0x1<<PM_SOFT_RST_REG_OFFST_##BLOCK)
+
+/*
+ * CNS3XXX support several power saving mode as following,
+ * DFS, IDLE, HALT, DOZE, SLEEP, Hibernate
+ */
+#define CNS3XXX_PWR_CPU_MODE_DFS                        (0)
+#define CNS3XXX_PWR_CPU_MODE_IDLE                       (1)
+#define CNS3XXX_PWR_CPU_MODE_HALT                       (2)
+#define CNS3XXX_PWR_CPU_MODE_DOZE                       (3)
+#define CNS3XXX_PWR_CPU_MODE_SLEEP                      (4)
+#define CNS3XXX_PWR_CPU_MODE_HIBERNATE                  (5)
+
+#define CNS3XXX_PWR_PLL(BLOCK)  (0x1<<PM_PLL_HM_PD_CTRL_REG_OFFSET_##BLOCK)
+#define CNS3XXX_PWR_PLL_ALL     PM_PLL_HM_PD_CTRL_REG_MASK
+
+/* Change CPU frequency and divider */
+#define CNS3XXX_PWR_PLL_CPU_300MHZ                      (0)
+#define CNS3XXX_PWR_PLL_CPU_333MHZ                      (1)
+#define CNS3XXX_PWR_PLL_CPU_366MHZ                      (2)
+#define CNS3XXX_PWR_PLL_CPU_400MHZ                      (3)
+#define CNS3XXX_PWR_PLL_CPU_433MHZ                      (4)
+#define CNS3XXX_PWR_PLL_CPU_466MHZ                      (5)
+#define CNS3XXX_PWR_PLL_CPU_500MHZ                      (6)
+#define CNS3XXX_PWR_PLL_CPU_533MHZ                      (7)
+#define CNS3XXX_PWR_PLL_CPU_566MHZ                      (8)
+#define CNS3XXX_PWR_PLL_CPU_600MHZ                      (9)
+#define CNS3XXX_PWR_PLL_CPU_633MHZ                      (10)
+#define CNS3XXX_PWR_PLL_CPU_666MHZ                      (11)
+#define CNS3XXX_PWR_PLL_CPU_700MHZ                      (12)
+
+#define CNS3XXX_PWR_CPU_CLK_DIV_BY1                     (0)
+#define CNS3XXX_PWR_CPU_CLK_DIV_BY2                     (1)
+#define CNS3XXX_PWR_CPU_CLK_DIV_BY4                     (2)
+
+/* Change DDR2 frequency */
+#define CNS3XXX_PWR_PLL_DDR2_200MHZ                     (0)
+#define CNS3XXX_PWR_PLL_DDR2_266MHZ                     (1)
+#define CNS3XXX_PWR_PLL_DDR2_333MHZ                     (2)
+#define CNS3XXX_PWR_PLL_DDR2_400MHZ                     (3)
+
+void cns3xxx_pwr_soft_rst(unsigned int block);
+void cns3xxx_pwr_clk_en(unsigned int block);
+int cns3xxx_cpu_clock(void);
+
+/*
+ * ARM11 MPCore interrupt sources (primary GIC)
+ */
+#define IRQ_CNS3XXX_PMU                 (IRQ_TC11MP_GIC_START + 0)
+#define IRQ_CNS3XXX_SDIO                (IRQ_TC11MP_GIC_START + 1)
+#define IRQ_CNS3XXX_L2CC                (IRQ_TC11MP_GIC_START + 2)
+#define IRQ_CNS3XXX_RTC                 (IRQ_TC11MP_GIC_START + 3)
+#define IRQ_CNS3XXX_I2S                 (IRQ_TC11MP_GIC_START + 4)
+#define IRQ_CNS3XXX_PCM                 (IRQ_TC11MP_GIC_START + 5)
+#define IRQ_CNS3XXX_SPI                 (IRQ_TC11MP_GIC_START + 6)
+#define IRQ_CNS3XXX_I2C                 (IRQ_TC11MP_GIC_START + 7)
+#define IRQ_CNS3XXX_CIM                 (IRQ_TC11MP_GIC_START + 8)
+#define IRQ_CNS3XXX_GPU                 (IRQ_TC11MP_GIC_START + 9)
+#define IRQ_CNS3XXX_LCD                 (IRQ_TC11MP_GIC_START + 10)
+#define IRQ_CNS3XXX_GPIOA               (IRQ_TC11MP_GIC_START + 11)
+#define IRQ_CNS3XXX_GPIOB               (IRQ_TC11MP_GIC_START + 12)
+#define IRQ_CNS3XXX_UART0               (IRQ_TC11MP_GIC_START + 13)
+#define IRQ_CNS3XXX_UART1               (IRQ_TC11MP_GIC_START + 14)
+#define IRQ_CNS3XXX_UART2               (IRQ_TC11MP_GIC_START + 15)
+#define IRQ_CNS3XXX_ARM11               (IRQ_TC11MP_GIC_START + 16)
+
+#define IRQ_CNS3XXX_SW_STATUS           (IRQ_TC11MP_GIC_START + 17)
+#define IRQ_CNS3XXX_SW_R0TXC            (IRQ_TC11MP_GIC_START + 18)
+#define IRQ_CNS3XXX_SW_R0RXC            (IRQ_TC11MP_GIC_START + 19)
+#define IRQ_CNS3XXX_SW_R0QE             (IRQ_TC11MP_GIC_START + 20)
+#define IRQ_CNS3XXX_SW_R0QF             (IRQ_TC11MP_GIC_START + 21)
+#define IRQ_CNS3XXX_SW_R1TXC            (IRQ_TC11MP_GIC_START + 22)
+#define IRQ_CNS3XXX_SW_R1RXC            (IRQ_TC11MP_GIC_START + 23)
+#define IRQ_CNS3XXX_SW_R1QE             (IRQ_TC11MP_GIC_START + 24)
+#define IRQ_CNS3XXX_SW_R1QF             (IRQ_TC11MP_GIC_START + 25)
+#define IRQ_CNS3XXX_SW_PPE              (IRQ_TC11MP_GIC_START + 26)
+
+#define IRQ_CNS3XXX_CRYPTO              (IRQ_TC11MP_GIC_START + 27)
+#define IRQ_CNS3XXX_HCIE                (IRQ_TC11MP_GIC_START + 28)
+#define IRQ_CNS3XXX_PCIE0_DEVICE        (IRQ_TC11MP_GIC_START + 29)
+#define IRQ_CNS3XXX_PCIE1_DEVICE        (IRQ_TC11MP_GIC_START + 30)
+#define IRQ_CNS3XXX_USB_OTG             (IRQ_TC11MP_GIC_START + 31)
+#define IRQ_CNS3XXX_USB_EHCI            (IRQ_TC11MP_GIC_START + 32)
+#define IRQ_CNS3XXX_SATA                (IRQ_TC11MP_GIC_START + 33)
+#define IRQ_CNS3XXX_RAID                (IRQ_TC11MP_GIC_START + 34)
+#define IRQ_CNS3XXX_SMC                 (IRQ_TC11MP_GIC_START + 35)
+
+#define IRQ_CNS3XXX_DMAC_ABORT          (IRQ_TC11MP_GIC_START + 36)
+#define IRQ_CNS3XXX_DMAC0               (IRQ_TC11MP_GIC_START + 37)
+#define IRQ_CNS3XXX_DMAC1               (IRQ_TC11MP_GIC_START + 38)
+#define IRQ_CNS3XXX_DMAC2               (IRQ_TC11MP_GIC_START + 39)
+#define IRQ_CNS3XXX_DMAC3               (IRQ_TC11MP_GIC_START + 40)
+#define IRQ_CNS3XXX_DMAC4               (IRQ_TC11MP_GIC_START + 41)
+#define IRQ_CNS3XXX_DMAC5               (IRQ_TC11MP_GIC_START + 42)
+#define IRQ_CNS3XXX_DMAC6               (IRQ_TC11MP_GIC_START + 43)
+#define IRQ_CNS3XXX_DMAC7               (IRQ_TC11MP_GIC_START + 44)
+#define IRQ_CNS3XXX_DMAC8               (IRQ_TC11MP_GIC_START + 45)
+#define IRQ_CNS3XXX_DMAC9               (IRQ_TC11MP_GIC_START + 46)
+#define IRQ_CNS3XXX_DMAC10              (IRQ_TC11MP_GIC_START + 47)
+#define IRQ_CNS3XXX_DMAC11              (IRQ_TC11MP_GIC_START + 48)
+#define IRQ_CNS3XXX_DMAC12              (IRQ_TC11MP_GIC_START + 49)
+#define IRQ_CNS3XXX_DMAC13              (IRQ_TC11MP_GIC_START + 50)
+#define IRQ_CNS3XXX_DMAC14              (IRQ_TC11MP_GIC_START + 51)
+#define IRQ_CNS3XXX_DMAC15              (IRQ_TC11MP_GIC_START + 52)
+#define IRQ_CNS3XXX_DMAC16              (IRQ_TC11MP_GIC_START + 53)
+#define IRQ_CNS3XXX_DMAC17              (IRQ_TC11MP_GIC_START + 54)
+
+#define IRQ_CNS3XXX_PCIE0_RC            (IRQ_TC11MP_GIC_START + 55)
+#define IRQ_CNS3XXX_PCIE1_RC            (IRQ_TC11MP_GIC_START + 56)
+#define IRQ_CNS3XXX_TIMER0              (IRQ_TC11MP_GIC_START + 57)
+#define IRQ_CNS3XXX_TIMER1              (IRQ_TC11MP_GIC_START + 58)
+#define IRQ_CNS3XXX_USB_OHCI            (IRQ_TC11MP_GIC_START + 59)
+#define IRQ_CNS3XXX_TIMER2              (IRQ_TC11MP_GIC_START + 60)
+#define IRQ_CNS3XXX_EXTERNAL_PIN0       (IRQ_TC11MP_GIC_START + 61)
+#define IRQ_CNS3XXX_EXTERNAL_PIN1       (IRQ_TC11MP_GIC_START + 62)
+#define IRQ_CNS3XXX_EXTERNAL_PIN2       (IRQ_TC11MP_GIC_START + 63)
+
+#define NR_IRQS_CNS3XXX                 (IRQ_TC11MP_GIC_START + 64)
+
+#if !defined(NR_IRQS) || (NR_IRQS < NR_IRQS_CNS3XXX)
+#undef NR_IRQS
+#define NR_IRQS                         NR_IRQS_CNS3XXX
+#endif
+
+#endif  /* __MACH_BOARD_CNS3XXX_H */
diff --git a/arch/arm/mach-cns3xxx/include/mach/debug-macro.S b/arch/arm/mach-cns3xxx/include/mach/debug-macro.S
new file mode 100644
index 00000000000..d16ce7eb00e
--- /dev/null
+++ b/arch/arm/mach-cns3xxx/include/mach/debug-macro.S
@@ -0,0 +1,21 @@
+/*
+ * Debugging macro include header
+ *
+ * Copyright 1994-1999 Russell King
+ * Copyright 2008 Cavium Networks
+ * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
+ *
+ * This file 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,rx
+                mrc     p15, 0, \rx, c1, c0
+                tst     \rx, #1                 @ MMU enabled?
+                moveq   \rx,      #0x10000000
+                movne   \rx,      #0xf0000000   @ virtual base
+                orr     \rx, \rx, #0x00009000
+                .endm
+
+#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/mach-cns3xxx/include/mach/entry-macro.S b/arch/arm/mach-cns3xxx/include/mach/entry-macro.S
new file mode 100644
index 00000000000..5e1c5545680
--- /dev/null
+++ b/arch/arm/mach-cns3xxx/include/mach/entry-macro.S
@@ -0,0 +1,82 @@
+/*
+ * Low-level IRQ helper macros for Cavium Networks platforms
+ *
+ * Copyright 2008 Cavium Networks
+ *
+ * This file 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.
+ */
+
+#include <mach/hardware.h>
+#include <asm/hardware/gic.h>
+
+                .macro  disable_fiq
+                .endm
+
+                .macro  get_irqnr_preamble, base, tmp
+                ldr     \base, =gic_cpu_base_addr
+                ldr     \base, [\base]
+                .endm
+
+                .macro  arch_ret_to_user, tmp1, tmp2
+                .endm
+
+                /*
+                 * The interrupt numbering scheme is defined in the
+                 * interrupt controller spec.  To wit:
+                 *
+                 * Interrupts 0-15 are IPI
+                 * 16-28 are reserved
+                 * 29-31 are local.  We allow 30 to be used for the watchdog.
+                 * 32-1020 are global
+                 * 1021-1022 are reserved
+                 * 1023 is "spurious" (no interrupt)
+                 *
+                 * For now, we ignore all local interrupts so only return an interrupt if it's
+                 * between 30 and 1020.  The test_for_ipi routine below will pick up on IPIs.
+                 *
+                 * A simple read from the controller will tell us the number of the highest
+                 * priority enabled interrupt.  We then just need to check whether it is in the
+                 * valid range for an IRQ (30-1020 inclusive).
+                 */
+
+                .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
+
+                ldr     \irqstat, [\base, #GIC_CPU_INTACK] /* bits 12-10 = src CPU, 9-0 = int # */
+
+                ldr     \tmp, =1021
+
+                bic     \irqnr, \irqstat, #0x1c00
+
+                cmp     \irqnr, #29
+                cmpcc   \irqnr, \irqnr
+                cmpne   \irqnr, \tmp
+                cmpcs   \irqnr, \irqnr
+
+                .endm
+
+                /* We assume that irqstat (the raw value of the IRQ acknowledge
+                 * register) is preserved from the macro above.
+                 * If there is an IPI, we immediately signal end of interrupt on the
+                 * controller, since this requires the original irqstat value which
+                 * we won't easily be able to recreate later.
+                 */
+
+                .macro test_for_ipi, irqnr, irqstat, base, tmp
+                bic     \irqnr, \irqstat, #0x1c00
+                cmp     \irqnr, #16
+                strcc   \irqstat, [\base, #GIC_CPU_EOI]
+                cmpcs   \irqnr, \irqnr
+                .endm
+
+                /* As above, this assumes that irqstat and base are preserved.. */
+
+                .macro test_for_ltirq, irqnr, irqstat, base, tmp
+                bic     \irqnr, \irqstat, #0x1c00
+                mov     \tmp, #0
+                cmp     \irqnr, #29
+                moveq   \tmp, #1
+                streq   \irqstat, [\base, #GIC_CPU_EOI]
+                cmp     \tmp, #0
+                .endm
diff --git a/arch/arm/mach-cns3xxx/include/mach/hardware.h b/arch/arm/mach-cns3xxx/include/mach/hardware.h
new file mode 100644
index 00000000000..57e09836f9d
--- /dev/null
+++ b/arch/arm/mach-cns3xxx/include/mach/hardware.h
@@ -0,0 +1,22 @@
+/*
+ * This file contains the hardware definitions of the Cavium Networks boards.
+ *
+ * Copyright 2003 ARM Limited.
+ * Copyright 2008 Cavium Networks
+ *
+ * This file 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.
+ */
+
+#ifndef __MACH_HARDWARE_H
+#define __MACH_HARDWARE_H
+
+#include <asm/sizes.h>
+
+/* macro to get at IO space when running virtually */
+#define PCIBIOS_MIN_IO          0x00000000
+#define PCIBIOS_MIN_MEM         0x00000000
+#define pcibios_assign_all_busses()     1
+
+#endif
diff --git a/arch/arm/mach-cns3xxx/include/mach/io.h b/arch/arm/mach-cns3xxx/include/mach/io.h
new file mode 100644
index 00000000000..33b6fc1ece7
--- /dev/null
+++ b/arch/arm/mach-cns3xxx/include/mach/io.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2008 Cavium Networks
+ * Copyright 2003 ARM Limited
+ *
+ * This file 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.
+ */
+#ifndef __MACH_IO_H
+#define __MACH_IO_H
+
+#define IO_SPACE_LIMIT 0xffffffff
+
+#define __io(a)                 __typesafe_io(a)
+#define __mem_pci(a)            (a)
+
+#endif
diff --git a/arch/arm/mach-cns3xxx/include/mach/irqs.h b/arch/arm/mach-cns3xxx/include/mach/irqs.h
new file mode 100644
index 00000000000..2ab96f8085c
--- /dev/null
+++ b/arch/arm/mach-cns3xxx/include/mach/irqs.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2000 Deep Blue Solutions Ltd.
+ * Copyright 2003 ARM Limited
+ * Copyright 2008 Cavium Networks
+ *
+ * This file 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.
+ */
+
+#ifndef __MACH_IRQS_H
+#define __MACH_IRQS_H
+
+#define IRQ_LOCALTIMER          29
+#define IRQ_LOCALWDOG           30
+#define IRQ_TC11MP_GIC_START    32
+
+#include <mach/cns3xxx.h>
+
+#ifndef NR_IRQS
+#error "NR_IRQS not defined by the board-specific files"
+#endif
+
+#endif
diff --git a/arch/arm/mach-cns3xxx/include/mach/memory.h b/arch/arm/mach-cns3xxx/include/mach/memory.h
new file mode 100644
index 00000000000..3b6b769b7a2
--- /dev/null
+++ b/arch/arm/mach-cns3xxx/include/mach/memory.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2003 ARM Limited
+ * Copyright 2008 Cavium Networks
+ *
+ * This file 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.
+ */
+
+#ifndef __MACH_MEMORY_H
+#define __MACH_MEMORY_H
+
+/*
+ * Physical DRAM offset.
+ */
+#define PHYS_OFFSET             UL(0x00000000)
+
+#define __phys_to_bus(x)        ((x) + PHYS_OFFSET)
+#define __bus_to_phys(x)        ((x) - PHYS_OFFSET)
+
+#define __virt_to_bus(v)        __phys_to_bus(__virt_to_phys(v))
+#define __bus_to_virt(b)        __phys_to_virt(__bus_to_phys(b))
+#define __pfn_to_bus(p)         __phys_to_bus(__pfn_to_phys(p))
+#define __bus_to_pfn(b)         __phys_to_pfn(__bus_to_phys(b))
+
+#endif
diff --git a/arch/arm/mach-cns3xxx/include/mach/system.h b/arch/arm/mach-cns3xxx/include/mach/system.h
new file mode 100644
index 00000000000..58bb03ae3cf
--- /dev/null
+++ b/arch/arm/mach-cns3xxx/include/mach/system.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2000 Deep Blue Solutions Ltd
+ * Copyright 2003 ARM Limited
+ * Copyright 2008 Cavium Networks
+ *
+ * This file 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.
+ */
+
+#ifndef __MACH_SYSTEM_H
+#define __MACH_SYSTEM_H
+
+#include <linux/io.h>
+#include <asm/proc-fns.h>
+#include <mach/hardware.h>
+
+static inline void arch_idle(void)
+{
+        /*
+         * This should do all the clock switching
+         * and wait for interrupt tricks
+         */
+        cpu_do_idle();
+}
+
+void arch_reset(char mode, const char *cmd);
+
+#endif
diff --git a/arch/arm/mach-cns3xxx/include/mach/timex.h b/arch/arm/mach-cns3xxx/include/mach/timex.h
new file mode 100644
index 00000000000..1fd04217cac
--- /dev/null
+++ b/arch/arm/mach-cns3xxx/include/mach/timex.h
@@ -0,0 +1,12 @@
+/*
+ * Cavium Networks architecture timex specifications
+ *
+ * Copyright 2003 ARM Limited
+ * Copyright 2008 Cavium Networks
+ *
+ * This file 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.
+ */
+
+#define CLOCK_TICK_RATE         (50000000 / 16)
diff --git a/arch/arm/mach-cns3xxx/include/mach/uncompress.h b/arch/arm/mach-cns3xxx/include/mach/uncompress.h
new file mode 100644
index 00000000000..de8ead9b91f
--- /dev/null
+++ b/arch/arm/mach-cns3xxx/include/mach/uncompress.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2003 ARM Limited
+ * Copyright 2008 Cavium Networks
+ *
+ * This file 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.
+ */
+
+#include <asm/mach-types.h>
+#include <mach/hardware.h>
+#include <mach/cns3xxx.h>
+
+#define AMBA_UART_DR(base)      (*(volatile unsigned char *)((base) + 0x00))
+#define AMBA_UART_LCRH(base)    (*(volatile unsigned char *)((base) + 0x2c))
+#define AMBA_UART_CR(base)      (*(volatile unsigned char *)((base) + 0x30))
+#define AMBA_UART_FR(base)      (*(volatile unsigned char *)((base) + 0x18))
+
+/*
+ * Return the UART base address
+ */
+static inline unsigned long get_uart_base(void)
+{
+        if (machine_is_cns3420vb())
+                return CNS3XXX_UART0_BASE;
+        else
+                return 0;
+}
+
+/*
+ * This does not append a newline
+ */
+static inline void putc(int c)
+{
+        unsigned long base = get_uart_base();
+
+        while (AMBA_UART_FR(base) & (1 << 5))
+                barrier();
+
+        AMBA_UART_DR(base) = c;
+}
+
+static inline void flush(void)
+{
+        unsigned long base = get_uart_base();
+
+        while (AMBA_UART_FR(base) & (1 << 3))
+                barrier();
+}
+
+/*
+ * nothing to do
+ */
+#define arch_decomp_setup()
+#define arch_decomp_wdog()
diff --git a/arch/arm/mach-cns3xxx/include/mach/vmalloc.h b/arch/arm/mach-cns3xxx/include/mach/vmalloc.h
new file mode 100644
index 00000000000..4d381ec0527
--- /dev/null
+++ b/arch/arm/mach-cns3xxx/include/mach/vmalloc.h
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2000 Russell King.
+ * Copyright 2003 ARM Limited
+ * Copyright 2008 Cavium Networks
+ *
+ * This file 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.
+ */
+
+#define VMALLOC_END             0xd8000000