From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752285AbcAGAXq (ORCPT ); Wed, 6 Jan 2016 19:23:46 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:37000 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752145AbcAGAXn (ORCPT ); Wed, 6 Jan 2016 19:23:43 -0500 From: Guenter Roeck To: Greg Kroah-Hartman Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Guenter Roeck , Arnd Bergmann Subject: [PATCH -next] serial: 8250: Fix serial port driver for OF platform devices Date: Wed, 6 Jan 2016 16:23:41 -0800 Message-Id: <1452126221-1253-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.1.4 X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit afd7f88f1577 ("serial: 8250: move of_serial code to 8250 directory") moved the serial port driver for Open Firmware platform devices from one directory to another, but a mixup in Kconfig options resulted in the driver never being built. This results in runtime failures for some xtensa, openrisc, and powerpc configurations. Fixes: afd7f88f1577 ("serial: 8250: move of_serial code to 8250 directory") Cc: Arnd Bergmann Signed-off-by: Guenter Roeck --- It might make sense to merge this patch with the commit introducing the problem. drivers/tty/serial/8250/8250_of.c | 3 +-- drivers/tty/serial/8250/Kconfig | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c index d66fd24f87cf..33021c1f7d55 100644 --- a/drivers/tty/serial/8250/8250_of.c +++ b/drivers/tty/serial/8250/8250_of.c @@ -18,10 +18,9 @@ #include #include #include -#include #include -#include "8250/8250.h" +#include "8250.h" struct of_serial_info { struct clk *clk; diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig index b03cb5175113..e5ab94e381fb 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig @@ -378,9 +378,14 @@ config SERIAL_8250_MID present on the UART found on Intel Medfield SOC and various other Intel platforms. +config SERIAL_8250_OF + tristate + depends on SERIAL_8250 && OF + config SERIAL_OF_PLATFORM tristate "Devicetree based probing for 8250 ports" depends on SERIAL_8250 && OF + select SERIAL_8250_OF help This option is used for all 8250 compatible serial ports that are probed through devicetree, including Open Firmware based -- 2.1.4