From patchwork Thu Oct 2 08:40:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 38273 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f71.google.com (mail-ee0-f71.google.com [74.125.83.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 558C320549 for ; Thu, 2 Oct 2014 08:41:03 +0000 (UTC) Received: by mail-ee0-f71.google.com with SMTP id d17sf873434eek.2 for ; Thu, 02 Oct 2014 01:41:02 -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=oJpFeuZpwmo20YNHR+Nsp/iKA9I4VdJoyXR8Gg8Yqnw=; b=Czk3gCgSDxx7TIN3CPfWQl691cbH3wMIZF4er1lvWGAPp981NLD7wk27IDRyvFHVFu nl78CkYqeEIj11AITbf7+9VHk4Da8w1gNzzKI3KJVTPURgWCwpkn+1jXGcPBhKclReNr fFP8O818te92FN/iTay6uj2RrzvPg/kapHtkHAUALV0hKQxvlcQ8MCwuQDqJDlrgx0Mq ZgYTTqGzeauv2vF5bBX7MGA/rNeJP5bFxMa4QViF8N0WxEbKuIe7AQaJhsKzAwOuj8q+ g6cT1Jhy2isIGBlu3wdgdXvYpD5baUwk8gzWywxe2ZgPa++Oqh8mVPUfcf1ZXFgfpvoW H3EQ== X-Gm-Message-State: ALoCoQnD7W+LrvDrYVTVetcZLcqC3LNEVlLGXPumkQZtjV3j1XRURDNColbk8r0pRh/H+ejxBz4b X-Received: by 10.152.4.4 with SMTP id g4mr9240860lag.2.1412239262388; Thu, 02 Oct 2014 01:41:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.18.227 with SMTP id z3ls246797lad.44.gmail; Thu, 02 Oct 2014 01:41:02 -0700 (PDT) X-Received: by 10.112.218.70 with SMTP id pe6mr55224353lbc.65.1412239262220; Thu, 02 Oct 2014 01:41:02 -0700 (PDT) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com [209.85.217.175]) by mx.google.com with ESMTPS id mn8si5404772lbb.102.2014.10.02.01.41.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 Oct 2014 01:41:02 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by mail-lb0-f175.google.com with SMTP id u10so1851303lbd.34 for ; Thu, 02 Oct 2014 01:41:02 -0700 (PDT) X-Received: by 10.152.7.73 with SMTP id h9mr29336808laa.27.1412239262108; Thu, 02 Oct 2014 01:41:02 -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.112.130.169 with SMTP id of9csp16936lbb; Thu, 2 Oct 2014 01:41:01 -0700 (PDT) X-Received: by 10.68.137.65 with SMTP id qg1mr85403685pbb.116.1412239260623; Thu, 02 Oct 2014 01:41:00 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o2si3167358pdo.163.2014.10.02.01.40.59 for ; Thu, 02 Oct 2014 01:41:00 -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 S1752482AbaJBIkq (ORCPT + 27 others); Thu, 2 Oct 2014 04:40:46 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:40403 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752397AbaJBIkm (ORCPT ); Thu, 2 Oct 2014 04:40:42 -0400 Received: by mail-wi0-f177.google.com with SMTP id fb4so575151wid.4 for ; Thu, 02 Oct 2014 01:40:41 -0700 (PDT) X-Received: by 10.180.84.193 with SMTP id b1mr2281535wiz.40.1412239241049; Thu, 02 Oct 2014 01:40:41 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id ma8sm3767640wjb.46.2014.10.02.01.40.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Oct 2014 01:40:40 -0700 (PDT) From: Linus Walleij To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: linux-gpio@vger.kernel.org, Linus Walleij Subject: [PATCH 5/7] pinctrl: abx500: retire phandle config mechanism Date: Thu, 2 Oct 2014 10:40:18 +0200 Message-Id: <1412239220-22495-6-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1412239220-22495-1-git-send-email-linus.walleij@linaro.org> References: <1412239220-22495-1-git-send-email-linus.walleij@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: linus.walleij@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.217.175 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 abx500 pin control driver supported a method of fetching the generic config from a phandle to a separate node using the "ste,config" as a phandle. This is not used in any device trees and not documented in the bindings, so drop this support. Signed-off-by: Linus Walleij --- drivers/pinctrl/nomadik/pinctrl-abx500.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/pinctrl/nomadik/pinctrl-abx500.c b/drivers/pinctrl/nomadik/pinctrl-abx500.c index 93ded6e0e21a..3b3fbb4c21c9 100644 --- a/drivers/pinctrl/nomadik/pinctrl-abx500.c +++ b/drivers/pinctrl/nomadik/pinctrl-abx500.c @@ -892,9 +892,7 @@ static int abx500_dt_subnode_to_map(struct pinctrl_dev *pctldev, const char *function = NULL; unsigned long *configs; unsigned int nconfigs = 0; - bool has_config = 0; struct property *prop; - struct device_node *np_config; ret = of_property_read_string(np, "function", &function); if (ret >= 0) { @@ -918,17 +916,7 @@ static int abx500_dt_subnode_to_map(struct pinctrl_dev *pctldev, } ret = pinconf_generic_parse_dt_config(np, &configs, &nconfigs); - if (nconfigs) - has_config = 1; - np_config = of_parse_phandle(np, "ste,config", 0); - if (np_config) { - ret = pinconf_generic_parse_dt_config(np_config, &configs, - &nconfigs); - if (ret) - goto exit; - has_config |= nconfigs; - } - if (has_config) { + if (nconfigs) { const char *gpio_name; const char *pin;