aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2012-05-08 03:20:27 -0400
committerSascha Hauer <s.hauer@pengutronix.de>2012-05-08 11:31:25 -0400
commit53a02d11f1bc9c2c692908d2eda3f3fb34f9bf9d (patch)
tree98646355c7e542215f4101c0bedbf09e7c455c67 /arch/arm
parentfc33d40007a67f4b669bc78b66bfe6f63c199049 (diff)
ARM: imx: eukrea_mbimxsd rename to eukrea_mbimxsd51
this makes the mbimxsd51 board naming consistant with others Signed-off-by: Eric Bénard <eric@eukrea.com> Cc: Sascha Hauer <kernel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-imx/Makefile2
-rw-r--r--arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c (renamed from arch/arm/mach-imx/eukrea_mbimxsd-baseboard.c)36
2 files changed, 19 insertions, 19 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 55303d96d322..4937c070a57e 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -84,7 +84,7 @@ obj-$(CONFIG_MACH_MX53_SMD) += mach-mx53_smd.o
84obj-$(CONFIG_MACH_MX53_LOCO) += mach-mx53_loco.o 84obj-$(CONFIG_MACH_MX53_LOCO) += mach-mx53_loco.o
85obj-$(CONFIG_MACH_MX53_ARD) += mach-mx53_ard.o 85obj-$(CONFIG_MACH_MX53_ARD) += mach-mx53_ard.o
86obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += mach-cpuimx51sd.o 86obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += mach-cpuimx51sd.o
87obj-$(CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD) += eukrea_mbimxsd-baseboard.o 87obj-$(CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD) += eukrea_mbimxsd51-baseboard.o
88obj-$(CONFIG_MX51_EFIKA_COMMON) += mx51_efika.o 88obj-$(CONFIG_MX51_EFIKA_COMMON) += mx51_efika.o
89obj-$(CONFIG_MACH_MX51_EFIKAMX) += mach-mx51_efikamx.o 89obj-$(CONFIG_MACH_MX51_EFIKAMX) += mach-mx51_efikamx.o
90obj-$(CONFIG_MACH_MX51_EFIKASB) += mach-mx51_efikasb.o 90obj-$(CONFIG_MACH_MX51_EFIKASB) += mach-mx51_efikasb.o
diff --git a/arch/arm/mach-imx/eukrea_mbimxsd-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c
index 920e42a9389f..96a24b73dc23 100644
--- a/arch/arm/mach-imx/eukrea_mbimxsd-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c
@@ -42,7 +42,7 @@
42 42
43#include "devices-imx51.h" 43#include "devices-imx51.h"
44 44
45static iomux_v3_cfg_t eukrea_mbimxsd_pads[] = { 45static iomux_v3_cfg_t eukrea_mbimxsd51_pads[] = {
46 /* LED */ 46 /* LED */
47 MX51_PAD_NANDF_D10__GPIO3_30, 47 MX51_PAD_NANDF_D10__GPIO3_30,
48 /* SWITCH */ 48 /* SWITCH */
@@ -125,7 +125,7 @@ static struct platform_device eukrea_mbimxsd51_bl_dev = {
125 }, 125 },
126}; 126};
127 127
128static const struct gpio_led eukrea_mbimxsd_leds[] __initconst = { 128static const struct gpio_led eukrea_mbimxsd51_leds[] __initconst = {
129 { 129 {
130 .name = "led1", 130 .name = "led1",
131 .default_trigger = "heartbeat", 131 .default_trigger = "heartbeat",
@@ -135,12 +135,12 @@ static const struct gpio_led eukrea_mbimxsd_leds[] __initconst = {
135}; 135};
136 136
137static const struct gpio_led_platform_data 137static const struct gpio_led_platform_data
138 eukrea_mbimxsd_led_info __initconst = { 138 eukrea_mbimxsd51_led_info __initconst = {
139 .leds = eukrea_mbimxsd_leds, 139 .leds = eukrea_mbimxsd51_leds,
140 .num_leds = ARRAY_SIZE(eukrea_mbimxsd_leds), 140 .num_leds = ARRAY_SIZE(eukrea_mbimxsd51_leds),
141}; 141};
142 142
143static struct gpio_keys_button eukrea_mbimxsd_gpio_buttons[] = { 143static struct gpio_keys_button eukrea_mbimxsd51_gpio_buttons[] = {
144 { 144 {
145 .gpio = GPIO_SWITCH1, 145 .gpio = GPIO_SWITCH1,
146 .code = BTN_0, 146 .code = BTN_0,
@@ -151,23 +151,23 @@ static struct gpio_keys_button eukrea_mbimxsd_gpio_buttons[] = {
151}; 151};
152 152
153static const struct gpio_keys_platform_data 153static const struct gpio_keys_platform_data
154 eukrea_mbimxsd_button_data __initconst = { 154 eukrea_mbimxsd51_button_data __initconst = {
155 .buttons = eukrea_mbimxsd_gpio_buttons, 155 .buttons = eukrea_mbimxsd51_gpio_buttons,
156 .nbuttons = ARRAY_SIZE(eukrea_mbimxsd_gpio_buttons), 156 .nbuttons = ARRAY_SIZE(eukrea_mbimxsd51_gpio_buttons),
157}; 157};
158 158
159static const struct imxuart_platform_data uart_pdata __initconst = { 159static const struct imxuart_platform_data uart_pdata __initconst = {
160 .flags = IMXUART_HAVE_RTSCTS, 160 .flags = IMXUART_HAVE_RTSCTS,
161}; 161};
162 162
163static struct i2c_board_info eukrea_mbimxsd_i2c_devices[] = { 163static struct i2c_board_info eukrea_mbimxsd51_i2c_devices[] = {
164 { 164 {
165 I2C_BOARD_INFO("tlv320aic23", 0x1a), 165 I2C_BOARD_INFO("tlv320aic23", 0x1a),
166 }, 166 },
167}; 167};
168 168
169static const 169static const
170struct imx_ssi_platform_data eukrea_mbimxsd_ssi_pdata __initconst = { 170struct imx_ssi_platform_data eukrea_mbimxsd51_ssi_pdata __initconst = {
171 .flags = IMX_SSI_SYN | IMX_SSI_NET | IMX_SSI_USE_I2S_SLAVE, 171 .flags = IMX_SSI_SYN | IMX_SSI_NET | IMX_SSI_USE_I2S_SLAVE,
172}; 172};
173 173
@@ -192,8 +192,8 @@ __setup("screen_type=", eukrea_mbimxsd51_screen_type);
192 */ 192 */
193void __init eukrea_mbimxsd51_baseboard_init(void) 193void __init eukrea_mbimxsd51_baseboard_init(void)
194{ 194{
195 if (mxc_iomux_v3_setup_multiple_pads(eukrea_mbimxsd_pads, 195 if (mxc_iomux_v3_setup_multiple_pads(eukrea_mbimxsd51_pads,
196 ARRAY_SIZE(eukrea_mbimxsd_pads))) 196 ARRAY_SIZE(eukrea_mbimxsd51_pads)))
197 printk(KERN_ERR "error setting mbimxsd pads !\n"); 197 printk(KERN_ERR "error setting mbimxsd pads !\n");
198 198
199 imx51_add_imx_uart(1, NULL); 199 imx51_add_imx_uart(1, NULL);
@@ -201,7 +201,7 @@ void __init eukrea_mbimxsd51_baseboard_init(void)
201 201
202 imx51_add_sdhci_esdhc_imx(0, NULL); 202 imx51_add_sdhci_esdhc_imx(0, NULL);
203 203
204 imx51_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata); 204 imx51_add_imx_ssi(0, &eukrea_mbimxsd51_ssi_pdata);
205 205
206 gpio_request(GPIO_LED1, "LED1"); 206 gpio_request(GPIO_LED1, "LED1");
207 gpio_direction_output(GPIO_LED1, 1); 207 gpio_direction_output(GPIO_LED1, 1);
@@ -223,9 +223,9 @@ void __init eukrea_mbimxsd51_baseboard_init(void)
223 gpio_free(GPIO_LCDBL); 223 gpio_free(GPIO_LCDBL);
224 } 224 }
225 225
226 i2c_register_board_info(0, eukrea_mbimxsd_i2c_devices, 226 i2c_register_board_info(0, eukrea_mbimxsd51_i2c_devices,
227 ARRAY_SIZE(eukrea_mbimxsd_i2c_devices)); 227 ARRAY_SIZE(eukrea_mbimxsd51_i2c_devices));
228 228
229 gpio_led_register_device(-1, &eukrea_mbimxsd_led_info); 229 gpio_led_register_device(-1, &eukrea_mbimxsd51_led_info);
230 imx_add_gpio_keys(&eukrea_mbimxsd_button_data); 230 imx_add_gpio_keys(&eukrea_mbimxsd51_button_data);
231} 231}