* [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 07/29] ARM: OMAP1: Move lcd_mipid.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
* 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-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 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
* [PATCH 07/29] ARM: OMAP1: Move lcd_mipid.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:17 ` 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 This is only used by omap1. Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Cc: linux-fbdev@vger.kernel.org Signed-off-by: Tony Lindgren <tony@atomide.com> --- 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%) diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index bfc2b06..a2699eb 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c @@ -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> diff --git a/arch/arm/plat-omap/include/plat/lcd_mipid.h b/arch/arm/mach-omap1/include/mach/lcd_mipid.h 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 diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c index e3880c4..2b64d07 100644 --- a/drivers/video/omap/lcd_mipid.c +++ b/drivers/video/omap/lcd_mipid.c @@ -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" ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 07/29] ARM: OMAP1: Move lcd_mipid.h from plat to mach 2012-09-19 21:05 ` [PATCH 07/29] ARM: OMAP1: Move lcd_mipid.h " Tony Lindgren @ 2012-09-20 18:17 ` Tony Lindgren 0 siblings, 0 replies; 7+ messages in thread From: Tony Lindgren @ 2012-09-20 18:17 UTC (permalink / raw) To: linux-arm-kernel * Tony Lindgren <tony@atomide.com> [120919 14:07]: > This is only used by omap1. This too is handled by Arnd's series already, dropping this one. Regards, Tony ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-09-20 18:17 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 07/29] ARM: OMAP1: Move lcd_mipid.h " Tony Lindgren
2012-09-20 18:17 ` 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).