diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-25 10:34:58 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-03-08 12:30:58 +0100 |
commit | 11acf708009c45e557b98700d95e81d156e47898 (patch) | |
tree | 1b99e786a580b31053fc20a78ea5d29f3ac271ce /arch | |
parent | bbee3017c755627013f61a36715c42fbfae44277 (diff) | |
download | barebox-11acf708009c45e557b98700d95e81d156e47898.tar.gz barebox-11acf708009c45e557b98700d95e81d156e47898.tar.xz |
mci mxs: give functions a uniq mxs_mci_ namespace
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boards/chumby_falconwing/falconwing.c | 4 | ||||
-rw-r--r-- | arch/arm/boards/karo-tx28/tx28-stk5.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-mxs/include/mach/mci.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/boards/chumby_falconwing/falconwing.c b/arch/arm/boards/chumby_falconwing/falconwing.c index feb0da8004..7557b954b6 100644 --- a/arch/arm/boards/chumby_falconwing/falconwing.c +++ b/arch/arm/boards/chumby_falconwing/falconwing.c @@ -47,13 +47,13 @@ static struct device_d sdram_dev = { .platform_data = &ram_pdata, }; -static struct stm_mci_platform_data mci_pdata = { +static struct mxs_mci_platform_data mci_pdata = { .caps = MMC_MODE_4BIT | MMC_MODE_HS | MMC_MODE_HS_52MHz, .voltages = MMC_VDD_32_33 | MMC_VDD_33_34, /* fixed to 3.3 V */ }; static struct device_d mci_dev = { - .name = "stm_mci", + .name = "mxs_mci", .map_base = IMX_SSP1_BASE, .platform_data = &mci_pdata, }; diff --git a/arch/arm/boards/karo-tx28/tx28-stk5.c b/arch/arm/boards/karo-tx28/tx28-stk5.c index 92584426ff..a3f4a28e3e 100644 --- a/arch/arm/boards/karo-tx28/tx28-stk5.c +++ b/arch/arm/boards/karo-tx28/tx28-stk5.c @@ -28,14 +28,14 @@ #include <mach/mci.h> #include <mach/fb.h> -static struct stm_mci_platform_data mci_pdata = { +static struct mxs_mci_platform_data mci_pdata = { .caps = MMC_MODE_4BIT | MMC_MODE_HS | MMC_MODE_HS_52MHz, .voltages = MMC_VDD_32_33 | MMC_VDD_33_34, /* fixed to 3.3 V */ .f_min = 400 * 1000, }; static struct device_d mci_socket = { - .name = "stm_mci", + .name = "mxs_mci", .map_base = IMX_SSP0_BASE, .platform_data = &mci_pdata, }; diff --git a/arch/arm/mach-mxs/include/mach/mci.h b/arch/arm/mach-mxs/include/mach/mci.h index b9249085ae..1090c1a59c 100644 --- a/arch/arm/mach-mxs/include/mach/mci.h +++ b/arch/arm/mach-mxs/include/mach/mci.h @@ -18,7 +18,7 @@ #ifndef __MACH_MMC_H #define __MACH_MMC_H -struct stm_mci_platform_data { +struct mxs_mci_platform_data { unsigned caps; /**< supported operating modes (MMC_MODE_*) */ unsigned voltages; /**< supported voltage range (MMC_VDD_*) */ unsigned f_min; /**< min operating frequency in Hz (0 -> no limit) */ |