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

Commit 6618c3ad authored by Ryan Mallon's avatar Ryan Mallon Committed by Russell King
Browse files

ARM: 6930/1: SPEAr3xx: Rework pmx_dev code to remove conflicts 



Prefix the pmx_devs to remove naming conflicts between the three
SPEAr3xx platforms. Also make pmx_driver static to each platform and
rework the init code to pass the devices rather than export the
pmx_driver structure.

Reviewed-by: default avatarStanley Miao <stanley.miao@windriver.com>
Signed-off-by: default avatarRyan Mallon <ryan@bluewatersys.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 61e72bca

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

+97 −96
Original line number Diff line number Diff line
@@ -60,81 +60,80 @@ void __init spear3xx_init(void); 
#define PMX_TIMER_1_2_MASK	(1 << 0)



/* pad mux devices */

extern struct pmx_dev pmx_firda;

extern struct pmx_dev pmx_i2c;

extern struct pmx_dev pmx_ssp_cs;

extern struct pmx_dev pmx_ssp;

extern struct pmx_dev pmx_mii;

extern struct pmx_dev pmx_gpio_pin0;

extern struct pmx_dev pmx_gpio_pin1;

extern struct pmx_dev pmx_gpio_pin2;

extern struct pmx_dev pmx_gpio_pin3;

extern struct pmx_dev pmx_gpio_pin4;

extern struct pmx_dev pmx_gpio_pin5;

extern struct pmx_dev pmx_uart0_modem;

extern struct pmx_dev pmx_uart0;

extern struct pmx_dev pmx_timer_3_4;

extern struct pmx_dev pmx_timer_1_2;

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 pmx_plgpio_0_1;

extern struct pmx_dev pmx_plgpio_2_3;

extern struct pmx_dev pmx_plgpio_4_5;

extern struct pmx_dev pmx_plgpio_6_9;

extern struct pmx_dev pmx_plgpio_10_27;

extern struct pmx_dev pmx_plgpio_28;

extern struct pmx_dev pmx_plgpio_29;

extern struct pmx_dev pmx_plgpio_30;

extern struct pmx_dev pmx_plgpio_31;

extern struct pmx_dev pmx_plgpio_32;

extern struct pmx_dev pmx_plgpio_33;

extern struct pmx_dev pmx_plgpio_34_36;

extern struct pmx_dev pmx_plgpio_37_42;

extern struct pmx_dev pmx_plgpio_43_44_47_48;

extern struct pmx_dev pmx_plgpio_45_46_49_50;

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



extern struct pmx_driver pmx_driver;



/* spear300 declarations */

#ifdef CONFIG_MACH_SPEAR300

/* Add spear300 machine device structure declarations here */

extern struct amba_device gpio1_device;



/* pad mux modes */

extern struct pmx_mode nand_mode;

extern struct pmx_mode nor_mode;

extern struct pmx_mode photo_frame_mode;

extern struct pmx_mode lend_ip_phone_mode;

extern struct pmx_mode hend_ip_phone_mode;

extern struct pmx_mode lend_wifi_phone_mode;

extern struct pmx_mode hend_wifi_phone_mode;

extern struct pmx_mode ata_pabx_wi2s_mode;

extern struct pmx_mode ata_pabx_i2s_mode;

extern struct pmx_mode caml_lcdw_mode;

extern struct pmx_mode camu_lcd_mode;

extern struct pmx_mode camu_wlcd_mode;

extern struct pmx_mode caml_lcd_mode;

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 pmx_fsmc_2_chips;

extern struct pmx_dev pmx_fsmc_4_chips;

extern struct pmx_dev pmx_keyboard;

extern struct pmx_dev pmx_clcd;

extern struct pmx_dev pmx_telecom_gpio;

extern struct pmx_dev pmx_telecom_tdm;

extern struct pmx_dev pmx_telecom_spi_cs_i2c_clk;

extern struct pmx_dev pmx_telecom_camera;

extern struct pmx_dev pmx_telecom_dac;

extern struct pmx_dev pmx_telecom_i2s;

extern struct pmx_dev pmx_telecom_boot_pins;

extern struct pmx_dev pmx_telecom_sdhci_4bit;

extern struct pmx_dev pmx_telecom_sdhci_8bit;

extern struct pmx_dev pmx_gpio1;

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 function declarations here */

void __init spear300_init(void);

void __init spear300_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs,

		u8 pmx_dev_count);



#endif /* CONFIG_MACH_SPEAR300 */
@@ -143,17 +142,18 @@ void __init spear300_init(void); 
/* Add spear310 machine device structure declarations here */



/* pad mux devices */

extern struct pmx_dev pmx_emi_cs_0_1_4_5;

extern struct pmx_dev pmx_emi_cs_2_3;

extern struct pmx_dev pmx_uart1;

extern struct pmx_dev pmx_uart2;

extern struct pmx_dev pmx_uart3_4_5;

extern struct pmx_dev pmx_fsmc;

extern struct pmx_dev pmx_rs485_0_1;

extern struct pmx_dev pmx_tdm0;

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 function declarations here */

void __init spear310_init(void);

void __init spear310_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs,

		u8 pmx_dev_count);



#endif /* CONFIG_MACH_SPEAR310 */
@@ -162,37 +162,38 @@ void __init spear310_init(void); 
/* Add spear320 machine device structure declarations here */



/* pad mux modes */

extern struct pmx_mode auto_net_smii_mode;

extern struct pmx_mode auto_net_mii_mode;

extern struct pmx_mode auto_exp_mode;

extern struct pmx_mode small_printers_mode;

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 pmx_clcd;

extern struct pmx_dev pmx_emi;

extern struct pmx_dev pmx_fsmc;

extern struct pmx_dev pmx_spp;

extern struct pmx_dev pmx_sdhci;

extern struct pmx_dev pmx_i2s;

extern struct pmx_dev pmx_uart1;

extern struct pmx_dev pmx_uart1_modem;

extern struct pmx_dev pmx_uart2;

extern struct pmx_dev pmx_touchscreen;

extern struct pmx_dev pmx_can;

extern struct pmx_dev pmx_sdhci_led;

extern struct pmx_dev pmx_pwm0;

extern struct pmx_dev pmx_pwm1;

extern struct pmx_dev pmx_pwm2;

extern struct pmx_dev pmx_pwm3;

extern struct pmx_dev pmx_ssp1;

extern struct pmx_dev pmx_ssp2;

extern struct pmx_dev pmx_mii1;

extern struct pmx_dev pmx_smii0;

extern struct pmx_dev pmx_smii1;

extern struct pmx_dev pmx_i2c1;

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 function declarations here */

void __init spear320_init(void);

void __init spear320_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs,

		u8 pmx_dev_count);



#endif /* CONFIG_MACH_SPEAR320 */

arch/arm/mach-spear3xx/spear300.c

+48 −43
Original line number Diff line number Diff line
@@ -40,86 +40,86 @@ 
#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,7 +365,7 @@ 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},

};
@@ -444,7 +444,8 @@ struct amba_device gpio1_device = { 
};



/* 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);

arch/arm/mach-spear3xx/spear300_evb.c

+11 −15
Original line number Diff line number Diff line
@@ -19,17 +19,17 @@ 
/* padmux devices to enable */

static struct pmx_dev *pmx_devs[] = {

	/* spear3xx specific devices */

	&pmx_i2c,

	&pmx_ssp_cs,

	&pmx_ssp,

	&pmx_mii,

	&pmx_uart0,

	&spear3xx_pmx_i2c,

	&spear3xx_pmx_ssp_cs,

	&spear3xx_pmx_ssp,

	&spear3xx_pmx_mii,

	&spear3xx_pmx_uart0,



	/* spear300 specific devices */

	&pmx_fsmc_2_chips,

	&pmx_clcd,

	&pmx_telecom_sdhci_4bit,

	&pmx_gpio1,

	&spear300_pmx_fsmc_2_chips,

	&spear300_pmx_clcd,

	&spear300_pmx_telecom_sdhci_4bit,

	&spear300_pmx_gpio1,

};



static struct amba_device *amba_devs[] __initdata = {
@@ -51,13 +51,9 @@ static void __init spear300_evb_init(void) 
{

	unsigned int i;



	/* padmux initialization, must be done before spear300_init */

	pmx_driver.mode = &photo_frame_mode;

	pmx_driver.devs = pmx_devs;

	pmx_driver.devs_count = ARRAY_SIZE(pmx_devs);



	/* call spear300 machine init function */

	spear300_init();

	spear300_init(&spear300_photo_frame_mode, pmx_devs,

			ARRAY_SIZE(pmx_devs));



	/* Add Platform Devices */

	platform_add_devices(plat_devs, ARRAY_SIZE(plat_devs));

arch/arm/mach-spear3xx/spear310.c

+23 −18
Original line number Diff line number Diff line
@@ -22,112 +22,112 @@ 
#define PAD_MUX_CONFIG_REG	0x08



/* devices */

struct pmx_dev_mode pmx_emi_cs_0_1_4_5_modes[] = {

static struct pmx_dev_mode pmx_emi_cs_0_1_4_5_modes[] = {

	{

		.ids = 0x00,

		.mask = PMX_TIMER_3_4_MASK,

	},

};



struct pmx_dev pmx_emi_cs_0_1_4_5 = {

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,

};



struct pmx_dev_mode pmx_emi_cs_2_3_modes[] = {

static struct pmx_dev_mode pmx_emi_cs_2_3_modes[] = {

	{

		.ids = 0x00,

		.mask = PMX_TIMER_1_2_MASK,

	},

};



struct pmx_dev pmx_emi_cs_2_3 = {

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,

};



struct pmx_dev_mode pmx_uart1_modes[] = {

static struct pmx_dev_mode pmx_uart1_modes[] = {

	{

		.ids = 0x00,

		.mask = PMX_FIRDA_MASK,

	},

};



struct pmx_dev pmx_uart1 = {

struct pmx_dev spear310_pmx_uart1 = {

	.name = "uart1",

	.modes = pmx_uart1_modes,

	.mode_count = ARRAY_SIZE(pmx_uart1_modes),

	.enb_on_reset = 1,

};



struct pmx_dev_mode pmx_uart2_modes[] = {

static struct pmx_dev_mode pmx_uart2_modes[] = {

	{

		.ids = 0x00,

		.mask = PMX_TIMER_1_2_MASK,

	},

};



struct pmx_dev pmx_uart2 = {

struct pmx_dev spear310_pmx_uart2 = {

	.name = "uart2",

	.modes = pmx_uart2_modes,

	.mode_count = ARRAY_SIZE(pmx_uart2_modes),

	.enb_on_reset = 1,

};



struct pmx_dev_mode pmx_uart3_4_5_modes[] = {

static struct pmx_dev_mode pmx_uart3_4_5_modes[] = {

	{

		.ids = 0x00,

		.mask = PMX_UART0_MODEM_MASK,

	},

};



struct pmx_dev pmx_uart3_4_5 = {

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,

};



struct pmx_dev_mode pmx_fsmc_modes[] = {

static struct pmx_dev_mode pmx_fsmc_modes[] = {

	{

		.ids = 0x00,

		.mask = PMX_SSP_CS_MASK,

	},

};



struct pmx_dev pmx_fsmc = {

struct pmx_dev spear310_pmx_fsmc = {

	.name = "fsmc",

	.modes = pmx_fsmc_modes,

	.mode_count = ARRAY_SIZE(pmx_fsmc_modes),

	.enb_on_reset = 1,

};



struct pmx_dev_mode pmx_rs485_0_1_modes[] = {

static struct pmx_dev_mode pmx_rs485_0_1_modes[] = {

	{

		.ids = 0x00,

		.mask = PMX_MII_MASK,

	},

};



struct pmx_dev pmx_rs485_0_1 = {

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,

};



struct pmx_dev_mode pmx_tdm0_modes[] = {

static struct pmx_dev_mode pmx_tdm0_modes[] = {

	{

		.ids = 0x00,

		.mask = PMX_MII_MASK,

	},

};



struct pmx_dev pmx_tdm0 = {

struct pmx_dev spear310_pmx_tdm0 = {

	.name = "tdm0",

	.modes = pmx_tdm0_modes,

	.mode_count = ARRAY_SIZE(pmx_tdm0_modes),
@@ -135,7 +135,7 @@ struct pmx_dev pmx_tdm0 = { 
};



/* pmx driver structure */

struct pmx_driver pmx_driver = {

static struct pmx_driver pmx_driver = {

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

};
@@ -258,7 +258,8 @@ static struct spear_shirq shirq_intrcomm_ras = { 
/* Add spear310 specific devices here */



/* spear310 routines */

void __init spear310_init(void)

void __init spear310_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs,

		u8 pmx_dev_count)

{

	void __iomem *base;

	int ret = 0;
@@ -296,6 +297,10 @@ void __init spear310_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",

arch/arm/mach-spear3xx/spear310_evb.c

+18 −23
Original line number Diff line number Diff line
@@ -19,25 +19,25 @@ 
/* padmux devices to enable */

static struct pmx_dev *pmx_devs[] = {

	/* spear3xx specific devices */

	&pmx_i2c,

	&pmx_ssp,

	&pmx_gpio_pin0,

	&pmx_gpio_pin1,

	&pmx_gpio_pin2,

	&pmx_gpio_pin3,

	&pmx_gpio_pin4,

	&pmx_gpio_pin5,

	&pmx_uart0,

	&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 */

	&pmx_emi_cs_0_1_4_5,

	&pmx_emi_cs_2_3,

	&pmx_uart1,

	&pmx_uart2,

	&pmx_uart3_4_5,

	&pmx_fsmc,

	&pmx_rs485_0_1,

	&pmx_tdm0,

	&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,

};



static struct amba_device *amba_devs[] __initdata = {
@@ -58,13 +58,8 @@ static void __init spear310_evb_init(void) 
{

	unsigned int i;



	/* padmux initialization, must be done before spear310_init */

	pmx_driver.mode = NULL;

	pmx_driver.devs = pmx_devs;

	pmx_driver.devs_count = ARRAY_SIZE(pmx_devs);



	/* call spear310 machine init function */

	spear310_init();

	spear310_init(NULL, pmx_devs, ARRAY_SIZE(pmx_devs));



	/* Add Platform Devices */

	platform_add_devices(plat_devs, ARRAY_SIZE(plat_devs));