From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752904AbbKPPuw (ORCPT ); Mon, 16 Nov 2015 10:50:52 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:58801 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751824AbbKPPsx (ORCPT ); Mon, 16 Nov 2015 10:48:53 -0500 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 6/6] serial: 8250: move of_serial code to 8250 directory Date: Mon, 16 Nov 2015 16:48:14 +0100 Message-Id: <1447688894-2936779-7-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1447688894-2936779-1-git-send-email-arnd@arndb.de> References: <1447688894-2936779-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:HP6oA/aMesZfvx4KxJLVX6uT+aWE/vDK1gOE4jEKAdLhnts5S08 r3NZhNVvdaWHPgBEDGPZA/XmW4LQeNz5A4kUGbhp13e3OQoHt6+b0XCZyGHyVInUBJWnIqb kJlifK83A54Rnblbjhy8nO83QL+9uagYRU25G4SAM7N1cHsqhXIGh5MmcFVWtiw2QstWXxg dgpesu5nL2a2dOAypCaWg== X-UI-Out-Filterresults: notjunk:1;V01:K0:j57k2UcB9QQ=:g5pTbY5QdiEaeEp2MSuJS7 VqaR922h9Ftf4vcPpyATa4a3uFlmoT4ap5Rt+HHhOyyojC+lhAMRAZh0/FtJf7HITpjD/C+OI QYgRhanCJ+VlAOZsZqcUNLvZ5vec4y8Ko9bh4QsY7Y1D1zS9b+4SnybitFLo66Yk0ZwalX0aI bVp8b2clxB3iXgdO3RIt/6r5XigCY+j64SXFqsgpv5puO14F4Y1Qgo+shDjunxUOB8m66Y/nD P35rsKZQMNg69g5N9nvPreiWOFqy2pgDN9ZqgrCqCEhaSvGhWSY962O8UHs395YAU0i+JKp7+ ahpr9giYR2igJwkutAZd+WQxVkx4XLJILBN7j+0q8xZirqq0Q8KY7Y+NQv8/M3PcxO496+Rs2 CAzAcCkZdErRvaHyxG/TqtL99ojL9nX2Tmk4Jvxj/EYrynqnfgQf+hIoPFCNguE6oy72MOAQZ hWRQKVqBZ1Hg0QL2ou8EVgdbCKR8PGi7dSFLVlfWLa4an+OvGBaqTGiaP0ExREtCpfjCqnNBx HhhpF4quWARCv5SgAEgNRSwfTeSXBZiW6OYpSSVSOqrk2Oe/Z2hshgTeVx/7viWiaLFsGBx5U K5TNW+iV2ZWhB87Luoukfv1p4wBswmwen5H6rtsvGS11J38d8lppEzFtzNpXNEogec0xgvOj9 2o5uXOUs9AcHd98b9Ln/du4/JTTO/FN9iPEyZvfS1TsvWGur2IXui6bBDH7SMRdyuXcQ= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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