| Message ID | 20121121174230.25576.64507.stgit@muffinssi.local (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Nov 21, 2012 at 09:42:30AM -0800, Tony Lindgren wrote: > We need to move this file to allow ARM multiplatform configurations > to build for omap2+. This can now be done as this file now only > contains platform_data. > > cc: Russell King <linux@arm.linux.org.uk> > cc: Alan Cox <alan@linux.intel.com> > cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > cc: Govindraj.R <govindraj.raja@ti.com> > cc: Kevin Hilman <khilman@ti.com> > cc: Felipe Balbi <balbi@ti.com> > cc: linux-serial@vger.kernel.org > Signed-off-by: Tony Lindgren <tony@atomide.com> nice, thanks :-) Reviewed-by: Felipe Balbi <balbi@ti.com> > --- > arch/arm/mach-omap2/serial.c | 4 +--- > drivers/tty/serial/omap-serial.c | 3 +-- > include/linux/platform_data/serial-omap.h | 0 > 3 files changed, 2 insertions(+), 5 deletions(-) > rename arch/arm/plat-omap/include/plat/omap-serial.h => include/linux/platform_data/serial-omap.h (100%) > > diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c > index aa30a3c..25c799b 100644 > --- a/arch/arm/mach-omap2/serial.c > +++ b/arch/arm/mach-omap2/serial.c > @@ -26,9 +26,7 @@ > #include <linux/slab.h> > #include <linux/pm_runtime.h> > #include <linux/console.h> > - > -#include <plat/omap-serial.h> > -#include <plat-omap/dma-omap.h> > +#include <linux/platform_data/serial-omap.h> > > #include "common.h" > #include "omap_hwmod.h" > diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c > index 17babde..0240aa8 100644 > --- a/drivers/tty/serial/omap-serial.c > +++ b/drivers/tty/serial/omap-serial.c > @@ -41,8 +41,7 @@ > #include <linux/of.h> > #include <linux/gpio.h> > #include <linux/pinctrl/consumer.h> > - > -#include <plat/omap-serial.h> > +#include <linux/platform_data/serial-omap.h> > > #define OMAP_MAX_HSUART_PORTS 6 > > diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/include/linux/platform_data/serial-omap.h > similarity index 100% > rename from arch/arm/plat-omap/include/plat/omap-serial.h > rename to include/linux/platform_data/serial-omap.h >
* Tony Lindgren <tony@atomide.com> [121121 09:44]: > We need to move this file to allow ARM multiplatform configurations > to build for omap2+. This can now be done as this file now only > contains platform_data. Russell, this one depends on your commit fd9980c7 (SERIAL: omap: remove OMAP_UART_SYSC_RESET and OMAP_UART_FIFO_CLR). Is that commit immutable and OK to merge as a dependency to my branch? Regards, Tony
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index aa30a3c..25c799b 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -26,9 +26,7 @@ #include <linux/slab.h> #include <linux/pm_runtime.h> #include <linux/console.h> - -#include <plat/omap-serial.h> -#include <plat-omap/dma-omap.h> +#include <linux/platform_data/serial-omap.h> #include "common.h" #include "omap_hwmod.h" diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 17babde..0240aa8 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -41,8 +41,7 @@ #include <linux/of.h> #include <linux/gpio.h> #include <linux/pinctrl/consumer.h> - -#include <plat/omap-serial.h> +#include <linux/platform_data/serial-omap.h> #define OMAP_MAX_HSUART_PORTS 6
We need to move this file to allow ARM multiplatform configurations to build for omap2+. This can now be done as this file now only contains platform_data. cc: Russell King <linux@arm.linux.org.uk> cc: Alan Cox <alan@linux.intel.com> cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> cc: Govindraj.R <govindraj.raja@ti.com> cc: Kevin Hilman <khilman@ti.com> cc: Felipe Balbi <balbi@ti.com> cc: linux-serial@vger.kernel.org Signed-off-by: Tony Lindgren <tony@atomide.com> --- arch/arm/mach-omap2/serial.c | 4 +--- drivers/tty/serial/omap-serial.c | 3 +-- include/linux/platform_data/serial-omap.h | 0 3 files changed, 2 insertions(+), 5 deletions(-) rename arch/arm/plat-omap/include/plat/omap-serial.h => include/linux/platform_data/serial-omap.h (100%) diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/include/linux/platform_data/serial-omap.h similarity index 100% rename from arch/arm/plat-omap/include/plat/omap-serial.h rename to include/linux/platform_data/serial-omap.h