More omap header moves for common zImage support

---
 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

arch/arm/plat-omap/include/plat/param.h deleted +0 -8

deleted file mode 100644
index 1eb4dc3..0000000
@@ -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

Tony Lindgren

author maintainer

2012-09-19 21:05 UTC #2 lore raw

PATCH 2/29 ARM: OMAP: Remove smp.h

This is no longer needed.

---
 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

arch/arm/mach-omap1/include/mach/smp.h deleted +0 -5

deleted file mode 100644
index 80a371c..0000000
@@ -1,5 +0,0 @@
-/*
- * arch/arm/mach-omap1/include/mach/smp.h
- */
-
-#include <plat/smp.h>

arch/arm/mach-omap2/include/mach/smp.h deleted +0 -5

deleted file mode 100644
index 323675f..0000000
@@ -1,5 +0,0 @@
-/*
- * arch/arm/mach-omap2/include/mach/smp.h
- */
-
-#include <plat/smp.h>

Tony Lindgren

author maintainer

2012-09-19 21:05 UTC #3 lore raw

PATCH 3/29 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.

Cc Felipe Balbi <[email protected]>

Cc Grant Likely <[email protected]>

Cc Alan Stern <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

Cc Richard Purdie <[email protected]>

Cc Florian Tobias Schandinat <[email protected]>

Cc Tomi Valkeinen <[email protected]>

Cc linux-usb at vger.kernel.org

Cc linux-pcmcia at lists.infradead.org

Cc spi-devel-general at lists.sourceforge.net

---
 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 -
 arch/arm/mach-omap1/include/mach/mux.h        |    0 
 arch/arm/mach-omap1/io.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/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 -
 36 files changed, 84 insertions(+), 126 deletions(-)
 rename arch/arm/{plat-omap/include/plat/mux.h => mach-omap1/include/mach/mux.h} (100%)
 delete mode 100644 arch/arm/plat-omap/mux.c

arch/arm/mach-omap1/board-ams-delta.c +1 -1

index ab1e51f..05af063 100644
@@ -37,7 +37,7 @@
 
 #include <plat/board-ams-delta.h>
 #include <plat/keypad.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 
 #include <mach/hardware.h>
 #include <mach/ams-delta-fiq.h>

arch/arm/mach-omap1/board-fsample.c +1 -1

index 6d98552..4b784f2 100644
@@ -28,7 +28,7 @@
 #include <asm/mach/map.h>
 
 #include <plat/tc.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/flash.h>
 #include <plat/fpga.h>
 #include <plat/keypad.h>

arch/arm/mach-omap1/board-generic.c +1 -1

index 04b5fda..4ec579f 100644
@@ -22,7 +22,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 
 #include <mach/usb.h>

arch/arm/mach-omap1/board-h2.c +1 -1

index 5560a40..124db5c 100644
@@ -38,7 +38,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
 #include <plat/irda.h>

arch/arm/mach-omap1/board-h3.c +1 -1

index edc2487..a6f28a6 100644
@@ -40,7 +40,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/tc.h>
 #include <plat/keypad.h>
 #include <plat/dma.h>

arch/arm/mach-omap1/board-innovator.c +1 -1

index f21c296..0eb9881 100644
@@ -31,7 +31,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/flash.h>
 #include <plat/fpga.h>
 #include <plat/tc.h>

arch/arm/mach-omap1/board-nokia770.c +1 -1

index ec01f03..fb3a6e9 100644
@@ -25,7 +25,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/keypad.h>
 #include <plat/lcd_mipid.h>
 #include <plat/mmc.h>

arch/arm/mach-omap1/board-osk.c +1 -1

index 2b1db05..eb108d5 100644
@@ -47,7 +47,7 @@
 #include <asm/mach/map.h>
 
 #include <plat/flash.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/tc.h>
 
 #include <mach/hardware.h>

arch/arm/mach-omap1/board-palmte.c +1 -1

index 49f8d74..bd27646 100644
@@ -35,7 +35,7 @@
 #include <asm/mach/map.h>
 
 #include <plat/flash.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/tc.h>
 #include <plat/dma.h>
 #include <plat/irda.h>

arch/arm/mach-omap1/board-palmtt.c +1 -1

index 01523cd..8128eab 100644
@@ -35,7 +35,7 @@
 
 #include <plat/led.h>
 #include <plat/flash.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
 #include <plat/irda.h>

arch/arm/mach-omap1/board-palmz71.c +1 -1

index a7abce6..2367c0d 100644
@@ -37,7 +37,7 @@
 #include <asm/mach/map.h>
 
 #include <plat/flash.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
 #include <plat/irda.h>

arch/arm/mach-omap1/board-perseus2.c +1 -1

index 277e0bc..0d9b836 100644
@@ -28,7 +28,7 @@
 #include <asm/mach/map.h>
 
 #include <plat/tc.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/fpga.h>
 #include <plat/flash.h>
 #include <plat/keypad.h>

arch/arm/mach-omap1/board-sx1.c +1 -1

index 2e1fff2..1f43fe9 100644
@@ -34,7 +34,7 @@
 #include <asm/mach/map.h>
 
 #include <plat/flash.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/irda.h>
 #include <plat/tc.h>

arch/arm/mach-omap1/board-voiceblue.c +1 -1

index 1668af3..bd7b3fc 100644
@@ -33,7 +33,7 @@
 
 #include <plat/board-voiceblue.h>
 #include <plat/flash.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/tc.h>
 
 #include <mach/hardware.h>

arch/arm/mach-omap1/devices.c +1 -1

index 05fdbd9..0cc54dd 100644
@@ -20,7 +20,7 @@
 #include <asm/mach/map.h>
 
 #include <plat/tc.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/mmc.h>

arch/arm/mach-omap1/i2c.c +1 -1

index 5446c99..a0551a6 100644
@@ -20,7 +20,7 @@
  */
 
 #include <plat/i2c.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/cpu.h>
 
 void __init omap1_i2c_mux_pins(int bus_id)

arch/arm/mach-omap1/include/mach/mux.h renamed from arch/arm/plat-omap/include/plat/mux.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/mux.h
rename to arch/arm/mach-omap1/include/mach/mux.h

arch/arm/mach-omap1/io.c +1 -1

index 6c95a59..6a5baab 100644
@@ -16,7 +16,7 @@
 #include <asm/tlb.h>
 #include <asm/mach/map.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/tc.h>
 #include <plat/dma.h>

arch/arm/mach-omap1/mcbsp.c +1 -1

index adf0097..cd77423 100644
@@ -20,7 +20,7 @@
 #include <linux/slab.h>
 
 #include <plat/dma.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/cpu.h>
 #include <plat/mcbsp.h>

arch/arm/mach-omap1/mux.c +56 -2

73 lines not on this page · raw message

arch/arm/mach-omap1/pm.c +1 -1

index b2560d3..47ec161 100644
@@ -53,7 +53,7 @@
 #include <plat/clock.h>
 #include <plat/sram.h>
 #include <plat/tc.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/dmtimer.h>

arch/arm/mach-omap1/serial.c +1 -1

index 0d1709b..b9d6834 100644
@@ -22,7 +22,7 @@
 
 #include <asm/mach-types.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/fpga.h>
 
 #include "pm.h"

arch/arm/mach-omap1/usb.c +1 -1

index 65f8817..84267ed 100644
@@ -26,7 +26,7 @@
 
 #include <asm/irq.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 
 #include <mach/usb.h>

arch/arm/mach-omap2/common.c +0 -1

index 8e43c4d8..17950c6 100644
@@ -17,7 +17,6 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <plat/mux.h>
 #include <plat/clock.h>
 
 #include "soc.h"

arch/arm/mach-omap2/hsmmc.c +0 -1

index 80399d7..03ebf47 100644
@@ -19,7 +19,6 @@
 
 #include <plat/mmc.h>
 #include <plat/omap-pm.h>
-#include <plat/mux.h>
 #include <plat/omap_device.h>
 
 #include "mux.h"

arch/arm/plat-omap/Makefile +1 -1

index a017e99..dacaee0 100644
@@ -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-  :=

arch/arm/plat-omap/i2c.c +0 -1

index 40bc06a..6013831 100644
@@ -32,7 +32,6 @@
 #include <linux/clk.h>
 
 #include <mach/irqs.h>
-#include <plat/mux.h>
 #include <plat/i2c.h>
 #include <plat/omap-pm.h>
 #include <plat/omap_device.h>

arch/arm/plat-omap/include/plat/omap-serial.h +0 -2

index a5311498..b2eac60 100644
@@ -21,8 +21,6 @@
 #include <linux/device.h>
 #include <linux/pm_qos.h>
 
-#include <plat/mux.h>
-
 #define DRIVER_NAME	"omap_uart"
 
 /*

arch/arm/plat-omap/mux.c deleted +0 ~~-90~~

90 lines not on this page · raw message

drivers/pcmcia/omap_cf.c +1 -1

index 0ad06a3..fa74efe 100644
@@ -24,7 +24,7 @@
 #include <asm/io.h>
 #include <asm/sizes.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/tc.h>

drivers/spi/spi-omap-uwire.c +1 -1

index a3996a1..0a94d9d 100644
@@ -52,7 +52,7 @@
 #include <asm/io.h>
 #include <asm/mach-types.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 
 #include <mach/omap7xx.h>	/* OMAP7XX_IO_CONF registers */

drivers/usb/host/ohci-omap.c +1 -1

index f8b2d91..4531d03 100644
@@ -24,7 +24,7 @@
 #include <asm/io.h>
 #include <asm/mach-types.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/fpga.h>
 
 #include <mach/hardware.h>

drivers/usb/musb/tusb6010_omap.c +0 -1

index 53e2596..7a62b95 100644
@@ -17,7 +17,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <plat/dma.h>
-#include <plat/mux.h>
 
 #include "musb_core.h"
 #include "tusb6010.h"

drivers/usb/otg/isp1301_omap.c +1 -1

index 720df35..ceee211 100644
@@ -36,7 +36,7 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 
 #include <mach/usb.h>

drivers/video/backlight/omap1_bl.c +1 -1

index 92257ef..9a046a4 100644
@@ -30,7 +30,7 @@
 #include <linux/platform_data/omap1_bl.h>
 
 #include <mach/hardware.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 
 #define OMAPBL_MAX_INTENSITY		0xff

drivers/video/omap/lcd_osk.c +1 -1

index 5914220..3aa62da 100644
@@ -24,7 +24,7 @@
 #include <linux/platform_device.h>
 
 #include <asm/gpio.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include "omapfb.h"
 
 static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)

Felipe Balbi

2012-09-20 19:26 UTC #4 lore raw

PATCH 3/29 ARM: OMAP1: Make plat/mux.h omap1 only

Quoted 4 lines · Tony Lindgren

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.

Quoted 11 lines

Cc Felipe Balbi <[email protected]>
Cc Grant Likely <[email protected]>
Cc Alan Stern <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Richard Purdie <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
Cc Tomi Valkeinen <[email protected]>
Cc linux-usb at vger.kernel.org
Cc linux-pcmcia at lists.infradead.org
Cc spi-devel-general at lists.sourceforge.net
Signed-off-by Tony Lindgren <[email protected]>

for drivers/usb:

Acked-by Felipe Balbi <[email protected]>

Quoted 647 lines

---
 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 -
 arch/arm/mach-omap1/include/mach/mux.h        |    0 
 arch/arm/mach-omap1/io.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/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 -
 36 files changed, 84 insertions(+), 126 deletions(-)
 rename arch/arm/{plat-omap/include/plat/mux.h => mach-omap1/include/mach/mux.h} (100%)
 delete mode 100644 arch/arm/plat-omap/mux.c

arch/arm/mach-omap1/board-ams-delta.c +1 -1

index ab1e51f..05af063 100644
@@ -37,7 +37,7 @@
 
 #include <plat/board-ams-delta.h>
 #include <plat/keypad.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 
 #include <mach/hardware.h>
 #include <mach/ams-delta-fiq.h>

arch/arm/mach-omap1/board-fsample.c +1 -1

index 6d98552..4b784f2 100644
@@ -28,7 +28,7 @@
 #include <asm/mach/map.h>
 
 #include <plat/tc.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/flash.h>
 #include <plat/fpga.h>
 #include <plat/keypad.h>

arch/arm/mach-omap1/board-generic.c +1 -1

index 04b5fda..4ec579f 100644
@@ -22,7 +22,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 
 #include <mach/usb.h>

arch/arm/mach-omap1/board-h2.c +1 -1

index 5560a40..124db5c 100644
@@ -38,7 +38,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
 #include <plat/irda.h>

arch/arm/mach-omap1/board-h3.c +1 -1

index edc2487..a6f28a6 100644
@@ -40,7 +40,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/tc.h>
 #include <plat/keypad.h>
 #include <plat/dma.h>

arch/arm/mach-omap1/board-innovator.c +1 -1

index f21c296..0eb9881 100644
@@ -31,7 +31,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/flash.h>
 #include <plat/fpga.h>
 #include <plat/tc.h>

arch/arm/mach-omap1/board-nokia770.c +1 -1

index ec01f03..fb3a6e9 100644
@@ -25,7 +25,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/keypad.h>
 #include <plat/lcd_mipid.h>
 #include <plat/mmc.h>

arch/arm/mach-omap1/board-osk.c +1 -1

index 2b1db05..eb108d5 100644
@@ -47,7 +47,7 @@
 #include <asm/mach/map.h>
 
 #include <plat/flash.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/tc.h>
 
 #include <mach/hardware.h>

arch/arm/mach-omap1/board-palmte.c +1 -1

index 49f8d74..bd27646 100644
@@ -35,7 +35,7 @@
 #include <asm/mach/map.h>
 
 #include <plat/flash.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/tc.h>
 #include <plat/dma.h>
 #include <plat/irda.h>

arch/arm/mach-omap1/board-palmtt.c +1 -1

index 01523cd..8128eab 100644
@@ -35,7 +35,7 @@
 
 #include <plat/led.h>
 #include <plat/flash.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
 #include <plat/irda.h>

arch/arm/mach-omap1/board-palmz71.c +1 -1

index a7abce6..2367c0d 100644
@@ -37,7 +37,7 @@
 #include <asm/mach/map.h>
 
 #include <plat/flash.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
 #include <plat/irda.h>

arch/arm/mach-omap1/board-perseus2.c +1 -1

index 277e0bc..0d9b836 100644
@@ -28,7 +28,7 @@
 #include <asm/mach/map.h>
 
 #include <plat/tc.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/fpga.h>
 #include <plat/flash.h>
 #include <plat/keypad.h>

arch/arm/mach-omap1/board-sx1.c +1 -1

index 2e1fff2..1f43fe9 100644
@@ -34,7 +34,7 @@
 #include <asm/mach/map.h>
 
 #include <plat/flash.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/irda.h>
 #include <plat/tc.h>

arch/arm/mach-omap1/board-voiceblue.c +1 -1

index 1668af3..bd7b3fc 100644
@@ -33,7 +33,7 @@
 
 #include <plat/board-voiceblue.h>
 #include <plat/flash.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/tc.h>
 
 #include <mach/hardware.h>

arch/arm/mach-omap1/devices.c +1 -1

index 05fdbd9..0cc54dd 100644
@@ -20,7 +20,7 @@
 #include <asm/mach/map.h>
 
 #include <plat/tc.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/mmc.h>

arch/arm/mach-omap1/i2c.c +1 -1

index 5446c99..a0551a6 100644
@@ -20,7 +20,7 @@
  */
 
 #include <plat/i2c.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/cpu.h>
 
 void __init omap1_i2c_mux_pins(int bus_id)

arch/arm/mach-omap1/include/mach/mux.h renamed from arch/arm/plat-omap/include/plat/mux.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/mux.h
rename to arch/arm/mach-omap1/include/mach/mux.h

arch/arm/mach-omap1/io.c +1 -1

index 6c95a59..6a5baab 100644
@@ -16,7 +16,7 @@
 #include <asm/tlb.h>
 #include <asm/mach/map.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/tc.h>
 #include <plat/dma.h>

arch/arm/mach-omap1/mcbsp.c +1 -1

index adf0097..cd77423 100644
@@ -20,7 +20,7 @@
 #include <linux/slab.h>
 
 #include <plat/dma.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/cpu.h>
 #include <plat/mcbsp.h>

arch/arm/mach-omap1/mux.c +56 -2

index e9cc52d..667ce50 100644
@@ -29,7 +29,7 @@
 
 #include <mach/hardware.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 
 #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 */
+

arch/arm/mach-omap1/pm.c +1 -1

index b2560d3..47ec161 100644
@@ -53,7 +53,7 @@
 #include <plat/clock.h>
 #include <plat/sram.h>
 #include <plat/tc.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/dmtimer.h>

arch/arm/mach-omap1/serial.c +1 -1

index 0d1709b..b9d6834 100644
@@ -22,7 +22,7 @@
 
 #include <asm/mach-types.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/fpga.h>
 
 #include "pm.h"

arch/arm/mach-omap1/usb.c +1 -1

index 65f8817..84267ed 100644
@@ -26,7 +26,7 @@
 
 #include <asm/irq.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 
 #include <mach/usb.h>

arch/arm/mach-omap2/common.c +0 -1

index 8e43c4d8..17950c6 100644
@@ -17,7 +17,6 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <plat/mux.h>
 #include <plat/clock.h>
 
 #include "soc.h"

arch/arm/mach-omap2/hsmmc.c +0 -1

index 80399d7..03ebf47 100644
@@ -19,7 +19,6 @@
 
 #include <plat/mmc.h>
 #include <plat/omap-pm.h>
-#include <plat/mux.h>
 #include <plat/omap_device.h>
 
 #include "mux.h"

arch/arm/plat-omap/Makefile +1 -1

index a017e99..dacaee0 100644
@@ -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-  :=

arch/arm/plat-omap/i2c.c +0 -1

index 40bc06a..6013831 100644
@@ -32,7 +32,6 @@
 #include <linux/clk.h>
 
 #include <mach/irqs.h>
-#include <plat/mux.h>
 #include <plat/i2c.h>
 #include <plat/omap-pm.h>
 #include <plat/omap_device.h>

arch/arm/plat-omap/include/plat/omap-serial.h +0 -2

index a5311498..b2eac60 100644
@@ -21,8 +21,6 @@
 #include <linux/device.h>
 #include <linux/pm_qos.h>
 
-#include <plat/mux.h>
-
 #define DRIVER_NAME	"omap_uart"
 
 /*

arch/arm/plat-omap/mux.c deleted +0 ~~-90~~

deleted file mode 100644
index fd0d3aa..0000000
@@ -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 <linux/module.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/io.h>
-#include <linux/spinlock.h>
-
-#include <asm/system.h>
-
-#include <plat/cpu.h>
-#include <plat/mux.h>
-
-#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 */

drivers/pcmcia/omap_cf.c +1 -1

index 0ad06a3..fa74efe 100644
@@ -24,7 +24,7 @@
 #include <asm/io.h>
 #include <asm/sizes.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/tc.h>

drivers/spi/spi-omap-uwire.c +1 -1

index a3996a1..0a94d9d 100644
@@ -52,7 +52,7 @@
 #include <asm/io.h>
 #include <asm/mach-types.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 
 #include <mach/omap7xx.h>	/* OMAP7XX_IO_CONF registers */

drivers/usb/host/ohci-omap.c +1 -1

index f8b2d91..4531d03 100644
@@ -24,7 +24,7 @@
 #include <asm/io.h>
 #include <asm/mach-types.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include <plat/fpga.h>
 
 #include <mach/hardware.h>

drivers/usb/musb/tusb6010_omap.c +0 -1

index 53e2596..7a62b95 100644
@@ -17,7 +17,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <plat/dma.h>
-#include <plat/mux.h>
 
 #include "musb_core.h"
 #include "tusb6010.h"

drivers/usb/otg/isp1301_omap.c +1 -1

index 720df35..ceee211 100644
@@ -36,7 +36,7 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <plat/mux.h>
+#include <mach/mux.h>
 
 #include <mach/usb.h>

drivers/video/backlight/omap1_bl.c +1 -1

index 92257ef..9a046a4 100644
@@ -30,7 +30,7 @@
 #include <linux/platform_data/omap1_bl.h>
 
 #include <mach/hardware.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 
 #define OMAPBL_MAX_INTENSITY		0xff

drivers/video/omap/lcd_osk.c +1 -1

index 5914220..3aa62da 100644
@@ -24,7 +24,7 @@
 #include <linux/platform_device.h>
 
 #include <asm/gpio.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
 #include "omapfb.h"
 
 static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)

Signature · 8 lines

balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120920/27c27772/attachment.sig>

Tony Lindgren

author maintainer

2012-09-19 21:05 UTC #5 lore raw

PATCH 4/29 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.

Cc Janusz Krzysztofik <[email protected]>

Cc Tomi Valkeinen <[email protected]>

Cc Artem Bityutskiy <[email protected]>

Cc Dmitry Torokhov <[email protected]>

Cc Peter Ujfalusi <[email protected]>

Cc Liam Girdwood <[email protected]>

Cc Mark Brown <[email protected]>

---
 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 +-
 arch/arm/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                 |    2 +-
 sound/soc/omap/ams-delta.c                         |    2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename arch/arm/{plat-omap/include/plat/board-ams-delta.h => mach-omap1/include/mach/board-ams-delta.h} (100%)

arch/arm/mach-omap1/ams-delta-fiq-handler.S +1 -1

index d2b6acc..3d1e1c2 100644
@@ -16,7 +16,7 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 
-#include <plat/board-ams-delta.h>
+#include <mach/board-ams-delta.h>
 
 #include <mach/irqs.h>
 #include <mach/ams-delta-fiq.h>

arch/arm/mach-omap1/ams-delta-fiq.c +1 -1

index 68e8e56..f12a12a 100644
@@ -19,7 +19,7 @@
 #include <linux/module.h>
 #include <linux/io.h>
 
-#include <plat/board-ams-delta.h>
+#include <mach/board-ams-delta.h>
 
 #include <asm/fiq.h>

arch/arm/mach-omap1/board-ams-delta.c +1 -1

index 05af063..b9929cb 100644
@@ -35,7 +35,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/board-ams-delta.h>
+#include <mach/board-ams-delta.h>
 #include <plat/keypad.h>
 #include <mach/mux.h>

arch/arm/mach-omap1/include/mach/board-ams-delta.h renamed from arch/arm/plat-omap/include/plat/board-ams-delta.h +0 -0

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

drivers/input/serio/ams_delta_serio.c +1 -1

index f5fbdf9..45887e3 100644
@@ -27,7 +27,7 @@
 #include <linux/module.h>
 
 #include <asm/mach-types.h>
-#include <plat/board-ams-delta.h>
+#include <mach/board-ams-delta.h>
 
 #include <mach/ams-delta-fiq.h>

drivers/mtd/nand/ams-delta.c +1 -1

index c28eec0..9e7723a 100644
@@ -29,7 +29,7 @@
 #include <asm/io.h>
 #include <asm/sizes.h>
 
-#include <plat/board-ams-delta.h>
+#include <mach/board-ams-delta.h>
 
 #include <mach/hardware.h>

drivers/video/omap/lcd_ams_delta.c +1 -1

index 5cca6b3..ed4cad8 100644
@@ -27,7 +27,7 @@
 #include <linux/lcd.h>
 #include <linux/gpio.h>
 
-#include <plat/board-ams-delta.h>
+#include <mach/board-ams-delta.h>
 
 #include "omapfb.h"

sound/soc/omap/ams-delta.c +1 -1

index 7b18b74..98e25d5 100644
@@ -32,7 +32,7 @@
 
 #include <asm/mach-types.h>
 
-#include <plat/board-ams-delta.h>
+#include <mach/board-ams-delta.h>
 #include <plat/mcbsp.h>
 
 #include "omap-mcbsp.h"

Mark Brown

Acked-by on v1 4/29

2012-09-20 01:16 UTC #6 lore raw

Re: [PATCH 04/29] ARM: OMAP1: Move board-ams-delta.h from plat to mach

Quoted 4 lines · Tony Lindgren

This is only used by omap1.
And to fix things properly, this should not be included from the drivers at all.

Acked-by Mark Brown <[email protected]>

or I can apply it if that's easier.

Tony Lindgren

author maintainer

2012-09-20 17:12 UTC #7 lore raw

Re: [PATCH 04/29] ARM: OMAP1: Move board-ams-delta.h from plat to mach

Quoted 9 lines · Mark Brown

Quoted 4 lines · Tony Lindgren
This is only used by omap1.
And to fix things properly, this should not be included from the drivers at all.
Acked-by Mark Brown <[email protected]>
or I can apply it if that's easier.

Thanks I'll do a series for Arnd on top of the multiplatform changes to avoid more merge conflicts.

Regards,

Tony

Janusz Krzysztofik

2012-09-20 13:41 UTC #8 lore raw

Re: [PATCH 04/29] ARM: OMAP1: Move board-ams-delta.h from plat to mach

Quoted 4 lines · On Wed, 19 Sep 2012 14:05:43 Tony Lindgren wrote:

This is only used by omap1.
And to fix things properly, this should not be included from the drivers at all.

Akced-by Janusz Krzysztofik <[email protected]>

I'll take care of updating the drivers when I have some spare time.

Thanks,
Janusz

Tony Lindgren

author maintainer

2012-09-20 17:10 UTC #9 lore raw

Re: [PATCH 04/29] ARM: OMAP1: Move board-ams-delta.h from plat to mach

Quoted 9 lines · Janusz Krzysztofik

Quoted 4 lines · On Wed, 19 Sep 2012 14:05:43 Tony Lindgren wrote:
This is only used by omap1.
And to fix things properly, this should not be included from the drivers at all.
Akced-by Janusz Krzysztofik <[email protected]>
I'll take care of updating the drivers when I have some spare time.

Thanks those can be fixed by passing them in the platform data.

Regards,

Tony

Tony Lindgren

author maintainer

2012-09-19 21:05 UTC #10 lore raw

PATCH 5/29 ARM: OMAP2+: Make id.h local

This can be local to mach-omap2.

---
 arch/arm/mach-omap2/board-devkit8000.c |    2 +-
 arch/arm/mach-omap2/id.c               |    2 +-
 arch/arm/mach-omap2/id.h               |    0 
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename arch/arm/mach-omap2/{include/mach/id.h => id.h} (100%)

arch/arm/mach-omap2/board-devkit8000.c +1 -1

index 3435cc5..d9ddb66 100644
@@ -32,7 +32,7 @@
 
 #include <linux/regulator/machine.h>
 #include <linux/i2c/twl.h>
-#include <mach/id.h>
+#include "id.h"
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>

arch/arm/mach-omap2/id.c +1 -1

index 6b98a17..cf2362c 100644
@@ -23,7 +23,7 @@
 
 #include "common.h"
 
-#include <mach/id.h>
+#include "id.h"
 
 #include "soc.h"
 #include "control.h"

arch/arm/mach-omap2/id.h renamed from arch/arm/mach-omap2/include/mach/id.h +0 -0

similarity index 100%
rename from arch/arm/mach-omap2/include/mach/id.h
rename to arch/arm/mach-omap2/id.h

Tony Lindgren

author maintainer

2012-09-19 21:05 UTC #11 lore raw

PATCH 6/29 ARM: OMAP1: Move keypad.h from plat to mach

This is only used by omap1.

Cc Dmitry Torokhov <[email protected]>

Cc linux-input at vger.kernel.org

---
 arch/arm/mach-omap1/board-ams-delta.c     |    2 +-
 arch/arm/mach-omap1/board-fsample.c       |    2 +-
 arch/arm/mach-omap1/board-h2.c            |    2 +-
 arch/arm/mach-omap1/board-h3.c            |    2 +-
 arch/arm/mach-omap1/board-htcherald.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/include/mach/keypad.h |    0 
 drivers/input/keyboard/omap-keypad.c      |    2 +-
 15 files changed, 14 insertions(+), 14 deletions(-)
 rename arch/arm/{plat-omap/include/plat/keypad.h => mach-omap1/include/mach/keypad.h} (100%)

arch/arm/mach-omap1/board-ams-delta.c +1 -1

index b9929cb..384f77a 100644
@@ -36,7 +36,7 @@
 #include <asm/mach/map.h>
 
 #include <mach/board-ams-delta.h>
-#include <plat/keypad.h>
+#include <mach/keypad.h>
 #include <mach/mux.h>
 
 #include <mach/hardware.h>

arch/arm/mach-omap1/board-fsample.c +1 -1

index 4b784f2..81c41cc 100644
@@ -31,7 +31,7 @@
 #include <mach/mux.h>
 #include <plat/flash.h>
 #include <plat/fpga.h>
-#include <plat/keypad.h>
+#include <mach/keypad.h>
 
 #include <mach/hardware.h>

arch/arm/mach-omap1/board-h2.c +1 -1

index 124db5c..ce99021 100644
@@ -42,7 +42,7 @@
 #include <plat/dma.h>
 #include <plat/tc.h>
 #include <plat/irda.h>
-#include <plat/keypad.h>
+#include <mach/keypad.h>
 #include <plat/flash.h>
 
 #include <mach/hardware.h>

arch/arm/mach-omap1/board-h3.c +1 -1

index a6f28a6..76411dd 100644
@@ -42,7 +42,7 @@
 
 #include <mach/mux.h>
 #include <plat/tc.h>
-#include <plat/keypad.h>
+#include <mach/keypad.h>
 #include <plat/dma.h>
 #include <plat/flash.h>

arch/arm/mach-omap1/board-htcherald.c +1 -1

index 1dcb751..521a909 100644
@@ -42,7 +42,7 @@
 #include <asm/mach/arch.h>
 
 #include <mach/omap7xx.h>
-#include <plat/keypad.h>
+#include <mach/keypad.h>
 #include <plat/mmc.h>
 
 #include <mach/irqs.h>

arch/arm/mach-omap1/board-innovator.c +1 -1

index 0eb9881..2469811 100644
@@ -35,7 +35,7 @@
 #include <plat/flash.h>
 #include <plat/fpga.h>
 #include <plat/tc.h>
-#include <plat/keypad.h>
+#include <mach/keypad.h>
 #include <plat/mmc.h>
 
 #include <mach/hardware.h>

arch/arm/mach-omap1/board-nokia770.c +1 -1

index fb3a6e9..bfc2b06 100644
@@ -26,7 +26,7 @@
 #include <asm/mach/map.h>
 
 #include <mach/mux.h>
-#include <plat/keypad.h>
+#include <mach/keypad.h>
 #include <plat/lcd_mipid.h>
 #include <plat/mmc.h>
 #include <plat/clock.h>

arch/arm/mach-omap1/board-osk.c +1 -1

index eb108d5..eda3890 100644
@@ -304,7 +304,7 @@ static struct omap_lcd_config osk_lcd_config __initdata = {
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 
-#include <plat/keypad.h>
+#include <mach/keypad.h>
 
 static struct at24_platform_data at24c04 = {
 	.byte_len	= SZ_4K / 8,

arch/arm/mach-omap1/board-palmte.c +1 -1

index bd27646..58ef785 100644
@@ -39,7 +39,7 @@
 #include <plat/tc.h>
 #include <plat/dma.h>
 #include <plat/irda.h>
-#include <plat/keypad.h>
+#include <mach/keypad.h>
 
 #include <mach/hardware.h>
 #include <mach/usb.h>

arch/arm/mach-omap1/board-palmtt.c +1 -1

index 8128eab..7ab487c 100644
@@ -39,7 +39,7 @@
 #include <plat/dma.h>
 #include <plat/tc.h>
 #include <plat/irda.h>
-#include <plat/keypad.h>
+#include <mach/keypad.h>
 
 #include <mach/hardware.h>
 #include <mach/usb.h>

arch/arm/mach-omap1/board-palmz71.c +1 -1

index 2367c0d..4ce3278 100644
@@ -41,7 +41,7 @@
 #include <plat/dma.h>
 #include <plat/tc.h>
 #include <plat/irda.h>
-#include <plat/keypad.h>
+#include <mach/keypad.h>
 
 #include <mach/hardware.h>
 #include <mach/usb.h>

arch/arm/mach-omap1/board-perseus2.c +1 -1

index 0d9b836..deb0b00 100644
@@ -31,7 +31,7 @@
 #include <mach/mux.h>
 #include <plat/fpga.h>
 #include <plat/flash.h>
-#include <plat/keypad.h>
+#include <mach/keypad.h>
 
 #include <mach/hardware.h>

arch/arm/mach-omap1/board-sx1.c +1 -1

index 1f43fe9..2f136ea 100644
@@ -38,7 +38,7 @@
 #include <plat/dma.h>
 #include <plat/irda.h>
 #include <plat/tc.h>
-#include <plat/keypad.h>
+#include <mach/keypad.h>
 #include <plat/board-sx1.h>
 
 #include <mach/hardware.h>

arch/arm/mach-omap1/include/mach/keypad.h renamed from arch/arm/plat-omap/include/plat/keypad.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/keypad.h
rename to arch/arm/mach-omap1/include/mach/keypad.h

drivers/input/keyboard/omap-keypad.c +1 -1

index 8d8d45f..bee4576 100644
@@ -37,7 +37,7 @@
 #include <linux/slab.h>
 #include <linux/gpio.h>
 #include <linux/platform_data/gpio-omap.h>
-#include <plat/keypad.h>
+#include <mach/keypad.h>
 
 #undef NEW_BOARD_LEARNING_MODE

Tony Lindgren

author maintainer

2012-09-20 18:14 UTC #12 lore raw

PATCH 6/29 ARM: OMAP1: Move keypad.h from plat to mach

Quoted 1 line · Tony Lindgren

This is only used by omap1.

Turns out this one is already taken care of by Arnd's platform data patches, so I'll drop this one.

Regards,

Tony

Tony Lindgren

author maintainer

2012-09-19 21:05 UTC #13 lore raw

PATCH 7/29 ARM: OMAP1: Move lcd_mipid.h from plat to mach

This is only used by omap1.

Cc Tomi Valkeinen <[email protected]>

Cc Florian Tobias Schandinat <[email protected]>

Cc linux-fbdev at vger.kernel.org

---
 arch/arm/mach-omap1/board-nokia770.c         |    2 +-
 arch/arm/mach-omap1/include/mach/lcd_mipid.h |    0 
 drivers/video/omap/lcd_mipid.c               |    2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename arch/arm/{plat-omap/include/plat/lcd_mipid.h => mach-omap1/include/mach/lcd_mipid.h} (100%)

arch/arm/mach-omap1/board-nokia770.c +1 -1

index bfc2b06..a2699eb 100644
@@ -27,7 +27,7 @@
 
 #include <mach/mux.h>
 #include <mach/keypad.h>
-#include <plat/lcd_mipid.h>
+#include <mach/lcd_mipid.h>
 #include <plat/mmc.h>
 #include <plat/clock.h>

arch/arm/mach-omap1/include/mach/lcd_mipid.h renamed from arch/arm/plat-omap/include/plat/lcd_mipid.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/lcd_mipid.h
rename to arch/arm/mach-omap1/include/mach/lcd_mipid.h

drivers/video/omap/lcd_mipid.c +1 -1

index e3880c4..2b64d07 100644
@@ -25,7 +25,7 @@
 #include <linux/spi/spi.h>
 #include <linux/module.h>
 
-#include <plat/lcd_mipid.h>
+#include <mach/lcd_mipid.h>
 
 #include "omapfb.h"

Tony Lindgren

author maintainer

2012-09-20 18:17 UTC #14 lore raw

PATCH 7/29 ARM: OMAP1: Move lcd_mipid.h from plat to mach

Quoted 1 line · Tony Lindgren

This is only used by omap1.

This too is handled by Arnd's series already, dropping this one.

Regards,

Tony

Tony Lindgren

author maintainer

2012-09-19 21:05 UTC #15 lore raw

PATCH 8/29 ARM: OMAP2+: Make board-zoom.h local

This can be local to mach-omap2 after we rip out the messed up extmute stuff from board-zoom-peripherals.c that's all over the place and probably does not even work because of all the hardcoded GPIO numbers.

I also suggest ASoC gusy remove all extmute handling from sound/soc/codecs/twl4030.c unless it's been tested to work and implemented in a saner way.

Cc Peter Ujfalusi <[email protected]>

Cc Jarkko Nikula <[email protected]>

Cc Liam Girdwood <[email protected]>

Cc Mark Brown <[email protected]>

Cc alsa-devel at alsa-project.org

---
 arch/arm/mach-omap2/board-3630sdp.c           |    2 +-
 arch/arm/mach-omap2/board-ldp.c               |    2 +-
 arch/arm/mach-omap2/board-zoom-debugboard.c   |    2 +-
 arch/arm/mach-omap2/board-zoom-display.c      |    2 +-
 arch/arm/mach-omap2/board-zoom-peripherals.c  |   16 +---------------
 arch/arm/mach-omap2/board-zoom.c              |    2 +-
 arch/arm/mach-omap2/board-zoom.h              |    0 
 sound/soc/omap/zoom2.c                        |    2 +-
 8 files changed, 7 insertions(+), 21 deletions(-)
 rename arch/arm/mach-omap2/{include/mach/board-zoom.h => board-zoom.h} (100%)

arch/arm/mach-omap2/board-3630sdp.c +1 -1

index 8518b13..c7d6ea2 100644
@@ -20,7 +20,7 @@
 #include <plat/gpmc-smc91x.h>
 #include <plat/usb.h>
 
-#include <mach/board-zoom.h>
+#include "board-zoom.h"
 
 #include "board-flash.h"
 #include "mux.h"

arch/arm/mach-omap2/board-ldp.c +1 -1

index 3f3a552..d0372a6 100644
@@ -36,7 +36,7 @@
 #include <plat/mcspi.h>
 #include "common.h"
 #include <plat/gpmc.h>
-#include <mach/board-zoom.h>
+#include "board-zoom.h"
 #include <plat/usb.h>
 #include <plat/gpmc-smsc911x.h>

arch/arm/mach-omap2/board-zoom-debugboard.c +1 -1

index 0d8d919..42c97c2 100644
@@ -20,7 +20,7 @@
 #include <plat/gpmc.h>
 #include <plat/gpmc-smsc911x.h>
 
-#include <mach/board-zoom.h>
+#include "board-zoom.h"
 
 #include "soc.h"
 #include "common.h"

arch/arm/mach-omap2/board-zoom-display.c +1 -1

index ea79bc2..6a162fb 100644
@@ -16,7 +16,7 @@
 #include <linux/spi/spi.h>
 #include <plat/mcspi.h>
 #include <video/omapdss.h>
-#include <mach/board-zoom.h>
+#include "board-zoom.h"
 
 #include "common.h"

arch/arm/mach-omap2/board-zoom-peripherals.c +1 ~~-15~~

index 6bcc107..c8377b71 100644
@@ -28,7 +28,7 @@
 #include "common.h"
 #include <plat/usb.h>
 
-#include <mach/board-zoom.h>
+#include "board-zoom.h"
 
 #include "mux.h"
 #include "hsmmc.h"

@@ -245,12 +245,6 @@ static int zoom_twl_gpio_setup(struct device *dev,
 	return ret;
 }
 
-/* EXTMUTE callback function */
-static void zoom2_set_hs_extmute(int mute)
-{
-	gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute);
-}
-
 static struct twl4030_gpio_platform_data zoom_gpio_data = {
 	.setup		= zoom_twl_gpio_setup,
 };

@@ -271,14 +265,6 @@ static int __init omap_i2c_init(void)
 			TWL_COMMON_PDATA_MADC | TWL_COMMON_PDATA_AUDIO,
 			TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);
 
-	if (machine_is_omap_zoom2()) {
-		struct twl4030_codec_data *codec_data;
-		codec_data = zoom_twldata.audio->codec;
-
-		codec_data->ramp_delay_value = 3;	/* 161 ms */
-		codec_data->hs_extmute = 1;
-		codec_data->set_hs_extmute = zoom2_set_hs_extmute;
-	}
 	omap_pmic_init(1, 2400, "twl5030", 7 + OMAP_INTC_START, &zoom_twldata);
 	omap_register_i2c_bus(2, 400, NULL, 0);
 	omap_register_i2c_bus(3, 400, NULL, 0);

arch/arm/mach-omap2/board-zoom.c +1 -1

index 4994438..cbfd9df 100644
@@ -24,7 +24,7 @@
 #include "common.h"
 #include <plat/usb.h>
 
-#include <mach/board-zoom.h>
+#include "board-zoom.h"
 
 #include "board-flash.h"
 #include "mux.h"

arch/arm/mach-omap2/board-zoom.h renamed from arch/arm/mach-omap2/include/mach/board-zoom.h +0 -0

similarity index 100%
rename from arch/arm/mach-omap2/include/mach/board-zoom.h
rename to arch/arm/mach-omap2/board-zoom.h

sound/soc/omap/zoom2.c +1 -1

index 920e0d9..187cb0c 100644
@@ -28,7 +28,6 @@
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 #include <mach/gpio.h>
-#include <mach/board-zoom.h>
 #include <plat/mcbsp.h>
 
 /* Register descriptions for twl4030 codec part */

@@ -39,6 +38,7 @@
 #include "omap-pcm.h"
 
 #define ZOOM2_HEADSET_MUX_GPIO		(OMAP_MAX_GPIO_LINES + 15)
+#define ZOOM2_HEADSET_EXTMUTE_GPIO     153
 
 static int zoom2_hw_params(struct snd_pcm_substream *substream,
 				struct snd_pcm_hw_params *params)

Mark Brown

Acked-by on v1 8/29

2012-09-20 01:24 UTC #16 lore raw

Re: [PATCH 08/29] ARM: OMAP2+: Make board-zoom.h local

Quoted 8 lines · Tony Lindgren

This can be local to mach-omap2 after we rip out the messed up extmute stuff from board-zoom-peripherals.c that's all over the place and probably does not even work because of all the hardcoded GPIO numbers.
I also suggest ASoC gusy remove all extmute handling from sound/soc/codecs/twl4030.c unless it's been tested to work and implemented in a saner way.

Acked-by Mark Brown <[email protected]>

or I can apply it if that's easier.

Peter Ujfalusi

2012-09-20 07:28 UTC #17 lore raw

Re: [PATCH 08/29] ARM: OMAP2+: Make board-zoom.h local

Hi Tony,

Quoted 8 lines · Tony Lindgren

This can be local to mach-omap2 after we rip out the messed up extmute stuff from board-zoom-peripherals.c that's all over the place and probably does not even work because of all the hardcoded GPIO numbers.
I also suggest ASoC gusy remove all extmute handling from sound/soc/codecs/twl4030.c unless it's been tested to work and implemented in a saner way.

I just wanted to note that I also have pending patch for zoom2.c as part of the twl4030 audio module DT support series:
http://lkml.indiana.edu/hypermail/linux/kernel/1209.1/00711.html

Quoted 150 lines

Cc Peter Ujfalusi <[email protected]>

Cc Jarkko Nikula <[email protected]>

Cc Liam Girdwood <[email protected]>

Cc Mark Brown <[email protected]>

---
 arch/arm/mach-omap2/board-3630sdp.c           |    2 +-
 arch/arm/mach-omap2/board-ldp.c               |    2 +-
 arch/arm/mach-omap2/board-zoom-debugboard.c   |    2 +-
 arch/arm/mach-omap2/board-zoom-display.c      |    2 +-
 arch/arm/mach-omap2/board-zoom-peripherals.c  |   16 +---------------
 arch/arm/mach-omap2/board-zoom.c              |    2 +-
 arch/arm/mach-omap2/board-zoom.h              |    0 
 sound/soc/omap/zoom2.c                        |    2 +-
 8 files changed, 7 insertions(+), 21 deletions(-)
 rename arch/arm/mach-omap2/{include/mach/board-zoom.h => board-zoom.h} (100%)

arch/arm/mach-omap2/board-3630sdp.c +1 -1

index 8518b13..c7d6ea2 100644
@@ -20,7 +20,7 @@
 #include <plat/gpmc-smc91x.h>
 #include <plat/usb.h>
 
-#include <mach/board-zoom.h>
+#include "board-zoom.h"
 
 #include "board-flash.h"
 #include "mux.h"

arch/arm/mach-omap2/board-ldp.c +1 -1

index 3f3a552..d0372a6 100644
@@ -36,7 +36,7 @@
 #include <plat/mcspi.h>
 #include "common.h"
 #include <plat/gpmc.h>
-#include <mach/board-zoom.h>
+#include "board-zoom.h"
 #include <plat/usb.h>
 #include <plat/gpmc-smsc911x.h>

arch/arm/mach-omap2/board-zoom-debugboard.c +1 -1

index 0d8d919..42c97c2 100644
@@ -20,7 +20,7 @@
 #include <plat/gpmc.h>
 #include <plat/gpmc-smsc911x.h>
 
-#include <mach/board-zoom.h>
+#include "board-zoom.h"
 
 #include "soc.h"
 #include "common.h"

arch/arm/mach-omap2/board-zoom-display.c +1 -1

index ea79bc2..6a162fb 100644
@@ -16,7 +16,7 @@
 #include <linux/spi/spi.h>
 #include <plat/mcspi.h>
 #include <video/omapdss.h>
-#include <mach/board-zoom.h>
+#include "board-zoom.h"
 
 #include "common.h"

arch/arm/mach-omap2/board-zoom-peripherals.c +1 ~~-15~~

index 6bcc107..c8377b71 100644
@@ -28,7 +28,7 @@
 #include "common.h"
 #include <plat/usb.h>
 
-#include <mach/board-zoom.h>
+#include "board-zoom.h"
 
 #include "mux.h"
 #include "hsmmc.h"

@@ -245,12 +245,6 @@ static int zoom_twl_gpio_setup(struct device *dev,
 	return ret;
 }
 
-/* EXTMUTE callback function */
-static void zoom2_set_hs_extmute(int mute)
-{
-	gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute);
-}
-
 static struct twl4030_gpio_platform_data zoom_gpio_data = {
 	.setup		= zoom_twl_gpio_setup,
 };

@@ -271,14 +265,6 @@ static int __init omap_i2c_init(void)
 			TWL_COMMON_PDATA_MADC | TWL_COMMON_PDATA_AUDIO,
 			TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);
 
-	if (machine_is_omap_zoom2()) {
-		struct twl4030_codec_data *codec_data;
-		codec_data = zoom_twldata.audio->codec;
-
-		codec_data->ramp_delay_value = 3;	/* 161 ms */
-		codec_data->hs_extmute = 1;
-		codec_data->set_hs_extmute = zoom2_set_hs_extmute;
-	}
 	omap_pmic_init(1, 2400, "twl5030", 7 + OMAP_INTC_START, &zoom_twldata);
 	omap_register_i2c_bus(2, 400, NULL, 0);
 	omap_register_i2c_bus(3, 400, NULL, 0);

arch/arm/mach-omap2/board-zoom.c +1 -1

index 4994438..cbfd9df 100644
@@ -24,7 +24,7 @@
 #include "common.h"
 #include <plat/usb.h>
 
-#include <mach/board-zoom.h>
+#include "board-zoom.h"
 
 #include "board-flash.h"
 #include "mux.h"

arch/arm/mach-omap2/board-zoom.h renamed from arch/arm/mach-omap2/include/mach/board-zoom.h +0 -0

similarity index 100%
rename from arch/arm/mach-omap2/include/mach/board-zoom.h
rename to arch/arm/mach-omap2/board-zoom.h

sound/soc/omap/zoom2.c +1 -1

index 920e0d9..187cb0c 100644
@@ -28,7 +28,6 @@
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 #include <mach/gpio.h>
-#include <mach/board-zoom.h>
 #include <plat/mcbsp.h>
 
 /* Register descriptions for twl4030 codec part */

@@ -39,6 +38,7 @@
 #include "omap-pcm.h"
 
 #define ZOOM2_HEADSET_MUX_GPIO		(OMAP_MAX_GPIO_LINES + 15)
+#define ZOOM2_HEADSET_EXTMUTE_GPIO     153
 
 static int zoom2_hw_params(struct snd_pcm_substream *substream,
 				struct snd_pcm_hw_params *params)

Signature · 5 lines

Péter
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Tony Lindgren

author maintainer

2012-09-20 17:15 UTC #18 lore raw

Re: [PATCH 08/29] ARM: OMAP2+: Make board-zoom.h local

Quoted 9 lines · Peter Ujfalusi

Hi Tony,
Quoted 5 lines · Tony Lindgren
This can be local to mach-omap2 after we rip out the messed up extmute stuff from board-zoom-peripherals.c that's all over the place and probably does not even work because of all the hardcoded GPIO numbers.

Quoted 7 lines

Quoted 3 lines
I also suggest ASoC gusy remove all extmute handling from sound/soc/codecs/twl4030.c unless it's been tested to work and implemented in a saner way.
I just wanted to note that I also have pending patch for zoom2.c as part of the twl4030 audio module DT support series:
http://lkml.indiana.edu/hypermail/linux/kernel/1209.1/00711.html

Oh great, that makes it quite a bit saner. I'll drop this for now as after your patch I can just move it.

Regards,

Tony

Tony Lindgren

author maintainer

2012-09-19 21:05 UTC #19 lore raw

PATCH 9/29 ARM: OMAP2+: Make am35xx.h local

This can be local to mach-omap2.

---
 arch/arm/mach-omap2/am35xx-emac.c          |    2 +-
 arch/arm/mach-omap2/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 => am35xx.h} (100%)

arch/arm/mach-omap2/am35xx-emac.c +1 -1

index 2c90ac6..d0c54c5 100644
@@ -19,7 +19,7 @@
 #include <linux/davinci_emac.h>
 #include <asm/system.h>
 #include <plat/omap_device.h>
-#include <mach/am35xx.h>
+#include "am35xx.h"
 #include "control.h"
 #include "am35xx-emac.h"

arch/arm/mach-omap2/am35xx.h renamed from arch/arm/mach-omap2/include/mach/am35xx.h +0 -0

similarity index 100%
rename from arch/arm/mach-omap2/include/mach/am35xx.h
rename to arch/arm/mach-omap2/am35xx.h

arch/arm/mach-omap2/board-am3517evm.c +1 -1

index 6e80d78..e162897 100644
@@ -27,7 +27,7 @@
 #include <linux/mmc/host.h>
 #include <linux/platform_data/gpio-omap.h>
 
-#include <mach/am35xx.h>
+#include "am35xx.h"
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>

arch/arm/mach-omap2/board-cm-t3517.c +1 -1

index 27a5450..a749990 100644
@@ -43,7 +43,7 @@
 #include <plat/nand.h>
 #include <plat/gpmc.h>
 
-#include <mach/am35xx.h>
+#include "am35xx.h"
 
 #include "mux.h"
 #include "control.h"

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +1 -1

index 8fec2ce..61486f2 100644
@@ -28,7 +28,7 @@
 #include <plat/mcspi.h>
 #include <plat/dmtimer.h>
 
-#include <mach/am35xx.h>
+#include "am35xx.h"
 
 #include "soc.h"
 #include "omap_hwmod_common_data.h"

arch/arm/mach-omap2/usb-musb.c +1 -1

index 0a592f4..51da21c 100644
@@ -28,7 +28,7 @@
 #include <plat/usb.h>
 #include <plat/omap_device.h>
 
-#include <mach/am35xx.h>
+#include "am35xx.h"
 
 #include "mux.h"

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #20 lore raw

PATCH 10/29 ARM: OMAP2+: Make board-rx51.h local

This can be local to mach-omap2.

---
 arch/arm/mach-omap2/board-rx51-peripherals.c  |    2 +-
 arch/arm/mach-omap2/board-rx51-video.c        |    2 +-
 arch/arm/mach-omap2/board-rx51.h              |    0 
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename arch/arm/mach-omap2/{include/mach/board-rx51.h => board-rx51.h} (100%)

arch/arm/mach-omap2/board-rx51-peripherals.c +1 -1

index 5b2edfe..bf78ad4 100644
@@ -35,7 +35,7 @@
 #include <plat/gpmc-smc91x.h>
 #include <plat/omap-pm.h>
 
-#include <mach/board-rx51.h>
+#include "board-rx51.h"
 
 #include <sound/tlv320aic3x.h>
 #include <sound/tpa6130a2-plat.h>

arch/arm/mach-omap2/board-rx51-video.c +1 -1

index 2c1289b..6e5b196 100644
@@ -19,7 +19,7 @@
 #include <plat/vram.h>
 #include <plat/mcspi.h>
 
-#include <mach/board-rx51.h>
+#include "board-rx51.h"
 
 #include "mux.h"

arch/arm/mach-omap2/board-rx51.h renamed from arch/arm/mach-omap2/include/mach/board-rx51.h +0 -0

similarity index 100%
rename from arch/arm/mach-omap2/include/mach/board-rx51.h
rename to arch/arm/mach-omap2/board-rx51.h

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #21 lore raw

PATCH 11/29 ARM: OMAP2+: Make ctrl_module_core_44xx.h local

This can be local to mach-omap2.

---
 arch/arm/mach-omap2/control.h                      |    2 +-
 arch/arm/mach-omap2/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 => ctrl_module_core_44xx.h} (100%)

arch/arm/mach-omap2/control.h +1 -1

index c1a5cab..2d25478 100644
@@ -16,7 +16,7 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_CONTROL_H
 #define __ARCH_ARM_MACH_OMAP2_CONTROL_H
 
-#include <mach/ctrl_module_core_44xx.h>
+#include "ctrl_module_core_44xx.h"
 #include <mach/ctrl_module_wkup_44xx.h>
 #include <mach/ctrl_module_pad_core_44xx.h>
 #include <mach/ctrl_module_pad_wkup_44xx.h>

arch/arm/mach-omap2/ctrl_module_core_44xx.h renamed from arch/arm/mach-omap2/include/mach/ctrl_module_core_44xx.h +0 -0

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

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #22 lore raw

PATCH 12/29 ARM: OMAP2+: Make ctrl_module_pad_core_44xx.h local

This can be local to mach-omap2.

---
 arch/arm/mach-omap2/control.h                      |    2 +-
 arch/arm/mach-omap2/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 => ctrl_module_pad_core_44xx.h} (100%)

arch/arm/mach-omap2/control.h +1 -1

index 2d25478..b36123a 100644
@@ -18,7 +18,7 @@
 
 #include "ctrl_module_core_44xx.h"
 #include <mach/ctrl_module_wkup_44xx.h>
-#include <mach/ctrl_module_pad_core_44xx.h>
+#include "ctrl_module_pad_core_44xx.h"
 #include <mach/ctrl_module_pad_wkup_44xx.h>
 
 #include "am33xx.h"

arch/arm/mach-omap2/ctrl_module_pad_core_44xx.h renamed from arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h +0 -0

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

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #23 lore raw

PATCH 13/29 ARM: OMAP2+: Make ctrl_module_pad_wkup_44xx.h local

This can be local to mach-omap2.

---
 arch/arm/mach-omap2/control.h                      |    2 +-
 arch/arm/mach-omap2/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 => ctrl_module_pad_wkup_44xx.h} (100%)

arch/arm/mach-omap2/control.h +1 -1

index b36123a..dbad6eb 100644
@@ -19,7 +19,7 @@
 #include "ctrl_module_core_44xx.h"
 #include <mach/ctrl_module_wkup_44xx.h>
 #include "ctrl_module_pad_core_44xx.h"
-#include <mach/ctrl_module_pad_wkup_44xx.h>
+#include "ctrl_module_pad_wkup_44xx.h"
 
 #include "am33xx.h"

arch/arm/mach-omap2/ctrl_module_pad_wkup_44xx.h renamed from arch/arm/mach-omap2/include/mach/ctrl_module_pad_wkup_44xx.h +0 -0

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

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #24 lore raw

PATCH 14/29 ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local

This can be local to mach-omap2.

---
 arch/arm/mach-omap2/control.h                      |    2 +-
 arch/arm/mach-omap2/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 => ctrl_module_wkup_44xx.h} (100%)

arch/arm/mach-omap2/control.h +1 -1

index dbad6eb..123186a 100644
@@ -17,7 +17,7 @@
 #define __ARCH_ARM_MACH_OMAP2_CONTROL_H
 
 #include "ctrl_module_core_44xx.h"
-#include <mach/ctrl_module_wkup_44xx.h>
+#include "ctrl_module_wkup_44xx.h"
 #include "ctrl_module_pad_core_44xx.h"
 #include "ctrl_module_pad_wkup_44xx.h"

arch/arm/mach-omap2/ctrl_module_wkup_44xx.h renamed from arch/arm/mach-omap2/include/mach/ctrl_module_wkup_44xx.h +0 -0

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

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #25 lore raw

PATCH 15/29 ARM: OMAP2+: Make omap-secure.h local

This can be local to mach-omap2.

---
 arch/arm/mach-omap2/omap-secure.c              |    2 +-
 arch/arm/mach-omap2/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 => omap-secure.h} (100%)

arch/arm/mach-omap2/omap-secure.c +1 -1

index d9ae4a5..a004cb9 100644
@@ -19,7 +19,7 @@
 #include <asm/memblock.h>
 
 #include <plat/omap-secure.h>
-#include <mach/omap-secure.h>
+#include "omap-secure.h"
 
 static phys_addr_t omap_secure_memblock_base;

arch/arm/mach-omap2/omap-secure.h renamed from arch/arm/mach-omap2/include/mach/omap-secure.h +0 -0

similarity index 100%
rename from arch/arm/mach-omap2/include/mach/omap-secure.h
rename to arch/arm/mach-omap2/omap-secure.h

arch/arm/mach-omap2/omap-smp.c +1 -1

index 19cc5f5..cf2b32e 100644
@@ -24,7 +24,7 @@
 #include <asm/hardware/gic.h>
 #include <asm/smp_scu.h>
 
-#include <mach/omap-secure.h>
+#include "omap-secure.h"
 #include <mach/omap-wakeupgen.h>
 #include <asm/cputype.h>

arch/arm/mach-omap2/omap-wakeupgen.c +1 -1

index 5fb3112..1729823 100644
@@ -28,7 +28,7 @@
 #include <asm/hardware/gic.h>
 
 #include <mach/omap-wakeupgen.h>
-#include <mach/omap-secure.h>
+#include "omap-secure.h"
 
 #include "soc.h"
 #include "omap4-sar-layout.h"

arch/arm/mach-omap2/sleep44xx.S +1 -1

index b7d8ead..88ff83a 100644
@@ -14,7 +14,7 @@
 #include <asm/memory.h>
 #include <asm/hardware/cache-l2x0.h>
 
-#include <mach/omap-secure.h>
+#include "omap-secure.h"
 
 #include "common.h"
 #include "omap44xx.h"

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #26 lore raw

PATCH 16/29 ARM: OMAP2+: Make omap-wakeupgen.h local

This can be local to mach-omap2.

---
 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/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 => omap-wakeupgen.h} (100%)

arch/arm/mach-omap2/omap-hotplug.c +1 -1

index 414083b..765a2ac 100644
@@ -20,7 +20,7 @@
 #include <linux/io.h>
 
 #include <asm/cacheflush.h>
-#include <mach/omap-wakeupgen.h>
+#include "omap-wakeupgen.h"
 
 #include "common.h"

arch/arm/mach-omap2/omap-smp.c +1 -1

index cf2b32e..06d8bc3 100644
@@ -25,7 +25,7 @@
 #include <asm/smp_scu.h>
 
 #include "omap-secure.h"
-#include <mach/omap-wakeupgen.h>
+#include "omap-wakeupgen.h"
 #include <asm/cputype.h>
 
 #include "soc.h"

arch/arm/mach-omap2/omap-wakeupgen.c +1 -1

index 1729823..5d3b4f4 100644
@@ -27,7 +27,7 @@
 
 #include <asm/hardware/gic.h>
 
-#include <mach/omap-wakeupgen.h>
+#include "omap-wakeupgen.h"
 #include "omap-secure.h"
 
 #include "soc.h"

arch/arm/mach-omap2/omap-wakeupgen.h renamed from arch/arm/mach-omap2/include/mach/omap-wakeupgen.h +0 -0

similarity index 100%
rename from arch/arm/mach-omap2/include/mach/omap-wakeupgen.h
rename to arch/arm/mach-omap2/omap-wakeupgen.h

arch/arm/mach-omap2/omap4-common.c +1 -1

index 73c1440..9fc8655 100644
@@ -29,7 +29,7 @@
 #include <plat/omap-secure.h>
 #include <plat/mmc.h>
 
-#include <mach/omap-wakeupgen.h>
+#include "omap-wakeupgen.h"
 
 #include "soc.h"
 #include "common.h"

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #27 lore raw

PATCH 17/29 ARM: OMAP1: Move board-sx1.h from plat to mach

This is only used by omap1.

---
 arch/arm/mach-omap1/board-sx1-mmc.c          |    2 +-
 arch/arm/mach-omap1/board-sx1.c              |    2 +-
 arch/arm/mach-omap1/include/mach/board-sx1.h |    0 
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename arch/arm/{plat-omap/include/plat/board-sx1.h => mach-omap1/include/mach/board-sx1.h} (100%)

arch/arm/mach-omap1/board-sx1-mmc.c +1 -1

index b59f788..5932d56 100644
@@ -17,7 +17,7 @@
 
 #include <mach/hardware.h>
 #include <plat/mmc.h>
-#include <plat/board-sx1.h>
+#include <mach/board-sx1.h>
 
 #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)

arch/arm/mach-omap1/board-sx1.c +1 -1

index 2f136ea..e5edabf 100644
@@ -39,7 +39,7 @@
 #include <plat/irda.h>
 #include <plat/tc.h>
 #include <mach/keypad.h>
-#include <plat/board-sx1.h>
+#include <mach/board-sx1.h>
 
 #include <mach/hardware.h>
 #include <mach/usb.h>

arch/arm/mach-omap1/include/mach/board-sx1.h renamed from arch/arm/plat-omap/include/plat/board-sx1.h +0 -0

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

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #28 lore raw

PATCH 18/29 ARM: OMAP1: Move board-voiceblue.h from plat to mach

This is only used by omap1.

---
 arch/arm/mach-omap1/board-voiceblue.c              |    2 +-
 arch/arm/mach-omap1/include/mach/board-voiceblue.h |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename arch/arm/{plat-omap/include/plat/board-voiceblue.h => mach-omap1/include/mach/board-voiceblue.h} (100%)

arch/arm/mach-omap1/board-voiceblue.c +1 -1

index bd7b3fc..64289ea 100644
@@ -31,7 +31,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/board-voiceblue.h>
+#include <mach/board-voiceblue.h>
 #include <plat/flash.h>
 #include <mach/mux.h>
 #include <plat/tc.h>

arch/arm/mach-omap1/include/mach/board-voiceblue.h renamed from arch/arm/plat-omap/include/plat/board-voiceblue.h +0 -0

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

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #29 lore raw

PATCH 19/29 ARM: OMAP2+: Make debug-devices.h local

This can be local to mach-omap2.

---
 arch/arm/mach-omap2/board-h4.c                  |    2 +-
 arch/arm/mach-omap2/debug-devices.h             |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename arch/arm/{plat-omap/include/plat/debug-devices.h => mach-omap2/debug-devices.h} (100%)

arch/arm/mach-omap2/board-h4.c +1 -1

index 12569cb..f6c48dd 100644
@@ -34,7 +34,7 @@
 #include <plat/menelaus.h>
 #include <plat/dma.h>
 #include <plat/gpmc.h>
-#include <plat/debug-devices.h>
+#include "debug-devices.h"
 
 #include <video/omapdss.h>
 #include <video/omap-panel-generic-dpi.h>

arch/arm/mach-omap2/debug-devices.h renamed from arch/arm/plat-omap/include/plat/debug-devices.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/debug-devices.h
rename to arch/arm/mach-omap2/debug-devices.h

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #30 lore raw

PATCH 20/29 ARM: OMAP1: Move flash.h from plat to mach

This is only used by omap1.

---
 arch/arm/mach-omap1/board-fsample.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-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/flash.c              |    2 +-
 arch/arm/mach-omap1/include/mach/flash.h |    0 
 13 files changed, 12 insertions(+), 12 deletions(-)
 rename arch/arm/{plat-omap/include/plat/flash.h => mach-omap1/include/mach/flash.h} (100%)

arch/arm/mach-omap1/board-fsample.c +1 -1

index 81c41cc..228e4ca 100644
@@ -29,7 +29,7 @@
 
 #include <plat/tc.h>
 #include <mach/mux.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <plat/fpga.h>
 #include <mach/keypad.h>

arch/arm/mach-omap1/board-h2.c +1 -1

index ce99021..166f90c 100644
@@ -43,7 +43,7 @@
 #include <plat/tc.h>
 #include <plat/irda.h>
 #include <mach/keypad.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 
 #include <mach/hardware.h>
 #include <mach/usb.h>

arch/arm/mach-omap1/board-h3.c +1 -1

index 76411dd..6c44bb4 100644
@@ -44,7 +44,7 @@
 #include <plat/tc.h>
 #include <mach/keypad.h>
 #include <plat/dma.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 
 #include <mach/hardware.h>
 #include <mach/irqs.h>

arch/arm/mach-omap1/board-innovator.c +1 -1

index 2469811..3ed0d87 100644
@@ -32,7 +32,7 @@
 #include <asm/mach/map.h>
 
 #include <mach/mux.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <plat/fpga.h>
 #include <plat/tc.h>
 #include <mach/keypad.h>

arch/arm/mach-omap1/board-osk.c +1 -1

index eda3890..8d00068 100644
@@ -46,7 +46,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/tc.h>

arch/arm/mach-omap1/board-palmte.c +1 -1

index 58ef785..cbe17fa 100644
@@ -34,7 +34,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/tc.h>
 #include <plat/dma.h>

arch/arm/mach-omap1/board-palmtt.c +1 -1

index 7ab487c..5df8672 100644
@@ -34,7 +34,7 @@
 #include <asm/mach/map.h>
 
 #include <plat/led.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>

arch/arm/mach-omap1/board-palmz71.c +1 -1

index 4ce3278..b087ba0 100644
@@ -36,7 +36,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>

arch/arm/mach-omap1/board-perseus2.c +1 -1

index deb0b00..3f485ce 100644
@@ -30,7 +30,7 @@
 #include <plat/tc.h>
 #include <mach/mux.h>
 #include <plat/fpga.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/keypad.h>
 
 #include <mach/hardware.h>

arch/arm/mach-omap1/board-sx1.c +1 -1

index e5edabf..87637e7 100644
@@ -33,7 +33,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/irda.h>

arch/arm/mach-omap1/board-voiceblue.c +1 -1

index 64289ea..ad75e34 100644
@@ -32,7 +32,7 @@
 #include <asm/mach/map.h>
 
 #include <mach/board-voiceblue.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/tc.h>

arch/arm/mach-omap1/flash.c +1 -1

index 401eb3c..73ae616 100644
@@ -11,7 +11,7 @@
 #include <linux/mtd/map.h>
 
 #include <plat/tc.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 
 #include <mach/hardware.h>

arch/arm/mach-omap1/include/mach/flash.h renamed from arch/arm/plat-omap/include/plat/flash.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/flash.h
rename to arch/arm/mach-omap1/include/mach/flash.h

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #31 lore raw

PATCH 21/29 ARM: OMAP2+: Make gpmc-smc91x.h local

This can be local to mach-omap2.

---
 arch/arm/mach-omap2/board-2430sdp.c           |    2 +-
 arch/arm/mach-omap2/board-3430sdp.c           |    2 +-
 arch/arm/mach-omap2/board-3630sdp.c           |    2 +-
 arch/arm/mach-omap2/board-rx51-peripherals.c  |    2 +-
 arch/arm/mach-omap2/gpmc-smc91x.c             |    2 +-
 arch/arm/mach-omap2/gpmc-smc91x.h             |    0 
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename arch/arm/{plat-omap/include/plat/gpmc-smc91x.h => mach-omap2/gpmc-smc91x.h} (100%)

arch/arm/mach-omap2/board-2430sdp.c +1 -1

index 0900eac..95b384d 100644
@@ -36,7 +36,7 @@
 #include "common.h"
 #include <plat/gpmc.h>
 #include <plat/usb.h>
-#include <plat/gpmc-smc91x.h>
+#include "gpmc-smc91x.h"
 
 #include <video/omapdss.h>
 #include <video/omap-panel-generic-dpi.h>

arch/arm/mach-omap2/board-3430sdp.c +1 -1

index 5453173..fe354dc 100644
@@ -37,7 +37,7 @@
 #include <video/omapdss.h>
 #include <video/omap-panel-tfp410.h>
 
-#include <plat/gpmc-smc91x.h>
+#include "gpmc-smc91x.h"
 
 #include "board-flash.h"
 #include "mux.h"

arch/arm/mach-omap2/board-3630sdp.c +1 -1

index c7d6ea2..f1df601 100644
@@ -17,7 +17,7 @@
 #include <asm/mach/arch.h>
 
 #include "common.h"
-#include <plat/gpmc-smc91x.h>
+#include "gpmc-smc91x.h"
 #include <plat/usb.h>
 
 #include "board-zoom.h"

arch/arm/mach-omap2/board-rx51-peripherals.c +1 -1

index bf78ad4..93bb5b8 100644
@@ -32,7 +32,7 @@
 #include <plat/dma.h>
 #include <plat/gpmc.h>
 #include <plat/onenand.h>
-#include <plat/gpmc-smc91x.h>
+#include "gpmc-smc91x.h"
 #include <plat/omap-pm.h>
 
 #include "board-rx51.h"

arch/arm/mach-omap2/gpmc-smc91x.c +1 -1

index 245839d..5654753 100644
@@ -18,7 +18,7 @@
 #include <linux/smc91x.h>
 
 #include <plat/gpmc.h>
-#include <plat/gpmc-smc91x.h>
+#include "gpmc-smc91x.h"
 
 #include "soc.h"

arch/arm/mach-omap2/gpmc-smc91x.h renamed from arch/arm/plat-omap/include/plat/gpmc-smc91x.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/gpmc-smc91x.h
rename to arch/arm/mach-omap2/gpmc-smc91x.h

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #32 lore raw

PATCH 22/29 ARM: OMAP2+: Make gpmc-smsc911x.h local

This can be local to mach-omap2.

---
 arch/arm/mach-omap2/board-cm-t35.c              |    2 +-
 arch/arm/mach-omap2/board-igep0020.c            |    2 +-
 arch/arm/mach-omap2/board-ldp.c                 |    2 +-
 arch/arm/mach-omap2/board-omap3evm.c            |    2 +-
 arch/arm/mach-omap2/board-omap3logic.c          |    2 +-
 arch/arm/mach-omap2/board-omap3stalker.c        |    2 +-
 arch/arm/mach-omap2/board-overo.c               |    2 +-
 arch/arm/mach-omap2/board-zoom-debugboard.c     |    2 +-
 arch/arm/mach-omap2/gpmc-smsc911x.c             |    2 +-
 arch/arm/mach-omap2/gpmc-smsc911x.h             |    0 
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename arch/arm/{plat-omap/include/plat/gpmc-smsc911x.h => mach-omap2/gpmc-smsc911x.h} (100%)

arch/arm/mach-omap2/board-cm-t35.c +1 -1

index 2cbb825..f3a9cec 100644
@@ -64,7 +64,7 @@
 
 #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
 #include <linux/smsc911x.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
 
 static struct omap_smsc911x_platform_data cm_t35_smsc911x_cfg = {
 	.id		= 0,

arch/arm/mach-omap2/board-igep0020.c +1 -1

index 1b2e9a3..e2a94d8f 100644
@@ -192,7 +192,7 @@ static void __init igep_flash_init(void) {}
 #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
 
 #include <linux/smsc911x.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
 
 static struct omap_smsc911x_platform_data smsc911x_cfg = {
 	.cs             = IGEP2_SMSC911X_CS,

arch/arm/mach-omap2/board-ldp.c +1 -1

index d0372a6..5682147 100644
@@ -38,7 +38,7 @@
 #include <plat/gpmc.h>
 #include "board-zoom.h"
 #include <plat/usb.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
 
 #include <video/omapdss.h>
 #include <video/omap-panel-generic-dpi.h>

arch/arm/mach-omap2/board-omap3evm.c +1 -1

index 6a1c849..9d54178 100644
@@ -119,7 +119,7 @@ static void __init omap3_evm_get_revision(void)
 }
 
 #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
 
 static struct omap_smsc911x_platform_data smsc911x_cfg = {
 	.cs             = OMAP3EVM_SMSC911X_CS,

arch/arm/mach-omap2/board-omap3logic.c +1 -1

index b5e56fa..7bd8253 100644
@@ -34,7 +34,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
 #include <plat/gpmc.h>
 #include <plat/sdrc.h>
 #include <plat/usb.h>

arch/arm/mach-omap2/board-omap3stalker.c +1 -1

index b8756f0..a083f81 100644
@@ -60,7 +60,7 @@
 #include "common-board-devices.h"
 
 #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
 
 #define OMAP3STALKER_ETHR_START	0x2c000000
 #define OMAP3STALKER_ETHR_SIZE	1024

arch/arm/mach-omap2/board-overo.c +1 -1

index 90d57fb..e34a1ea 100644
@@ -113,7 +113,7 @@ static inline void __init overo_ads7846_init(void) { return; }
 #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
 
 #include <linux/smsc911x.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
 
 static struct omap_smsc911x_platform_data smsc911x_cfg = {
 	.id		= 0,

arch/arm/mach-omap2/board-zoom-debugboard.c +1 -1

index 42c97c2..36c8767 100644
@@ -18,7 +18,7 @@
 #include <linux/regulator/machine.h>
 
 #include <plat/gpmc.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
 
 #include "board-zoom.h"

arch/arm/mach-omap2/gpmc-smsc911x.c +1 -1

index a3a2887..249a0b4 100644
@@ -21,7 +21,7 @@
 #include <linux/smsc911x.h>
 
 #include <plat/gpmc.h>
-#include <plat/gpmc-smsc911x.h>
+#include "gpmc-smsc911x.h"
 
 static struct resource gpmc_smsc911x_resources[] = {
 	[0] = {

arch/arm/mach-omap2/gpmc-smsc911x.h renamed from arch/arm/plat-omap/include/plat/gpmc-smsc911x.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/gpmc-smsc911x.h
rename to arch/arm/mach-omap2/gpmc-smsc911x.h

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #33 lore raw

PATCH 23/29 ARM: OMAP2+: Make hdq1w.h local

This can be local to mach-omap2.

---
 arch/arm/mach-omap2/hdq1w.c                        |    2 +-
 arch/arm/mach-omap2/hdq1w.h                        |    0 
 .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c |    2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename arch/arm/{plat-omap/include/plat/hdq1w.h => mach-omap2/hdq1w.h} (100%)

arch/arm/mach-omap2/hdq1w.c +1 -1

index cdd6dda..e003f2b 100644
@@ -29,7 +29,7 @@
 
 #include <plat/omap_hwmod.h>
 #include <plat/omap_device.h>
-#include <plat/hdq1w.h>
+#include "hdq1w.h"
 
 #include "common.h"

arch/arm/mach-omap2/hdq1w.h renamed from arch/arm/plat-omap/include/plat/hdq1w.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/hdq1w.h
rename to arch/arm/mach-omap2/hdq1w.h

arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c +1 -1

index bea700e..8851bbb 100644
@@ -13,7 +13,7 @@
 #include <plat/serial.h>
 #include <plat/dma.h>
 #include <plat/common.h>
-#include <plat/hdq1w.h>
+#include "hdq1w.h"
 
 #include "omap_hwmod_common_data.h"

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #34 lore raw

PATCH 24/29 ARM: OMAP1: Move irda.h from plat to mach

This is only used by omap1.

---
 arch/arm/mach-omap1/board-h2.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-sx1.c         |    2 +-
 arch/arm/mach-omap1/include/mach/irda.h |    0 
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename arch/arm/{plat-omap/include/plat/irda.h => mach-omap1/include/mach/irda.h} (100%)

arch/arm/mach-omap1/board-h2.c +1 -1

index 166f90c..69f1513 100644
@@ -41,7 +41,7 @@
 #include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
-#include <plat/irda.h>
+#include <mach/irda.h>
 #include <mach/keypad.h>
 #include <mach/flash.h>

arch/arm/mach-omap1/board-palmte.c +1 -1

index cbe17fa..08e1912 100644
@@ -38,7 +38,7 @@
 #include <mach/mux.h>
 #include <plat/tc.h>
 #include <plat/dma.h>
-#include <plat/irda.h>
+#include <mach/irda.h>
 #include <mach/keypad.h>
 
 #include <mach/hardware.h>

arch/arm/mach-omap1/board-palmtt.c +1 -1

index 5df8672..938eaff 100644
@@ -38,7 +38,7 @@
 #include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
-#include <plat/irda.h>
+#include <mach/irda.h>
 #include <mach/keypad.h>
 
 #include <mach/hardware.h>

arch/arm/mach-omap1/board-palmz71.c +1 -1

index b087ba0..b4341d0 100644
@@ -40,7 +40,7 @@
 #include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
-#include <plat/irda.h>
+#include <mach/irda.h>
 #include <mach/keypad.h>
 
 #include <mach/hardware.h>

arch/arm/mach-omap1/board-sx1.c +1 -1

index 87637e7..50b8536 100644
@@ -36,7 +36,7 @@
 #include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/dma.h>
-#include <plat/irda.h>
+#include <mach/irda.h>
 #include <plat/tc.h>
 #include <mach/keypad.h>
 #include <mach/board-sx1.h>

arch/arm/mach-omap1/include/mach/irda.h renamed from arch/arm/plat-omap/include/plat/irda.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/irda.h
rename to arch/arm/mach-omap1/include/mach/irda.h

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #35 lore raw

PATCH 25/29 ARM: OMAP2+: Make l3_2xxx.h local

This can be local to mach-omap2.

---
 arch/arm/mach-omap2/l3_2xxx.h                      |    0 
 arch/arm/mach-omap2/omap_hwmod_2420_data.c         |    2 +-
 arch/arm/mach-omap2/omap_hwmod_2430_data.c         |    2 +-
 .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c |    2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename arch/arm/{plat-omap/include/plat/l3_2xxx.h => mach-omap2/l3_2xxx.h} (100%)

arch/arm/mach-omap2/l3_2xxx.h renamed from arch/arm/plat-omap/include/plat/l3_2xxx.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/l3_2xxx.h
rename to arch/arm/mach-omap2/l3_2xxx.h

arch/arm/mach-omap2/omap_hwmod_2420_data.c +1 -1

index 4e81637..fa8e55b 100644
@@ -18,7 +18,7 @@
 #include <plat/i2c.h>
 #include <plat/mcspi.h>
 #include <plat/dmtimer.h>
-#include <plat/l3_2xxx.h>
+#include "l3_2xxx.h"
 #include <plat/l4_2xxx.h>
 #include <plat/mmc.h>

arch/arm/mach-omap2/omap_hwmod_2430_data.c +1 -1

index ceb23c3..f19460e 100644
@@ -20,7 +20,7 @@
 #include <plat/mcspi.h>
 #include <plat/dmtimer.h>
 #include <plat/mmc.h>
-#include <plat/l3_2xxx.h>
+#include "l3_2xxx.h"
 
 #include "soc.h"
 #include "omap_hwmod_common_data.h"

arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c +1 -1

index 5178e40..4d1572e 100644
@@ -15,7 +15,7 @@
 
 #include <plat/omap_hwmod.h>
 #include <plat/serial.h>
-#include <plat/l3_2xxx.h>
+#include "l3_2xxx.h"
 #include <plat/l4_2xxx.h>
 
 #include "omap_hwmod_common_data.h"

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #36 lore raw

PATCH 26/29 ARM: OMAP2+: Make l3_3xxx.h local

This can be local to mach-omap2.

---
 arch/arm/mach-omap2/l3_3xxx.h              |    0 
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename arch/arm/{plat-omap/include/plat/l3_3xxx.h => mach-omap2/l3_3xxx.h} (100%)

arch/arm/mach-omap2/l3_3xxx.h renamed from arch/arm/plat-omap/include/plat/l3_3xxx.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/l3_3xxx.h
rename to arch/arm/mach-omap2/l3_3xxx.h

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +1 -1

index 61486f2..13a9aa8 100644
@@ -20,7 +20,7 @@
 #include <plat/omap_hwmod.h>
 #include <plat/dma.h>
 #include <plat/serial.h>
-#include <plat/l3_3xxx.h>
+#include "l3_3xxx.h"
 #include <plat/l4_3xxx.h>
 #include <plat/i2c.h>
 #include <plat/mmc.h>

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #37 lore raw

PATCH 27/29 ARM: OMAP2+: Make l4_2xxx.h local

This can be local to mach-omap2.

---
 arch/arm/mach-omap2/l4_2xxx.h                      |    0 
 arch/arm/mach-omap2/omap_hwmod_2420_data.c         |    2 +-
 .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c |    2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename arch/arm/{plat-omap/include/plat/l4_2xxx.h => mach-omap2/l4_2xxx.h} (100%)

arch/arm/mach-omap2/l4_2xxx.h renamed from arch/arm/plat-omap/include/plat/l4_2xxx.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/l4_2xxx.h
rename to arch/arm/mach-omap2/l4_2xxx.h

arch/arm/mach-omap2/omap_hwmod_2420_data.c +1 -1

index fa8e55b..a1e8f1d 100644
@@ -19,7 +19,7 @@
 #include <plat/mcspi.h>
 #include <plat/dmtimer.h>
 #include "l3_2xxx.h"
-#include <plat/l4_2xxx.h>
+#include "l4_2xxx.h"
 #include <plat/mmc.h>
 
 #include "omap_hwmod_common_data.h"

arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c +1 -1

index 4d1572e..f853a0b 100644
@@ -16,7 +16,7 @@
 #include <plat/omap_hwmod.h>
 #include <plat/serial.h>
 #include "l3_2xxx.h"
-#include <plat/l4_2xxx.h>
+#include "l4_2xxx.h"
 
 #include "omap_hwmod_common_data.h"

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #38 lore raw

PATCH 28/29 ARM: OMAP2+: Make l4_3xxx.h local

This can be local to mach-omap2.

---
 arch/arm/mach-omap2/l4_3xxx.h              |    0 
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename arch/arm/{plat-omap/include/plat/l4_3xxx.h => mach-omap2/l4_3xxx.h} (100%)

arch/arm/mach-omap2/l4_3xxx.h renamed from arch/arm/plat-omap/include/plat/l4_3xxx.h +0 -0

similarity index 100%
rename from arch/arm/plat-omap/include/plat/l4_3xxx.h
rename to arch/arm/mach-omap2/l4_3xxx.h

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +1 -1

index 13a9aa8..1c6d763 100644
@@ -21,7 +21,7 @@
 #include <plat/dma.h>
 #include <plat/serial.h>
 #include "l3_3xxx.h"
-#include <plat/l4_3xxx.h>
+#include "l4_3xxx.h"
 #include <plat/i2c.h>
 #include <plat/mmc.h>
 #include <plat/mcbsp.h>

Tony Lindgren

author maintainer

2012-09-19 21:06 UTC #39 lore raw

PATCH 29/29 ARM: OMAP2+: Make omap4-keypad.h local

This can be local to mach-omap2.