* [PATCH 04/29] ARM: OMAP1: Move board-ams-delta.h from plat to mach
[not found] <20120919205732.28074.43697.stgit@muffinssi>
@ 2012-09-19 21:05 ` Tony Lindgren
2012-09-20 1:16 ` Mark Brown
2012-09-20 13:41 ` Janusz Krzysztofik
2012-09-19 21:05 ` [PATCH 06/29] ARM: OMAP1: Move keypad.h " Tony Lindgren
1 sibling, 2 replies; 7+ messages in thread
From: Tony Lindgren @ 2012-09-19 21:05 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-fbdev, Mark Brown, Janusz Krzysztofik, Artem Bityutskiy,
Dmitry Torokhov, alsa-devel, Peter Ujfalusi, Tomi Valkeinen,
linux-mtd, linux-input, linux-omap, Liam Girdwood
This is only used by omap1.
And to fix things properly, this should not be included
from the drivers at all.
Cc: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-fbdev@vger.kernel.org
Cc: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
Cc: linux-mtd@lists.infradead.org
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: alsa-devel@alsa-project.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
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%)
diff --git a/arch/arm/mach-omap1/ams-delta-fiq-handler.S b/arch/arm/mach-omap1/ams-delta-fiq-handler.S
index d2b6acc..3d1e1c2 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 <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>
diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c
index 68e8e56..f12a12a 100644
--- a/arch/arm/mach-omap1/ams-delta-fiq.c
+++ b/arch/arm/mach-omap1/ams-delta-fiq.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index 05af063..b9929cb 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -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>
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 f5fbdf9..45887e3 100644
--- a/drivers/input/serio/ams_delta_serio.c
+++ b/drivers/input/serio/ams_delta_serio.c
@@ -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>
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index c28eec0..9e7723a 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -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>
diff --git a/drivers/video/omap/lcd_ams_delta.c b/drivers/video/omap/lcd_ams_delta.c
index 5cca6b3..ed4cad8 100644
--- a/drivers/video/omap/lcd_ams_delta.c
+++ b/drivers/video/omap/lcd_ams_delta.c
@@ -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"
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index 7b18b74..98e25d5 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -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"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 06/29] ARM: OMAP1: Move keypad.h from plat to mach
[not found] <20120919205732.28074.43697.stgit@muffinssi>
2012-09-19 21:05 ` [PATCH 04/29] ARM: OMAP1: Move board-ams-delta.h from plat to mach Tony Lindgren
@ 2012-09-19 21:05 ` Tony Lindgren
2012-09-20 18:14 ` Tony Lindgren
1 sibling, 1 reply; 7+ messages in thread
From: Tony Lindgren @ 2012-09-19 21:05 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: linux-omap, Dmitry Torokhov, linux-input
This is only used by omap1.
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
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%)
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index b9929cb..384f77a 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index 4b784f2..81c41cc 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 124db5c..ce99021 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index a6f28a6..76411dd 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c
index 1dcb751..521a909 100644
--- a/arch/arm/mach-omap1/board-htcherald.c
+++ b/arch/arm/mach-omap1/board-htcherald.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c
index 0eb9881..2469811 100644
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index fb3a6e9..bfc2b06 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index eb108d5..eda3890 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -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,
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
index bd27646..58ef785 100644
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c
index 8128eab..7ab487c 100644
--- a/arch/arm/mach-omap1/board-palmtt.c
+++ b/arch/arm/mach-omap1/board-palmtt.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index 2367c0d..4ce3278 100644
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 0d9b836..deb0b00 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -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>
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index 1f43fe9..2f136ea 100644
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -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>
diff --git a/arch/arm/plat-omap/include/plat/keypad.h b/arch/arm/mach-omap1/include/mach/keypad.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/keypad.h
rename to arch/arm/mach-omap1/include/mach/keypad.h
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index 8d8d45f..bee4576 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 04/29] ARM: OMAP1: Move board-ams-delta.h from plat to mach
2012-09-19 21:05 ` [PATCH 04/29] ARM: OMAP1: Move board-ams-delta.h from plat to mach Tony Lindgren
@ 2012-09-20 1:16 ` Mark Brown
2012-09-20 17:12 ` Tony Lindgren
2012-09-20 13:41 ` Janusz Krzysztofik
1 sibling, 1 reply; 7+ messages in thread
From: Mark Brown @ 2012-09-20 1:16 UTC (permalink / raw)
To: Tony Lindgren
Cc: linux-arm-kernel, linux-fbdev, Janusz Krzysztofik,
Artem Bityutskiy, Dmitry Torokhov, alsa-devel, Peter Ujfalusi,
Tomi Valkeinen, linux-mtd, linux-input, linux-omap, Liam Girdwood
On Wed, Sep 19, 2012 at 02:05:43PM -0700, Tony Lindgren wrote:
> 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 <broonie@opensource.wolfsonmicro.com>
or I can apply it if that's easier.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 04/29] ARM: OMAP1: Move board-ams-delta.h from plat to mach
2012-09-19 21:05 ` [PATCH 04/29] ARM: OMAP1: Move board-ams-delta.h from plat to mach Tony Lindgren
2012-09-20 1:16 ` Mark Brown
@ 2012-09-20 13:41 ` Janusz Krzysztofik
2012-09-20 17:10 ` Tony Lindgren
1 sibling, 1 reply; 7+ messages in thread
From: Janusz Krzysztofik @ 2012-09-20 13:41 UTC (permalink / raw)
To: Tony Lindgren
Cc: linux-arm-kernel, linux-fbdev, Mark Brown, Artem Bityutskiy,
Dmitry Torokhov, alsa-devel, Peter Ujfalusi, Tomi Valkeinen,
linux-mtd, linux-input, linux-omap, Liam Girdwood
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 <jkrzyszt@tis.icnet.pl>
I'll take care of updating the drivers when I have some spare time.
Thanks,
Janusz
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 04/29] ARM: OMAP1: Move board-ams-delta.h from plat to mach
2012-09-20 13:41 ` Janusz Krzysztofik
@ 2012-09-20 17:10 ` Tony Lindgren
0 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2012-09-20 17:10 UTC (permalink / raw)
To: Janusz Krzysztofik
Cc: linux-arm-kernel, linux-fbdev, Mark Brown, Artem Bityutskiy,
Dmitry Torokhov, alsa-devel, Peter Ujfalusi, Tomi Valkeinen,
linux-mtd, linux-input, linux-omap, Liam Girdwood
* Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> [120920 06:48]:
> 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 <jkrzyszt@tis.icnet.pl>
>
> 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 04/29] ARM: OMAP1: Move board-ams-delta.h from plat to mach
2012-09-20 1:16 ` Mark Brown
@ 2012-09-20 17:12 ` Tony Lindgren
0 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2012-09-20 17:12 UTC (permalink / raw)
To: Mark Brown
Cc: linux-arm-kernel, linux-fbdev, Janusz Krzysztofik,
Artem Bityutskiy, Dmitry Torokhov, alsa-devel, Peter Ujfalusi,
Tomi Valkeinen, linux-mtd, linux-input, linux-omap, Liam Girdwood
* Mark Brown <broonie@opensource.wolfsonmicro.com> [120919 19:05]:
> On Wed, Sep 19, 2012 at 02:05:43PM -0700, Tony Lindgren wrote:
> > 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 <broonie@opensource.wolfsonmicro.com>
>
> 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 06/29] ARM: OMAP1: Move keypad.h from plat to mach
2012-09-19 21:05 ` [PATCH 06/29] ARM: OMAP1: Move keypad.h " Tony Lindgren
@ 2012-09-20 18:14 ` Tony Lindgren
0 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2012-09-20 18:14 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: linux-omap, Dmitry Torokhov, linux-input
* Tony Lindgren <tony@atomide.com> [120919 14:07]:
> 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
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-09-20 18:14 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20120919205732.28074.43697.stgit@muffinssi>
2012-09-19 21:05 ` [PATCH 04/29] ARM: OMAP1: Move board-ams-delta.h from plat to mach Tony Lindgren
2012-09-20 1:16 ` Mark Brown
2012-09-20 17:12 ` Tony Lindgren
2012-09-20 13:41 ` Janusz Krzysztofik
2012-09-20 17:10 ` Tony Lindgren
2012-09-19 21:05 ` [PATCH 06/29] ARM: OMAP1: Move keypad.h " Tony Lindgren
2012-09-20 18:14 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).