From patchwork Thu Oct 4 10:39:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 1546031 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 511DB40D7F for ; Thu, 4 Oct 2012 10:41:56 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TJiqc-0001iQ-O8; Thu, 04 Oct 2012 10:40:06 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TJiqY-0001i8-Ey for linux-arm-kernel@lists.infradead.org; Thu, 04 Oct 2012 10:40:03 +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 1TJiqR-0005CT-Hc; Thu, 04 Oct 2012 12:39:55 +0200 Received: from sha by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1TJiqP-0002yP-6C; Thu, 04 Oct 2012 12:39:53 +0200 From: Sascha Hauer To: linux-serial@vger.kernel.org Subject: [PATCH] serial: i.MX: evaluate linux,stdout-path property Date: Thu, 4 Oct 2012 12:39:51 +0200 Message-Id: <1349347191-7406-1-git-send-email-s.hauer@pengutronix.de> X-Mailer: git-send-email 1.7.10.4 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 the linux,stdout-path property to specify the console. This patch adds support to the i.MX serial driver for this. Signed-off-by: Sascha Hauer --- I was originally looking for a more generic way to handle this, but since a struct console has no device associated to it, it's not possible to match a console with a device in a generic way. So we just call add_preferred_console from the driver and let it go down to a string matching in the console code. If anyone has a better idea how to handle this, please let me know. Otherwise I'm happy to see this patch applied aswell. Thanks Sascha drivers/tty/serial/imx.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index e309e8b..b52c4a7 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -1397,6 +1397,32 @@ static int serial_imx_resume(struct platform_device *dev) #ifdef CONFIG_OF /* + * Check if this device matches the linux,stdout-path property + * in the chosen node. return true if yes, false otherwise + */ +static int serial_imx_is_stdoutpath(struct platform_device *pdev) +{ + struct device_node *dn; + const char *name; + + if (!IS_ENABLED(CONFIG_SERIAL_IMX_CONSOLE)) + return 0; + + 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 == pdev->dev.of_node) + return 1; + + return 0; +} + +/* * This function returns 1 iff pdev isn't a device instatiated by dt, 0 iff it * could successfully get all information from dt or a negative errno. */ @@ -1427,6 +1453,9 @@ static int serial_imx_probe_dt(struct imx_port *sport, sport->devdata = of_id->data; + if (serial_imx_is_stdoutpath(pdev)) + add_preferred_console(imx_reg.cons->name, sport->port.line, 0); + return 0; } #else