Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[pandora-kernel.git] / arch / arm / mach-spear3xx / spear320.c
index 741c1f4..ee29bef 100644 (file)
 #define SMALL_PRINTERS_MODE    (1 << 3)
 #define ALL_MODES              0xF
 
-struct pmx_mode auto_net_smii_mode = {
+struct pmx_mode spear320_auto_net_smii_mode = {
        .id = AUTO_NET_SMII_MODE,
        .name = "Automation Networking SMII Mode",
        .mask = 0x00,
 };
 
-struct pmx_mode auto_net_mii_mode = {
+struct pmx_mode spear320_auto_net_mii_mode = {
        .id = AUTO_NET_MII_MODE,
        .name = "Automation Networking MII Mode",
        .mask = 0x01,
 };
 
-struct pmx_mode auto_exp_mode = {
+struct pmx_mode spear320_auto_exp_mode = {
        .id = AUTO_EXP_MODE,
        .name = "Automation Expanded Mode",
        .mask = 0x02,
 };
 
-struct pmx_mode small_printers_mode = {
+struct pmx_mode spear320_small_printers_mode = {
        .id = SMALL_PRINTERS_MODE,
        .name = "Small Printers Mode",
        .mask = 0x03,
 };
 
 /* devices */
-struct pmx_dev_mode pmx_clcd_modes[] = {
+static struct pmx_dev_mode pmx_clcd_modes[] = {
        {
                .ids = AUTO_NET_SMII_MODE,
                .mask = 0x0,
        },
 };
 
-struct pmx_dev pmx_clcd = {
+struct pmx_dev spear320_pmx_clcd = {
        .name = "clcd",
        .modes = pmx_clcd_modes,
        .mode_count = ARRAY_SIZE(pmx_clcd_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_emi_modes[] = {
+static struct pmx_dev_mode pmx_emi_modes[] = {
        {
                .ids = AUTO_EXP_MODE,
                .mask = PMX_TIMER_1_2_MASK | PMX_TIMER_3_4_MASK,
        },
 };
 
-struct pmx_dev pmx_emi = {
+struct pmx_dev spear320_pmx_emi = {
        .name = "emi",
        .modes = pmx_emi_modes,
        .mode_count = ARRAY_SIZE(pmx_emi_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_fsmc_modes[] = {
+static struct pmx_dev_mode pmx_fsmc_modes[] = {
        {
                .ids = ALL_MODES,
                .mask = 0x0,
        },
 };
 
-struct pmx_dev pmx_fsmc = {
+struct pmx_dev spear320_pmx_fsmc = {
        .name = "fsmc",
        .modes = pmx_fsmc_modes,
        .mode_count = ARRAY_SIZE(pmx_fsmc_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_spp_modes[] = {
+static struct pmx_dev_mode pmx_spp_modes[] = {
        {
                .ids = SMALL_PRINTERS_MODE,
                .mask = 0x0,
        },
 };
 
-struct pmx_dev pmx_spp = {
+struct pmx_dev spear320_pmx_spp = {
        .name = "spp",
        .modes = pmx_spp_modes,
        .mode_count = ARRAY_SIZE(pmx_spp_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_sdhci_modes[] = {
+static struct pmx_dev_mode pmx_sdhci_modes[] = {
        {
                .ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE |
                        SMALL_PRINTERS_MODE,
@@ -118,42 +118,42 @@ struct pmx_dev_mode pmx_sdhci_modes[] = {
        },
 };
 
-struct pmx_dev pmx_sdhci = {
+struct pmx_dev spear320_pmx_sdhci = {
        .name = "sdhci",
        .modes = pmx_sdhci_modes,
        .mode_count = ARRAY_SIZE(pmx_sdhci_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_i2s_modes[] = {
+static struct pmx_dev_mode pmx_i2s_modes[] = {
        {
                .ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE,
                .mask = PMX_UART0_MODEM_MASK,
        },
 };
 
-struct pmx_dev pmx_i2s = {
+struct pmx_dev spear320_pmx_i2s = {
        .name = "i2s",
        .modes = pmx_i2s_modes,
        .mode_count = ARRAY_SIZE(pmx_i2s_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_uart1_modes[] = {
+static struct pmx_dev_mode pmx_uart1_modes[] = {
        {
                .ids = ALL_MODES,
                .mask = PMX_GPIO_PIN0_MASK | PMX_GPIO_PIN1_MASK,
        },
 };
 
-struct pmx_dev pmx_uart1 = {
+struct pmx_dev spear320_pmx_uart1 = {
        .name = "uart1",
        .modes = pmx_uart1_modes,
        .mode_count = ARRAY_SIZE(pmx_uart1_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_uart1_modem_modes[] = {
+static struct pmx_dev_mode pmx_uart1_modem_modes[] = {
        {
                .ids = AUTO_EXP_MODE,
                .mask = PMX_TIMER_1_2_MASK | PMX_TIMER_3_4_MASK |
@@ -165,42 +165,42 @@ struct pmx_dev_mode pmx_uart1_modem_modes[] = {
        },
 };
 
-struct pmx_dev pmx_uart1_modem = {
+struct pmx_dev spear320_pmx_uart1_modem = {
        .name = "uart1_modem",
        .modes = pmx_uart1_modem_modes,
        .mode_count = ARRAY_SIZE(pmx_uart1_modem_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_uart2_modes[] = {
+static struct pmx_dev_mode pmx_uart2_modes[] = {
        {
                .ids = ALL_MODES,
                .mask = PMX_FIRDA_MASK,
        },
 };
 
-struct pmx_dev pmx_uart2 = {
+struct pmx_dev spear320_pmx_uart2 = {
        .name = "uart2",
        .modes = pmx_uart2_modes,
        .mode_count = ARRAY_SIZE(pmx_uart2_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_touchscreen_modes[] = {
+static struct pmx_dev_mode pmx_touchscreen_modes[] = {
        {
                .ids = AUTO_NET_SMII_MODE,
                .mask = PMX_SSP_CS_MASK,
        },
 };
 
-struct pmx_dev pmx_touchscreen = {
+struct pmx_dev spear320_pmx_touchscreen = {
        .name = "touchscreen",
        .modes = pmx_touchscreen_modes,
        .mode_count = ARRAY_SIZE(pmx_touchscreen_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_can_modes[] = {
+static struct pmx_dev_mode pmx_can_modes[] = {
        {
                .ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE | AUTO_EXP_MODE,
                .mask = PMX_GPIO_PIN2_MASK | PMX_GPIO_PIN3_MASK |
@@ -208,28 +208,28 @@ struct pmx_dev_mode pmx_can_modes[] = {
        },
 };
 
-struct pmx_dev pmx_can = {
+struct pmx_dev spear320_pmx_can = {
        .name = "can",
        .modes = pmx_can_modes,
        .mode_count = ARRAY_SIZE(pmx_can_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_sdhci_led_modes[] = {
+static struct pmx_dev_mode pmx_sdhci_led_modes[] = {
        {
                .ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE,
                .mask = PMX_SSP_CS_MASK,
        },
 };
 
-struct pmx_dev pmx_sdhci_led = {
+struct pmx_dev spear320_pmx_sdhci_led = {
        .name = "sdhci_led",
        .modes = pmx_sdhci_led_modes,
        .mode_count = ARRAY_SIZE(pmx_sdhci_led_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_pwm0_modes[] = {
+static struct pmx_dev_mode pmx_pwm0_modes[] = {
        {
                .ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE,
                .mask = PMX_UART0_MODEM_MASK,
@@ -239,14 +239,14 @@ struct pmx_dev_mode pmx_pwm0_modes[] = {
        },
 };
 
-struct pmx_dev pmx_pwm0 = {
+struct pmx_dev spear320_pmx_pwm0 = {
        .name = "pwm0",
        .modes = pmx_pwm0_modes,
        .mode_count = ARRAY_SIZE(pmx_pwm0_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_pwm1_modes[] = {
+static struct pmx_dev_mode pmx_pwm1_modes[] = {
        {
                .ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE,
                .mask = PMX_UART0_MODEM_MASK,
@@ -256,14 +256,14 @@ struct pmx_dev_mode pmx_pwm1_modes[] = {
        },
 };
 
-struct pmx_dev pmx_pwm1 = {
+struct pmx_dev spear320_pmx_pwm1 = {
        .name = "pwm1",
        .modes = pmx_pwm1_modes,
        .mode_count = ARRAY_SIZE(pmx_pwm1_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_pwm2_modes[] = {
+static struct pmx_dev_mode pmx_pwm2_modes[] = {
        {
                .ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE,
                .mask = PMX_SSP_CS_MASK,
@@ -273,105 +273,105 @@ struct pmx_dev_mode pmx_pwm2_modes[] = {
        },
 };
 
-struct pmx_dev pmx_pwm2 = {
+struct pmx_dev spear320_pmx_pwm2 = {
        .name = "pwm2",
        .modes = pmx_pwm2_modes,
        .mode_count = ARRAY_SIZE(pmx_pwm2_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_pwm3_modes[] = {
+static struct pmx_dev_mode pmx_pwm3_modes[] = {
        {
                .ids = AUTO_EXP_MODE | SMALL_PRINTERS_MODE | AUTO_NET_SMII_MODE,
                .mask = PMX_MII_MASK,
        },
 };
 
-struct pmx_dev pmx_pwm3 = {
+struct pmx_dev spear320_pmx_pwm3 = {
        .name = "pwm3",
        .modes = pmx_pwm3_modes,
        .mode_count = ARRAY_SIZE(pmx_pwm3_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_ssp1_modes[] = {
+static struct pmx_dev_mode pmx_ssp1_modes[] = {
        {
                .ids = SMALL_PRINTERS_MODE | AUTO_NET_SMII_MODE,
                .mask = PMX_MII_MASK,
        },
 };
 
-struct pmx_dev pmx_ssp1 = {
+struct pmx_dev spear320_pmx_ssp1 = {
        .name = "ssp1",
        .modes = pmx_ssp1_modes,
        .mode_count = ARRAY_SIZE(pmx_ssp1_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_ssp2_modes[] = {
+static struct pmx_dev_mode pmx_ssp2_modes[] = {
        {
                .ids = AUTO_NET_SMII_MODE,
                .mask = PMX_MII_MASK,
        },
 };
 
-struct pmx_dev pmx_ssp2 = {
+struct pmx_dev spear320_pmx_ssp2 = {
        .name = "ssp2",
        .modes = pmx_ssp2_modes,
        .mode_count = ARRAY_SIZE(pmx_ssp2_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_mii1_modes[] = {
+static struct pmx_dev_mode pmx_mii1_modes[] = {
        {
                .ids = AUTO_NET_MII_MODE,
                .mask = 0x0,
        },
 };
 
-struct pmx_dev pmx_mii1 = {
+struct pmx_dev spear320_pmx_mii1 = {
        .name = "mii1",
        .modes = pmx_mii1_modes,
        .mode_count = ARRAY_SIZE(pmx_mii1_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_smii0_modes[] = {
+static struct pmx_dev_mode pmx_smii0_modes[] = {
        {
                .ids = AUTO_NET_SMII_MODE | AUTO_EXP_MODE | SMALL_PRINTERS_MODE,
                .mask = PMX_MII_MASK,
        },
 };
 
-struct pmx_dev pmx_smii0 = {
+struct pmx_dev spear320_pmx_smii0 = {
        .name = "smii0",
        .modes = pmx_smii0_modes,
        .mode_count = ARRAY_SIZE(pmx_smii0_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_smii1_modes[] = {
+static struct pmx_dev_mode pmx_smii1_modes[] = {
        {
                .ids = AUTO_NET_SMII_MODE | SMALL_PRINTERS_MODE,
                .mask = PMX_MII_MASK,
        },
 };
 
-struct pmx_dev pmx_smii1 = {
+struct pmx_dev spear320_pmx_smii1 = {
        .name = "smii1",
        .modes = pmx_smii1_modes,
        .mode_count = ARRAY_SIZE(pmx_smii1_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_i2c1_modes[] = {
+static struct pmx_dev_mode pmx_i2c1_modes[] = {
        {
                .ids = AUTO_EXP_MODE,
                .mask = 0x0,
        },
 };
 
-struct pmx_dev pmx_i2c1 = {
+struct pmx_dev spear320_pmx_i2c1 = {
        .name = "i2c1",
        .modes = pmx_i2c1_modes,
        .mode_count = ARRAY_SIZE(pmx_i2c1_modes),
@@ -379,131 +379,131 @@ struct pmx_dev pmx_i2c1 = {
 };
 
 /* pmx driver structure */
-struct pmx_driver pmx_driver = {
+static struct pmx_driver pmx_driver = {
        .mode_reg = {.offset = MODE_CONFIG_REG, .mask = 0x00000007},
        .mux_reg = {.offset = PAD_MUX_CONFIG_REG, .mask = 0x00007fff},
 };
 
 /* spear3xx shared irq */
-struct shirq_dev_config shirq_ras1_config[] = {
+static struct shirq_dev_config shirq_ras1_config[] = {
        {
-               .virq = VIRQ_EMI,
-               .status_mask = EMI_IRQ_MASK,
-               .clear_mask = EMI_IRQ_MASK,
+               .virq = SPEAR320_VIRQ_EMI,
+               .status_mask = SPEAR320_EMI_IRQ_MASK,
+               .clear_mask = SPEAR320_EMI_IRQ_MASK,
        }, {
-               .virq = VIRQ_CLCD,
-               .status_mask = CLCD_IRQ_MASK,
-               .clear_mask = CLCD_IRQ_MASK,
+               .virq = SPEAR320_VIRQ_CLCD,
+               .status_mask = SPEAR320_CLCD_IRQ_MASK,
+               .clear_mask = SPEAR320_CLCD_IRQ_MASK,
        }, {
-               .virq = VIRQ_SPP,
-               .status_mask = SPP_IRQ_MASK,
-               .clear_mask = SPP_IRQ_MASK,
+               .virq = SPEAR320_VIRQ_SPP,
+               .status_mask = SPEAR320_SPP_IRQ_MASK,
+               .clear_mask = SPEAR320_SPP_IRQ_MASK,
        },
 };
 
-struct spear_shirq shirq_ras1 = {
-       .irq = IRQ_GEN_RAS_1,
+static struct spear_shirq shirq_ras1 = {
+       .irq = SPEAR3XX_IRQ_GEN_RAS_1,
        .dev_config = shirq_ras1_config,
        .dev_count = ARRAY_SIZE(shirq_ras1_config),
        .regs = {
                .enb_reg = -1,
-               .status_reg = INT_STS_MASK_REG,
-               .status_reg_mask = SHIRQ_RAS1_MASK,
-               .clear_reg = INT_CLR_MASK_REG,
+               .status_reg = SPEAR320_INT_STS_MASK_REG,
+               .status_reg_mask = SPEAR320_SHIRQ_RAS1_MASK,
+               .clear_reg = SPEAR320_INT_CLR_MASK_REG,
                .reset_to_clear = 1,
        },
 };
 
-struct shirq_dev_config shirq_ras3_config[] = {
+static struct shirq_dev_config shirq_ras3_config[] = {
        {
-               .virq = VIRQ_PLGPIO,
-               .enb_mask = GPIO_IRQ_MASK,
-               .status_mask = GPIO_IRQ_MASK,
-               .clear_mask = GPIO_IRQ_MASK,
+               .virq = SPEAR320_VIRQ_PLGPIO,
+               .enb_mask = SPEAR320_GPIO_IRQ_MASK,
+               .status_mask = SPEAR320_GPIO_IRQ_MASK,
+               .clear_mask = SPEAR320_GPIO_IRQ_MASK,
        }, {
-               .virq = VIRQ_I2S_PLAY,
-               .enb_mask = I2S_PLAY_IRQ_MASK,
-               .status_mask = I2S_PLAY_IRQ_MASK,
-               .clear_mask = I2S_PLAY_IRQ_MASK,
+               .virq = SPEAR320_VIRQ_I2S_PLAY,
+               .enb_mask = SPEAR320_I2S_PLAY_IRQ_MASK,
+               .status_mask = SPEAR320_I2S_PLAY_IRQ_MASK,
+               .clear_mask = SPEAR320_I2S_PLAY_IRQ_MASK,
        }, {
-               .virq = VIRQ_I2S_REC,
-               .enb_mask = I2S_REC_IRQ_MASK,
-               .status_mask = I2S_REC_IRQ_MASK,
-               .clear_mask = I2S_REC_IRQ_MASK,
+               .virq = SPEAR320_VIRQ_I2S_REC,
+               .enb_mask = SPEAR320_I2S_REC_IRQ_MASK,
+               .status_mask = SPEAR320_I2S_REC_IRQ_MASK,
+               .clear_mask = SPEAR320_I2S_REC_IRQ_MASK,
        },
 };
 
-struct spear_shirq shirq_ras3 = {
-       .irq = IRQ_GEN_RAS_3,
+static struct spear_shirq shirq_ras3 = {
+       .irq = SPEAR3XX_IRQ_GEN_RAS_3,
        .dev_config = shirq_ras3_config,
        .dev_count = ARRAY_SIZE(shirq_ras3_config),
        .regs = {
-               .enb_reg = INT_ENB_MASK_REG,
+               .enb_reg = SPEAR320_INT_ENB_MASK_REG,
                .reset_to_enb = 1,
-               .status_reg = INT_STS_MASK_REG,
-               .status_reg_mask = SHIRQ_RAS3_MASK,
-               .clear_reg = INT_CLR_MASK_REG,
+               .status_reg = SPEAR320_INT_STS_MASK_REG,
+               .status_reg_mask = SPEAR320_SHIRQ_RAS3_MASK,
+               .clear_reg = SPEAR320_INT_CLR_MASK_REG,
                .reset_to_clear = 1,
        },
 };
 
-struct shirq_dev_config shirq_intrcomm_ras_config[] = {
+static struct shirq_dev_config shirq_intrcomm_ras_config[] = {
        {
-               .virq = VIRQ_CANU,
-               .status_mask = CAN_U_IRQ_MASK,
-               .clear_mask = CAN_U_IRQ_MASK,
+               .virq = SPEAR320_VIRQ_CANU,
+               .status_mask = SPEAR320_CAN_U_IRQ_MASK,
+               .clear_mask = SPEAR320_CAN_U_IRQ_MASK,
        }, {
-               .virq = VIRQ_CANL,
-               .status_mask = CAN_L_IRQ_MASK,
-               .clear_mask = CAN_L_IRQ_MASK,
+               .virq = SPEAR320_VIRQ_CANL,
+               .status_mask = SPEAR320_CAN_L_IRQ_MASK,
+               .clear_mask = SPEAR320_CAN_L_IRQ_MASK,
        }, {
-               .virq = VIRQ_UART1,
-               .status_mask = UART1_IRQ_MASK,
-               .clear_mask = UART1_IRQ_MASK,
+               .virq = SPEAR320_VIRQ_UART1,
+               .status_mask = SPEAR320_UART1_IRQ_MASK,
+               .clear_mask = SPEAR320_UART1_IRQ_MASK,
        }, {
-               .virq = VIRQ_UART2,
-               .status_mask = UART2_IRQ_MASK,
-               .clear_mask = UART2_IRQ_MASK,
+               .virq = SPEAR320_VIRQ_UART2,
+               .status_mask = SPEAR320_UART2_IRQ_MASK,
+               .clear_mask = SPEAR320_UART2_IRQ_MASK,
        }, {
-               .virq = VIRQ_SSP1,
-               .status_mask = SSP1_IRQ_MASK,
-               .clear_mask = SSP1_IRQ_MASK,
+               .virq = SPEAR320_VIRQ_SSP1,
+               .status_mask = SPEAR320_SSP1_IRQ_MASK,
+               .clear_mask = SPEAR320_SSP1_IRQ_MASK,
        }, {
-               .virq = VIRQ_SSP2,
-               .status_mask = SSP2_IRQ_MASK,
-               .clear_mask = SSP2_IRQ_MASK,
+               .virq = SPEAR320_VIRQ_SSP2,
+               .status_mask = SPEAR320_SSP2_IRQ_MASK,
+               .clear_mask = SPEAR320_SSP2_IRQ_MASK,
        }, {
-               .virq = VIRQ_SMII0,
-               .status_mask = SMII0_IRQ_MASK,
-               .clear_mask = SMII0_IRQ_MASK,
+               .virq = SPEAR320_VIRQ_SMII0,
+               .status_mask = SPEAR320_SMII0_IRQ_MASK,
+               .clear_mask = SPEAR320_SMII0_IRQ_MASK,
        }, {
-               .virq = VIRQ_MII1_SMII1,
-               .status_mask = MII1_SMII1_IRQ_MASK,
-               .clear_mask = MII1_SMII1_IRQ_MASK,
+               .virq = SPEAR320_VIRQ_MII1_SMII1,
+               .status_mask = SPEAR320_MII1_SMII1_IRQ_MASK,
+               .clear_mask = SPEAR320_MII1_SMII1_IRQ_MASK,
        }, {
-               .virq = VIRQ_WAKEUP_SMII0,
-               .status_mask = WAKEUP_SMII0_IRQ_MASK,
-               .clear_mask = WAKEUP_SMII0_IRQ_MASK,
+               .virq = SPEAR320_VIRQ_WAKEUP_SMII0,
+               .status_mask = SPEAR320_WAKEUP_SMII0_IRQ_MASK,
+               .clear_mask = SPEAR320_WAKEUP_SMII0_IRQ_MASK,
        }, {
-               .virq = VIRQ_WAKEUP_MII1_SMII1,
-               .status_mask = WAKEUP_MII1_SMII1_IRQ_MASK,
-               .clear_mask = WAKEUP_MII1_SMII1_IRQ_MASK,
+               .virq = SPEAR320_VIRQ_WAKEUP_MII1_SMII1,
+               .status_mask = SPEAR320_WAKEUP_MII1_SMII1_IRQ_MASK,
+               .clear_mask = SPEAR320_WAKEUP_MII1_SMII1_IRQ_MASK,
        }, {
-               .virq = VIRQ_I2C,
-               .status_mask = I2C1_IRQ_MASK,
-               .clear_mask = I2C1_IRQ_MASK,
+               .virq = SPEAR320_VIRQ_I2C1,
+               .status_mask = SPEAR320_I2C1_IRQ_MASK,
+               .clear_mask = SPEAR320_I2C1_IRQ_MASK,
        },
 };
 
-struct spear_shirq shirq_intrcomm_ras = {
-       .irq = IRQ_INTRCOMM_RAS_ARM,
+static struct spear_shirq shirq_intrcomm_ras = {
+       .irq = SPEAR3XX_IRQ_INTRCOMM_RAS_ARM,
        .dev_config = shirq_intrcomm_ras_config,
        .dev_count = ARRAY_SIZE(shirq_intrcomm_ras_config),
        .regs = {
                .enb_reg = -1,
-               .status_reg = INT_STS_MASK_REG,
-               .status_reg_mask = SHIRQ_INTRCOMM_RAS_MASK,
-               .clear_reg = INT_CLR_MASK_REG,
+               .status_reg = SPEAR320_INT_STS_MASK_REG,
+               .status_reg_mask = SPEAR320_SHIRQ_INTRCOMM_RAS_MASK,
+               .clear_reg = SPEAR320_INT_CLR_MASK_REG,
                .reset_to_clear = 1,
        },
 };
@@ -511,7 +511,8 @@ struct spear_shirq shirq_intrcomm_ras = {
 /* Add spear320 specific devices here */
 
 /* spear320 routines */
-void __init spear320_init(void)
+void __init spear320_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs,
+               u8 pmx_dev_count)
 {
        void __iomem *base;
        int ret = 0;
@@ -543,6 +544,10 @@ void __init spear320_init(void)
 
        /* pmx initialization */
        pmx_driver.base = base;
+       pmx_driver.mode = pmx_mode;
+       pmx_driver.devs = pmx_devs;
+       pmx_driver.devs_count = pmx_dev_count;
+
        ret = pmx_register(&pmx_driver);
        if (ret)
                printk(KERN_ERR "padmux: registeration failed. err no: %d\n",