dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

ARM: 6789/1: SPEAr3xx: Rename sdio to sdhci 

Device name of SD/MMC/SDIO controller in linux is sdhci. To maintain
consistency across all spear code, rename sdio to sdhci.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
viresh kumar 2011-03-07 05:57:03 +01:00 committed by Russell King
parent 02aa06bc49
commit 069580b831
8 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-spear3xx/include/mach/generic.h
View File

@ -129,8 +129,8 @@ extern struct pmx_dev pmx_telecom_camera;
extern struct pmx_dev pmx_telecom_dac; extern struct pmx_dev pmx_telecom_dac;
extern struct pmx_dev pmx_telecom_i2s; extern struct pmx_dev pmx_telecom_i2s;
extern struct pmx_dev pmx_telecom_boot_pins; extern struct pmx_dev pmx_telecom_boot_pins;
extern struct pmx_dev pmx_telecom_sdio_4bit; extern struct pmx_dev pmx_telecom_sdhci_4bit;
extern struct pmx_dev pmx_telecom_sdio_8bit; extern struct pmx_dev pmx_telecom_sdhci_8bit;
extern struct pmx_dev pmx_gpio1; extern struct pmx_dev pmx_gpio1;
/* Add spear300 machine function declarations here */ /* Add spear300 machine function declarations here */
@ -172,14 +172,14 @@ extern struct pmx_dev pmx_clcd;
extern struct pmx_dev pmx_emi; extern struct pmx_dev pmx_emi;
extern struct pmx_dev pmx_fsmc; extern struct pmx_dev pmx_fsmc;
extern struct pmx_dev pmx_spp; extern struct pmx_dev pmx_spp;
extern struct pmx_dev pmx_sdio; extern struct pmx_dev pmx_sdhci;
extern struct pmx_dev pmx_i2s; extern struct pmx_dev pmx_i2s;
extern struct pmx_dev pmx_uart1; extern struct pmx_dev pmx_uart1;
extern struct pmx_dev pmx_uart1_modem; extern struct pmx_dev pmx_uart1_modem;
extern struct pmx_dev pmx_uart2; extern struct pmx_dev pmx_uart2;
extern struct pmx_dev pmx_touchscreen; extern struct pmx_dev pmx_touchscreen;
extern struct pmx_dev pmx_can; extern struct pmx_dev pmx_can;
extern struct pmx_dev pmx_sdio_led; extern struct pmx_dev pmx_sdhci_led;
extern struct pmx_dev pmx_pwm0; extern struct pmx_dev pmx_pwm0;
extern struct pmx_dev pmx_pwm1; extern struct pmx_dev pmx_pwm1;
extern struct pmx_dev pmx_pwm2; extern struct pmx_dev pmx_pwm2;

4
arch/arm/mach-spear3xx/include/mach/irqs.h
View File

@ -69,7 +69,7 @@
#define IRQ_CLCD IRQ_GEN_RAS_3 #define IRQ_CLCD IRQ_GEN_RAS_3
/* IRQs sharing IRQ_INTRCOMM_RAS_ARM */ /* IRQs sharing IRQ_INTRCOMM_RAS_ARM */
#define IRQ_SDIO IRQ_INTRCOMM_RAS_ARM #define IRQ_SDHCI IRQ_INTRCOMM_RAS_ARM
/* GPIO pins virtual irqs */ /* GPIO pins virtual irqs */
#define SPEAR_GPIO_INT_BASE (VIRQ_START + 9) #define SPEAR_GPIO_INT_BASE (VIRQ_START + 9)
@ -115,7 +115,7 @@
#define VIRQ_SPP (VIRQ_START + 2) #define VIRQ_SPP (VIRQ_START + 2)
/* IRQs sharing IRQ_GEN_RAS_2 */ /* IRQs sharing IRQ_GEN_RAS_2 */
#define IRQ_SDIO IRQ_GEN_RAS_2 #define IRQ_SDHCI IRQ_GEN_RAS_2
/* IRQs sharing IRQ_GEN_RAS_3 */ /* IRQs sharing IRQ_GEN_RAS_3 */
#define VIRQ_PLGPIO (VIRQ_START + 3) #define VIRQ_PLGPIO (VIRQ_START + 3)

4
arch/arm/mach-spear3xx/include/mach/spear300.h
View File

@ -39,8 +39,8 @@
#define SPEAR300_CLCD_BASE 0x60000000 #define SPEAR300_CLCD_BASE 0x60000000
#define SPEAR300_CLCD_SIZE 0x10000000 #define SPEAR300_CLCD_SIZE 0x10000000
#define SPEAR300_SDIO_BASE 0x70000000 #define SPEAR300_SDHCI_BASE 0x70000000
#define SPEAR300_SDIO_SIZE 0x10000000 #define SPEAR300_SDHCI_SIZE 0x10000000
#define SPEAR300_NAND_0_BASE 0x80000000 #define SPEAR300_NAND_0_BASE 0x80000000
#define SPEAR300_NAND_0_SIZE 0x04000000 #define SPEAR300_NAND_0_SIZE 0x04000000

6
arch/arm/mach-spear3xx/include/mach/spear320.h
View File

@ -25,8 +25,8 @@
#define SPEAR320_I2S_BASE 0x60000000 #define SPEAR320_I2S_BASE 0x60000000
#define SPEAR320_I2S_SIZE 0x10000000 #define SPEAR320_I2S_SIZE 0x10000000
#define SPEAR320_SDIO_BASE 0x70000000 #define SPEAR320_SDHCI_BASE 0x70000000
#define SPEAR320_SDIO_SIZE 0x10000000 #define SPEAR320_SDHCI_SIZE 0x10000000
#define SPEAR320_CLCD_BASE 0x90000000 #define SPEAR320_CLCD_BASE 0x90000000
#define SPEAR320_CLCD_SIZE 0x10000000 #define SPEAR320_CLCD_SIZE 0x10000000
@ -74,7 +74,7 @@
#define EMI_IRQ_MASK (1 << 7) #define EMI_IRQ_MASK (1 << 7)
#define CLCD_IRQ_MASK (1 << 8) #define CLCD_IRQ_MASK (1 << 8)
#define SPP_IRQ_MASK (1 << 9) #define SPP_IRQ_MASK (1 << 9)
#define SDIO_IRQ_MASK (1 << 10) #define SDHCI_IRQ_MASK (1 << 10)
#define CAN_U_IRQ_MASK (1 << 11) #define CAN_U_IRQ_MASK (1 << 11)
#define CAN_L_IRQ_MASK (1 << 12) #define CAN_L_IRQ_MASK (1 << 12)
#define UART1_IRQ_MASK (1 << 13) #define UART1_IRQ_MASK (1 << 13)

20
arch/arm/mach-spear3xx/spear300.c
View File

@ -310,7 +310,7 @@ struct pmx_dev pmx_telecom_boot_pins = {
.enb_on_reset = 1, .enb_on_reset = 1,
}; };
struct pmx_dev_mode pmx_telecom_sdio_4bit_modes[] = { struct pmx_dev_mode pmx_telecom_sdhci_4bit_modes[] = {
{ {
.ids = PHOTO_FRAME_MODE | LEND_IP_PHONE_MODE | .ids = PHOTO_FRAME_MODE | LEND_IP_PHONE_MODE |
HEND_IP_PHONE_MODE | LEND_WIFI_PHONE_MODE | HEND_IP_PHONE_MODE | LEND_WIFI_PHONE_MODE |
@ -323,14 +323,14 @@ struct pmx_dev_mode pmx_telecom_sdio_4bit_modes[] = {
}, },
}; };
struct pmx_dev pmx_telecom_sdio_4bit = { struct pmx_dev pmx_telecom_sdhci_4bit = {
.name = "telecom_sdio_4bit", .name = "telecom_sdhci_4bit",
.modes = pmx_telecom_sdio_4bit_modes, .modes = pmx_telecom_sdhci_4bit_modes,
.mode_count = ARRAY_SIZE(pmx_telecom_sdio_4bit_modes), .mode_count = ARRAY_SIZE(pmx_telecom_sdhci_4bit_modes),
.enb_on_reset = 1, .enb_on_reset = 1,
}; };
struct pmx_dev_mode pmx_telecom_sdio_8bit_modes[] = { struct pmx_dev_mode pmx_telecom_sdhci_8bit_modes[] = {
{ {
.ids = PHOTO_FRAME_MODE | LEND_IP_PHONE_MODE | .ids = PHOTO_FRAME_MODE | LEND_IP_PHONE_MODE |
HEND_IP_PHONE_MODE | LEND_WIFI_PHONE_MODE | HEND_IP_PHONE_MODE | LEND_WIFI_PHONE_MODE |
@ -342,10 +342,10 @@ struct pmx_dev_mode pmx_telecom_sdio_8bit_modes[] = {
}, },
}; };
struct pmx_dev pmx_telecom_sdio_8bit = { struct pmx_dev pmx_telecom_sdhci_8bit = {
.name = "telecom_sdio_8bit", .name = "telecom_sdhci_8bit",
.modes = pmx_telecom_sdio_8bit_modes, .modes = pmx_telecom_sdhci_8bit_modes,
.mode_count = ARRAY_SIZE(pmx_telecom_sdio_8bit_modes), .mode_count = ARRAY_SIZE(pmx_telecom_sdhci_8bit_modes),
.enb_on_reset = 1, .enb_on_reset = 1,
}; };

2
arch/arm/mach-spear3xx/spear300_evb.c
View File

@ -28,7 +28,7 @@ static struct pmx_dev *pmx_devs[] = {
/* spear300 specific devices */ /* spear300 specific devices */
&pmx_fsmc_2_chips, &pmx_fsmc_2_chips,
&pmx_clcd, &pmx_clcd,
&pmx_telecom_sdio_4bit, &pmx_telecom_sdhci_4bit,
&pmx_gpio1, &pmx_gpio1,
}; };

20
arch/arm/mach-spear3xx/spear320.c
View File

@ -110,7 +110,7 @@ struct pmx_dev pmx_spp = {
.enb_on_reset = 1, .enb_on_reset = 1,
}; };
struct pmx_dev_mode pmx_sdio_modes[] = { struct pmx_dev_mode pmx_sdhci_modes[] = {
{ {
.ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE | .ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE |
SMALL_PRINTERS_MODE, SMALL_PRINTERS_MODE,
@ -118,10 +118,10 @@ struct pmx_dev_mode pmx_sdio_modes[] = {
}, },
}; };
struct pmx_dev pmx_sdio = { struct pmx_dev pmx_sdhci = {
.name = "sdio", .name = "sdhci",
.modes = pmx_sdio_modes, .modes = pmx_sdhci_modes,
.mode_count = ARRAY_SIZE(pmx_sdio_modes), .mode_count = ARRAY_SIZE(pmx_sdhci_modes),
.enb_on_reset = 1, .enb_on_reset = 1,
}; };
@ -215,17 +215,17 @@ struct pmx_dev pmx_can = {
.enb_on_reset = 1, .enb_on_reset = 1,
}; };
struct pmx_dev_mode pmx_sdio_led_modes[] = { struct pmx_dev_mode pmx_sdhci_led_modes[] = {
{ {
.ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE, .ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE,
.mask = PMX_SSP_CS_MASK, .mask = PMX_SSP_CS_MASK,
}, },
}; };
struct pmx_dev pmx_sdio_led = { struct pmx_dev pmx_sdhci_led = {
.name = "sdio_led", .name = "sdhci_led",
.modes = pmx_sdio_led_modes, .modes = pmx_sdhci_led_modes,
.mode_count = ARRAY_SIZE(pmx_sdio_led_modes), .mode_count = ARRAY_SIZE(pmx_sdhci_led_modes),
.enb_on_reset = 1, .enb_on_reset = 1,
}; };

2
arch/arm/mach-spear3xx/spear320_evb.c
View File

@ -26,7 +26,7 @@ static struct pmx_dev *pmx_devs[] = {
/* spear320 specific devices */ /* spear320 specific devices */
&pmx_fsmc, &pmx_fsmc,
&pmx_sdio, &pmx_sdhci,
&pmx_i2s, &pmx_i2s,
&pmx_uart1, &pmx_uart1,
&pmx_uart2, &pmx_uart2,