From patchwork Mon Nov 24 22:23:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 41421 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 948CF25AEA for ; Mon, 24 Nov 2014 22:23:55 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id l18sf5836573wgh.2 for ; Mon, 24 Nov 2014 14:23:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=cARMXVaivTfw3TLK8X0rhVZOXbaCYBojwHeW6mQmVa4=; b=Nj6JBqueW0k2FGtQ6WZidfBIQXtGrCSvmrjV42VmPl3Mc6V2RuKzsMnTnxdnVflH4D KcPG4hwMGGGhjm5K+bfWhJj8brTalwpGTRtAFiWgrOnTxFgtn76zHxEvhnXzbqqzVQoc h9T4tO8rbI59f8iShztXycdzHHuTcINz65Z1UAg932/rnG9pvrdioAaJihwByZ8T6sm3 GvHyWXABSSCfDqjfaX0dPPgw7RyvAn1qUdROfx8Z6hYIQB7wmA9uRzcliHNtmatiAkMi 43U0ETO9OFWDqJAyeNFIOXhnG5XINXCo8vqjQzE9jb4wlYGdnjOEI0MrlUQGb4u+SAUV 23vA== X-Gm-Message-State: ALoCoQlNLkVHZtUiSybJZj8nHAUxUNLNT+X3Cgoty/y7JMc7+7tRSH6Ln9RAATlfzWz+dDjmbBuh X-Received: by 10.112.168.228 with SMTP id zz4mr5764013lbb.7.1416867834739; Mon, 24 Nov 2014 14:23:54 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.242.161 with SMTP id wr1ls85696lac.48.gmail; Mon, 24 Nov 2014 14:23:54 -0800 (PST) X-Received: by 10.152.6.228 with SMTP id e4mr22776719laa.71.1416867834472; Mon, 24 Nov 2014 14:23:54 -0800 (PST) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id f8si3626759lab.102.2014.11.24.14.23.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Nov 2014 14:23:54 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by mail-la0-f42.google.com with SMTP id s18so8577623lam.1 for ; Mon, 24 Nov 2014 14:23:54 -0800 (PST) X-Received: by 10.112.14.69 with SMTP id n5mr22813549lbc.34.1416867834132; Mon, 24 Nov 2014 14:23:54 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp346646lbc; Mon, 24 Nov 2014 14:23:53 -0800 (PST) X-Received: by 10.68.135.33 with SMTP id pp1mr36478362pbb.120.1416867832520; Mon, 24 Nov 2014 14:23:52 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gv6si23437297pac.208.2014.11.24.14.23.51 for ; Mon, 24 Nov 2014 14:23:52 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751457AbaKXWXn (ORCPT + 26 others); Mon, 24 Nov 2014 17:23:43 -0500 Received: from mail-wg0-f50.google.com ([74.125.82.50]:64745 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750734AbaKXWXk (ORCPT ); Mon, 24 Nov 2014 17:23:40 -0500 Received: by mail-wg0-f50.google.com with SMTP id k14so13661060wgh.9 for ; Mon, 24 Nov 2014 14:23:39 -0800 (PST) X-Received: by 10.194.71.84 with SMTP id s20mr36917383wju.128.1416867819728; Mon, 24 Nov 2014 14:23:39 -0800 (PST) Received: from mohikan.mushroom.smurfnet.nu (cpc4-cmbg17-2-0-cust71.5-4.cable.virginm.net. [86.14.224.72]) by mx.google.com with ESMTPSA id el6sm13828534wib.23.2014.11.24.14.23.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Nov 2014 14:23:38 -0800 (PST) From: Leif Lindholm To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: mark.rutland@arm.com, grant.likely@linaro.org, robh+dt@kernel.org, plagnioj@jcrosoft.com, ijc@debian.org Subject: [PATCH] of: support passing console options with stdout-path Date: Mon, 24 Nov 2014 22:23:58 +0000 Message-Id: <1416867838-18652-1-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: leif.lindholm@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Support specifying console options (like with console=ttyXN,) by appending them to the stdout-path property after a separating ':'. Example: stdout-path = "uart0:115200"; This patch also modifies of_find_node_by_path() to match only the portion of the path before a ':'. Signed-off-by: Leif Lindholm --- drivers/of/base.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index 3823edf..89c6b33 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -37,6 +37,7 @@ EXPORT_SYMBOL(of_allnodes); struct device_node *of_chosen; struct device_node *of_aliases; struct device_node *of_stdout; +static char *of_stdout_options; struct kset *of_kset; @@ -703,6 +704,8 @@ static struct device_node *__of_find_node_by_path(struct device_node *parent, if (!len) return NULL; + len = strchrnul(path, ':') - path; + __for_each_child_of_node(parent, child) { const char *name = strrchr(child->full_name, '/'); if (WARN(!name, "malformed device_node %s\n", child->full_name)) @@ -747,6 +750,8 @@ struct device_node *of_find_node_by_path(const char *path) if (!of_aliases) return NULL; + len = strchrnul(path, ':') - path; + for_each_property_of_node(of_aliases, pp) { if (strlen(pp->name) == len && !strncmp(pp->name, path, len)) { np = of_find_node_by_path(pp->value); @@ -1830,8 +1835,12 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align)) name = of_get_property(of_chosen, "linux,stdout-path", NULL); if (IS_ENABLED(CONFIG_PPC) && !name) name = of_get_property(of_aliases, "stdout", NULL); - if (name) + if (name) { of_stdout = of_find_node_by_path(name); + of_stdout_options = strchr(name, ':'); + if (of_stdout_options != NULL) + of_stdout_options++; + } } if (!of_aliases) @@ -1957,7 +1966,7 @@ bool of_console_check(struct device_node *dn, char *name, int index) { if (!dn || dn != of_stdout || console_set_on_cmdline) return false; - return !add_preferred_console(name, index, NULL); + return !add_preferred_console(name, index, of_stdout_options); } EXPORT_SYMBOL_GPL(of_console_check);