Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
[pandora-kernel.git] / arch / arm / mach-spear3xx / spear300.c
index 2697e65..a5e46b4 100644 (file)
 #define CAML_LCD_MODE                  (1 << 12)
 #define ALL_MODES                      0x1FFF
 
-struct pmx_mode nand_mode = {
+struct pmx_mode spear300_nand_mode = {
        .id = NAND_MODE,
        .name = "nand mode",
        .mask = 0x00,
 };
 
-struct pmx_mode nor_mode = {
+struct pmx_mode spear300_nor_mode = {
        .id = NOR_MODE,
        .name = "nor mode",
        .mask = 0x01,
 };
 
-struct pmx_mode photo_frame_mode = {
+struct pmx_mode spear300_photo_frame_mode = {
        .id = PHOTO_FRAME_MODE,
        .name = "photo frame mode",
        .mask = 0x02,
 };
 
-struct pmx_mode lend_ip_phone_mode = {
+struct pmx_mode spear300_lend_ip_phone_mode = {
        .id = LEND_IP_PHONE_MODE,
        .name = "lend ip phone mode",
        .mask = 0x03,
 };
 
-struct pmx_mode hend_ip_phone_mode = {
+struct pmx_mode spear300_hend_ip_phone_mode = {
        .id = HEND_IP_PHONE_MODE,
        .name = "hend ip phone mode",
        .mask = 0x04,
 };
 
-struct pmx_mode lend_wifi_phone_mode = {
+struct pmx_mode spear300_lend_wifi_phone_mode = {
        .id = LEND_WIFI_PHONE_MODE,
        .name = "lend wifi phone mode",
        .mask = 0x05,
 };
 
-struct pmx_mode hend_wifi_phone_mode = {
+struct pmx_mode spear300_hend_wifi_phone_mode = {
        .id = HEND_WIFI_PHONE_MODE,
        .name = "hend wifi phone mode",
        .mask = 0x06,
 };
 
-struct pmx_mode ata_pabx_wi2s_mode = {
+struct pmx_mode spear300_ata_pabx_wi2s_mode = {
        .id = ATA_PABX_WI2S_MODE,
        .name = "ata pabx wi2s mode",
        .mask = 0x07,
 };
 
-struct pmx_mode ata_pabx_i2s_mode = {
+struct pmx_mode spear300_ata_pabx_i2s_mode = {
        .id = ATA_PABX_I2S_MODE,
        .name = "ata pabx i2s mode",
        .mask = 0x08,
 };
 
-struct pmx_mode caml_lcdw_mode = {
+struct pmx_mode spear300_caml_lcdw_mode = {
        .id = CAML_LCDW_MODE,
        .name = "caml lcdw mode",
        .mask = 0x0C,
 };
 
-struct pmx_mode camu_lcd_mode = {
+struct pmx_mode spear300_camu_lcd_mode = {
        .id = CAMU_LCD_MODE,
        .name = "camu lcd mode",
        .mask = 0x0D,
 };
 
-struct pmx_mode camu_wlcd_mode = {
+struct pmx_mode spear300_camu_wlcd_mode = {
        .id = CAMU_WLCD_MODE,
        .name = "camu wlcd mode",
        .mask = 0x0E,
 };
 
-struct pmx_mode caml_lcd_mode = {
+struct pmx_mode spear300_caml_lcd_mode = {
        .id = CAML_LCD_MODE,
        .name = "caml lcd mode",
        .mask = 0x0F,
 };
 
 /* devices */
-struct pmx_dev_mode pmx_fsmc_2_chips_modes[] = {
+static struct pmx_dev_mode pmx_fsmc_2_chips_modes[] = {
        {
                .ids = NAND_MODE | NOR_MODE | PHOTO_FRAME_MODE |
                        ATA_PABX_WI2S_MODE | ATA_PABX_I2S_MODE,
@@ -127,14 +127,14 @@ struct pmx_dev_mode pmx_fsmc_2_chips_modes[] = {
        },
 };
 
-struct pmx_dev pmx_fsmc_2_chips = {
+struct pmx_dev spear300_pmx_fsmc_2_chips = {
        .name = "fsmc_2_chips",
        .modes = pmx_fsmc_2_chips_modes,
        .mode_count = ARRAY_SIZE(pmx_fsmc_2_chips_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_fsmc_4_chips_modes[] = {
+static struct pmx_dev_mode pmx_fsmc_4_chips_modes[] = {
        {
                .ids = NAND_MODE | NOR_MODE | PHOTO_FRAME_MODE |
                        ATA_PABX_WI2S_MODE | ATA_PABX_I2S_MODE,
@@ -142,14 +142,14 @@ struct pmx_dev_mode pmx_fsmc_4_chips_modes[] = {
        },
 };
 
-struct pmx_dev pmx_fsmc_4_chips = {
+struct pmx_dev spear300_pmx_fsmc_4_chips = {
        .name = "fsmc_4_chips",
        .modes = pmx_fsmc_4_chips_modes,
        .mode_count = ARRAY_SIZE(pmx_fsmc_4_chips_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_keyboard_modes[] = {
+static struct pmx_dev_mode pmx_keyboard_modes[] = {
        {
                .ids = LEND_IP_PHONE_MODE | HEND_IP_PHONE_MODE |
                        LEND_WIFI_PHONE_MODE | HEND_WIFI_PHONE_MODE |
@@ -159,14 +159,14 @@ struct pmx_dev_mode pmx_keyboard_modes[] = {
        },
 };
 
-struct pmx_dev pmx_keyboard = {
+struct pmx_dev spear300_pmx_keyboard = {
        .name = "keyboard",
        .modes = pmx_keyboard_modes,
        .mode_count = ARRAY_SIZE(pmx_keyboard_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_clcd_modes[] = {
+static struct pmx_dev_mode pmx_clcd_modes[] = {
        {
                .ids = PHOTO_FRAME_MODE,
                .mask = PMX_TIMER_1_2_MASK | PMX_TIMER_3_4_MASK ,
@@ -177,14 +177,14 @@ struct pmx_dev_mode pmx_clcd_modes[] = {
        },
 };
 
-struct pmx_dev pmx_clcd = {
+struct pmx_dev spear300_pmx_clcd = {
        .name = "clcd",
        .modes = pmx_clcd_modes,
        .mode_count = ARRAY_SIZE(pmx_clcd_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_gpio_modes[] = {
+static struct pmx_dev_mode pmx_telecom_gpio_modes[] = {
        {
                .ids = PHOTO_FRAME_MODE | CAMU_LCD_MODE | CAML_LCD_MODE,
                .mask = PMX_MII_MASK,
@@ -204,14 +204,14 @@ struct pmx_dev_mode pmx_telecom_gpio_modes[] = {
        },
 };
 
-struct pmx_dev pmx_telecom_gpio = {
+struct pmx_dev spear300_pmx_telecom_gpio = {
        .name = "telecom_gpio",
        .modes = pmx_telecom_gpio_modes,
        .mode_count = ARRAY_SIZE(pmx_telecom_gpio_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_tdm_modes[] = {
+static struct pmx_dev_mode pmx_telecom_tdm_modes[] = {
        {
                .ids = PHOTO_FRAME_MODE | LEND_IP_PHONE_MODE |
                        HEND_IP_PHONE_MODE | LEND_WIFI_PHONE_MODE
@@ -222,14 +222,14 @@ struct pmx_dev_mode pmx_telecom_tdm_modes[] = {
        },
 };
 
-struct pmx_dev pmx_telecom_tdm = {
+struct pmx_dev spear300_pmx_telecom_tdm = {
        .name = "telecom_tdm",
        .modes = pmx_telecom_tdm_modes,
        .mode_count = ARRAY_SIZE(pmx_telecom_tdm_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_spi_cs_i2c_clk_modes[] = {
+static struct pmx_dev_mode pmx_telecom_spi_cs_i2c_clk_modes[] = {
        {
                .ids = LEND_IP_PHONE_MODE | HEND_IP_PHONE_MODE |
                        LEND_WIFI_PHONE_MODE | HEND_WIFI_PHONE_MODE
@@ -239,14 +239,14 @@ struct pmx_dev_mode pmx_telecom_spi_cs_i2c_clk_modes[] = {
        },
 };
 
-struct pmx_dev pmx_telecom_spi_cs_i2c_clk = {
+struct pmx_dev spear300_pmx_telecom_spi_cs_i2c_clk = {
        .name = "telecom_spi_cs_i2c_clk",
        .modes = pmx_telecom_spi_cs_i2c_clk_modes,
        .mode_count = ARRAY_SIZE(pmx_telecom_spi_cs_i2c_clk_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_camera_modes[] = {
+static struct pmx_dev_mode pmx_telecom_camera_modes[] = {
        {
                .ids = CAML_LCDW_MODE | CAML_LCD_MODE,
                .mask = PMX_MII_MASK,
@@ -256,14 +256,14 @@ struct pmx_dev_mode pmx_telecom_camera_modes[] = {
        },
 };
 
-struct pmx_dev pmx_telecom_camera = {
+struct pmx_dev spear300_pmx_telecom_camera = {
        .name = "telecom_camera",
        .modes = pmx_telecom_camera_modes,
        .mode_count = ARRAY_SIZE(pmx_telecom_camera_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_dac_modes[] = {
+static struct pmx_dev_mode pmx_telecom_dac_modes[] = {
        {
                .ids = ATA_PABX_I2S_MODE | CAML_LCDW_MODE | CAMU_LCD_MODE
                        | CAMU_WLCD_MODE | CAML_LCD_MODE,
@@ -271,14 +271,14 @@ struct pmx_dev_mode pmx_telecom_dac_modes[] = {
        },
 };
 
-struct pmx_dev pmx_telecom_dac = {
+struct pmx_dev spear300_pmx_telecom_dac = {
        .name = "telecom_dac",
        .modes = pmx_telecom_dac_modes,
        .mode_count = ARRAY_SIZE(pmx_telecom_dac_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_i2s_modes[] = {
+static struct pmx_dev_mode pmx_telecom_i2s_modes[] = {
        {
                .ids = LEND_IP_PHONE_MODE | HEND_IP_PHONE_MODE
                        | LEND_WIFI_PHONE_MODE | HEND_WIFI_PHONE_MODE |
@@ -288,14 +288,14 @@ struct pmx_dev_mode pmx_telecom_i2s_modes[] = {
        },
 };
 
-struct pmx_dev pmx_telecom_i2s = {
+struct pmx_dev spear300_pmx_telecom_i2s = {
        .name = "telecom_i2s",
        .modes = pmx_telecom_i2s_modes,
        .mode_count = ARRAY_SIZE(pmx_telecom_i2s_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_boot_pins_modes[] = {
+static struct pmx_dev_mode pmx_telecom_boot_pins_modes[] = {
        {
                .ids = NAND_MODE | NOR_MODE,
                .mask = PMX_UART0_MODEM_MASK | PMX_TIMER_1_2_MASK |
@@ -303,14 +303,14 @@ struct pmx_dev_mode pmx_telecom_boot_pins_modes[] = {
        },
 };
 
-struct pmx_dev pmx_telecom_boot_pins = {
+struct pmx_dev spear300_pmx_telecom_boot_pins = {
        .name = "telecom_boot_pins",
        .modes = pmx_telecom_boot_pins_modes,
        .mode_count = ARRAY_SIZE(pmx_telecom_boot_pins_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_sdhci_4bit_modes[] = {
+static struct pmx_dev_mode pmx_telecom_sdhci_4bit_modes[] = {
        {
                .ids = PHOTO_FRAME_MODE | LEND_IP_PHONE_MODE |
                        HEND_IP_PHONE_MODE | LEND_WIFI_PHONE_MODE |
@@ -323,14 +323,14 @@ struct pmx_dev_mode pmx_telecom_sdhci_4bit_modes[] = {
        },
 };
 
-struct pmx_dev pmx_telecom_sdhci_4bit = {
+struct pmx_dev spear300_pmx_telecom_sdhci_4bit = {
        .name = "telecom_sdhci_4bit",
        .modes = pmx_telecom_sdhci_4bit_modes,
        .mode_count = ARRAY_SIZE(pmx_telecom_sdhci_4bit_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_sdhci_8bit_modes[] = {
+static struct pmx_dev_mode pmx_telecom_sdhci_8bit_modes[] = {
        {
                .ids = PHOTO_FRAME_MODE | LEND_IP_PHONE_MODE |
                        HEND_IP_PHONE_MODE | LEND_WIFI_PHONE_MODE |
@@ -342,14 +342,14 @@ struct pmx_dev_mode pmx_telecom_sdhci_8bit_modes[] = {
        },
 };
 
-struct pmx_dev pmx_telecom_sdhci_8bit = {
+struct pmx_dev spear300_pmx_telecom_sdhci_8bit = {
        .name = "telecom_sdhci_8bit",
        .modes = pmx_telecom_sdhci_8bit_modes,
        .mode_count = ARRAY_SIZE(pmx_telecom_sdhci_8bit_modes),
        .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_gpio1_modes[] = {
+static struct pmx_dev_mode pmx_gpio1_modes[] = {
        {
                .ids = PHOTO_FRAME_MODE,
                .mask = PMX_UART0_MODEM_MASK | PMX_TIMER_1_2_MASK |
@@ -357,7 +357,7 @@ struct pmx_dev_mode pmx_gpio1_modes[] = {
        },
 };
 
-struct pmx_dev pmx_gpio1 = {
+struct pmx_dev spear300_pmx_gpio1 = {
        .name = "arm gpio1",
        .modes = pmx_gpio1_modes,
        .mode_count = ARRAY_SIZE(pmx_gpio1_modes),
@@ -365,60 +365,60 @@ struct pmx_dev pmx_gpio1 = {
 };
 
 /* pmx driver structure */
-struct pmx_driver pmx_driver = {
+static struct pmx_driver pmx_driver = {
        .mode_reg = {.offset = MODE_CONFIG_REG, .mask = 0x0000000f},
        .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_IT_PERS_S,
-               .enb_mask = IT_PERS_S_IRQ_MASK,
-               .status_mask = IT_PERS_S_IRQ_MASK,
+               .virq = SPEAR300_VIRQ_IT_PERS_S,
+               .enb_mask = SPEAR300_IT_PERS_S_IRQ_MASK,
+               .status_mask = SPEAR300_IT_PERS_S_IRQ_MASK,
        }, {
-               .virq = VIRQ_IT_CHANGE_S,
-               .enb_mask = IT_CHANGE_S_IRQ_MASK,
-               .status_mask = IT_CHANGE_S_IRQ_MASK,
+               .virq = SPEAR300_VIRQ_IT_CHANGE_S,
+               .enb_mask = SPEAR300_IT_CHANGE_S_IRQ_MASK,
+               .status_mask = SPEAR300_IT_CHANGE_S_IRQ_MASK,
        }, {
-               .virq = VIRQ_I2S,
-               .enb_mask = I2S_IRQ_MASK,
-               .status_mask = I2S_IRQ_MASK,
+               .virq = SPEAR300_VIRQ_I2S,
+               .enb_mask = SPEAR300_I2S_IRQ_MASK,
+               .status_mask = SPEAR300_I2S_IRQ_MASK,
        }, {
-               .virq = VIRQ_TDM,
-               .enb_mask = TDM_IRQ_MASK,
-               .status_mask = TDM_IRQ_MASK,
+               .virq = SPEAR300_VIRQ_TDM,
+               .enb_mask = SPEAR300_TDM_IRQ_MASK,
+               .status_mask = SPEAR300_TDM_IRQ_MASK,
        }, {
-               .virq = VIRQ_CAMERA_L,
-               .enb_mask = CAMERA_L_IRQ_MASK,
-               .status_mask = CAMERA_L_IRQ_MASK,
+               .virq = SPEAR300_VIRQ_CAMERA_L,
+               .enb_mask = SPEAR300_CAMERA_L_IRQ_MASK,
+               .status_mask = SPEAR300_CAMERA_L_IRQ_MASK,
        }, {
-               .virq = VIRQ_CAMERA_F,
-               .enb_mask = CAMERA_F_IRQ_MASK,
-               .status_mask = CAMERA_F_IRQ_MASK,
+               .virq = SPEAR300_VIRQ_CAMERA_F,
+               .enb_mask = SPEAR300_CAMERA_F_IRQ_MASK,
+               .status_mask = SPEAR300_CAMERA_F_IRQ_MASK,
        }, {
-               .virq = VIRQ_CAMERA_V,
-               .enb_mask = CAMERA_V_IRQ_MASK,
-               .status_mask = CAMERA_V_IRQ_MASK,
+               .virq = SPEAR300_VIRQ_CAMERA_V,
+               .enb_mask = SPEAR300_CAMERA_V_IRQ_MASK,
+               .status_mask = SPEAR300_CAMERA_V_IRQ_MASK,
        }, {
-               .virq = VIRQ_KEYBOARD,
-               .enb_mask = KEYBOARD_IRQ_MASK,
-               .status_mask = KEYBOARD_IRQ_MASK,
+               .virq = SPEAR300_VIRQ_KEYBOARD,
+               .enb_mask = SPEAR300_KEYBOARD_IRQ_MASK,
+               .status_mask = SPEAR300_KEYBOARD_IRQ_MASK,
        }, {
-               .virq = VIRQ_GPIO1,
-               .enb_mask = GPIO1_IRQ_MASK,
-               .status_mask = GPIO1_IRQ_MASK,
+               .virq = SPEAR300_VIRQ_GPIO1,
+               .enb_mask = SPEAR300_GPIO1_IRQ_MASK,
+               .status_mask = SPEAR300_GPIO1_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 = INT_ENB_MASK_REG,
-               .status_reg = INT_STS_MASK_REG,
-               .status_reg_mask = SHIRQ_RAS1_MASK,
+               .enb_reg = SPEAR300_INT_ENB_MASK_REG,
+               .status_reg = SPEAR300_INT_STS_MASK_REG,
+               .status_reg_mask = SPEAR300_SHIRQ_RAS1_MASK,
                .clear_reg = -1,
        },
 };
@@ -427,10 +427,10 @@ struct spear_shirq shirq_ras1 = {
 /* arm gpio1 device registration */
 static struct pl061_platform_data gpio1_plat_data = {
        .gpio_base      = 8,
-       .irq_base       = SPEAR_GPIO1_INT_BASE,
+       .irq_base       = SPEAR300_GPIO1_INT_BASE,
 };
 
-struct amba_device gpio1_device = {
+struct amba_device spear300_gpio1_device = {
        .dev = {
                .init_name = "gpio1",
                .platform_data = &gpio1_plat_data,
@@ -440,11 +440,12 @@ struct amba_device gpio1_device = {
                .end = SPEAR300_GPIO_BASE + SZ_4K - 1,
                .flags = IORESOURCE_MEM,
        },
-       .irq = {VIRQ_GPIO1, NO_IRQ},
+       .irq = {SPEAR300_VIRQ_GPIO1, NO_IRQ},
 };
 
 /* spear300 routines */
-void __init spear300_init(void)
+void __init spear300_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs,
+               u8 pmx_dev_count)
 {
        int ret = 0;
 
@@ -460,6 +461,10 @@ void __init spear300_init(void)
        }
 
        /* pmx initialization */
+       pmx_driver.mode = pmx_mode;
+       pmx_driver.devs = pmx_devs;
+       pmx_driver.devs_count = pmx_dev_count;
+
        pmx_driver.base = ioremap(SPEAR300_SOC_CONFIG_BASE, SZ_4K);
        if (pmx_driver.base) {
                ret = pmx_register(&pmx_driver);