Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8076dd1b authored by Viresh Kumar's avatar Viresh Kumar Committed by Arnd Bergmann
Browse files

SPEAr: Remove existing padmux support for SPEAr 



We must use pinctrl framework instead of defining per SoC pinmux drivers. This
patch removes existing padmux support present for SPEAr platform.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarStephen Warren <swarren@wwwdotorg.org>
parent 52130b60

arch/arm/mach-spear3xx/include/mach/generic.h

+0 −128
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/amba/bus.h>

#include <asm/mach/time.h>

#include <asm/mach/map.h>

#include <plat/padmux.h>



/* spear3xx declarations */

/*
@@ -43,147 +42,20 @@ void __init spear3xx_dt_init_irq(void); 


void spear_restart(char, const char *);



/* pad mux declarations */

#define PMX_FIRDA_MASK		(1 << 14)

#define PMX_I2C_MASK		(1 << 13)

#define PMX_SSP_CS_MASK		(1 << 12)

#define PMX_SSP_MASK		(1 << 11)

#define PMX_MII_MASK		(1 << 10)

#define PMX_GPIO_PIN0_MASK	(1 << 9)

#define PMX_GPIO_PIN1_MASK	(1 << 8)

#define PMX_GPIO_PIN2_MASK	(1 << 7)

#define PMX_GPIO_PIN3_MASK	(1 << 6)

#define PMX_GPIO_PIN4_MASK	(1 << 5)

#define PMX_GPIO_PIN5_MASK	(1 << 4)

#define PMX_UART0_MODEM_MASK	(1 << 3)

#define PMX_UART0_MASK		(1 << 2)

#define PMX_TIMER_3_4_MASK	(1 << 1)

#define PMX_TIMER_1_2_MASK	(1 << 0)



/* pad mux devices */

extern struct pmx_dev spear3xx_pmx_firda;

extern struct pmx_dev spear3xx_pmx_i2c;

extern struct pmx_dev spear3xx_pmx_ssp_cs;

extern struct pmx_dev spear3xx_pmx_ssp;

extern struct pmx_dev spear3xx_pmx_mii;

extern struct pmx_dev spear3xx_pmx_gpio_pin0;

extern struct pmx_dev spear3xx_pmx_gpio_pin1;

extern struct pmx_dev spear3xx_pmx_gpio_pin2;

extern struct pmx_dev spear3xx_pmx_gpio_pin3;

extern struct pmx_dev spear3xx_pmx_gpio_pin4;

extern struct pmx_dev spear3xx_pmx_gpio_pin5;

extern struct pmx_dev spear3xx_pmx_uart0_modem;

extern struct pmx_dev spear3xx_pmx_uart0;

extern struct pmx_dev spear3xx_pmx_timer_3_4;

extern struct pmx_dev spear3xx_pmx_timer_1_2;



#if defined(CONFIG_MACH_SPEAR310) || defined(CONFIG_MACH_SPEAR320)

/* padmux plgpio devices */

extern struct pmx_dev spear3xx_pmx_plgpio_0_1;

extern struct pmx_dev spear3xx_pmx_plgpio_2_3;

extern struct pmx_dev spear3xx_pmx_plgpio_4_5;

extern struct pmx_dev spear3xx_pmx_plgpio_6_9;

extern struct pmx_dev spear3xx_pmx_plgpio_10_27;

extern struct pmx_dev spear3xx_pmx_plgpio_28;

extern struct pmx_dev spear3xx_pmx_plgpio_29;

extern struct pmx_dev spear3xx_pmx_plgpio_30;

extern struct pmx_dev spear3xx_pmx_plgpio_31;

extern struct pmx_dev spear3xx_pmx_plgpio_32;

extern struct pmx_dev spear3xx_pmx_plgpio_33;

extern struct pmx_dev spear3xx_pmx_plgpio_34_36;

extern struct pmx_dev spear3xx_pmx_plgpio_37_42;

extern struct pmx_dev spear3xx_pmx_plgpio_43_44_47_48;

extern struct pmx_dev spear3xx_pmx_plgpio_45_46_49_50;

#endif



/* spear300 declarations */

#ifdef CONFIG_MACH_SPEAR300

/* pad mux modes */

extern struct pmx_mode spear300_nand_mode;

extern struct pmx_mode spear300_nor_mode;

extern struct pmx_mode spear300_photo_frame_mode;

extern struct pmx_mode spear300_lend_ip_phone_mode;

extern struct pmx_mode spear300_hend_ip_phone_mode;

extern struct pmx_mode spear300_lend_wifi_phone_mode;

extern struct pmx_mode spear300_hend_wifi_phone_mode;

extern struct pmx_mode spear300_ata_pabx_wi2s_mode;

extern struct pmx_mode spear300_ata_pabx_i2s_mode;

extern struct pmx_mode spear300_caml_lcdw_mode;

extern struct pmx_mode spear300_camu_lcd_mode;

extern struct pmx_mode spear300_camu_wlcd_mode;

extern struct pmx_mode spear300_caml_lcd_mode;



/* pad mux devices */

extern struct pmx_dev spear300_pmx_fsmc_2_chips;

extern struct pmx_dev spear300_pmx_fsmc_4_chips;

extern struct pmx_dev spear300_pmx_keyboard;

extern struct pmx_dev spear300_pmx_clcd;

extern struct pmx_dev spear300_pmx_telecom_gpio;

extern struct pmx_dev spear300_pmx_telecom_tdm;

extern struct pmx_dev spear300_pmx_telecom_spi_cs_i2c_clk;

extern struct pmx_dev spear300_pmx_telecom_camera;

extern struct pmx_dev spear300_pmx_telecom_dac;

extern struct pmx_dev spear300_pmx_telecom_i2s;

extern struct pmx_dev spear300_pmx_telecom_boot_pins;

extern struct pmx_dev spear300_pmx_telecom_sdhci_4bit;

extern struct pmx_dev spear300_pmx_telecom_sdhci_8bit;

extern struct pmx_dev spear300_pmx_gpio1;



/* Add spear300 machine declarations here */

void __init spear300_clk_init(void);



#endif /* CONFIG_MACH_SPEAR300 */



/* spear310 declarations */

#ifdef CONFIG_MACH_SPEAR310

/* pad mux devices */

extern struct pmx_dev spear310_pmx_emi_cs_0_1_4_5;

extern struct pmx_dev spear310_pmx_emi_cs_2_3;

extern struct pmx_dev spear310_pmx_uart1;

extern struct pmx_dev spear310_pmx_uart2;

extern struct pmx_dev spear310_pmx_uart3_4_5;

extern struct pmx_dev spear310_pmx_fsmc;

extern struct pmx_dev spear310_pmx_rs485_0_1;

extern struct pmx_dev spear310_pmx_tdm0;



/* Add spear310 machine declarations here */

void __init spear310_clk_init(void);



#endif /* CONFIG_MACH_SPEAR310 */



/* spear320 declarations */

#ifdef CONFIG_MACH_SPEAR320

/* pad mux modes */

extern struct pmx_mode spear320_auto_net_smii_mode;

extern struct pmx_mode spear320_auto_net_mii_mode;

extern struct pmx_mode spear320_auto_exp_mode;

extern struct pmx_mode spear320_small_printers_mode;



/* pad mux devices */

extern struct pmx_dev spear320_pmx_clcd;

extern struct pmx_dev spear320_pmx_emi;

extern struct pmx_dev spear320_pmx_fsmc;

extern struct pmx_dev spear320_pmx_spp;

extern struct pmx_dev spear320_pmx_sdhci;

extern struct pmx_dev spear320_pmx_i2s;

extern struct pmx_dev spear320_pmx_uart1;

extern struct pmx_dev spear320_pmx_uart1_modem;

extern struct pmx_dev spear320_pmx_uart2;

extern struct pmx_dev spear320_pmx_touchscreen;

extern struct pmx_dev spear320_pmx_can;

extern struct pmx_dev spear320_pmx_sdhci_led;

extern struct pmx_dev spear320_pmx_pwm0;

extern struct pmx_dev spear320_pmx_pwm1;

extern struct pmx_dev spear320_pmx_pwm2;

extern struct pmx_dev spear320_pmx_pwm3;

extern struct pmx_dev spear320_pmx_ssp1;

extern struct pmx_dev spear320_pmx_ssp2;

extern struct pmx_dev spear320_pmx_mii1;

extern struct pmx_dev spear320_pmx_smii0;

extern struct pmx_dev spear320_pmx_smii1;

extern struct pmx_dev spear320_pmx_i2c1;



/* Add spear320 machine declarations here */

void __init spear320_clk_init(void);



#endif /* CONFIG_MACH_SPEAR320 */

arch/arm/mach-spear3xx/spear300.c

+1 −388
Original line number Diff line number Diff line
@@ -21,357 +21,6 @@ 
#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,

	},

};



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,

};



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,

	},

};



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,

};



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,

	},

};



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,

	},

};



struct pmx_dev spear300_pmx_gpio1 = {

	.name = "arm gpio1",

	.modes = pmx_gpio1_modes,

	.mode_count = ARRAY_SIZE(pmx_gpio1_modes),

	.enb_on_reset = 1,

};



/* 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},

};



/* spear3xx shared irq */

static struct shirq_dev_config shirq_ras1_config[] = {

	{
@@ -425,22 +74,6 @@ static struct spear_shirq shirq_ras1 = { 
	},

};



/* padmux devices to enable */

static struct pmx_dev *spear300_evb_pmx_devs[] = {

	/* spear3xx specific devices */

	&spear3xx_pmx_i2c,

	&spear3xx_pmx_ssp_cs,

	&spear3xx_pmx_ssp,

	&spear3xx_pmx_mii,

	&spear3xx_pmx_uart0,



	/* spear300 specific devices */

	&spear300_pmx_fsmc_2_chips,

	&spear300_pmx_clcd,

	&spear300_pmx_telecom_sdhci_4bit,

	&spear300_pmx_gpio1,

};



/* DMAC platform data's slave info */

struct pl08x_channel_data spear300_dma_info[] = {

	{
@@ -639,7 +272,7 @@ static struct of_dev_auxdata spear300_auxdata_lookup[] __initdata = { 


static void __init spear300_dt_init(void)

{

	int ret = -EINVAL;

	int ret;



	pl080_plat_data.slave_channels = spear300_dma_info;

	pl080_plat_data.num_slave_channels = ARRAY_SIZE(spear300_dma_info);
@@ -654,26 +287,6 @@ static void __init spear300_dt_init(void) 
		if (ret)

			pr_err("Error registering Shared IRQ\n");

	}



	if (of_machine_is_compatible("st,spear300-evb")) {

		/* pmx initialization */

		pmx_driver.mode = &spear300_photo_frame_mode;

		pmx_driver.devs = spear300_evb_pmx_devs;

		pmx_driver.devs_count = ARRAY_SIZE(spear300_evb_pmx_devs);



		pmx_driver.base = ioremap(SPEAR300_SOC_CONFIG_BASE, SZ_4K);

		if (pmx_driver.base) {

			ret = pmx_register(&pmx_driver);

			if (ret)

				pr_err("padmux: registration failed. err no: %d\n",

						ret);

			/* Free Mapping, device selection already done */

			iounmap(pmx_driver.base);

		}



		if (ret)

			pr_err("Initialization Failed");

	}

}



static const char * const spear300_dt_board_compat[] = {

arch/arm/mach-spear3xx/spear310.c

+1 −160
Original line number Diff line number Diff line
@@ -22,128 +22,6 @@ 
#include <mach/generic.h>

#include <mach/hardware.h>



/* pad multiplexing support */

/* muxing registers */

#define PAD_MUX_CONFIG_REG	0x08



/* devices */

static struct pmx_dev_mode pmx_emi_cs_0_1_4_5_modes[] = {

	{

		.ids = 0x00,

		.mask = PMX_TIMER_3_4_MASK,

	},

};



struct pmx_dev spear310_pmx_emi_cs_0_1_4_5 = {

	.name = "emi_cs_0_1_4_5",

	.modes = pmx_emi_cs_0_1_4_5_modes,

	.mode_count = ARRAY_SIZE(pmx_emi_cs_0_1_4_5_modes),

	.enb_on_reset = 1,

};



static struct pmx_dev_mode pmx_emi_cs_2_3_modes[] = {

	{

		.ids = 0x00,

		.mask = PMX_TIMER_1_2_MASK,

	},

};



struct pmx_dev spear310_pmx_emi_cs_2_3 = {

	.name = "emi_cs_2_3",

	.modes = pmx_emi_cs_2_3_modes,

	.mode_count = ARRAY_SIZE(pmx_emi_cs_2_3_modes),

	.enb_on_reset = 1,

};



static struct pmx_dev_mode pmx_uart1_modes[] = {

	{

		.ids = 0x00,

		.mask = PMX_FIRDA_MASK,

	},

};



struct pmx_dev spear310_pmx_uart1 = {

	.name = "uart1",

	.modes = pmx_uart1_modes,

	.mode_count = ARRAY_SIZE(pmx_uart1_modes),

	.enb_on_reset = 1,

};



static struct pmx_dev_mode pmx_uart2_modes[] = {

	{

		.ids = 0x00,

		.mask = PMX_TIMER_1_2_MASK,

	},

};



struct pmx_dev spear310_pmx_uart2 = {

	.name = "uart2",

	.modes = pmx_uart2_modes,

	.mode_count = ARRAY_SIZE(pmx_uart2_modes),

	.enb_on_reset = 1,

};



static struct pmx_dev_mode pmx_uart3_4_5_modes[] = {

	{

		.ids = 0x00,

		.mask = PMX_UART0_MODEM_MASK,

	},

};



struct pmx_dev spear310_pmx_uart3_4_5 = {

	.name = "uart3_4_5",

	.modes = pmx_uart3_4_5_modes,

	.mode_count = ARRAY_SIZE(pmx_uart3_4_5_modes),

	.enb_on_reset = 1,

};



static struct pmx_dev_mode pmx_fsmc_modes[] = {

	{

		.ids = 0x00,

		.mask = PMX_SSP_CS_MASK,

	},

};



struct pmx_dev spear310_pmx_fsmc = {

	.name = "fsmc",

	.modes = pmx_fsmc_modes,

	.mode_count = ARRAY_SIZE(pmx_fsmc_modes),

	.enb_on_reset = 1,

};



static struct pmx_dev_mode pmx_rs485_0_1_modes[] = {

	{

		.ids = 0x00,

		.mask = PMX_MII_MASK,

	},

};



struct pmx_dev spear310_pmx_rs485_0_1 = {

	.name = "rs485_0_1",

	.modes = pmx_rs485_0_1_modes,

	.mode_count = ARRAY_SIZE(pmx_rs485_0_1_modes),

	.enb_on_reset = 1,

};



static struct pmx_dev_mode pmx_tdm0_modes[] = {

	{

		.ids = 0x00,

		.mask = PMX_MII_MASK,

	},

};



struct pmx_dev spear310_pmx_tdm0 = {

	.name = "tdm0",

	.modes = pmx_tdm0_modes,

	.mode_count = ARRAY_SIZE(pmx_tdm0_modes),

	.enb_on_reset = 1,

};



/* pmx driver structure */

static struct pmx_driver pmx_driver = {

	.mux_reg = {.offset = PAD_MUX_CONFIG_REG, .mask = 0x00007fff},

};



/* spear3xx shared irq */

static struct shirq_dev_config shirq_ras1_config[] = {

	{
@@ -260,30 +138,6 @@ static struct spear_shirq shirq_intrcomm_ras = { 
	},

};



/* padmux devices to enable */

static struct pmx_dev *spear310_evb_pmx_devs[] = {

	/* spear3xx specific devices */

	&spear3xx_pmx_i2c,

	&spear3xx_pmx_ssp,

	&spear3xx_pmx_gpio_pin0,

	&spear3xx_pmx_gpio_pin1,

	&spear3xx_pmx_gpio_pin2,

	&spear3xx_pmx_gpio_pin3,

	&spear3xx_pmx_gpio_pin4,

	&spear3xx_pmx_gpio_pin5,

	&spear3xx_pmx_uart0,



	/* spear310 specific devices */

	&spear310_pmx_emi_cs_0_1_4_5,

	&spear310_pmx_emi_cs_2_3,

	&spear310_pmx_uart1,

	&spear310_pmx_uart2,

	&spear310_pmx_uart3_4_5,

	&spear310_pmx_fsmc,

	&spear310_pmx_rs485_0_1,

	&spear310_pmx_tdm0,

};



/* DMAC platform data's slave info */

struct pl08x_channel_data spear310_dma_info[] = {

	{
@@ -518,7 +372,7 @@ static struct of_dev_auxdata spear310_auxdata_lookup[] __initdata = { 
static void __init spear310_dt_init(void)

{

	void __iomem *base;

	int ret = 0;

	int ret;



	pl080_plat_data.slave_channels = spear310_dma_info;

	pl080_plat_data.num_slave_channels = ARRAY_SIZE(spear310_dma_info);
@@ -553,19 +407,6 @@ static void __init spear310_dt_init(void) 
		if (ret)

			pr_err("Error registering Shared IRQ 4\n");

	}



	if (of_machine_is_compatible("st,spear310-evb")) {

		/* pmx initialization */

		pmx_driver.base = base;

		pmx_driver.mode = NULL;

		pmx_driver.devs = spear310_evb_pmx_devs;

		pmx_driver.devs_count = ARRAY_SIZE(spear310_evb_pmx_devs);



		ret = pmx_register(&pmx_driver);

		if (ret)

			pr_err("padmux: registration failed. err no: %d\n",

					ret);

	}

}



static const char * const spear310_dt_board_compat[] = {

arch/arm/mach-spear3xx/spear320.c

+1 −402

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-spear3xx/spear3xx.c

+0 −425

File changed.

Preview size limit exceeded, changes collapsed.