Patchwork [16/19] eukrea-cpuimx51: remove board

login
register
mail settings
Submitter Eric Benard
Date Dec. 13, 2011, 6:31 a.m.
Message ID <1323757911-25217-16-git-send-email-eric@eukrea.com>
Download mbox | patch
Permalink /patch/131019/
State New
Headers show

Comments

Eric Benard - Dec. 13, 2011, 6:31 a.m.
this board is not maintained anymore and is replaced by cpuimx51sd

Signed-off-by: Eric Bénard <eric@eukrea.com>
Cc: Sascha Hauer <kernel@pengutronix.de>
---
 arch/arm/configs/mx5_defconfig               |    1 -
 arch/arm/mach-mx5/Kconfig                    |   30 ---
 arch/arm/mach-mx5/Makefile                   |    2 -
 arch/arm/mach-mx5/board-cpuimx51.c           |  300 --------------------------
 arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c |  206 ------------------
 5 files changed, 0 insertions(+), 539 deletions(-)
 delete mode 100644 arch/arm/mach-mx5/board-cpuimx51.c
 delete mode 100644 arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
Sascha Hauer - Dec. 13, 2011, 10:05 a.m.
On Tue, Dec 13, 2011 at 07:31:48AM +0100, Eric Bénard wrote:
> this board is not maintained anymore and is replaced by cpuimx51sd

I'm happy to remove this code, but aren't there any users of this board?

Sascha

> 
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> ---
>  arch/arm/configs/mx5_defconfig               |    1 -
>  arch/arm/mach-mx5/Kconfig                    |   30 ---
>  arch/arm/mach-mx5/Makefile                   |    2 -
>  arch/arm/mach-mx5/board-cpuimx51.c           |  300 --------------------------
>  arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c |  206 ------------------
>  5 files changed, 0 insertions(+), 539 deletions(-)
>  delete mode 100644 arch/arm/mach-mx5/board-cpuimx51.c
>  delete mode 100644 arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
> 
> diff --git a/arch/arm/configs/mx5_defconfig b/arch/arm/configs/mx5_defconfig
> index d0d8dfe..32e91f8 100644
> --- a/arch/arm/configs/mx5_defconfig
> +++ b/arch/arm/configs/mx5_defconfig
> @@ -17,7 +17,6 @@ CONFIG_ARCH_MXC=y
>  CONFIG_ARCH_MX5=y
>  CONFIG_MACH_MX51_BABBAGE=y
>  CONFIG_MACH_MX51_3DS=y
> -CONFIG_MACH_EUKREA_CPUIMX51=y
>  CONFIG_MACH_EUKREA_CPUIMX51SD=y
>  CONFIG_MACH_MX51_EFIKAMX=y
>  CONFIG_MACH_MX51_EFIKASB=y
> diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
> index af0c212..0cea604 100644
> --- a/arch/arm/mach-mx5/Kconfig
> +++ b/arch/arm/mach-mx5/Kconfig
> @@ -93,36 +93,6 @@ config MACH_MX51_3DS
>  	  Include support for MX51PDK (3DS) platform. This includes specific
>  	  configurations for the board and its peripherals.
>  
> -config MACH_EUKREA_CPUIMX51
> -	bool "Support Eukrea CPUIMX51 module"
> -	select SOC_IMX51
> -	select IMX_HAVE_PLATFORM_FSL_USB2_UDC
> -	select IMX_HAVE_PLATFORM_IMX_I2C
> -	select IMX_HAVE_PLATFORM_IMX_UART
> -	select IMX_HAVE_PLATFORM_MXC_EHCI
> -	select IMX_HAVE_PLATFORM_MXC_NAND
> -	select IMX_HAVE_PLATFORM_SPI_IMX
> -	help
> -	  Include support for Eukrea CPUIMX51 platform. This includes
> -	  specific configurations for the module and its peripherals.
> -
> -choice
> -	prompt "Baseboard"
> -	depends on MACH_EUKREA_CPUIMX51
> -	default MACH_EUKREA_MBIMX51_BASEBOARD
> -
> -config MACH_EUKREA_MBIMX51_BASEBOARD
> -	prompt "Eukrea MBIMX51 development board"
> -	bool
> -	select IMX_HAVE_PLATFORM_IMX_KEYPAD
> -	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
> -	select LEDS_GPIO_REGISTER
> -	help
> -	  This adds board specific devices that can be found on Eukrea's
> -	  MBIMX51 evaluation board.
> -
> -endchoice
> -
>  config MACH_EUKREA_CPUIMX51SD
>  	bool "Support Eukrea CPUIMX51SD module"
>  	select SOC_IMX51
> diff --git a/arch/arm/mach-mx5/Makefile b/arch/arm/mach-mx5/Makefile
> index 0fc6080..596c1c7 100644
> --- a/arch/arm/mach-mx5/Makefile
> +++ b/arch/arm/mach-mx5/Makefile
> @@ -13,8 +13,6 @@ obj-$(CONFIG_MACH_MX53_EVK) += board-mx53_evk.o
>  obj-$(CONFIG_MACH_MX53_SMD) += board-mx53_smd.o
>  obj-$(CONFIG_MACH_MX53_LOCO) += board-mx53_loco.o
>  obj-$(CONFIG_MACH_MX53_ARD) += board-mx53_ard.o
> -obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o
> -obj-$(CONFIG_MACH_EUKREA_MBIMX51_BASEBOARD) += eukrea_mbimx51-baseboard.o
>  obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += board-cpuimx51sd.o
>  obj-$(CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD) += eukrea_mbimxsd-baseboard.o
>  obj-$(CONFIG_MX51_EFIKA_COMMON) += mx51_efika.o
> diff --git a/arch/arm/mach-mx5/board-cpuimx51.c b/arch/arm/mach-mx5/board-cpuimx51.c
> deleted file mode 100644
> index 1fc1103..0000000
> --- a/arch/arm/mach-mx5/board-cpuimx51.c
> +++ /dev/null
> @@ -1,300 +0,0 @@
> -/*
> - *
> - * Copyright (C) 2010 Eric Bénard <eric@eukrea.com>
> - *
> - * based on board-mx51_babbage.c which is
> - * Copyright 2009 Freescale Semiconductor, Inc. All Rights Reserved.
> - * Copyright (C) 2009-2010 Amit Kucheria <amit.kucheria@canonical.com>
> - *
> - * The code contained herein is licensed under the GNU General Public
> - * License. You may obtain a copy of the GNU General Public License
> - * Version 2 or later at the following locations:
> - *
> - * http://www.opensource.org/licenses/gpl-license.html
> - * http://www.gnu.org/copyleft/gpl.html
> - */
> -
> -#include <linux/init.h>
> -#include <linux/platform_device.h>
> -#include <linux/serial_8250.h>
> -#include <linux/i2c.h>
> -#include <linux/gpio.h>
> -#include <linux/delay.h>
> -#include <linux/io.h>
> -#include <linux/interrupt.h>
> -
> -#include <mach/eukrea-baseboards.h>
> -#include <mach/common.h>
> -#include <mach/hardware.h>
> -#include <mach/iomux-mx51.h>
> -
> -#include <asm/setup.h>
> -#include <asm/mach-types.h>
> -#include <asm/mach/arch.h>
> -#include <asm/mach/time.h>
> -
> -#include "devices-imx51.h"
> -
> -#define CPUIMX51_USBH1_STP	IMX_GPIO_NR(1, 27)
> -#define CPUIMX51_QUARTA_GPIO	IMX_GPIO_NR(3, 28)
> -#define CPUIMX51_QUARTB_GPIO	IMX_GPIO_NR(3, 25)
> -#define CPUIMX51_QUARTC_GPIO	IMX_GPIO_NR(3, 26)
> -#define CPUIMX51_QUARTD_GPIO	IMX_GPIO_NR(3, 27)
> -#define CPUIMX51_QUART_XTAL	14745600
> -#define CPUIMX51_QUART_REGSHIFT	17
> -
> -/* USB_CTRL_1 */
> -#define MX51_USB_CTRL_1_OFFSET		0x10
> -#define MX51_USB_CTRL_UH1_EXT_CLK_EN	(1 << 25)
> -
> -#define	MX51_USB_PLLDIV_12_MHZ		0x00
> -#define	MX51_USB_PLL_DIV_19_2_MHZ	0x01
> -#define	MX51_USB_PLL_DIV_24_MHZ		0x02
> -
> -static struct plat_serial8250_port serial_platform_data[] = {
> -	{
> -		.mapbase = (unsigned long)(MX51_CS1_BASE_ADDR + 0x400000),
> -		.irq = IMX_GPIO_TO_IRQ(CPUIMX51_QUARTA_GPIO),
> -		.irqflags = IRQF_TRIGGER_HIGH,
> -		.uartclk = CPUIMX51_QUART_XTAL,
> -		.regshift = CPUIMX51_QUART_REGSHIFT,
> -		.iotype = UPIO_MEM,
> -		.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP,
> -	}, {
> -		.mapbase = (unsigned long)(MX51_CS1_BASE_ADDR + 0x800000),
> -		.irq = IMX_GPIO_TO_IRQ(CPUIMX51_QUARTB_GPIO),
> -		.irqflags = IRQF_TRIGGER_HIGH,
> -		.uartclk = CPUIMX51_QUART_XTAL,
> -		.regshift = CPUIMX51_QUART_REGSHIFT,
> -		.iotype = UPIO_MEM,
> -		.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP,
> -	}, {
> -		.mapbase = (unsigned long)(MX51_CS1_BASE_ADDR + 0x1000000),
> -		.irq = IMX_GPIO_TO_IRQ(CPUIMX51_QUARTC_GPIO),
> -		.irqflags = IRQF_TRIGGER_HIGH,
> -		.uartclk = CPUIMX51_QUART_XTAL,
> -		.regshift = CPUIMX51_QUART_REGSHIFT,
> -		.iotype = UPIO_MEM,
> -		.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP,
> -	}, {
> -		.mapbase = (unsigned long)(MX51_CS1_BASE_ADDR + 0x2000000),
> -		.irq = IMX_GPIO_TO_IRQ(CPUIMX51_QUARTD_GPIO),
> -		.irqflags = IRQF_TRIGGER_HIGH,
> -		.uartclk = CPUIMX51_QUART_XTAL,
> -		.regshift = CPUIMX51_QUART_REGSHIFT,
> -		.iotype = UPIO_MEM,
> -		.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP,
> -	}, {
> -	}
> -};
> -
> -static struct platform_device serial_device = {
> -	.name = "serial8250",
> -	.id = 0,
> -	.dev = {
> -		.platform_data = serial_platform_data,
> -	},
> -};
> -
> -static struct platform_device *devices[] __initdata = {
> -	&serial_device,
> -};
> -
> -static iomux_v3_cfg_t eukrea_cpuimx51_pads[] = {
> -	/* UART1 */
> -	MX51_PAD_UART1_RXD__UART1_RXD,
> -	MX51_PAD_UART1_TXD__UART1_TXD,
> -	MX51_PAD_UART1_RTS__UART1_RTS,
> -	MX51_PAD_UART1_CTS__UART1_CTS,
> -
> -	/* I2C2 */
> -	MX51_PAD_GPIO1_2__I2C2_SCL,
> -	MX51_PAD_GPIO1_3__I2C2_SDA,
> -	MX51_PAD_NANDF_D10__GPIO3_30,
> -
> -	/* QUART IRQ */
> -	MX51_PAD_NANDF_D15__GPIO3_25,
> -	MX51_PAD_NANDF_D14__GPIO3_26,
> -	MX51_PAD_NANDF_D13__GPIO3_27,
> -	MX51_PAD_NANDF_D12__GPIO3_28,
> -
> -	/* USB HOST1 */
> -	MX51_PAD_USBH1_CLK__USBH1_CLK,
> -	MX51_PAD_USBH1_DIR__USBH1_DIR,
> -	MX51_PAD_USBH1_NXT__USBH1_NXT,
> -	MX51_PAD_USBH1_DATA0__USBH1_DATA0,
> -	MX51_PAD_USBH1_DATA1__USBH1_DATA1,
> -	MX51_PAD_USBH1_DATA2__USBH1_DATA2,
> -	MX51_PAD_USBH1_DATA3__USBH1_DATA3,
> -	MX51_PAD_USBH1_DATA4__USBH1_DATA4,
> -	MX51_PAD_USBH1_DATA5__USBH1_DATA5,
> -	MX51_PAD_USBH1_DATA6__USBH1_DATA6,
> -	MX51_PAD_USBH1_DATA7__USBH1_DATA7,
> -	MX51_PAD_USBH1_STP__USBH1_STP,
> -};
> -
> -static const struct mxc_nand_platform_data
> -		eukrea_cpuimx51_nand_board_info __initconst = {
> -	.width		= 1,
> -	.hw_ecc		= 1,
> -	.flash_bbt	= 1,
> -};
> -
> -static const struct imxuart_platform_data uart_pdata __initconst = {
> -	.flags = IMXUART_HAVE_RTSCTS,
> -};
> -
> -static const
> -struct imxi2c_platform_data eukrea_cpuimx51_i2c_data __initconst = {
> -	.bitrate = 100000,
> -};
> -
> -static struct i2c_board_info eukrea_cpuimx51_i2c_devices[] = {
> -	{
> -		I2C_BOARD_INFO("pcf8563", 0x51),
> -	},
> -};
> -
> -/* This function is board specific as the bit mask for the plldiv will also
> -be different for other Freescale SoCs, thus a common bitmask is not
> -possible and cannot get place in /plat-mxc/ehci.c.*/
> -static int initialize_otg_port(struct platform_device *pdev)
> -{
> -	u32 v;
> -	void __iomem *usb_base;
> -	void __iomem *usbother_base;
> -
> -	usb_base = ioremap(MX51_USB_OTG_BASE_ADDR, SZ_4K);
> -	if (!usb_base)
> -		return -ENOMEM;
> -	usbother_base = usb_base + MX5_USBOTHER_REGS_OFFSET;
> -
> -	/* Set the PHY clock to 19.2MHz */
> -	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
> -	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
> -	v |= MX51_USB_PLL_DIV_19_2_MHZ;
> -	__raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
> -	iounmap(usb_base);
> -
> -	mdelay(10);
> -
> -	return mx51_initialize_usb_hw(0, MXC_EHCI_INTERNAL_PHY);
> -}
> -
> -static int initialize_usbh1_port(struct platform_device *pdev)
> -{
> -	u32 v;
> -	void __iomem *usb_base;
> -	void __iomem *usbother_base;
> -
> -	usb_base = ioremap(MX51_USB_OTG_BASE_ADDR, SZ_4K);
> -	if (!usb_base)
> -		return -ENOMEM;
> -	usbother_base = usb_base + MX5_USBOTHER_REGS_OFFSET;
> -
> -	/* The clock for the USBH1 ULPI port will come externally from the PHY. */
> -	v = __raw_readl(usbother_base + MX51_USB_CTRL_1_OFFSET);
> -	__raw_writel(v | MX51_USB_CTRL_UH1_EXT_CLK_EN, usbother_base + MX51_USB_CTRL_1_OFFSET);
> -	iounmap(usb_base);
> -
> -	mdelay(10);
> -
> -	return mx51_initialize_usb_hw(1, MXC_EHCI_POWER_PINS_ENABLED |
> -			MXC_EHCI_ITC_NO_THRESHOLD);
> -}
> -
> -static const struct mxc_usbh_platform_data dr_utmi_config __initconst = {
> -	.init		= initialize_otg_port,
> -	.portsc	= MXC_EHCI_UTMI_16BIT,
> -};
> -
> -static const struct fsl_usb2_platform_data usb_pdata __initconst = {
> -	.operating_mode	= FSL_USB2_DR_DEVICE,
> -	.phy_mode	= FSL_USB2_PHY_UTMI_WIDE,
> -};
> -
> -static const struct mxc_usbh_platform_data usbh1_config __initconst = {
> -	.init		= initialize_usbh1_port,
> -	.portsc	= MXC_EHCI_MODE_ULPI,
> -};
> -
> -static int otg_mode_host;
> -
> -static int __init eukrea_cpuimx51_otg_mode(char *options)
> -{
> -	if (!strcmp(options, "host"))
> -		otg_mode_host = 1;
> -	else if (!strcmp(options, "device"))
> -		otg_mode_host = 0;
> -	else
> -		pr_info("otg_mode neither \"host\" nor \"device\". "
> -			"Defaulting to device\n");
> -	return 0;
> -}
> -__setup("otg_mode=", eukrea_cpuimx51_otg_mode);
> -
> -/*
> - * Board specific initialization.
> - */
> -static void __init eukrea_cpuimx51_init(void)
> -{
> -	imx51_soc_init();
> -
> -	mxc_iomux_v3_setup_multiple_pads(eukrea_cpuimx51_pads,
> -					ARRAY_SIZE(eukrea_cpuimx51_pads));
> -
> -	imx51_add_imx_uart(0, &uart_pdata);
> -	imx51_add_mxc_nand(&eukrea_cpuimx51_nand_board_info);
> -
> -	gpio_request(CPUIMX51_QUARTA_GPIO, "quarta_irq");
> -	gpio_direction_input(CPUIMX51_QUARTA_GPIO);
> -	gpio_free(CPUIMX51_QUARTA_GPIO);
> -	gpio_request(CPUIMX51_QUARTB_GPIO, "quartb_irq");
> -	gpio_direction_input(CPUIMX51_QUARTB_GPIO);
> -	gpio_free(CPUIMX51_QUARTB_GPIO);
> -	gpio_request(CPUIMX51_QUARTC_GPIO, "quartc_irq");
> -	gpio_direction_input(CPUIMX51_QUARTC_GPIO);
> -	gpio_free(CPUIMX51_QUARTC_GPIO);
> -	gpio_request(CPUIMX51_QUARTD_GPIO, "quartd_irq");
> -	gpio_direction_input(CPUIMX51_QUARTD_GPIO);
> -	gpio_free(CPUIMX51_QUARTD_GPIO);
> -
> -	imx51_add_fec(NULL);
> -	platform_add_devices(devices, ARRAY_SIZE(devices));
> -
> -	imx51_add_imx_i2c(1, &eukrea_cpuimx51_i2c_data);
> -	i2c_register_board_info(1, eukrea_cpuimx51_i2c_devices,
> -				ARRAY_SIZE(eukrea_cpuimx51_i2c_devices));
> -
> -	if (otg_mode_host)
> -		imx51_add_mxc_ehci_otg(&dr_utmi_config);
> -	else {
> -		initialize_otg_port(NULL);
> -		imx51_add_fsl_usb2_udc(&usb_pdata);
> -	}
> -	imx51_add_mxc_ehci_hs(1, &usbh1_config);
> -
> -#ifdef CONFIG_MACH_EUKREA_MBIMX51_BASEBOARD
> -	eukrea_mbimx51_baseboard_init();
> -#endif
> -}
> -
> -static void __init eukrea_cpuimx51_timer_init(void)
> -{
> -	mx51_clocks_init(32768, 24000000, 22579200, 0);
> -}
> -
> -static struct sys_timer mxc_timer = {
> -	.init	= eukrea_cpuimx51_timer_init,
> -};
> -
> -MACHINE_START(EUKREA_CPUIMX51, "Eukrea CPUIMX51 Module")
> -	/* Maintainer: Eric Bénard <eric@eukrea.com> */
> -	.atag_offset = 0x100,
> -	.map_io = mx51_map_io,
> -	.init_early = imx51_init_early,
> -	.init_irq = mx51_init_irq,
> -	.handle_irq = imx51_handle_irq,
> -	.timer = &mxc_timer,
> -	.init_machine = eukrea_cpuimx51_init,
> -MACHINE_END
> diff --git a/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c b/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
> deleted file mode 100644
> index a6a3ab8..0000000
> --- a/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
> +++ /dev/null
> @@ -1,206 +0,0 @@
> -/*
> - *
> - * Copyright (C) 2010 Eric Bénard <eric@eukrea.com>
> - *
> - * The code contained herein is licensed under the GNU General Public
> - * License. You may obtain a copy of the GNU General Public License
> - * Version 2 or later at the following locations:
> - *
> - * http://www.opensource.org/licenses/gpl-license.html
> - * http://www.gnu.org/copyleft/gpl.html
> - */
> -
> -#include <linux/init.h>
> -#include <linux/platform_device.h>
> -#include <linux/serial_8250.h>
> -#include <linux/i2c.h>
> -#include <linux/gpio.h>
> -#include <linux/io.h>
> -#include <linux/interrupt.h>
> -#include <linux/irq.h>
> -#include <linux/i2c/tsc2007.h>
> -#include <linux/leds.h>
> -
> -#include <mach/common.h>
> -#include <mach/hardware.h>
> -#include <mach/iomux-mx51.h>
> -
> -#include <asm/mach/arch.h>
> -
> -#include "devices-imx51.h"
> -
> -#define MBIMX51_TSC2007_GPIO	IMX_GPIO_NR(3, 30)
> -#define MBIMX51_LED0		IMX_GPIO_NR(3, 5)
> -#define MBIMX51_LED1		IMX_GPIO_NR(3, 6)
> -#define MBIMX51_LED2		IMX_GPIO_NR(3, 7)
> -#define MBIMX51_LED3		IMX_GPIO_NR(3, 8)
> -
> -static const struct gpio_led mbimx51_leds[] __initconst = {
> -	{
> -		.name			= "led0",
> -		.default_trigger	= "heartbeat",
> -		.active_low		= 1,
> -		.gpio			= MBIMX51_LED0,
> -	},
> -	{
> -		.name			= "led1",
> -		.default_trigger	= "nand-disk",
> -		.active_low		= 1,
> -		.gpio			= MBIMX51_LED1,
> -	},
> -	{
> -		.name			= "led2",
> -		.default_trigger	= "mmc0",
> -		.active_low		= 1,
> -		.gpio			= MBIMX51_LED2,
> -	},
> -	{
> -		.name			= "led3",
> -		.default_trigger	= "default-on",
> -		.active_low		= 1,
> -		.gpio			= MBIMX51_LED3,
> -	},
> -};
> -
> -static const struct gpio_led_platform_data mbimx51_leds_info __initconst = {
> -	.leds		= mbimx51_leds,
> -	.num_leds	= ARRAY_SIZE(mbimx51_leds),
> -};
> -
> -static iomux_v3_cfg_t mbimx51_pads[] = {
> -	/* UART2 */
> -	MX51_PAD_UART2_RXD__UART2_RXD,
> -	MX51_PAD_UART2_TXD__UART2_TXD,
> -
> -	/* UART3 */
> -	MX51_PAD_UART3_RXD__UART3_RXD,
> -	MX51_PAD_UART3_TXD__UART3_TXD,
> -	MX51_PAD_KEY_COL4__UART3_RTS,
> -	MX51_PAD_KEY_COL5__UART3_CTS,
> -
> -	/* TSC2007 IRQ */
> -	MX51_PAD_NANDF_D10__GPIO3_30,
> -
> -	/* LEDS */
> -	MX51_PAD_DISPB2_SER_DIN__GPIO3_5,
> -	MX51_PAD_DISPB2_SER_DIO__GPIO3_6,
> -	MX51_PAD_DISPB2_SER_CLK__GPIO3_7,
> -	MX51_PAD_DISPB2_SER_RS__GPIO3_8,
> -
> -	/* KPP */
> -	MX51_PAD_KEY_ROW0__KEY_ROW0,
> -	MX51_PAD_KEY_ROW1__KEY_ROW1,
> -	MX51_PAD_KEY_ROW2__KEY_ROW2,
> -	MX51_PAD_KEY_ROW3__KEY_ROW3,
> -	MX51_PAD_KEY_COL0__KEY_COL0,
> -	MX51_PAD_KEY_COL1__KEY_COL1,
> -	MX51_PAD_KEY_COL2__KEY_COL2,
> -	MX51_PAD_KEY_COL3__KEY_COL3,
> -
> -	/* SD 1 */
> -	MX51_PAD_SD1_CMD__SD1_CMD,
> -	MX51_PAD_SD1_CLK__SD1_CLK,
> -	MX51_PAD_SD1_DATA0__SD1_DATA0,
> -	MX51_PAD_SD1_DATA1__SD1_DATA1,
> -	MX51_PAD_SD1_DATA2__SD1_DATA2,
> -	MX51_PAD_SD1_DATA3__SD1_DATA3,
> -
> -	/* SD 2 */
> -	MX51_PAD_SD2_CMD__SD2_CMD,
> -	MX51_PAD_SD2_CLK__SD2_CLK,
> -	MX51_PAD_SD2_DATA0__SD2_DATA0,
> -	MX51_PAD_SD2_DATA1__SD2_DATA1,
> -	MX51_PAD_SD2_DATA2__SD2_DATA2,
> -	MX51_PAD_SD2_DATA3__SD2_DATA3,
> -};
> -
> -static const struct imxuart_platform_data uart_pdata __initconst = {
> -	.flags = IMXUART_HAVE_RTSCTS,
> -};
> -
> -static int mbimx51_keymap[] = {
> -	KEY(0, 0, KEY_1),
> -	KEY(0, 1, KEY_2),
> -	KEY(0, 2, KEY_3),
> -	KEY(0, 3, KEY_UP),
> -
> -	KEY(1, 0, KEY_4),
> -	KEY(1, 1, KEY_5),
> -	KEY(1, 2, KEY_6),
> -	KEY(1, 3, KEY_LEFT),
> -
> -	KEY(2, 0, KEY_7),
> -	KEY(2, 1, KEY_8),
> -	KEY(2, 2, KEY_9),
> -	KEY(2, 3, KEY_RIGHT),
> -
> -	KEY(3, 0, KEY_0),
> -	KEY(3, 1, KEY_DOWN),
> -	KEY(3, 2, KEY_ESC),
> -	KEY(3, 3, KEY_ENTER),
> -};
> -
> -static const struct matrix_keymap_data mbimx51_map_data __initconst = {
> -	.keymap		= mbimx51_keymap,
> -	.keymap_size	= ARRAY_SIZE(mbimx51_keymap),
> -};
> -
> -static int tsc2007_get_pendown_state(void)
> -{
> -	return !gpio_get_value(MBIMX51_TSC2007_GPIO);
> -}
> -
> -struct tsc2007_platform_data tsc2007_data = {
> -	.model = 2007,
> -	.x_plate_ohms = 180,
> -	.get_pendown_state = tsc2007_get_pendown_state,
> -};
> -
> -static struct i2c_board_info mbimx51_i2c_devices[] = {
> -	{
> -		I2C_BOARD_INFO("tsc2007", 0x49),
> -		.irq  = IMX_GPIO_TO_IRQ(MBIMX51_TSC2007_GPIO),
> -		.platform_data = &tsc2007_data,
> -	}, {
> -		I2C_BOARD_INFO("tlv320aic23", 0x1a),
> -	},
> -};
> -
> -/*
> - * baseboard initialization.
> - */
> -void __init eukrea_mbimx51_baseboard_init(void)
> -{
> -	mxc_iomux_v3_setup_multiple_pads(mbimx51_pads,
> -					ARRAY_SIZE(mbimx51_pads));
> -
> -	imx51_add_imx_uart(1, NULL);
> -	imx51_add_imx_uart(2, &uart_pdata);
> -
> -	gpio_request(MBIMX51_LED0, "LED0");
> -	gpio_direction_output(MBIMX51_LED0, 1);
> -	gpio_free(MBIMX51_LED0);
> -	gpio_request(MBIMX51_LED1, "LED1");
> -	gpio_direction_output(MBIMX51_LED1, 1);
> -	gpio_free(MBIMX51_LED1);
> -	gpio_request(MBIMX51_LED2, "LED2");
> -	gpio_direction_output(MBIMX51_LED2, 1);
> -	gpio_free(MBIMX51_LED2);
> -	gpio_request(MBIMX51_LED3, "LED3");
> -	gpio_direction_output(MBIMX51_LED3, 1);
> -	gpio_free(MBIMX51_LED3);
> -
> -	gpio_led_register_device(-1, &mbimx51_leds_info);
> -
> -	imx51_add_imx_keypad(&mbimx51_map_data);
> -
> -	gpio_request(MBIMX51_TSC2007_GPIO, "tsc2007_irq");
> -	gpio_direction_input(MBIMX51_TSC2007_GPIO);
> -	irq_set_irq_type(gpio_to_irq(MBIMX51_TSC2007_GPIO),
> -					IRQF_TRIGGER_FALLING);
> -	i2c_register_board_info(1, mbimx51_i2c_devices,
> -				ARRAY_SIZE(mbimx51_i2c_devices));
> -
> -	imx51_add_sdhci_esdhc_imx(0, NULL);
> -	imx51_add_sdhci_esdhc_imx(1, NULL);
> -}
> -- 
> 1.7.6.4
> 
>
Eric Benard - Dec. 13, 2011, 10:13 a.m.
Hi Sascha,

Le 13/12/2011 11:05, Sascha Hauer a écrit :
> On Tue, Dec 13, 2011 at 07:31:48AM +0100, Eric Bénard wrote:
>> this board is not maintained anymore and is replaced by cpuimx51sd
>
> I'm happy to remove this code, but aren't there any users of this board?
>
not any that would need a kernel upgrade considering the Freescale proprietary 
drivers used on it :-(
Thanks,
Eric
Amit Kucheria - Dec. 15, 2011, 3:58 a.m.
On 11 Dec 13, Eric Bénard wrote:
> Hi Sascha,
> 
> Le 13/12/2011 11:05, Sascha Hauer a écrit :
> >On Tue, Dec 13, 2011 at 07:31:48AM +0100, Eric Bénard wrote:
> >>this board is not maintained anymore and is replaced by cpuimx51sd
> >
> >I'm happy to remove this code, but aren't there any users of this board?
> >
> not any that would need a kernel upgrade considering the Freescale
> proprietary drivers used on it :-(
> Thanks,
> Eric

Just for posterity, could you list the drivers that make an upgrade
impossible?

IMHO, if these boards were sold commercially we should maintain support if
there is a chance that we will get open drivers in the future.

OTOH, if you can tell who each of these boards to, it is probably a good
target for removal. :)

/Amit
Eric Benard - Dec. 15, 2011, 6:55 a.m.
Hi Amit,

Le 15/12/2011 04:58, Amit Kucheria a écrit :
 > On 11 Dec 13, Eric Bénard wrote:
 >> Hi Sascha,
 >>
 >> Le 13/12/2011 11:05, Sascha Hauer a écrit :
 >>> On Tue, Dec 13, 2011 at 07:31:48AM +0100, Eric Bénard wrote:
 >>>> this board is not maintained anymore and is replaced by cpuimx51sd
 >>>
 >>> I'm happy to remove this code, but aren't there any users of this board?
 >>>
 >> not any that would need a kernel upgrade considering the Freescale
 >> proprietary drivers used on it :-(
 >> Thanks,
 >> Eric
 >
 > Just for posterity, could you list the drivers that make an upgrade
 > impossible?
 >
at least gpu (AMD/FSL proprietary) & iirc video codecs (not all proprietary 
but far from mainline unless I missed something). In fact in the end these 
boards were using Freescale's kernel.

 > IMHO, if these boards were sold commercially we should maintain support if
 > there is a chance that we will get open drivers in the future.
 >
 > OTOH, if you can tell who each of these boards to, it is probably a good
 > target for removal. :)
 >
I confirm that's a good target for removal as our i.MX51 customers are 
actually using cpuimx51sd (actually without 3D & codecs actually but not 
everyone need these peripherals in industrial applications). Moreover, if all 
the drivers are mainlined we will be able to use dt if we want to upgrade 
cpuimx51.

Thanks,
Eric

Patch

diff --git a/arch/arm/configs/mx5_defconfig b/arch/arm/configs/mx5_defconfig
index d0d8dfe..32e91f8 100644
--- a/arch/arm/configs/mx5_defconfig
+++ b/arch/arm/configs/mx5_defconfig
@@ -17,7 +17,6 @@  CONFIG_ARCH_MXC=y
 CONFIG_ARCH_MX5=y
 CONFIG_MACH_MX51_BABBAGE=y
 CONFIG_MACH_MX51_3DS=y
-CONFIG_MACH_EUKREA_CPUIMX51=y
 CONFIG_MACH_EUKREA_CPUIMX51SD=y
 CONFIG_MACH_MX51_EFIKAMX=y
 CONFIG_MACH_MX51_EFIKASB=y
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
index af0c212..0cea604 100644
--- a/arch/arm/mach-mx5/Kconfig
+++ b/arch/arm/mach-mx5/Kconfig
@@ -93,36 +93,6 @@  config MACH_MX51_3DS
 	  Include support for MX51PDK (3DS) platform. This includes specific
 	  configurations for the board and its peripherals.
 
-config MACH_EUKREA_CPUIMX51
-	bool "Support Eukrea CPUIMX51 module"
-	select SOC_IMX51
-	select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-	select IMX_HAVE_PLATFORM_IMX_I2C
-	select IMX_HAVE_PLATFORM_IMX_UART
-	select IMX_HAVE_PLATFORM_MXC_EHCI
-	select IMX_HAVE_PLATFORM_MXC_NAND
-	select IMX_HAVE_PLATFORM_SPI_IMX
-	help
-	  Include support for Eukrea CPUIMX51 platform. This includes
-	  specific configurations for the module and its peripherals.
-
-choice
-	prompt "Baseboard"
-	depends on MACH_EUKREA_CPUIMX51
-	default MACH_EUKREA_MBIMX51_BASEBOARD
-
-config MACH_EUKREA_MBIMX51_BASEBOARD
-	prompt "Eukrea MBIMX51 development board"
-	bool
-	select IMX_HAVE_PLATFORM_IMX_KEYPAD
-	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-	select LEDS_GPIO_REGISTER
-	help
-	  This adds board specific devices that can be found on Eukrea's
-	  MBIMX51 evaluation board.
-
-endchoice
-
 config MACH_EUKREA_CPUIMX51SD
 	bool "Support Eukrea CPUIMX51SD module"
 	select SOC_IMX51
diff --git a/arch/arm/mach-mx5/Makefile b/arch/arm/mach-mx5/Makefile
index 0fc6080..596c1c7 100644
--- a/arch/arm/mach-mx5/Makefile
+++ b/arch/arm/mach-mx5/Makefile
@@ -13,8 +13,6 @@  obj-$(CONFIG_MACH_MX53_EVK) += board-mx53_evk.o
 obj-$(CONFIG_MACH_MX53_SMD) += board-mx53_smd.o
 obj-$(CONFIG_MACH_MX53_LOCO) += board-mx53_loco.o
 obj-$(CONFIG_MACH_MX53_ARD) += board-mx53_ard.o
-obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o
-obj-$(CONFIG_MACH_EUKREA_MBIMX51_BASEBOARD) += eukrea_mbimx51-baseboard.o
 obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += board-cpuimx51sd.o
 obj-$(CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD) += eukrea_mbimxsd-baseboard.o
 obj-$(CONFIG_MX51_EFIKA_COMMON) += mx51_efika.o
diff --git a/arch/arm/mach-mx5/board-cpuimx51.c b/arch/arm/mach-mx5/board-cpuimx51.c
deleted file mode 100644
index 1fc1103..0000000
--- a/arch/arm/mach-mx5/board-cpuimx51.c
+++ /dev/null
@@ -1,300 +0,0 @@ 
-/*
- *
- * Copyright (C) 2010 Eric Bénard <eric@eukrea.com>
- *
- * based on board-mx51_babbage.c which is
- * Copyright 2009 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright (C) 2009-2010 Amit Kucheria <amit.kucheria@canonical.com>
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/serial_8250.h>
-#include <linux/i2c.h>
-#include <linux/gpio.h>
-#include <linux/delay.h>
-#include <linux/io.h>
-#include <linux/interrupt.h>
-
-#include <mach/eukrea-baseboards.h>
-#include <mach/common.h>
-#include <mach/hardware.h>
-#include <mach/iomux-mx51.h>
-
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/time.h>
-
-#include "devices-imx51.h"
-
-#define CPUIMX51_USBH1_STP	IMX_GPIO_NR(1, 27)
-#define CPUIMX51_QUARTA_GPIO	IMX_GPIO_NR(3, 28)
-#define CPUIMX51_QUARTB_GPIO	IMX_GPIO_NR(3, 25)
-#define CPUIMX51_QUARTC_GPIO	IMX_GPIO_NR(3, 26)
-#define CPUIMX51_QUARTD_GPIO	IMX_GPIO_NR(3, 27)
-#define CPUIMX51_QUART_XTAL	14745600
-#define CPUIMX51_QUART_REGSHIFT	17
-
-/* USB_CTRL_1 */
-#define MX51_USB_CTRL_1_OFFSET		0x10
-#define MX51_USB_CTRL_UH1_EXT_CLK_EN	(1 << 25)
-
-#define	MX51_USB_PLLDIV_12_MHZ		0x00
-#define	MX51_USB_PLL_DIV_19_2_MHZ	0x01
-#define	MX51_USB_PLL_DIV_24_MHZ		0x02
-
-static struct plat_serial8250_port serial_platform_data[] = {
-	{
-		.mapbase = (unsigned long)(MX51_CS1_BASE_ADDR + 0x400000),
-		.irq = IMX_GPIO_TO_IRQ(CPUIMX51_QUARTA_GPIO),
-		.irqflags = IRQF_TRIGGER_HIGH,
-		.uartclk = CPUIMX51_QUART_XTAL,
-		.regshift = CPUIMX51_QUART_REGSHIFT,
-		.iotype = UPIO_MEM,
-		.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP,
-	}, {
-		.mapbase = (unsigned long)(MX51_CS1_BASE_ADDR + 0x800000),
-		.irq = IMX_GPIO_TO_IRQ(CPUIMX51_QUARTB_GPIO),
-		.irqflags = IRQF_TRIGGER_HIGH,
-		.uartclk = CPUIMX51_QUART_XTAL,
-		.regshift = CPUIMX51_QUART_REGSHIFT,
-		.iotype = UPIO_MEM,
-		.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP,
-	}, {
-		.mapbase = (unsigned long)(MX51_CS1_BASE_ADDR + 0x1000000),
-		.irq = IMX_GPIO_TO_IRQ(CPUIMX51_QUARTC_GPIO),
-		.irqflags = IRQF_TRIGGER_HIGH,
-		.uartclk = CPUIMX51_QUART_XTAL,
-		.regshift = CPUIMX51_QUART_REGSHIFT,
-		.iotype = UPIO_MEM,
-		.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP,
-	}, {
-		.mapbase = (unsigned long)(MX51_CS1_BASE_ADDR + 0x2000000),
-		.irq = IMX_GPIO_TO_IRQ(CPUIMX51_QUARTD_GPIO),
-		.irqflags = IRQF_TRIGGER_HIGH,
-		.uartclk = CPUIMX51_QUART_XTAL,
-		.regshift = CPUIMX51_QUART_REGSHIFT,
-		.iotype = UPIO_MEM,
-		.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP,
-	}, {
-	}
-};
-
-static struct platform_device serial_device = {
-	.name = "serial8250",
-	.id = 0,
-	.dev = {
-		.platform_data = serial_platform_data,
-	},
-};
-
-static struct platform_device *devices[] __initdata = {
-	&serial_device,
-};
-
-static iomux_v3_cfg_t eukrea_cpuimx51_pads[] = {
-	/* UART1 */
-	MX51_PAD_UART1_RXD__UART1_RXD,
-	MX51_PAD_UART1_TXD__UART1_TXD,
-	MX51_PAD_UART1_RTS__UART1_RTS,
-	MX51_PAD_UART1_CTS__UART1_CTS,
-
-	/* I2C2 */
-	MX51_PAD_GPIO1_2__I2C2_SCL,
-	MX51_PAD_GPIO1_3__I2C2_SDA,
-	MX51_PAD_NANDF_D10__GPIO3_30,
-
-	/* QUART IRQ */
-	MX51_PAD_NANDF_D15__GPIO3_25,
-	MX51_PAD_NANDF_D14__GPIO3_26,
-	MX51_PAD_NANDF_D13__GPIO3_27,
-	MX51_PAD_NANDF_D12__GPIO3_28,
-
-	/* USB HOST1 */
-	MX51_PAD_USBH1_CLK__USBH1_CLK,
-	MX51_PAD_USBH1_DIR__USBH1_DIR,
-	MX51_PAD_USBH1_NXT__USBH1_NXT,
-	MX51_PAD_USBH1_DATA0__USBH1_DATA0,
-	MX51_PAD_USBH1_DATA1__USBH1_DATA1,
-	MX51_PAD_USBH1_DATA2__USBH1_DATA2,
-	MX51_PAD_USBH1_DATA3__USBH1_DATA3,
-	MX51_PAD_USBH1_DATA4__USBH1_DATA4,
-	MX51_PAD_USBH1_DATA5__USBH1_DATA5,
-	MX51_PAD_USBH1_DATA6__USBH1_DATA6,
-	MX51_PAD_USBH1_DATA7__USBH1_DATA7,
-	MX51_PAD_USBH1_STP__USBH1_STP,
-};
-
-static const struct mxc_nand_platform_data
-		eukrea_cpuimx51_nand_board_info __initconst = {
-	.width		= 1,
-	.hw_ecc		= 1,
-	.flash_bbt	= 1,
-};
-
-static const struct imxuart_platform_data uart_pdata __initconst = {
-	.flags = IMXUART_HAVE_RTSCTS,
-};
-
-static const
-struct imxi2c_platform_data eukrea_cpuimx51_i2c_data __initconst = {
-	.bitrate = 100000,
-};
-
-static struct i2c_board_info eukrea_cpuimx51_i2c_devices[] = {
-	{
-		I2C_BOARD_INFO("pcf8563", 0x51),
-	},
-};
-
-/* This function is board specific as the bit mask for the plldiv will also
-be different for other Freescale SoCs, thus a common bitmask is not
-possible and cannot get place in /plat-mxc/ehci.c.*/
-static int initialize_otg_port(struct platform_device *pdev)
-{
-	u32 v;
-	void __iomem *usb_base;
-	void __iomem *usbother_base;
-
-	usb_base = ioremap(MX51_USB_OTG_BASE_ADDR, SZ_4K);
-	if (!usb_base)
-		return -ENOMEM;
-	usbother_base = usb_base + MX5_USBOTHER_REGS_OFFSET;
-
-	/* Set the PHY clock to 19.2MHz */
-	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
-	v |= MX51_USB_PLL_DIV_19_2_MHZ;
-	__raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
-	iounmap(usb_base);
-
-	mdelay(10);
-
-	return mx51_initialize_usb_hw(0, MXC_EHCI_INTERNAL_PHY);
-}
-
-static int initialize_usbh1_port(struct platform_device *pdev)
-{
-	u32 v;
-	void __iomem *usb_base;
-	void __iomem *usbother_base;
-
-	usb_base = ioremap(MX51_USB_OTG_BASE_ADDR, SZ_4K);
-	if (!usb_base)
-		return -ENOMEM;
-	usbother_base = usb_base + MX5_USBOTHER_REGS_OFFSET;
-
-	/* The clock for the USBH1 ULPI port will come externally from the PHY. */
-	v = __raw_readl(usbother_base + MX51_USB_CTRL_1_OFFSET);
-	__raw_writel(v | MX51_USB_CTRL_UH1_EXT_CLK_EN, usbother_base + MX51_USB_CTRL_1_OFFSET);
-	iounmap(usb_base);
-
-	mdelay(10);
-
-	return mx51_initialize_usb_hw(1, MXC_EHCI_POWER_PINS_ENABLED |
-			MXC_EHCI_ITC_NO_THRESHOLD);
-}
-
-static const struct mxc_usbh_platform_data dr_utmi_config __initconst = {
-	.init		= initialize_otg_port,
-	.portsc	= MXC_EHCI_UTMI_16BIT,
-};
-
-static const struct fsl_usb2_platform_data usb_pdata __initconst = {
-	.operating_mode	= FSL_USB2_DR_DEVICE,
-	.phy_mode	= FSL_USB2_PHY_UTMI_WIDE,
-};
-
-static const struct mxc_usbh_platform_data usbh1_config __initconst = {
-	.init		= initialize_usbh1_port,
-	.portsc	= MXC_EHCI_MODE_ULPI,
-};
-
-static int otg_mode_host;
-
-static int __init eukrea_cpuimx51_otg_mode(char *options)
-{
-	if (!strcmp(options, "host"))
-		otg_mode_host = 1;
-	else if (!strcmp(options, "device"))
-		otg_mode_host = 0;
-	else
-		pr_info("otg_mode neither \"host\" nor \"device\". "
-			"Defaulting to device\n");
-	return 0;
-}
-__setup("otg_mode=", eukrea_cpuimx51_otg_mode);
-
-/*
- * Board specific initialization.
- */
-static void __init eukrea_cpuimx51_init(void)
-{
-	imx51_soc_init();
-
-	mxc_iomux_v3_setup_multiple_pads(eukrea_cpuimx51_pads,
-					ARRAY_SIZE(eukrea_cpuimx51_pads));
-
-	imx51_add_imx_uart(0, &uart_pdata);
-	imx51_add_mxc_nand(&eukrea_cpuimx51_nand_board_info);
-
-	gpio_request(CPUIMX51_QUARTA_GPIO, "quarta_irq");
-	gpio_direction_input(CPUIMX51_QUARTA_GPIO);
-	gpio_free(CPUIMX51_QUARTA_GPIO);
-	gpio_request(CPUIMX51_QUARTB_GPIO, "quartb_irq");
-	gpio_direction_input(CPUIMX51_QUARTB_GPIO);
-	gpio_free(CPUIMX51_QUARTB_GPIO);
-	gpio_request(CPUIMX51_QUARTC_GPIO, "quartc_irq");
-	gpio_direction_input(CPUIMX51_QUARTC_GPIO);
-	gpio_free(CPUIMX51_QUARTC_GPIO);
-	gpio_request(CPUIMX51_QUARTD_GPIO, "quartd_irq");
-	gpio_direction_input(CPUIMX51_QUARTD_GPIO);
-	gpio_free(CPUIMX51_QUARTD_GPIO);
-
-	imx51_add_fec(NULL);
-	platform_add_devices(devices, ARRAY_SIZE(devices));
-
-	imx51_add_imx_i2c(1, &eukrea_cpuimx51_i2c_data);
-	i2c_register_board_info(1, eukrea_cpuimx51_i2c_devices,
-				ARRAY_SIZE(eukrea_cpuimx51_i2c_devices));
-
-	if (otg_mode_host)
-		imx51_add_mxc_ehci_otg(&dr_utmi_config);
-	else {
-		initialize_otg_port(NULL);
-		imx51_add_fsl_usb2_udc(&usb_pdata);
-	}
-	imx51_add_mxc_ehci_hs(1, &usbh1_config);
-
-#ifdef CONFIG_MACH_EUKREA_MBIMX51_BASEBOARD
-	eukrea_mbimx51_baseboard_init();
-#endif
-}
-
-static void __init eukrea_cpuimx51_timer_init(void)
-{
-	mx51_clocks_init(32768, 24000000, 22579200, 0);
-}
-
-static struct sys_timer mxc_timer = {
-	.init	= eukrea_cpuimx51_timer_init,
-};
-
-MACHINE_START(EUKREA_CPUIMX51, "Eukrea CPUIMX51 Module")
-	/* Maintainer: Eric Bénard <eric@eukrea.com> */
-	.atag_offset = 0x100,
-	.map_io = mx51_map_io,
-	.init_early = imx51_init_early,
-	.init_irq = mx51_init_irq,
-	.handle_irq = imx51_handle_irq,
-	.timer = &mxc_timer,
-	.init_machine = eukrea_cpuimx51_init,
-MACHINE_END
diff --git a/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c b/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
deleted file mode 100644
index a6a3ab8..0000000
--- a/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
+++ /dev/null
@@ -1,206 +0,0 @@ 
-/*
- *
- * Copyright (C) 2010 Eric Bénard <eric@eukrea.com>
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/serial_8250.h>
-#include <linux/i2c.h>
-#include <linux/gpio.h>
-#include <linux/io.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/i2c/tsc2007.h>
-#include <linux/leds.h>
-
-#include <mach/common.h>
-#include <mach/hardware.h>
-#include <mach/iomux-mx51.h>
-
-#include <asm/mach/arch.h>
-
-#include "devices-imx51.h"
-
-#define MBIMX51_TSC2007_GPIO	IMX_GPIO_NR(3, 30)
-#define MBIMX51_LED0		IMX_GPIO_NR(3, 5)
-#define MBIMX51_LED1		IMX_GPIO_NR(3, 6)
-#define MBIMX51_LED2		IMX_GPIO_NR(3, 7)
-#define MBIMX51_LED3		IMX_GPIO_NR(3, 8)
-
-static const struct gpio_led mbimx51_leds[] __initconst = {
-	{
-		.name			= "led0",
-		.default_trigger	= "heartbeat",
-		.active_low		= 1,
-		.gpio			= MBIMX51_LED0,
-	},
-	{
-		.name			= "led1",
-		.default_trigger	= "nand-disk",
-		.active_low		= 1,
-		.gpio			= MBIMX51_LED1,
-	},
-	{
-		.name			= "led2",
-		.default_trigger	= "mmc0",
-		.active_low		= 1,
-		.gpio			= MBIMX51_LED2,
-	},
-	{
-		.name			= "led3",
-		.default_trigger	= "default-on",
-		.active_low		= 1,
-		.gpio			= MBIMX51_LED3,
-	},
-};
-
-static const struct gpio_led_platform_data mbimx51_leds_info __initconst = {
-	.leds		= mbimx51_leds,
-	.num_leds	= ARRAY_SIZE(mbimx51_leds),
-};
-
-static iomux_v3_cfg_t mbimx51_pads[] = {
-	/* UART2 */
-	MX51_PAD_UART2_RXD__UART2_RXD,
-	MX51_PAD_UART2_TXD__UART2_TXD,
-
-	/* UART3 */
-	MX51_PAD_UART3_RXD__UART3_RXD,
-	MX51_PAD_UART3_TXD__UART3_TXD,
-	MX51_PAD_KEY_COL4__UART3_RTS,
-	MX51_PAD_KEY_COL5__UART3_CTS,
-
-	/* TSC2007 IRQ */
-	MX51_PAD_NANDF_D10__GPIO3_30,
-
-	/* LEDS */
-	MX51_PAD_DISPB2_SER_DIN__GPIO3_5,
-	MX51_PAD_DISPB2_SER_DIO__GPIO3_6,
-	MX51_PAD_DISPB2_SER_CLK__GPIO3_7,
-	MX51_PAD_DISPB2_SER_RS__GPIO3_8,
-
-	/* KPP */
-	MX51_PAD_KEY_ROW0__KEY_ROW0,
-	MX51_PAD_KEY_ROW1__KEY_ROW1,
-	MX51_PAD_KEY_ROW2__KEY_ROW2,
-	MX51_PAD_KEY_ROW3__KEY_ROW3,
-	MX51_PAD_KEY_COL0__KEY_COL0,
-	MX51_PAD_KEY_COL1__KEY_COL1,
-	MX51_PAD_KEY_COL2__KEY_COL2,
-	MX51_PAD_KEY_COL3__KEY_COL3,
-
-	/* SD 1 */
-	MX51_PAD_SD1_CMD__SD1_CMD,
-	MX51_PAD_SD1_CLK__SD1_CLK,
-	MX51_PAD_SD1_DATA0__SD1_DATA0,
-	MX51_PAD_SD1_DATA1__SD1_DATA1,
-	MX51_PAD_SD1_DATA2__SD1_DATA2,
-	MX51_PAD_SD1_DATA3__SD1_DATA3,
-
-	/* SD 2 */
-	MX51_PAD_SD2_CMD__SD2_CMD,
-	MX51_PAD_SD2_CLK__SD2_CLK,
-	MX51_PAD_SD2_DATA0__SD2_DATA0,
-	MX51_PAD_SD2_DATA1__SD2_DATA1,
-	MX51_PAD_SD2_DATA2__SD2_DATA2,
-	MX51_PAD_SD2_DATA3__SD2_DATA3,
-};
-
-static const struct imxuart_platform_data uart_pdata __initconst = {
-	.flags = IMXUART_HAVE_RTSCTS,
-};
-
-static int mbimx51_keymap[] = {
-	KEY(0, 0, KEY_1),
-	KEY(0, 1, KEY_2),
-	KEY(0, 2, KEY_3),
-	KEY(0, 3, KEY_UP),
-
-	KEY(1, 0, KEY_4),
-	KEY(1, 1, KEY_5),
-	KEY(1, 2, KEY_6),
-	KEY(1, 3, KEY_LEFT),
-
-	KEY(2, 0, KEY_7),
-	KEY(2, 1, KEY_8),
-	KEY(2, 2, KEY_9),
-	KEY(2, 3, KEY_RIGHT),
-
-	KEY(3, 0, KEY_0),
-	KEY(3, 1, KEY_DOWN),
-	KEY(3, 2, KEY_ESC),
-	KEY(3, 3, KEY_ENTER),
-};
-
-static const struct matrix_keymap_data mbimx51_map_data __initconst = {
-	.keymap		= mbimx51_keymap,
-	.keymap_size	= ARRAY_SIZE(mbimx51_keymap),
-};
-
-static int tsc2007_get_pendown_state(void)
-{
-	return !gpio_get_value(MBIMX51_TSC2007_GPIO);
-}
-
-struct tsc2007_platform_data tsc2007_data = {
-	.model = 2007,
-	.x_plate_ohms = 180,
-	.get_pendown_state = tsc2007_get_pendown_state,
-};
-
-static struct i2c_board_info mbimx51_i2c_devices[] = {
-	{
-		I2C_BOARD_INFO("tsc2007", 0x49),
-		.irq  = IMX_GPIO_TO_IRQ(MBIMX51_TSC2007_GPIO),
-		.platform_data = &tsc2007_data,
-	}, {
-		I2C_BOARD_INFO("tlv320aic23", 0x1a),
-	},
-};
-
-/*
- * baseboard initialization.
- */
-void __init eukrea_mbimx51_baseboard_init(void)
-{
-	mxc_iomux_v3_setup_multiple_pads(mbimx51_pads,
-					ARRAY_SIZE(mbimx51_pads));
-
-	imx51_add_imx_uart(1, NULL);
-	imx51_add_imx_uart(2, &uart_pdata);
-
-	gpio_request(MBIMX51_LED0, "LED0");
-	gpio_direction_output(MBIMX51_LED0, 1);
-	gpio_free(MBIMX51_LED0);
-	gpio_request(MBIMX51_LED1, "LED1");
-	gpio_direction_output(MBIMX51_LED1, 1);
-	gpio_free(MBIMX51_LED1);
-	gpio_request(MBIMX51_LED2, "LED2");
-	gpio_direction_output(MBIMX51_LED2, 1);
-	gpio_free(MBIMX51_LED2);
-	gpio_request(MBIMX51_LED3, "LED3");
-	gpio_direction_output(MBIMX51_LED3, 1);
-	gpio_free(MBIMX51_LED3);
-
-	gpio_led_register_device(-1, &mbimx51_leds_info);
-
-	imx51_add_imx_keypad(&mbimx51_map_data);
-
-	gpio_request(MBIMX51_TSC2007_GPIO, "tsc2007_irq");
-	gpio_direction_input(MBIMX51_TSC2007_GPIO);
-	irq_set_irq_type(gpio_to_irq(MBIMX51_TSC2007_GPIO),
-					IRQF_TRIGGER_FALLING);
-	i2c_register_board_info(1, mbimx51_i2c_devices,
-				ARRAY_SIZE(mbimx51_i2c_devices));
-
-	imx51_add_sdhci_esdhc_imx(0, NULL);
-	imx51_add_sdhci_esdhc_imx(1, NULL);
-}