Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1270310

[PATCH 6/6] serial: 8250: move of_serial code to 8250 directory

Show all headers | View raw

As the of-serial driver is now 8250 specific, we can move the
file to a more appropriate place in teh 8250 subdirectory and
adapt the Kconfig help text and file name.

I'm leaving the CONFIG_SERIAL_OF_PLATFORM symbol unchanged
to avoid breaking user configuration files unnecessarily.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/tty/serial/{of_serial.c => 8250/8250_of.c} |  0
 drivers/tty/serial/8250/Kconfig                    |  9 +++++++++
 drivers/tty/serial/8250/Makefile                   |  1 +
 drivers/tty/serial/Kconfig                         | 10 ----------
 drivers/tty/serial/Makefile                        |  1 -
 5 files changed, 10 insertions(+), 11 deletions(-)
 rename drivers/tty/serial/{of_serial.c => 8250/8250_of.c} (100%)

diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/8250/8250_of.c
similarity index 100%
rename from drivers/tty/serial/of_serial.c
rename to drivers/tty/serial/8250/8250_of.c
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
index 6412f1455beb..f8507d718dd4 100644
--- a/drivers/tty/serial/8250/Kconfig
+++ b/drivers/tty/serial/8250/Kconfig
@@ -378,3 +378,12 @@ config SERIAL_8250_MID
 	  Selecting this option will enable handling of the extra features
 	  present on the UART found on Intel Medfield SOC and various other
 	  Intel platforms.
+
+config SERIAL_OF_PLATFORM
+	tristate "Devicetree based probing for 8250 ports"
+	depends on SERIAL_8250 && OF
+	help
+	  This option is used for all 8250 compatible serial ports that
+	  are probed through devicetree, including Open Firmware based
+	  PowerPC systems and embedded systems on architectures using the
+	  flattened device tree format.
diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile
index e177f8681ada..4ecb80d3549a 100644
--- a/drivers/tty/serial/8250/Makefile
+++ b/drivers/tty/serial/8250/Makefile
@@ -28,5 +28,6 @@ obj-$(CONFIG_SERIAL_8250_MT6577)	+= 8250_mtk.o
 obj-$(CONFIG_SERIAL_8250_UNIPHIER)	+= 8250_uniphier.o
 obj-$(CONFIG_SERIAL_8250_INGENIC)	+= 8250_ingenic.o
 obj-$(CONFIG_SERIAL_8250_MID)		+= 8250_mid.o
+obj-$(CONFIG_SERIAL_8250_OF)		+= 8250_of.o
 
 CFLAGS_8250_ingenic.o += -I$(srctree)/scripts/dtc/libfdt
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index a9c2200fd528..6879a5785be7 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1094,16 +1094,6 @@ config SERIAL_NETX_CONSOLE
 	  If you have enabled the serial port on the Hilscher NetX SoC
 	  you can make it the console by answering Y to this option.
 
-config SERIAL_OF_PLATFORM
-	tristate "Serial port on Open Firmware platform bus"
-	depends on OF
-	depends on SERIAL_8250
-	help
-	  If you have a PowerPC based system that has serial ports
-	  on a platform specific bus, you should enable this option.
-	  Currently, only 8250 compatible ports are supported, but
-	  others can easily be added.
-
 config SERIAL_OMAP
 	tristate "OMAP serial port support"
 	depends on ARCH_OMAP2PLUS
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index ee8893317433..b391c9b31960 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -63,7 +63,6 @@ obj-$(CONFIG_SERIAL_ATMEL) += atmel_serial.o
 obj-$(CONFIG_SERIAL_UARTLITE) += uartlite.o
 obj-$(CONFIG_SERIAL_MSM) += msm_serial.o
 obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
-obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
 obj-$(CONFIG_SERIAL_KGDB_NMI) += kgdb_nmi.o
 obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
 obj-$(CONFIG_SERIAL_OMAP) += omap-serial.o
-- 
2.1.0.rc2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] serial: fixes and cleanups Arnd Bergmann <arnd@arndb.de> - 2015-11-16 16:50 +0100
  [PATCH 2/6] serial: fsl-lpuart: move SERIAL_EARLYCON dependency to console Arnd Bergmann <arnd@arndb.de> - 2015-11-16 17:00 +0100
    Re: [PATCH 2/6] serial: fsl-lpuart: move SERIAL_EARLYCON dependency  to console Stefan Agner <stefan@agner.ch> - 2015-11-17 01:40 +0100
  [PATCH 1/6] serial: export fsl8250_handle_irq Arnd Bergmann <arnd@arndb.de> - 2015-11-16 17:00 +0100
  [PATCH 6/6] serial: 8250: move of_serial code to 8250 directory Arnd Bergmann <arnd@arndb.de> - 2015-11-16 17:00 +0100
  [PATCH 3/6] serial: mid8250: select CONFIG_RATIONAL Arnd Bergmann <arnd@arndb.de> - 2015-11-16 17:00 +0100
    Re: [PATCH 3/6] serial: mid8250: select CONFIG_RATIONAL Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2015-11-16 18:00 +0100
      Re: [PATCH 3/6] serial: mid8250: select CONFIG_RATIONAL Arnd Bergmann <arnd@arndb.de> - 2015-11-16 18:10 +0100

csiph-web