From 06ff74fd197aa8205443cf64b94383802602e320 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Fri, 18 Oct 2013 17:37:53 +0200 Subject: [PATCH] ARM: OMAP2+: remove legacy support for IGEP boards Device Tree support for IGEP boards in mainline is almost finished. The only remaining bits are support for the Marvell SD8686 wifi + BT and TFP410 DVI chips. Adding support for these should be straightforward so let's not block OMAP3 moving to Device Tree only boot and remove the board file for IGEP boards. Signed-off-by: Javier Martinez Canillas Signed-off-by: Tony Lindgren --- MAINTAINERS | 2 +- arch/arm/mach-omap2/Kconfig | 13 - arch/arm/mach-omap2/Makefile | 1 - arch/arm/mach-omap2/board-igep0020.c | 683 --------------------------- 4 files changed, 1 insertion(+), 698 deletions(-) delete mode 100644 arch/arm/mach-omap2/board-igep0020.c diff --git a/MAINTAINERS b/MAINTAINERS index 8a0cbf3cf2c8..1f006f15668c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -929,7 +929,7 @@ M: Javier Martinez Canillas L: linux-omap@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained -F: arch/arm/mach-omap2/board-igep0020.c +F: arch/arm/boot/dts/omap3-igep* ARM/INCOME PXA270 SUPPORT M: Marek Vasut diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 7a020c5f985c..68c9688815aa 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -326,19 +326,6 @@ config MACH_CM_T3517 config MACH_CM_T3730 bool -config MACH_IGEP0020 - bool "IGEP v2 board" - depends on ARCH_OMAP3 - default y - select OMAP_PACKAGE_CBB - -config MACH_IGEP0030 - bool "IGEP OMAP3 module" - depends on ARCH_OMAP3 - default y - select MACH_IGEP0020 - select OMAP_PACKAGE_CBB - config MACH_SBC3530 bool "OMAP3 SBC STALKER board" depends on ARCH_OMAP3 diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 449a174ab926..096d6bbcd3bc 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -250,7 +250,6 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51-peripherals.o obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51-video.o obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o obj-$(CONFIG_MACH_CM_T3517) += board-cm-t3517.o -obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o obj-$(CONFIG_MACH_TOUCHBOOK) += board-omap3touchbook.o obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c deleted file mode 100644 index d648d50d9d24..000000000000 --- a/arch/arm/mach-omap2/board-igep0020.c +++ /dev/null @@ -1,683 +0,0 @@ -/* - * Copyright (C) 2009 Integration Software and Electronic Engineering. - * - * Modified from mach-omap2/board-generic.c - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include - -#include -#include - -#include