From patchwork Fri Oct 5 16:12:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 1554841 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 83B0F3FE80 for ; Fri, 5 Oct 2012 16:18:28 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TKAYQ-0002Li-2a; Fri, 05 Oct 2012 16:15:10 +0000 Received: from metis.ext.pengutronix.de ([92.198.50.35]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TKAWb-00019r-1G for linux-arm-kernel@lists.infradead.org; Fri, 05 Oct 2012 16:13:21 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1TKAWN-0004Yo-CL; Fri, 05 Oct 2012 18:13:03 +0200 Received: from sha by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1TKAWL-0003ZZ-Tp; Fri, 05 Oct 2012 18:13:01 +0200 From: Sascha Hauer To: linux-serial@vger.kernel.org Subject: [PATCH 1/3] serial_core: Add helper for matching against linux, stdout-path Date: Fri, 5 Oct 2012 18:12:59 +0200 Message-Id: <1349453581-1685-2-git-send-email-s.hauer@pengutronix.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1349453581-1685-1-git-send-email-s.hauer@pengutronix.de> References: <1349453581-1685-1-git-send-email-s.hauer@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.0 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.1 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Greg Kroah-Hartman , devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, Rob Herring , Grant Likely , Sascha Hauer , linux-arm-kernel@lists.infradead.org, Alan Cox X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org devicetrees may have a linux,stdout-path property in the chosen node describing the console device. This adds a helper function to match a device against this property so a driver can call add_preferred_console for a matching device. Signed-off-by: Sascha Hauer --- drivers/tty/serial/serial_core.c | 30 ++++++++++++++++++++++++++++++ include/linux/serial_core.h | 3 +++ 2 files changed, 33 insertions(+) diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index a21dc8e..f4a9f26 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -2540,6 +2541,35 @@ void uart_insert_char(struct uart_port *port, unsigned int status, } EXPORT_SYMBOL_GPL(uart_insert_char); +#ifdef CONFIG_OF +/** + * of_uart_is_stdoutpath - check if this device matches the linux,stdout-path + * property + * + * Check if this device matches the linux,stdout-path property + * in the chosen node. return true if yes, false otherwise. + */ +int of_uart_is_stdoutpath(struct device *dev) +{ + struct device_node *dn; + const char *name; + + name = of_get_property(of_chosen, "linux,stdout-path", NULL); + if (name == NULL) + return 0; + + dn = of_find_node_by_path(name); + if (!dn) + return 0; + + if (dn == dev->of_node) + return 1; + + return 0; +} +EXPORT_SYMBOL_GPL(of_uart_is_stdoutpath); +#endif + EXPORT_SYMBOL(uart_write_wakeup); EXPORT_SYMBOL(uart_register_driver); EXPORT_SYMBOL(uart_unregister_driver); diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 0253c20..35a61f6 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -560,6 +560,9 @@ static inline int uart_handle_break(struct uart_port *port) (cflag) & CRTSCTS || \ !((cflag) & CLOCAL)) +/* check if a device matches the linux,stdout-path property */ +int of_uart_is_stdoutpath(struct device *dev); + #endif #endif /* LINUX_SERIAL_CORE_H */