From patchwork Wed Jun 18 20:54:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 32157 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 214B2206A0 for ; Wed, 18 Jun 2014 20:55:07 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id hy10sf4078845vcb.5 for ; Wed, 18 Jun 2014 13:55:06 -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=siqnvdnQzhYF6VHyP2IxeEffq66qnU6ZB2UCf13hYtE=; b=jToG1SL5d78wwO3BiaW2XsS7JDFdFMFSJhWb93m+LUtsuc3O64wP7DB0/TjHEk+Kzt NwcHQWAe0bvwWK4E5/djXPknvk5vfNg2VJDgjELCWW1+cz84VfuwV+gPvmyrYtNnSPQV HOpWPytNjIho4X/tJ2yJYqC/3Xpy7wUZyprN8d3J7OHpRAnxCuCRUyS8amZRj/w9j8Ce GsrhIYjxArZlp/J6l34ySPc1CnlzoYizReHlMiog5OdpkVtr0ThDb2CzMEllfP+do5JB 3c/w+ICvHqJUe5U+/zNPT0ErCAUdUvbqT6CTHEAF6LKS8qfYxSZDRmo70S37Y44FeH+d WTTQ== X-Gm-Message-State: ALoCoQm4Edam3XyPYgHjUPaGQfqdb6FbceJCirseygy4UH1D2h8KTG4YcHUIVfaOwPDve2/bBjyw X-Received: by 10.236.24.196 with SMTP id x44mr260810yhx.15.1403124906955; Wed, 18 Jun 2014 13:55:06 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.6 with SMTP id j6ls287709qge.89.gmail; Wed, 18 Jun 2014 13:55:06 -0700 (PDT) X-Received: by 10.220.163.3 with SMTP id y3mr284872vcx.7.1403124906822; Wed, 18 Jun 2014 13:55:06 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id fv10si1392472vdc.39.2014.06.18.13.55.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Jun 2014 13:55:06 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id la4so1413180vcb.0 for ; Wed, 18 Jun 2014 13:55:06 -0700 (PDT) X-Received: by 10.52.84.2 with SMTP id u2mr11792vdy.84.1403124906734; Wed, 18 Jun 2014 13:55:06 -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.221.54.6 with SMTP id vs6csp312758vcb; Wed, 18 Jun 2014 13:55:06 -0700 (PDT) X-Received: by 10.68.197.8 with SMTP id iq8mr590967pbc.124.1403124906002; Wed, 18 Jun 2014 13:55:06 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yr5si3408686pab.84.2014.06.18.13.55.05; Wed, 18 Jun 2014 13:55:05 -0700 (PDT) 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 S1755473AbaFRUzA (ORCPT + 6 others); Wed, 18 Jun 2014 16:55:00 -0400 Received: from mail-we0-f169.google.com ([74.125.82.169]:64978 "EHLO mail-we0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755643AbaFRUy5 (ORCPT ); Wed, 18 Jun 2014 16:54:57 -0400 Received: by mail-we0-f169.google.com with SMTP id t60so1470139wes.14 for ; Wed, 18 Jun 2014 13:54:56 -0700 (PDT) X-Received: by 10.194.90.7 with SMTP id bs7mr470469wjb.25.1403124896099; Wed, 18 Jun 2014 13:54:56 -0700 (PDT) Received: from trevor.secretlab.ca (host31-50-107-191.range31-50.btcentralplus.com. [31.50.107.191]) by mx.google.com with ESMTPSA id o46sm7669253eef.31.2014.06.18.13.54.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jun 2014 13:54:55 -0700 (PDT) Received: by trevor.secretlab.ca (Postfix, from userid 1000) id 31D6EC40D86; Wed, 18 Jun 2014 21:54:44 +0100 (BST) From: Grant Likely To: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, robh@kernel.org, olof@lixom.net, benh@kernel.crashing.org Cc: Grant Likely Subject: [PATCH 1/4] of: Create of_console_check() for selecting a console specified in /chosen Date: Wed, 18 Jun 2014 21:54:31 +0100 Message-Id: <1403124874-19929-2-git-send-email-grant.likely@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1403124874-19929-1-git-send-email-grant.likely@linaro.org> References: <1403124874-19929-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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 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: , The devicetree has a binding for specifying the console device in the /chosen node, but the kernel doesn't use it consistently. This change adds an API for testing if a device node is a console, and adds a preferred console entry if it is. At the same time this patch removes the of_device_is_stdout_path() API since it is unused. Signed-off-by: Grant Likely Tested-by: Sascha Hauer --- drivers/of/base.c | 23 +++++++++++++---------- include/linux/of.h | 6 +++--- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index 8368d96ae7b4..ed037ae7eefe 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -17,6 +17,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ +#include #include #include #include @@ -2179,20 +2180,22 @@ const char *of_prop_next_string(struct property *prop, const char *cur) EXPORT_SYMBOL_GPL(of_prop_next_string); /** - * of_device_is_stdout_path - check if a device node matches the - * linux,stdout-path property - * - * Check if this device node matches the linux,stdout-path property - * in the chosen node. return true if yes, false otherwise. + * of_console_check() - Test and setup console for DT setup + * @dn - Pointer to device node + * @name - Name to use for preferred console without index. ex. "ttyS" + * @index - Index to use for preferred console. + * + * Check if the given device node matches the stdout-path property in the + * /chosen node. If it does then register it as the preferred console and return + * TRUE. Otherwise return FALSE. */ -int of_device_is_stdout_path(struct device_node *dn) +bool of_console_check(struct device_node *dn, char *name, int index) { - if (!of_stdout) + if (!dn || dn != of_stdout || console_set_on_cmdline) return false; - - return of_stdout == dn; + return add_preferred_console(name, index, NULL); } -EXPORT_SYMBOL_GPL(of_device_is_stdout_path); +EXPORT_SYMBOL_GPL(of_console_check); /** * of_find_next_cache_node - Find a node's subsidiary cache diff --git a/include/linux/of.h b/include/linux/of.h index 196b34c1ef4e..9d9734056e39 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -352,7 +352,7 @@ const __be32 *of_prop_next_u32(struct property *prop, const __be32 *cur, */ const char *of_prop_next_string(struct property *prop, const char *cur); -int of_device_is_stdout_path(struct device_node *dn); +bool of_console_check(struct device_node *dn, char *name, int index); #else /* CONFIG_OF */ @@ -564,9 +564,9 @@ static inline int of_machine_is_compatible(const char *compat) return 0; } -static inline int of_device_is_stdout_path(struct device_node *dn) +static inline bool of_console_check(const struct device_node *dn, const char *name, int index) { - return 0; + return false; } static inline const __be32 *of_prop_next_u32(struct property *prop,