Skip to content

Commit

Permalink
ARM: imx: eukrea_mbimxsd rename to eukrea_mbimxsd51
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Eric Bénard authored and Sascha Hauer committed May 8, 2012
1 parent fc33d40 commit 53a02d1
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-imx/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ obj-$(CONFIG_MACH_MX53_SMD) += mach-mx53_smd.o
obj-$(CONFIG_MACH_MX53_LOCO) += mach-mx53_loco.o
obj-$(CONFIG_MACH_MX53_ARD) += mach-mx53_ard.o
obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += mach-cpuimx51sd.o
obj-$(CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD) += eukrea_mbimxsd-baseboard.o
obj-$(CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD) += eukrea_mbimxsd51-baseboard.o
obj-$(CONFIG_MX51_EFIKA_COMMON) += mx51_efika.o
obj-$(CONFIG_MACH_MX51_EFIKAMX) += mach-mx51_efikamx.o
obj-$(CONFIG_MACH_MX51_EFIKASB) += mach-mx51_efikasb.o
Expand Down
36 changes: 18 additions & 18 deletions arch/arm/mach-imx/eukrea_mbimxsd-baseboard.c → ...arm/mach-imx/eukrea_mbimxsd51-baseboard.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

#include "devices-imx51.h"

static iomux_v3_cfg_t eukrea_mbimxsd_pads[] = {
static iomux_v3_cfg_t eukrea_mbimxsd51_pads[] = {
/* LED */
MX51_PAD_NANDF_D10__GPIO3_30,
/* SWITCH */
Expand Down Expand Up @@ -125,7 +125,7 @@ static struct platform_device eukrea_mbimxsd51_bl_dev = {
},
};

static const struct gpio_led eukrea_mbimxsd_leds[] __initconst = {
static const struct gpio_led eukrea_mbimxsd51_leds[] __initconst = {
{
.name = "led1",
.default_trigger = "heartbeat",
Expand All @@ -135,12 +135,12 @@ static const struct gpio_led eukrea_mbimxsd_leds[] __initconst = {
};

static const struct gpio_led_platform_data
eukrea_mbimxsd_led_info __initconst = {
.leds = eukrea_mbimxsd_leds,
.num_leds = ARRAY_SIZE(eukrea_mbimxsd_leds),
eukrea_mbimxsd51_led_info __initconst = {
.leds = eukrea_mbimxsd51_leds,
.num_leds = ARRAY_SIZE(eukrea_mbimxsd51_leds),
};

static struct gpio_keys_button eukrea_mbimxsd_gpio_buttons[] = {
static struct gpio_keys_button eukrea_mbimxsd51_gpio_buttons[] = {
{
.gpio = GPIO_SWITCH1,
.code = BTN_0,
Expand All @@ -151,23 +151,23 @@ static struct gpio_keys_button eukrea_mbimxsd_gpio_buttons[] = {
};

static const struct gpio_keys_platform_data
eukrea_mbimxsd_button_data __initconst = {
.buttons = eukrea_mbimxsd_gpio_buttons,
.nbuttons = ARRAY_SIZE(eukrea_mbimxsd_gpio_buttons),
eukrea_mbimxsd51_button_data __initconst = {
.buttons = eukrea_mbimxsd51_gpio_buttons,
.nbuttons = ARRAY_SIZE(eukrea_mbimxsd51_gpio_buttons),
};

static const struct imxuart_platform_data uart_pdata __initconst = {
.flags = IMXUART_HAVE_RTSCTS,
};

static struct i2c_board_info eukrea_mbimxsd_i2c_devices[] = {
static struct i2c_board_info eukrea_mbimxsd51_i2c_devices[] = {
{
I2C_BOARD_INFO("tlv320aic23", 0x1a),
},
};

static const
struct imx_ssi_platform_data eukrea_mbimxsd_ssi_pdata __initconst = {
struct imx_ssi_platform_data eukrea_mbimxsd51_ssi_pdata __initconst = {
.flags = IMX_SSI_SYN | IMX_SSI_NET | IMX_SSI_USE_I2S_SLAVE,
};

Expand All @@ -192,16 +192,16 @@ __setup("screen_type=", eukrea_mbimxsd51_screen_type);
*/
void __init eukrea_mbimxsd51_baseboard_init(void)
{
if (mxc_iomux_v3_setup_multiple_pads(eukrea_mbimxsd_pads,
ARRAY_SIZE(eukrea_mbimxsd_pads)))
if (mxc_iomux_v3_setup_multiple_pads(eukrea_mbimxsd51_pads,
ARRAY_SIZE(eukrea_mbimxsd51_pads)))
printk(KERN_ERR "error setting mbimxsd pads !\n");

imx51_add_imx_uart(1, NULL);
imx51_add_imx_uart(2, &uart_pdata);

imx51_add_sdhci_esdhc_imx(0, NULL);

imx51_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata);
imx51_add_imx_ssi(0, &eukrea_mbimxsd51_ssi_pdata);

gpio_request(GPIO_LED1, "LED1");
gpio_direction_output(GPIO_LED1, 1);
Expand All @@ -223,9 +223,9 @@ void __init eukrea_mbimxsd51_baseboard_init(void)
gpio_free(GPIO_LCDBL);
}

i2c_register_board_info(0, eukrea_mbimxsd_i2c_devices,
ARRAY_SIZE(eukrea_mbimxsd_i2c_devices));
i2c_register_board_info(0, eukrea_mbimxsd51_i2c_devices,
ARRAY_SIZE(eukrea_mbimxsd51_i2c_devices));

gpio_led_register_device(-1, &eukrea_mbimxsd_led_info);
imx_add_gpio_keys(&eukrea_mbimxsd_button_data);
gpio_led_register_device(-1, &eukrea_mbimxsd51_led_info);
imx_add_gpio_keys(&eukrea_mbimxsd51_button_data);
}

0 comments on commit 53a02d1

Please sign in to comment.