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: 395859 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EDD0E1400D5 for ; Thu, 2 Oct 2014 18:42:39 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752457AbaJBIko (ORCPT ); Thu, 2 Oct 2014 04:40:44 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:44969 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752399AbaJBIkm (ORCPT ); Thu, 2 Oct 2014 04:40:42 -0400 Received: by mail-wi0-f178.google.com with SMTP id cc10so3207263wib.11 for ; Thu, 02 Oct 2014 01:40:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=udL+Th7YWmrsX7pngtU1trFaZ65OdCn49lspnK4zyPo=; b=RAZk0PIrQFjVfVpQq7meTbFbxhxsFG5Labn/XjOSZVg96siyaznSmkatSRngi9g+Y1 qGiDZOeG3j4e30e8uyV5qxibLb/Bi0ch61tYb40f3kYAHhISvjywT4xsYF0zhSxiasuY kho7Rlpi+7Blw0LHDM7wzvX15nHH5f0gJHXo1gWGls6YnHzv1YmEjQ0CBjnfWS8k6805 WxekSgH6Dk95GNGKWb0FYq69a02vOoaZvLM6S6Ak4y9I9/1hlGa6YhMnlUu9UlRP9Oqf UVBLP0LJILdt1Fjopze8/7nl9ODkXSOqOVcZdwdZrOq4LoejxeoLBUKiDo/bIMbXbP9F cPuQ== X-Gm-Message-State: ALoCoQkVFWrE4N0ni5qTOozeK3YD0I+CBby7r79NA/0/u3mJMAyHHmeDeNzLq/L4YBJJDpbDmgex 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-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org 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;