From mboxrd@z Thu Jan 1 00:00:00 1970 From: eric@eukrea.com (Eric =?ISO-8859-1?B?QuluYXJk?=) Date: Sat, 26 Jul 2014 20:20:42 +0200 Subject: [PATCH] ARM: i.MX: Remove mach-cpuimx27sd board file In-Reply-To: <1406382068-13452-1-git-send-email-shc_work@mail.ru> References: <1406382068-13452-1-git-send-email-shc_work@mail.ru> Message-ID: <20140726202042.6979888c@e6520eb> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Le Sat, 26 Jul 2014 17:41:08 +0400, Alexander Shiyan a ?crit : > > eukrea_mbimx27-baseboard.c and mach-cpuimx27.c can be replaced with their > devicetree equivalents: imx27-eukrea-mbimxsd27-baseboard.dts and > imx27-eukrea-cpuimx27.dtsi respectively, so remove the board files. > > Signed-off-by: Alexander Shiyan Acked-by: Eric B?nard Thanks ! > --- > arch/arm/configs/imx_v4_v5_defconfig | 3 - > arch/arm/mach-imx/Kconfig | 50 ---- > arch/arm/mach-imx/Makefile | 2 - > arch/arm/mach-imx/eukrea-baseboards.h | 10 +- > arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 351 --------------------------- > arch/arm/mach-imx/mach-cpuimx27.c | 321 ------------------------ > 6 files changed, 1 insertion(+), 736 deletions(-) > delete mode 100644 arch/arm/mach-imx/eukrea_mbimx27-baseboard.c > delete mode 100644 arch/arm/mach-imx/mach-cpuimx27.c > > diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig > index 63bde0e..f53074c 100644 > --- a/arch/arm/configs/imx_v4_v5_defconfig > +++ b/arch/arm/configs/imx_v4_v5_defconfig > @@ -31,9 +31,6 @@ CONFIG_MACH_EUKREA_CPUIMX25SD=y > CONFIG_MACH_IMX25_DT=y > CONFIG_MACH_MX27ADS=y > CONFIG_MACH_PCM038=y > -CONFIG_MACH_CPUIMX27=y > -CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2=y > -CONFIG_MACH_EUKREA_CPUIMX27_USEUART4=y > CONFIG_MACH_MX27_3DS=y > CONFIG_MACH_IMX27_VISSTRIM_M10=y > CONFIG_MACH_PCA100=y > diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig > index c6810b8..901e9ab 100644 > --- a/arch/arm/mach-imx/Kconfig > +++ b/arch/arm/mach-imx/Kconfig > @@ -263,56 +263,6 @@ config MACH_PCM970_BASEBOARD > > endchoice > > -config MACH_CPUIMX27 > - bool "Eukrea CPUIMX27 module" > - select IMX_HAVE_PLATFORM_FSL_USB2_UDC > - select IMX_HAVE_PLATFORM_IMX2_WDT > - 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_MXC_W1 > - select USB_ULPI_VIEWPORT if USB_ULPI > - select SOC_IMX27 > - help > - Include support for Eukrea CPUIMX27 platform. This includes > - specific configurations for the module and its peripherals. > - > -config MACH_EUKREA_CPUIMX27_USESDHC2 > - bool "CPUIMX27 integrates SDHC2 module" > - depends on MACH_CPUIMX27 > - select IMX_HAVE_PLATFORM_MXC_MMC > - help > - This adds support for the internal SDHC2 used on CPUIMX27 > - for wifi or eMMC. > - > -config MACH_EUKREA_CPUIMX27_USEUART4 > - bool "CPUIMX27 integrates UART4 module" > - depends on MACH_CPUIMX27 > - help > - This adds support for the internal UART4 used on CPUIMX27 > - for bluetooth. > - > -choice > - prompt "Baseboard" > - depends on MACH_CPUIMX27 > - default MACH_EUKREA_MBIMX27_BASEBOARD > - > -config MACH_EUKREA_MBIMX27_BASEBOARD > - bool "Eukrea MBIMX27 development board" > - select IMX_HAVE_PLATFORM_IMX_FB > - select IMX_HAVE_PLATFORM_IMX_KEYPAD > - select IMX_HAVE_PLATFORM_IMX_SSI > - select IMX_HAVE_PLATFORM_IMX_UART > - select IMX_HAVE_PLATFORM_MXC_MMC > - select IMX_HAVE_PLATFORM_SPI_IMX > - select LEDS_GPIO_REGISTER > - help > - This adds board specific devices that can be found on Eukrea's > - MBIMX27 evaluation board. > - > -endchoice > - > config MACH_MX27_3DS > bool "MX27PDK platform" > select IMX_HAVE_PLATFORM_FSL_USB2_UDC > diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile > index 2783d27..2942ec3 100644 > --- a/arch/arm/mach-imx/Makefile > +++ b/arch/arm/mach-imx/Makefile > @@ -61,8 +61,6 @@ obj-$(CONFIG_MACH_PCM038) += mach-pcm038.o > obj-$(CONFIG_MACH_PCM970_BASEBOARD) += pcm970-baseboard.o > obj-$(CONFIG_MACH_MX27_3DS) += mach-mx27_3ds.o > obj-$(CONFIG_MACH_IMX27_VISSTRIM_M10) += mach-imx27_visstrim_m10.o > -obj-$(CONFIG_MACH_CPUIMX27) += mach-cpuimx27.o > -obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o > obj-$(CONFIG_MACH_PCA100) += mach-pca100.o > obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o > obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o > diff --git a/arch/arm/mach-imx/eukrea-baseboards.h b/arch/arm/mach-imx/eukrea-baseboards.h > index a21d331..bb2c90d 100644 > --- a/arch/arm/mach-imx/eukrea-baseboards.h > +++ b/arch/arm/mach-imx/eukrea-baseboards.h > @@ -27,23 +27,15 @@ > * This CPU module needs a baseboard to work. After basic initializing > * its own devices, it calls baseboard's init function. > * TODO: Add your own baseboard init function and call it from > - * inside eukrea_cpuimx25_init() eukrea_cpuimx27_init() > - * eukrea_cpuimx35_init() eukrea_cpuimx51_init() > - * or eukrea_cpuimx51sd_init(). > + * inside eukrea_cpuimx25_init() or eukrea_cpuimx35_init() > * > * This example here is for the development board. Refer > * mach-mx25/eukrea_mbimxsd-baseboard.c for cpuimx25 > - * mach-imx/eukrea_mbimx27-baseboard.c for cpuimx27 > * mach-mx3/eukrea_mbimxsd-baseboard.c for cpuimx35 > - * mach-mx5/eukrea_mbimx51-baseboard.c for cpuimx51 > - * mach-mx5/eukrea_mbimxsd-baseboard.c for cpuimx51sd > */ > > extern void eukrea_mbimxsd25_baseboard_init(void); > -extern void eukrea_mbimx27_baseboard_init(void); > extern void eukrea_mbimxsd35_baseboard_init(void); > -extern void eukrea_mbimx51_baseboard_init(void); > -extern void eukrea_mbimxsd51_baseboard_init(void); > > #endif > > diff --git a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c > deleted file mode 100644 > index b2f08bf..0000000 > --- a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c > +++ /dev/null > @@ -1,351 +0,0 @@ > -/* > - * Copyright (C) 2009-2010 Eric Benard - eric at eukrea.com > - * > - * Based on pcm970-baseboard.c which is : > - * Copyright (C) 2008 Juergen Beisert (kernel at pengutronix.de) > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version 2 > - * of the License, or (at your option) any later version. > - * This program is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - * > - * You should have received a copy of the GNU General Public License > - * along with this program; if not, write to the Free Software > - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, > - * MA 02110-1301, USA. > - */ > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include