diff options
Diffstat (limited to 'arch/arm/mach-spear3xx/spear300.c')
| -rw-r--r-- | arch/arm/mach-spear3xx/spear300.c | 637 | 
1 files changed, 260 insertions, 377 deletions
diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c index f7db66812ab..f74a05bdb82 100644 --- a/arch/arm/mach-spear3xx/spear300.c +++ b/arch/arm/mach-spear3xx/spear300.c @@ -3,372 +3,62 @@   *   * SPEAr300 machine source file   * - * Copyright (C) 2009 ST Microelectronics - * Viresh Kumar<viresh.kumar@st.com> + * Copyright (C) 2009-2012 ST Microelectronics + * Viresh Kumar <viresh.kumar@st.com>   *   * This file is licensed under the terms of the GNU General Public   * License version 2. This program is licensed "as is" without any   * warranty of any kind, whether express or implied.   */ -#include <linux/types.h> -#include <linux/amba/pl061.h> -#include <linux/ptrace.h> -#include <asm/irq.h> +#define pr_fmt(fmt) "SPEAr300: " fmt + +#include <linux/amba/pl08x.h> +#include <linux/of_platform.h> +#include <asm/hardware/vic.h> +#include <asm/mach/arch.h>  #include <plat/shirq.h>  #include <mach/generic.h> -#include <mach/hardware.h> - -/* pad multiplexing support */ -/* muxing registers */ -#define PAD_MUX_CONFIG_REG	0x00 -#define MODE_CONFIG_REG		0x04 - -/* modes */ -#define NAND_MODE			(1 << 0) -#define NOR_MODE			(1 << 1) -#define PHOTO_FRAME_MODE		(1 << 2) -#define LEND_IP_PHONE_MODE		(1 << 3) -#define HEND_IP_PHONE_MODE		(1 << 4) -#define LEND_WIFI_PHONE_MODE		(1 << 5) -#define HEND_WIFI_PHONE_MODE		(1 << 6) -#define ATA_PABX_WI2S_MODE		(1 << 7) -#define ATA_PABX_I2S_MODE		(1 << 8) -#define CAML_LCDW_MODE			(1 << 9) -#define CAMU_LCD_MODE			(1 << 10) -#define CAMU_WLCD_MODE			(1 << 11) -#define CAML_LCD_MODE			(1 << 12) -#define ALL_MODES			0x1FFF - -struct pmx_mode spear300_nand_mode = { -	.id = NAND_MODE, -	.name = "nand mode", -	.mask = 0x00, -}; - -struct pmx_mode spear300_nor_mode = { -	.id = NOR_MODE, -	.name = "nor mode", -	.mask = 0x01, -}; - -struct pmx_mode spear300_photo_frame_mode = { -	.id = PHOTO_FRAME_MODE, -	.name = "photo frame mode", -	.mask = 0x02, -}; - -struct pmx_mode spear300_lend_ip_phone_mode = { -	.id = LEND_IP_PHONE_MODE, -	.name = "lend ip phone mode", -	.mask = 0x03, -}; - -struct pmx_mode spear300_hend_ip_phone_mode = { -	.id = HEND_IP_PHONE_MODE, -	.name = "hend ip phone mode", -	.mask = 0x04, -}; - -struct pmx_mode spear300_lend_wifi_phone_mode = { -	.id = LEND_WIFI_PHONE_MODE, -	.name = "lend wifi phone mode", -	.mask = 0x05, -}; - -struct pmx_mode spear300_hend_wifi_phone_mode = { -	.id = HEND_WIFI_PHONE_MODE, -	.name = "hend wifi phone mode", -	.mask = 0x06, -}; - -struct pmx_mode spear300_ata_pabx_wi2s_mode = { -	.id = ATA_PABX_WI2S_MODE, -	.name = "ata pabx wi2s mode", -	.mask = 0x07, -}; - -struct pmx_mode spear300_ata_pabx_i2s_mode = { -	.id = ATA_PABX_I2S_MODE, -	.name = "ata pabx i2s mode", -	.mask = 0x08, -}; - -struct pmx_mode spear300_caml_lcdw_mode = { -	.id = CAML_LCDW_MODE, -	.name = "caml lcdw mode", -	.mask = 0x0C, -}; - -struct pmx_mode spear300_camu_lcd_mode = { -	.id = CAMU_LCD_MODE, -	.name = "camu lcd mode", -	.mask = 0x0D, -}; - -struct pmx_mode spear300_camu_wlcd_mode = { -	.id = CAMU_WLCD_MODE, -	.name = "camu wlcd mode", -	.mask = 0x0E, -}; - -struct pmx_mode spear300_caml_lcd_mode = { -	.id = CAML_LCD_MODE, -	.name = "caml lcd mode", -	.mask = 0x0F, -}; - -/* devices */ -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, -		.mask = PMX_FIRDA_MASK, -	}, -}; - -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, -}; - -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, -		.mask = PMX_FIRDA_MASK | PMX_UART0_MASK, -	}, -}; - -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, -}; - -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 | -			CAML_LCDW_MODE | CAMU_LCD_MODE | CAMU_WLCD_MODE | -			CAML_LCD_MODE, -		.mask = 0x0, -	}, -}; - -struct pmx_dev spear300_pmx_keyboard = { -	.name = "keyboard", -	.modes = pmx_keyboard_modes, -	.mode_count = ARRAY_SIZE(pmx_keyboard_modes), -	.enb_on_reset = 1, -}; - -static struct pmx_dev_mode pmx_clcd_modes[] = { -	{ -		.ids = PHOTO_FRAME_MODE, -		.mask = PMX_TIMER_1_2_MASK | PMX_TIMER_3_4_MASK , -	}, { -		.ids = HEND_IP_PHONE_MODE | HEND_WIFI_PHONE_MODE | -			CAMU_LCD_MODE | CAML_LCD_MODE, -		.mask = PMX_TIMER_3_4_MASK, -	}, -}; - -struct pmx_dev spear300_pmx_clcd = { -	.name = "clcd", -	.modes = pmx_clcd_modes, -	.mode_count = ARRAY_SIZE(pmx_clcd_modes), -	.enb_on_reset = 1, -}; - -static struct pmx_dev_mode pmx_telecom_gpio_modes[] = { -	{ -		.ids = PHOTO_FRAME_MODE | CAMU_LCD_MODE | CAML_LCD_MODE, -		.mask = PMX_MII_MASK, -	}, { -		.ids = LEND_IP_PHONE_MODE | LEND_WIFI_PHONE_MODE, -		.mask = PMX_MII_MASK | PMX_TIMER_1_2_MASK | PMX_TIMER_3_4_MASK, -	}, { -		.ids = ATA_PABX_I2S_MODE | CAML_LCDW_MODE | CAMU_WLCD_MODE, -		.mask = PMX_MII_MASK | PMX_TIMER_3_4_MASK, -	}, { -		.ids = HEND_IP_PHONE_MODE | HEND_WIFI_PHONE_MODE, -		.mask = PMX_MII_MASK | PMX_TIMER_1_2_MASK, -	}, { -		.ids = ATA_PABX_WI2S_MODE, -		.mask = PMX_MII_MASK | PMX_TIMER_1_2_MASK | PMX_TIMER_3_4_MASK -			| PMX_UART0_MODEM_MASK, -	}, -}; - -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, -}; - -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 -			| HEND_WIFI_PHONE_MODE | ATA_PABX_WI2S_MODE -			| ATA_PABX_I2S_MODE | CAML_LCDW_MODE | CAMU_LCD_MODE -			| CAMU_WLCD_MODE | CAML_LCD_MODE, -		.mask = PMX_UART0_MODEM_MASK | PMX_SSP_CS_MASK, -	}, -}; - -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, -}; - -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 -			| ATA_PABX_WI2S_MODE | ATA_PABX_I2S_MODE | -			CAML_LCDW_MODE | CAML_LCD_MODE, -		.mask = PMX_TIMER_1_2_MASK | PMX_TIMER_3_4_MASK, -	}, -}; +#include <mach/spear.h> -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, -}; +/* Base address of various IPs */ +#define SPEAR300_TELECOM_BASE		UL(0x50000000) -static struct pmx_dev_mode pmx_telecom_camera_modes[] = { -	{ -		.ids = CAML_LCDW_MODE | CAML_LCD_MODE, -		.mask = PMX_MII_MASK, -	}, { -		.ids = CAMU_LCD_MODE | CAMU_WLCD_MODE, -		.mask = PMX_TIMER_1_2_MASK | PMX_TIMER_3_4_MASK | PMX_MII_MASK, -	}, -}; +/* Interrupt registers offsets and masks */ +#define SPEAR300_INT_ENB_MASK_REG	0x54 +#define SPEAR300_INT_STS_MASK_REG	0x58 +#define SPEAR300_IT_PERS_S_IRQ_MASK	(1 << 0) +#define SPEAR300_IT_CHANGE_S_IRQ_MASK	(1 << 1) +#define SPEAR300_I2S_IRQ_MASK		(1 << 2) +#define SPEAR300_TDM_IRQ_MASK		(1 << 3) +#define SPEAR300_CAMERA_L_IRQ_MASK	(1 << 4) +#define SPEAR300_CAMERA_F_IRQ_MASK	(1 << 5) +#define SPEAR300_CAMERA_V_IRQ_MASK	(1 << 6) +#define SPEAR300_KEYBOARD_IRQ_MASK	(1 << 7) +#define SPEAR300_GPIO1_IRQ_MASK		(1 << 8) -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, -}; +#define SPEAR300_SHIRQ_RAS1_MASK	0x1FF -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, -		.mask = PMX_TIMER_1_2_MASK, -	}, -}; +#define SPEAR300_SOC_CONFIG_BASE	UL(0x99000000) -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, -}; -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 | -			ATA_PABX_I2S_MODE | CAML_LCDW_MODE | CAMU_LCD_MODE -			| CAMU_WLCD_MODE | CAML_LCD_MODE, -		.mask = PMX_UART0_MODEM_MASK, -	}, -}; - -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, -}; - -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 | -			PMX_TIMER_3_4_MASK, -	}, -}; - -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, -}; - -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 | -			HEND_WIFI_PHONE_MODE | CAML_LCDW_MODE | CAMU_LCD_MODE | -			CAMU_WLCD_MODE | CAML_LCD_MODE | ATA_PABX_WI2S_MODE | -			ATA_PABX_I2S_MODE, -		.mask = PMX_GPIO_PIN0_MASK | PMX_GPIO_PIN1_MASK | -			PMX_GPIO_PIN2_MASK | PMX_GPIO_PIN3_MASK | -			PMX_GPIO_PIN4_MASK | PMX_GPIO_PIN5_MASK, -	}, -}; - -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, -}; - -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 | -			HEND_WIFI_PHONE_MODE | CAML_LCDW_MODE | CAMU_LCD_MODE | -			CAMU_WLCD_MODE | CAML_LCD_MODE, -		.mask = PMX_GPIO_PIN0_MASK | PMX_GPIO_PIN1_MASK | -			PMX_GPIO_PIN2_MASK | PMX_GPIO_PIN3_MASK | -			PMX_GPIO_PIN4_MASK | PMX_GPIO_PIN5_MASK | PMX_MII_MASK, -	}, -}; - -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, -}; - -static struct pmx_dev_mode pmx_gpio1_modes[] = { -	{ -		.ids = PHOTO_FRAME_MODE, -		.mask = PMX_UART0_MODEM_MASK | PMX_TIMER_1_2_MASK | -			PMX_TIMER_3_4_MASK, -	}, -}; +/* SPEAr300 Virtual irq definitions */ +/* IRQs sharing IRQ_GEN_RAS_1 */ +#define SPEAR300_VIRQ_IT_PERS_S			(SPEAR3XX_VIRQ_START + 0) +#define SPEAR300_VIRQ_IT_CHANGE_S		(SPEAR3XX_VIRQ_START + 1) +#define SPEAR300_VIRQ_I2S			(SPEAR3XX_VIRQ_START + 2) +#define SPEAR300_VIRQ_TDM			(SPEAR3XX_VIRQ_START + 3) +#define SPEAR300_VIRQ_CAMERA_L			(SPEAR3XX_VIRQ_START + 4) +#define SPEAR300_VIRQ_CAMERA_F			(SPEAR3XX_VIRQ_START + 5) +#define SPEAR300_VIRQ_CAMERA_V			(SPEAR3XX_VIRQ_START + 6) +#define SPEAR300_VIRQ_KEYBOARD			(SPEAR3XX_VIRQ_START + 7) +#define SPEAR300_VIRQ_GPIO1			(SPEAR3XX_VIRQ_START + 8) -struct pmx_dev spear300_pmx_gpio1 = { -	.name = "arm gpio1", -	.modes = pmx_gpio1_modes, -	.mode_count = ARRAY_SIZE(pmx_gpio1_modes), -	.enb_on_reset = 1, -}; +/* IRQs sharing IRQ_GEN_RAS_3 */ +#define SPEAR300_IRQ_CLCD			SPEAR3XX_IRQ_GEN_RAS_3 -/* pmx driver structure */ -static struct pmx_driver pmx_driver = { -	.mode_reg = {.offset = MODE_CONFIG_REG, .mask = 0x0000000f}, -	.mux_reg = {.offset = PAD_MUX_CONFIG_REG, .mask = 0x00007fff}, -}; +/* IRQs sharing IRQ_INTRCOMM_RAS_ARM */ +#define SPEAR300_IRQ_SDHCI			SPEAR3XX_IRQ_INTRCOMM_RAS_ARM  /* spear3xx shared irq */  static struct shirq_dev_config shirq_ras1_config[] = { @@ -423,45 +113,238 @@ static struct spear_shirq shirq_ras1 = {  	},  }; -/* Add spear300 specific devices here */ -/* arm gpio1 device registration */ -static struct pl061_platform_data gpio1_plat_data = { -	.gpio_base	= 8, -	.irq_base	= SPEAR300_GPIO1_INT_BASE, +/* DMAC platform data's slave info */ +struct pl08x_channel_data spear300_dma_info[] = { +	{ +		.bus_id = "uart0_rx", +		.min_signal = 2, +		.max_signal = 2, +		.muxval = 0, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "uart0_tx", +		.min_signal = 3, +		.max_signal = 3, +		.muxval = 0, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ssp0_rx", +		.min_signal = 8, +		.max_signal = 8, +		.muxval = 0, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ssp0_tx", +		.min_signal = 9, +		.max_signal = 9, +		.muxval = 0, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "i2c_rx", +		.min_signal = 10, +		.max_signal = 10, +		.muxval = 0, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "i2c_tx", +		.min_signal = 11, +		.max_signal = 11, +		.muxval = 0, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "irda", +		.min_signal = 12, +		.max_signal = 12, +		.muxval = 0, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "adc", +		.min_signal = 13, +		.max_signal = 13, +		.muxval = 0, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "to_jpeg", +		.min_signal = 14, +		.max_signal = 14, +		.muxval = 0, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "from_jpeg", +		.min_signal = 15, +		.max_signal = 15, +		.muxval = 0, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ras0_rx", +		.min_signal = 0, +		.max_signal = 0, +		.muxval = 1, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ras0_tx", +		.min_signal = 1, +		.max_signal = 1, +		.muxval = 1, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ras1_rx", +		.min_signal = 2, +		.max_signal = 2, +		.muxval = 1, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ras1_tx", +		.min_signal = 3, +		.max_signal = 3, +		.muxval = 1, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ras2_rx", +		.min_signal = 4, +		.max_signal = 4, +		.muxval = 1, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ras2_tx", +		.min_signal = 5, +		.max_signal = 5, +		.muxval = 1, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ras3_rx", +		.min_signal = 6, +		.max_signal = 6, +		.muxval = 1, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ras3_tx", +		.min_signal = 7, +		.max_signal = 7, +		.muxval = 1, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ras4_rx", +		.min_signal = 8, +		.max_signal = 8, +		.muxval = 1, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ras4_tx", +		.min_signal = 9, +		.max_signal = 9, +		.muxval = 1, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ras5_rx", +		.min_signal = 10, +		.max_signal = 10, +		.muxval = 1, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ras5_tx", +		.min_signal = 11, +		.max_signal = 11, +		.muxval = 1, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ras6_rx", +		.min_signal = 12, +		.max_signal = 12, +		.muxval = 1, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ras6_tx", +		.min_signal = 13, +		.max_signal = 13, +		.muxval = 1, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ras7_rx", +		.min_signal = 14, +		.max_signal = 14, +		.muxval = 1, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	}, { +		.bus_id = "ras7_tx", +		.min_signal = 15, +		.max_signal = 15, +		.muxval = 1, +		.cctl = 0, +		.periph_buses = PL08X_AHB1, +	},  }; -AMBA_APB_DEVICE(spear300_gpio1, "gpio1", 0, SPEAR300_GPIO_BASE, -	{SPEAR300_VIRQ_GPIO1}, &gpio1_plat_data); +/* Add SPEAr300 auxdata to pass platform data */ +static struct of_dev_auxdata spear300_auxdata_lookup[] __initdata = { +	OF_DEV_AUXDATA("arm,pl022", SPEAR3XX_ICM1_SSP_BASE, NULL, +			&pl022_plat_data), +	OF_DEV_AUXDATA("arm,pl080", SPEAR3XX_ICM3_DMA_BASE, NULL, +			&pl080_plat_data), +	{} +}; -/* spear300 routines */ -void __init spear300_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, -		u8 pmx_dev_count) +static void __init spear300_dt_init(void)  { -	int ret = 0; +	int ret; + +	pl080_plat_data.slave_channels = spear300_dma_info; +	pl080_plat_data.num_slave_channels = ARRAY_SIZE(spear300_dma_info); -	/* call spear3xx family common init function */ -	spear3xx_init(); +	of_platform_populate(NULL, of_default_bus_match_table, +			spear300_auxdata_lookup, NULL);  	/* shared irq registration */  	shirq_ras1.regs.base = ioremap(SPEAR300_TELECOM_BASE, SZ_4K);  	if (shirq_ras1.regs.base) {  		ret = spear_shirq_register(&shirq_ras1);  		if (ret) -			printk(KERN_ERR "Error registering Shared IRQ\n"); +			pr_err("Error registering Shared IRQ\n");  	} +} -	/* pmx initialization */ -	pmx_driver.mode = pmx_mode; -	pmx_driver.devs = pmx_devs; -	pmx_driver.devs_count = pmx_dev_count; +static const char * const spear300_dt_board_compat[] = { +	"st,spear300", +	"st,spear300-evb", +	NULL, +}; -	pmx_driver.base = ioremap(SPEAR300_SOC_CONFIG_BASE, SZ_4K); -	if (pmx_driver.base) { -		ret = pmx_register(&pmx_driver); -		if (ret) -			printk(KERN_ERR "padmux: registration failed. err no" -					": %d\n", ret); -		/* Free Mapping, device selection already done */ -		iounmap(pmx_driver.base); -	} +static void __init spear300_map_io(void) +{ +	spear3xx_map_io();  } + +DT_MACHINE_START(SPEAR300_DT, "ST SPEAr300 SoC with Flattened Device Tree") +	.map_io		=	spear300_map_io, +	.init_irq	=	spear3xx_dt_init_irq, +	.handle_irq	=	vic_handle_irq, +	.timer		=	&spear3xx_timer, +	.init_machine	=	spear300_dt_init, +	.restart	=	spear_restart, +	.dt_compat	=	spear300_dt_board_compat, +MACHINE_END  |