From patchwork Fri Mar 28 16:08:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 27318 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 83DE02066E for ; Fri, 28 Mar 2014 16:09:37 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id i7sf18601717oag.8 for ; Fri, 28 Mar 2014 09:09:37 -0700 (PDT) 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:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=3cd09pj/5bqgTs/QTSusZ2MJtGLpPTm+E4MZ/LooOio=; b=DLyGLE9K2jaHYgQoorVIqNuNAD3CMrjhJWtJJCi+J0sntNIQzKSn4KueNwq22NT57W oBZ2A25qv1T3KBaqFCsi/YyCWMlORnsrRLLAFq5tibk/omzFD5MuWkCEVO18p3j8T1PK BQUXSWvP3+0dz6gvzo8ZFC6cKJo8AhcRY7AJ4XiEJ6o+ikm1e1KLQaY8VF6zAG+gZ3rg QhfVEB0/tX4zVfaPzmuBty3IdVPostGlCZhSczyar/pjpZdmQkGzq2hQJZJcRPycbink uP+sk/oc3d+qG847zH902GolbpKxXj90K3CGgr7QMzipjG2BzKqxN7ZkpKxl7xVw8vlE YgTg== X-Gm-Message-State: ALoCoQlKB6QqIVdT8LYgSAlvTELWejN7Qh3z0cPxeHNa8e5rCrFaGTknSDLU5p4o6+je6FA6PcBV X-Received: by 10.182.28.36 with SMTP id y4mr3497381obg.46.1396022977031; Fri, 28 Mar 2014 09:09:37 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.91.131 with SMTP id z3ls1570791qgd.59.gmail; Fri, 28 Mar 2014 09:09:36 -0700 (PDT) X-Received: by 10.52.72.48 with SMTP id a16mr6566717vdv.19.1396022976948; Fri, 28 Mar 2014 09:09:36 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id m3si1328612vcr.23.2014.03.28.09.09.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Mar 2014 09:09:36 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id lg15so6185054vcb.30 for ; Fri, 28 Mar 2014 09:09:36 -0700 (PDT) X-Received: by 10.58.23.6 with SMTP id i6mr7760828vef.12.1396022976868; Fri, 28 Mar 2014 09:09:36 -0700 (PDT) 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.220.12.8 with SMTP id v8csp20450vcv; Fri, 28 Mar 2014 09:09:36 -0700 (PDT) X-Received: by 10.68.194.65 with SMTP id hu1mr9543197pbc.158.1396022962481; Fri, 28 Mar 2014 09:09:22 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tk5si3956722pbc.123.2014.03.28.09.09.21; Fri, 28 Mar 2014 09:09:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752549AbaC1QJM (ORCPT + 27 others); Fri, 28 Mar 2014 12:09:12 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:54470 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752190AbaC1QIR (ORCPT ); Fri, 28 Mar 2014 12:08:17 -0400 Received: by mail-pd0-f176.google.com with SMTP id r10so5025969pdi.21 for ; Fri, 28 Mar 2014 09:08:16 -0700 (PDT) X-Received: by 10.66.164.229 with SMTP id yt5mr9470345pab.67.1396022896618; Fri, 28 Mar 2014 09:08:16 -0700 (PDT) Received: from trevor.secretlab.ca ([184.48.92.32]) by mx.google.com with ESMTPSA id ix2sm24795497pbc.45.2014.03.28.09.08.12 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Mar 2014 09:08:14 -0700 (PDT) Received: by trevor.secretlab.ca (Postfix, from userid 1000) id 70592C40887; Fri, 28 Mar 2014 16:08:10 +0000 (GMT) From: Grant Likely To: devicetree@vger.kernel.org, christoffer.dall@linaro.org, linux-kernel@vger.kernel.org, olof@lixom.net, benh@kernel.crashing.org, rob.herring@linaro.org Cc: Grant Likely Subject: [RFC 1/5] of: Add support for ePAPR "stdout-path" property Date: Fri, 28 Mar 2014 09:08:01 -0700 Message-Id: <1396022885-6102-2-git-send-email-grant.likely@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1396022885-6102-1-git-send-email-grant.likely@linaro.org> References: <1396022885-6102-1-git-send-email-grant.likely@linaro.org> 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: grant.likely@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: , ePAPR 1.1 defines the "stdout-path" property for specifying the console device, but Linux currently only handles the older "linux,stdout-path" property. This patch adds parsing for the new property name. Signed-off-by: Grant Likely --- drivers/of/base.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index 418a4ff9d97c..be2861d69b02 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1955,9 +1955,9 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align)) of_chosen = of_find_node_by_path("/chosen@0"); if (of_chosen) { - const char *name; - - name = of_get_property(of_chosen, "linux,stdout-path", NULL); + const char *name = of_get_property(of_chosen, "stdout-path", NULL); + if (!name) + name = of_get_property(of_chosen, "linux,stdout-path", NULL); if (name) of_stdout = of_find_node_by_path(name); }