From bfbb28e727348c140b75982005e7e51cf0197864 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 19 Sep 2012 11:06:06 -0700 Subject: [PATCH 01/26] ARM: OMAP: Remove unused param.h This is no longer needed. Signed-off-by: Tony Lindgren --- arch/arm/plat-omap/include/plat/param.h | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 arch/arm/plat-omap/include/plat/param.h diff --git a/arch/arm/plat-omap/include/plat/param.h b/arch/arm/plat-omap/include/plat/param.h deleted file mode 100644 index 1eb4dc326979..000000000000 --- a/arch/arm/plat-omap/include/plat/param.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * arch/arm/plat-omap/include/mach/param.h - * - */ - -#ifdef CONFIG_OMAP_32K_TIMER_HZ -#define HZ CONFIG_OMAP_32K_TIMER_HZ -#endif From a619ca9c4a132472adce3b8d11d0fdafa91ae9dd Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 19 Sep 2012 10:33:40 -0700 Subject: [PATCH 02/26] ARM: OMAP: Remove smp.h This is no longer needed. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap1/include/mach/smp.h | 5 ----- arch/arm/mach-omap2/include/mach/smp.h | 5 ----- 2 files changed, 10 deletions(-) delete mode 100644 arch/arm/mach-omap1/include/mach/smp.h delete mode 100644 arch/arm/mach-omap2/include/mach/smp.h diff --git a/arch/arm/mach-omap1/include/mach/smp.h b/arch/arm/mach-omap1/include/mach/smp.h deleted file mode 100644 index 80a371c06e59..000000000000 --- a/arch/arm/mach-omap1/include/mach/smp.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * arch/arm/mach-omap1/include/mach/smp.h - */ - -#include diff --git a/arch/arm/mach-omap2/include/mach/smp.h b/arch/arm/mach-omap2/include/mach/smp.h deleted file mode 100644 index 323675f21b69..000000000000 --- a/arch/arm/mach-omap2/include/mach/smp.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * arch/arm/mach-omap2/include/mach/smp.h - */ - -#include From 70c494c3122fb3d53518aea53c8cf5d61cad909a Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 19 Sep 2012 10:46:56 -0700 Subject: [PATCH 03/26] ARM: OMAP1: Make plat/mux.h omap1 only We are moving omap2+ to use the device tree based pinctrl-single.c and will be removing the old mux framework. This will remove the omap1 specific parts from plat-omap. Acked-by: Felipe Balbi Cc: Grant Likely Cc: Alan Stern Cc: Greg Kroah-Hartman Cc: Richard Purdie Cc: Florian Tobias Schandinat Cc: Tomi Valkeinen Cc: linux-usb@vger.kernel.org Cc: linux-pcmcia@lists.infradead.org Cc: spi-devel-general@lists.sourceforge.net Signed-off-by: Tony Lindgren --- arch/arm/mach-omap1/board-ams-delta.c | 2 +- arch/arm/mach-omap1/board-fsample.c | 2 +- arch/arm/mach-omap1/board-generic.c | 2 +- arch/arm/mach-omap1/board-h2.c | 2 +- arch/arm/mach-omap1/board-h3.c | 2 +- arch/arm/mach-omap1/board-innovator.c | 2 +- arch/arm/mach-omap1/board-nokia770.c | 2 +- arch/arm/mach-omap1/board-osk.c | 2 +- arch/arm/mach-omap1/board-palmte.c | 2 +- arch/arm/mach-omap1/board-palmtt.c | 2 +- arch/arm/mach-omap1/board-palmz71.c | 2 +- arch/arm/mach-omap1/board-perseus2.c | 2 +- arch/arm/mach-omap1/board-sx1.c | 2 +- arch/arm/mach-omap1/board-voiceblue.c | 2 +- arch/arm/mach-omap1/devices.c | 2 +- arch/arm/mach-omap1/i2c.c | 2 +- .../plat => mach-omap1/include/mach}/mux.h | 0 arch/arm/mach-omap1/io.c | 2 +- arch/arm/mach-omap1/leds.c | 2 +- arch/arm/mach-omap1/mcbsp.c | 2 +- arch/arm/mach-omap1/mux.c | 58 +++++++++++- arch/arm/mach-omap1/pm.c | 2 +- arch/arm/mach-omap1/serial.c | 2 +- arch/arm/mach-omap1/usb.c | 2 +- arch/arm/mach-omap2/common.c | 1 - arch/arm/mach-omap2/hsmmc.c | 1 - arch/arm/plat-omap/Makefile | 2 +- arch/arm/plat-omap/i2c.c | 1 - arch/arm/plat-omap/include/plat/omap-serial.h | 2 - arch/arm/plat-omap/mux.c | 90 ------------------- drivers/mmc/host/omap.c | 1 - drivers/pcmcia/omap_cf.c | 2 +- drivers/spi/spi-omap-uwire.c | 2 +- drivers/usb/host/ohci-omap.c | 2 +- drivers/usb/musb/tusb6010_omap.c | 1 - drivers/usb/otg/isp1301_omap.c | 2 +- drivers/video/backlight/omap1_bl.c | 2 +- drivers/video/omap/lcd_osk.c | 2 +- 38 files changed, 85 insertions(+), 128 deletions(-) rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/mux.h (100%) delete mode 100644 arch/arm/plat-omap/mux.c diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 56446d2b2844..275d7e50ae10 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c index ad5ba9f00efe..63aa634ce29f 100644 --- a/arch/arm/mach-omap1/board-fsample.c +++ b/arch/arm/mach-omap1/board-fsample.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c index 04b5fdaff831..4ec579fdd366 100644 --- a/arch/arm/mach-omap1/board-generic.c +++ b/arch/arm/mach-omap1/board-generic.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 519d827570bb..093297e50ec7 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index 4733eb510bad..adc0373299ec 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index 083afa79dfb1..04a67230cc94 100644 --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index 7b9fc99e705e..7d5c06d6a52a 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index c780a1b80c2a..3ef0bba65b61 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index e46f5c2ea63f..b633b386240e 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c index e1c842be749e..518b94dbeae1 100644 --- a/arch/arm/mach-omap1/board-palmtt.c +++ b/arch/arm/mach-omap1/board-palmtt.c @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index a71b7f59b7c3..f4a615d61f69 100644 --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index 87797025d6bb..cc38e36b3764 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c index a6a1ab638292..2fddf6f0b39a 100644 --- a/arch/arm/mach-omap1/board-sx1.c +++ b/arch/arm/mach-omap1/board-sx1.c @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index 1668af3017de..bd7b3fc18a49 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 05fdbd992c77..0cc54dd553e3 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/mach-omap1/i2c.c b/arch/arm/mach-omap1/i2c.c index 5446c9912641..a0551a6d7451 100644 --- a/arch/arm/mach-omap1/i2c.c +++ b/arch/arm/mach-omap1/i2c.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include void __init omap1_i2c_mux_pins(int bus_id) diff --git a/arch/arm/plat-omap/include/plat/mux.h b/arch/arm/mach-omap1/include/mach/mux.h similarity index 100% rename from arch/arm/plat-omap/include/plat/mux.h rename to arch/arm/mach-omap1/include/mach/mux.h diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index 6c95a59f0f16..6a5baab1f4cb 100644 --- a/arch/arm/mach-omap1/io.c +++ b/arch/arm/mach-omap1/io.c @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/mach-omap1/leds.c b/arch/arm/mach-omap1/leds.c index 7b1a3833165d..4071479f7106 100644 --- a/arch/arm/mach-omap1/leds.c +++ b/arch/arm/mach-omap1/leds.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include "leds.h" diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c index cf2ed9ef1351..bdc2e7541adb 100644 --- a/arch/arm/mach-omap1/mcbsp.c +++ b/arch/arm/mach-omap1/mcbsp.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c index e9cc52d4cb28..667ce5027f63 100644 --- a/arch/arm/mach-omap1/mux.c +++ b/arch/arm/mach-omap1/mux.c @@ -29,7 +29,7 @@ #include -#include +#include #ifdef CONFIG_OMAP_MUX @@ -451,6 +451,56 @@ static int __init_or_module omap1_cfg_reg(const struct pin_config *cfg) #endif } +static struct omap_mux_cfg *mux_cfg; + +int __init omap_mux_register(struct omap_mux_cfg *arch_mux_cfg) +{ + if (!arch_mux_cfg || !arch_mux_cfg->pins || arch_mux_cfg->size == 0 + || !arch_mux_cfg->cfg_reg) { + printk(KERN_ERR "Invalid pin table\n"); + return -EINVAL; + } + + mux_cfg = arch_mux_cfg; + + return 0; +} + +/* + * Sets the Omap MUX and PULL_DWN registers based on the table + */ +int __init_or_module omap_cfg_reg(const unsigned long index) +{ + struct pin_config *reg; + + if (!cpu_class_is_omap1()) { + printk(KERN_ERR "mux: Broken omap_cfg_reg(%lu) entry\n", + index); + WARN_ON(1); + return -EINVAL; + } + + if (mux_cfg == NULL) { + printk(KERN_ERR "Pin mux table not initialized\n"); + return -ENODEV; + } + + if (index >= mux_cfg->size) { + printk(KERN_ERR "Invalid pin mux index: %lu (%lu)\n", + index, mux_cfg->size); + dump_stack(); + return -ENODEV; + } + + reg = &mux_cfg->pins[index]; + + if (!mux_cfg->cfg_reg) + return -ENODEV; + + return mux_cfg->cfg_reg(reg); +} +EXPORT_SYMBOL(omap_cfg_reg); + int __init omap1_mux_init(void) { if (cpu_is_omap7xx()) { @@ -468,4 +518,8 @@ int __init omap1_mux_init(void) return omap_mux_register(&arch_mux_cfg); } -#endif +#else +#define omap_mux_init() do {} while(0) +#define omap_cfg_reg(x) do {} while(0) +#endif /* CONFIG_OMAP_MUX */ + diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index b2560d32b3a0..47ec16155483 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c index 0d1709b1a6fe..b9d6834af835 100644 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c @@ -22,7 +22,7 @@ #include -#include +#include #include #include "pm.h" diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c index 65f88176fba8..84267edd9421 100644 --- a/arch/arm/mach-omap1/usb.c +++ b/arch/arm/mach-omap1/usb.c @@ -26,7 +26,7 @@ #include -#include +#include #include diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 8e43c4d885d5..17950c6e130b 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c @@ -17,7 +17,6 @@ #include #include -#include #include #include "soc.h" diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index 80399d740952..03ebf47cfa9a 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -19,7 +19,6 @@ #include #include -#include #include #include "mux.h" diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index a017e994e006..dacaee009a4e 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile @@ -3,7 +3,7 @@ # # Common support -obj-y := common.o sram.o clock.o dma.o mux.o fb.o counter_32k.o +obj-y := common.o sram.o clock.o dma.o fb.o counter_32k.o obj-m := obj-n := obj- := diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c index 40bc06a7ac43..6013831a043e 100644 --- a/arch/arm/plat-omap/i2c.c +++ b/arch/arm/plat-omap/i2c.c @@ -32,7 +32,6 @@ #include #include -#include #include #include #include diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h index a531149823bb..b2eac60b6904 100644 --- a/arch/arm/plat-omap/include/plat/omap-serial.h +++ b/arch/arm/plat-omap/include/plat/omap-serial.h @@ -21,8 +21,6 @@ #include #include -#include - #define DRIVER_NAME "omap_uart" /* diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c deleted file mode 100644 index fd0d3aad00ef..000000000000 --- a/arch/arm/plat-omap/mux.c +++ /dev/null @@ -1,90 +0,0 @@ -/* - * linux/arch/arm/plat-omap/mux.c - * - * Utility to set the Omap MUX and PULL_DWN registers from a table in mux.h - * - * Copyright (C) 2003 - 2008 Nokia Corporation - * - * Written by Tony Lindgren - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -#include -#include -#include -#include -#include - -#include - -#include -#include - -#ifdef CONFIG_OMAP_MUX - -static struct omap_mux_cfg *mux_cfg; - -int __init omap_mux_register(struct omap_mux_cfg *arch_mux_cfg) -{ - if (!arch_mux_cfg || !arch_mux_cfg->pins || arch_mux_cfg->size == 0 - || !arch_mux_cfg->cfg_reg) { - printk(KERN_ERR "Invalid pin table\n"); - return -EINVAL; - } - - mux_cfg = arch_mux_cfg; - - return 0; -} - -/* - * Sets the Omap MUX and PULL_DWN registers based on the table - */ -int __init_or_module omap_cfg_reg(const unsigned long index) -{ - struct pin_config *reg; - - if (!cpu_class_is_omap1()) { - printk(KERN_ERR "mux: Broken omap_cfg_reg(%lu) entry\n", - index); - WARN_ON(1); - return -EINVAL; - } - - if (mux_cfg == NULL) { - printk(KERN_ERR "Pin mux table not initialized\n"); - return -ENODEV; - } - - if (index >= mux_cfg->size) { - printk(KERN_ERR "Invalid pin mux index: %lu (%lu)\n", - index, mux_cfg->size); - dump_stack(); - return -ENODEV; - } - - reg = &mux_cfg->pins[index]; - - if (!mux_cfg->cfg_reg) - return -ENODEV; - - return mux_cfg->cfg_reg(reg); -} -EXPORT_SYMBOL(omap_cfg_reg); -#else -#define omap_mux_init() do {} while(0) -#define omap_cfg_reg(x) do {} while(0) -#endif /* CONFIG_OMAP_MUX */ diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 87c0293a1eef..c6259a829544 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #define OMAP_MMC_REG_CMD 0x00 diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c index 0ad06a3bd562..fa74efe82206 100644 --- a/drivers/pcmcia/omap_cf.c +++ b/drivers/pcmcia/omap_cf.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c index a3996a1c6345..0a94d9dc9c31 100644 --- a/drivers/spi/spi-omap-uwire.c +++ b/drivers/spi/spi-omap-uwire.c @@ -52,7 +52,7 @@ #include #include -#include +#include #include /* OMAP7XX_IO_CONF registers */ diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index f8b2d91851f7..4531d03503c3 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c index b67b4bc596c1..89f0709f8935 100644 --- a/drivers/usb/musb/tusb6010_omap.c +++ b/drivers/usb/musb/tusb6010_omap.c @@ -17,7 +17,6 @@ #include #include #include -#include #include "musb_core.h" #include "tusb6010.h" diff --git a/drivers/usb/otg/isp1301_omap.c b/drivers/usb/otg/isp1301_omap.c index 7a88667742b6..81f1f9a0be8f 100644 --- a/drivers/usb/otg/isp1301_omap.c +++ b/drivers/usb/otg/isp1301_omap.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c index 92257ef19403..9a046a4c98f5 100644 --- a/drivers/video/backlight/omap1_bl.c +++ b/drivers/video/backlight/omap1_bl.c @@ -30,7 +30,7 @@ #include #include -#include +#include #define OMAPBL_MAX_INTENSITY 0xff diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c index 5914220dfa9c..3aa62da89195 100644 --- a/drivers/video/omap/lcd_osk.c +++ b/drivers/video/omap/lcd_osk.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include "omapfb.h" static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) From e27e35ec735fa78c976d30304f852cd2e02c5d1f Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 19 Sep 2012 10:33:43 -0700 Subject: [PATCH 04/26] ARM: OMAP1: Move board-ams-delta.h from plat to mach This is only used by omap1. And to fix things properly, this should not be included from the drivers at all. Acked-by: Janusz Krzysztofik Cc: Tomi Valkeinen Cc: linux-fbdev@vger.kernel.org Cc: Artem Bityutskiy Cc: linux-mtd@lists.infradead.org Cc: Dmitry Torokhov Cc: linux-input@vger.kernel.org Cc: Peter Ujfalusi Cc: Liam Girdwood Acked-by: Mark Brown Cc: alsa-devel@alsa-project.org Signed-off-by: Tony Lindgren --- arch/arm/mach-omap1/ams-delta-fiq-handler.S | 2 +- arch/arm/mach-omap1/ams-delta-fiq.c | 2 +- arch/arm/mach-omap1/board-ams-delta.c | 2 +- .../include/plat => mach-omap1/include/mach}/board-ams-delta.h | 0 drivers/input/serio/ams_delta_serio.c | 2 +- drivers/mtd/nand/ams-delta.c | 2 +- drivers/video/omap/lcd_ams_delta.c | 3 +-- sound/soc/omap/ams-delta.c | 2 +- 8 files changed, 7 insertions(+), 8 deletions(-) rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/board-ams-delta.h (100%) diff --git a/arch/arm/mach-omap1/ams-delta-fiq-handler.S b/arch/arm/mach-omap1/ams-delta-fiq-handler.S index d2b6acce8fc1..3d1e1c250a1a 100644 --- a/arch/arm/mach-omap1/ams-delta-fiq-handler.S +++ b/arch/arm/mach-omap1/ams-delta-fiq-handler.S @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c index 68e8e5654c0a..f12a12af3523 100644 --- a/arch/arm/mach-omap1/ams-delta-fiq.c +++ b/arch/arm/mach-omap1/ams-delta-fiq.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 275d7e50ae10..9518bf5996dc 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/plat-omap/include/plat/board-ams-delta.h b/arch/arm/mach-omap1/include/mach/board-ams-delta.h similarity index 100% rename from arch/arm/plat-omap/include/plat/board-ams-delta.h rename to arch/arm/mach-omap1/include/mach/board-ams-delta.h diff --git a/drivers/input/serio/ams_delta_serio.c b/drivers/input/serio/ams_delta_serio.c index f5fbdf94de3b..45887e31242a 100644 --- a/drivers/input/serio/ams_delta_serio.c +++ b/drivers/input/serio/ams_delta_serio.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c index 78a524b49357..a7040af08536 100644 --- a/drivers/mtd/nand/ams-delta.c +++ b/drivers/mtd/nand/ams-delta.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include diff --git a/drivers/video/omap/lcd_ams_delta.c b/drivers/video/omap/lcd_ams_delta.c index d3a311327227..ed4cad87fbcd 100644 --- a/drivers/video/omap/lcd_ams_delta.c +++ b/drivers/video/omap/lcd_ams_delta.c @@ -27,8 +27,7 @@ #include #include -#include -#include +#include #include "omapfb.h" diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index 4138453c9a72..dc0ee7626626 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c @@ -32,7 +32,7 @@ #include -#include +#include #include #include "omap-mcbsp.h" From 4952af4357cab6221750e5184017170b3becf42d Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 19 Sep 2012 10:33:40 -0700 Subject: [PATCH 05/26] ARM: OMAP2+: Make id.h local This can be local to mach-omap2. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/board-devkit8000.c | 2 +- arch/arm/mach-omap2/id.c | 2 +- arch/arm/mach-omap2/{include/mach => }/id.h | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/mach-omap2/{include/mach => }/id.h (100%) diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index fcd4ed0b84c3..7bb8056d4388 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c @@ -32,7 +32,7 @@ #include #include -#include +#include "id.h" #include #include #include diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 6b98a178fbe0..cf2362ccb234 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -23,7 +23,7 @@ #include "common.h" -#include +#include "id.h" #include "soc.h" #include "control.h" diff --git a/arch/arm/mach-omap2/include/mach/id.h b/arch/arm/mach-omap2/id.h similarity index 100% rename from arch/arm/mach-omap2/include/mach/id.h rename to arch/arm/mach-omap2/id.h From 4f9ed545a33746864ee9f55bc0b601e09167dfc4 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 20 Sep 2012 11:40:52 -0700 Subject: [PATCH 06/26] ARM: OMAP2+: Make am35xx.h local This can be local to mach-omap2. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/am35xx-emac.c | 2 +- arch/arm/mach-omap2/{include/mach => }/am35xx.h | 0 arch/arm/mach-omap2/board-am3517evm.c | 2 +- arch/arm/mach-omap2/board-cm-t3517.c | 2 +- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +- arch/arm/mach-omap2/usb-musb.c | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename arch/arm/mach-omap2/{include/mach => }/am35xx.h (100%) diff --git a/arch/arm/mach-omap2/am35xx-emac.c b/arch/arm/mach-omap2/am35xx-emac.c index 2c90ac686686..d0c54c573d34 100644 --- a/arch/arm/mach-omap2/am35xx-emac.c +++ b/arch/arm/mach-omap2/am35xx-emac.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include "am35xx.h" #include "control.h" #include "am35xx-emac.h" diff --git a/arch/arm/mach-omap2/include/mach/am35xx.h b/arch/arm/mach-omap2/am35xx.h similarity index 100% rename from arch/arm/mach-omap2/include/mach/am35xx.h rename to arch/arm/mach-omap2/am35xx.h diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index 403d048a00ee..0d99c9110d01 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c @@ -27,7 +27,7 @@ #include #include -#include +#include "am35xx.h" #include #include #include diff --git a/arch/arm/mach-omap2/board-cm-t3517.c b/arch/arm/mach-omap2/board-cm-t3517.c index 287d7392edf9..59c0a45f75b0 100644 --- a/arch/arm/mach-omap2/board-cm-t3517.c +++ b/arch/arm/mach-omap2/board-cm-t3517.c @@ -43,7 +43,7 @@ #include #include -#include +#include "am35xx.h" #include "mux.h" #include "control.h" diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index a1df9d4690f7..bf46dfac01e4 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -28,7 +28,7 @@ #include #include -#include +#include "am35xx.h" #include "soc.h" #include "omap_hwmod_common_data.h" diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index 89150b2435e5..136c64bc9028 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c @@ -28,7 +28,7 @@ #include #include -#include +#include "am35xx.h" #include "mux.h" From 0a6f98c95849e4b4053cd5114d2470251061a243 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 20 Sep 2012 11:40:56 -0700 Subject: [PATCH 07/26] ARM: OMAP2+: Make board-rx51.h local This can be local to mach-omap2. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +- arch/arm/mach-omap2/board-rx51-video.c | 2 +- arch/arm/mach-omap2/{include/mach => }/board-rx51.h | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/mach-omap2/{include/mach => }/board-rx51.h (100%) diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 29d838b8bdf9..364f985b33a9 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -35,7 +35,7 @@ #include #include -#include +#include "board-rx51.h" #include #include diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c index 7ef09945750d..c22e111bcd00 100644 --- a/arch/arm/mach-omap2/board-rx51-video.c +++ b/arch/arm/mach-omap2/board-rx51-video.c @@ -19,7 +19,7 @@ #include #include -#include +#include "board-rx51.h" #include "mux.h" diff --git a/arch/arm/mach-omap2/include/mach/board-rx51.h b/arch/arm/mach-omap2/board-rx51.h similarity index 100% rename from arch/arm/mach-omap2/include/mach/board-rx51.h rename to arch/arm/mach-omap2/board-rx51.h From 91e80aecff77349312f032cf8792885871fa6477 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 20 Sep 2012 11:40:59 -0700 Subject: [PATCH 08/26] ARM: OMAP2+: Make ctrl_module_core_44xx.h local This can be local to mach-omap2. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/control.h | 2 +- arch/arm/mach-omap2/{include/mach => }/ctrl_module_core_44xx.h | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename arch/arm/mach-omap2/{include/mach => }/ctrl_module_core_44xx.h (100%) diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h index c1a5cab0f236..2d25478a3d7f 100644 --- a/arch/arm/mach-omap2/control.h +++ b/arch/arm/mach-omap2/control.h @@ -16,7 +16,7 @@ #ifndef __ARCH_ARM_MACH_OMAP2_CONTROL_H #define __ARCH_ARM_MACH_OMAP2_CONTROL_H -#include +#include "ctrl_module_core_44xx.h" #include #include #include diff --git a/arch/arm/mach-omap2/include/mach/ctrl_module_core_44xx.h b/arch/arm/mach-omap2/ctrl_module_core_44xx.h similarity index 100% rename from arch/arm/mach-omap2/include/mach/ctrl_module_core_44xx.h rename to arch/arm/mach-omap2/ctrl_module_core_44xx.h From e2e02be3a71055be7f9dde5b19ca0bfd72775753 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 20 Sep 2012 11:41:01 -0700 Subject: [PATCH 09/26] ARM: OMAP2+: Make ctrl_module_pad_core_44xx.h local This can be local to mach-omap2. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/control.h | 2 +- .../mach-omap2/{include/mach => }/ctrl_module_pad_core_44xx.h | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename arch/arm/mach-omap2/{include/mach => }/ctrl_module_pad_core_44xx.h (100%) diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h index 2d25478a3d7f..b36123ae2fb3 100644 --- a/arch/arm/mach-omap2/control.h +++ b/arch/arm/mach-omap2/control.h @@ -18,7 +18,7 @@ #include "ctrl_module_core_44xx.h" #include -#include +#include "ctrl_module_pad_core_44xx.h" #include #include "am33xx.h" diff --git a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h b/arch/arm/mach-omap2/ctrl_module_pad_core_44xx.h similarity index 100% rename from arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h rename to arch/arm/mach-omap2/ctrl_module_pad_core_44xx.h From 98ce572fb3555daf8a029711212ec10e5530ff12 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 20 Sep 2012 11:41:04 -0700 Subject: [PATCH 10/26] ARM: OMAP2+: Make ctrl_module_pad_wkup_44xx.h local This can be local to mach-omap2. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/control.h | 2 +- .../mach-omap2/{include/mach => }/ctrl_module_pad_wkup_44xx.h | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename arch/arm/mach-omap2/{include/mach => }/ctrl_module_pad_wkup_44xx.h (100%) diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h index b36123ae2fb3..dbad6eb58314 100644 --- a/arch/arm/mach-omap2/control.h +++ b/arch/arm/mach-omap2/control.h @@ -19,7 +19,7 @@ #include "ctrl_module_core_44xx.h" #include #include "ctrl_module_pad_core_44xx.h" -#include +#include "ctrl_module_pad_wkup_44xx.h" #include "am33xx.h" diff --git a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_wkup_44xx.h b/arch/arm/mach-omap2/ctrl_module_pad_wkup_44xx.h similarity index 100% rename from arch/arm/mach-omap2/include/mach/ctrl_module_pad_wkup_44xx.h rename to arch/arm/mach-omap2/ctrl_module_pad_wkup_44xx.h From 829ce5906f6c714293d2f62165abecc24c61eba9 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 20 Sep 2012 11:41:06 -0700 Subject: [PATCH 11/26] ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local This can be local to mach-omap2. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/control.h | 2 +- arch/arm/mach-omap2/{include/mach => }/ctrl_module_wkup_44xx.h | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename arch/arm/mach-omap2/{include/mach => }/ctrl_module_wkup_44xx.h (100%) diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h index dbad6eb58314..123186ac7d2e 100644 --- a/arch/arm/mach-omap2/control.h +++ b/arch/arm/mach-omap2/control.h @@ -17,7 +17,7 @@ #define __ARCH_ARM_MACH_OMAP2_CONTROL_H #include "ctrl_module_core_44xx.h" -#include +#include "ctrl_module_wkup_44xx.h" #include "ctrl_module_pad_core_44xx.h" #include "ctrl_module_pad_wkup_44xx.h" diff --git a/arch/arm/mach-omap2/include/mach/ctrl_module_wkup_44xx.h b/arch/arm/mach-omap2/ctrl_module_wkup_44xx.h similarity index 100% rename from arch/arm/mach-omap2/include/mach/ctrl_module_wkup_44xx.h rename to arch/arm/mach-omap2/ctrl_module_wkup_44xx.h From c1db9d735c4d8de331611b7cc62926ffb7a7512d Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 20 Sep 2012 11:41:14 -0700 Subject: [PATCH 12/26] ARM: OMAP2+: Make omap-secure.h local This can be local to mach-omap2. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/omap-secure.c | 2 +- arch/arm/mach-omap2/{include/mach => }/omap-secure.h | 0 arch/arm/mach-omap2/omap-smp.c | 2 +- arch/arm/mach-omap2/omap-wakeupgen.c | 2 +- arch/arm/mach-omap2/sleep44xx.S | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename arch/arm/mach-omap2/{include/mach => }/omap-secure.h (100%) diff --git a/arch/arm/mach-omap2/omap-secure.c b/arch/arm/mach-omap2/omap-secure.c index d9ae4a53d818..a004cb9acf52 100644 --- a/arch/arm/mach-omap2/omap-secure.c +++ b/arch/arm/mach-omap2/omap-secure.c @@ -19,7 +19,7 @@ #include #include -#include +#include "omap-secure.h" static phys_addr_t omap_secure_memblock_base; diff --git a/arch/arm/mach-omap2/include/mach/omap-secure.h b/arch/arm/mach-omap2/omap-secure.h similarity index 100% rename from arch/arm/mach-omap2/include/mach/omap-secure.h rename to arch/arm/mach-omap2/omap-secure.h diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c index 19cc5f504f7e..cf2b32e99cb7 100644 --- a/arch/arm/mach-omap2/omap-smp.c +++ b/arch/arm/mach-omap2/omap-smp.c @@ -24,7 +24,7 @@ #include #include -#include +#include "omap-secure.h" #include #include diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c index b54427dec2a3..7b7d613d568d 100644 --- a/arch/arm/mach-omap2/omap-wakeupgen.c +++ b/arch/arm/mach-omap2/omap-wakeupgen.c @@ -28,7 +28,7 @@ #include #include -#include +#include "omap-secure.h" #include "soc.h" #include "omap4-sar-layout.h" diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S index b7d8ead4b86a..88ff83a0942e 100644 --- a/arch/arm/mach-omap2/sleep44xx.S +++ b/arch/arm/mach-omap2/sleep44xx.S @@ -14,7 +14,7 @@ #include #include -#include +#include "omap-secure.h" #include "common.h" #include "omap44xx.h" From 732231a7c04f334e69af89454073f7a23405468b Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 20 Sep 2012 11:41:16 -0700 Subject: [PATCH 13/26] ARM: OMAP2+: Make omap-wakeupgen.h local This can be local to mach-omap2. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/omap-hotplug.c | 2 +- arch/arm/mach-omap2/omap-smp.c | 2 +- arch/arm/mach-omap2/omap-wakeupgen.c | 2 +- arch/arm/mach-omap2/{include/mach => }/omap-wakeupgen.h | 0 arch/arm/mach-omap2/omap4-common.c | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename arch/arm/mach-omap2/{include/mach => }/omap-wakeupgen.h (100%) diff --git a/arch/arm/mach-omap2/omap-hotplug.c b/arch/arm/mach-omap2/omap-hotplug.c index 414083b427df..765a2aceb665 100644 --- a/arch/arm/mach-omap2/omap-hotplug.c +++ b/arch/arm/mach-omap2/omap-hotplug.c @@ -20,7 +20,7 @@ #include #include -#include +#include "omap-wakeupgen.h" #include "common.h" diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c index cf2b32e99cb7..06d8bc3a8886 100644 --- a/arch/arm/mach-omap2/omap-smp.c +++ b/arch/arm/mach-omap2/omap-smp.c @@ -25,7 +25,7 @@ #include #include "omap-secure.h" -#include +#include "omap-wakeupgen.h" #include #include "soc.h" diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c index 7b7d613d568d..4c965ab426ca 100644 --- a/arch/arm/mach-omap2/omap-wakeupgen.c +++ b/arch/arm/mach-omap2/omap-wakeupgen.c @@ -27,7 +27,7 @@ #include -#include +#include "omap-wakeupgen.h" #include "omap-secure.h" #include "soc.h" diff --git a/arch/arm/mach-omap2/include/mach/omap-wakeupgen.h b/arch/arm/mach-omap2/omap-wakeupgen.h similarity index 100% rename from arch/arm/mach-omap2/include/mach/omap-wakeupgen.h rename to arch/arm/mach-omap2/omap-wakeupgen.h diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index 73c1440a8253..9fc865502f0c 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c @@ -29,7 +29,7 @@ #include #include -#include +#include "omap-wakeupgen.h" #include "soc.h" #include "common.h" From c392b21dc698a91e00d0c846e2182e9d7db52546 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 20 Sep 2012 11:41:22 -0700 Subject: [PATCH 14/26] ARM: OMAP1: Move board-sx1.h from plat to mach This is only used by omap1. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap1/board-sx1-mmc.c | 2 +- arch/arm/mach-omap1/board-sx1.c | 2 +- .../include/plat => mach-omap1/include/mach}/board-sx1.h | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/board-sx1.h (100%) diff --git a/arch/arm/mach-omap1/board-sx1-mmc.c b/arch/arm/mach-omap1/board-sx1-mmc.c index b59f78850e69..5932d56e17bf 100644 --- a/arch/arm/mach-omap1/board-sx1-mmc.c +++ b/arch/arm/mach-omap1/board-sx1-mmc.c @@ -17,7 +17,7 @@ #include #include -#include +#include #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c index 2fddf6f0b39a..aef2a428883b 100644 --- a/arch/arm/mach-omap1/board-sx1.c +++ b/arch/arm/mach-omap1/board-sx1.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/arm/plat-omap/include/plat/board-sx1.h b/arch/arm/mach-omap1/include/mach/board-sx1.h similarity index 100% rename from arch/arm/plat-omap/include/plat/board-sx1.h rename to arch/arm/mach-omap1/include/mach/board-sx1.h From c510da1c642b56d32206b2d9d62098784063d152 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 20 Sep 2012 11:41:25 -0700 Subject: [PATCH 15/26] ARM: OMAP1: Move board-voiceblue.h from plat to mach This is only used by omap1. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap1/board-voiceblue.c | 2 +- .../include/plat => mach-omap1/include/mach}/board-voiceblue.h | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/board-voiceblue.h (100%) diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index bd7b3fc18a49..64289ea8902b 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/plat-omap/include/plat/board-voiceblue.h b/arch/arm/mach-omap1/include/mach/board-voiceblue.h similarity index 100% rename from arch/arm/plat-omap/include/plat/board-voiceblue.h rename to arch/arm/mach-omap1/include/mach/board-voiceblue.h From 6cf4fdae4078785695e6424b8f9a4d58e1a2a368 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 20 Sep 2012 11:41:30 -0700 Subject: [PATCH 16/26] ARM: OMAP2+: Make debug-devices.h local This can be local to mach-omap2. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/board-h4.c | 2 +- arch/arm/{plat-omap/include/plat => mach-omap2}/debug-devices.h | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename arch/arm/{plat-omap/include/plat => mach-omap2}/debug-devices.h (100%) diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 12569cb0eddd..f6c48dd764fe 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include "debug-devices.h" #include