From patchwork Tue Dec 18 15:58:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1015452 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XzKbHqhR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43K2k637WKz9sBZ for ; Wed, 19 Dec 2018 02:58:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727093AbeLRP6U (ORCPT ); Tue, 18 Dec 2018 10:58:20 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:38472 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726652AbeLRP6T (ORCPT ); Tue, 18 Dec 2018 10:58:19 -0500 Received: by mail-lj1-f195.google.com with SMTP id c19-v6so14661143lja.5; Tue, 18 Dec 2018 07:58:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AOxSxA2DTBN1MOMRADhDyHZ9Nkx7f7uCE3hXAzrT1aY=; b=XzKbHqhRMtE5i8PxD1Ei1M38nKxCW4rCD3ElaN7GKR4HB6fDPhy3H5ySpWnUfpl77f 6fDFxvHzvoO3Dw+vc1yFJ1SNhE6JpOBlU8JWjShtiY10/hEFHpEVq8CybQZWoQkWZ5pK ltQ0bnBJ3XEI7cBnlUYOV4wlt1tpn4zD9+X6Zwuxogkybrh9U+MbzKGXRwv+j5/yGOY8 2nzh7f0fdtYJ8Bvt3Pyago90PiwVbqL6zWqS9UsUKYidWy3SRZvKytKKXEQHG8MjR6L0 9yY+c4tceNOLOgWl8abAsisLfPM35TqVjMBmglw0MBMvUrtkKhAk1wfobdfYykksJg54 sVaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AOxSxA2DTBN1MOMRADhDyHZ9Nkx7f7uCE3hXAzrT1aY=; b=uhrcns8xv4Jictarr4Ftr9PMxd0DzOOGrWczjO3PaslElP7Lm0EnfuD5gI2dKDpxD9 u/BrXq4VEexABKQ/hSZbshY75wBIxbGBVESMesYxE/o82WWGP0Kby3NOEElnxDSg+aKM ARI2GWQmaB8TkCAFkNYxBULUFZmAkt6s/hpbXjPBAo0iB/4I4yLjzTowm2lhlOZSnbT6 1H4US5QVTKK8Ii5XsNQ3GUsfWwOigi1DKfglSoqFE4S/JQAxvj5sDY2nzLy1wAABfgxc kzA4HyFJQl31TqzTaoA/vSsuk5IAPfIbvQAI9bcTVw9v/I7Qk9pidk2FqsdsLfl/NhiW sXaw== X-Gm-Message-State: AA+aEWZkpBXcy9Tj4N+ZDdnjzXnnvwURi3HROrMLtQGtjjAYQ1MvS8Qg eDJm2oqca5iC2z+TZNHWuXE= X-Google-Smtp-Source: AFSGD/VIwLXwTX+pZ3dMwEJ7G4hslvVevAQtoGJTf3dyMkv9Cxxeisf9fi7wBMtquP8W5k5kzE/jQw== X-Received: by 2002:a2e:21a9:: with SMTP id h41-v6mr10270735lji.103.1545148696992; Tue, 18 Dec 2018 07:58:16 -0800 (PST) Received: from linux-veee.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id a18-v6sm3022061ljk.86.2018.12.18.07.58.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Dec 2018 07:58:16 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Linus Walleij , linux-gpio@vger.kernel.org, Rob Herring , devicetree@vger.kernel.org Cc: Mark Rutland , Ray Jui , Scott Branden , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH] pinctrl: bcm: ns: support updated DT binding as syscon subnode Date: Tue, 18 Dec 2018 16:58:08 +0100 Message-Id: <20181218155808.19517-1-zajec5@gmail.com> X-Mailer: git-send-email 2.13.7 MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Rafał Miłecki Documentation has been recently updated specifying that pinctrl should be subnode of the CRU "syscon". Support that by using parent node for regmap and reading "offset" property from the DT. Signed-off-by: Rafał Miłecki --- drivers/pinctrl/bcm/pinctrl-ns.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/drivers/pinctrl/bcm/pinctrl-ns.c b/drivers/pinctrl/bcm/pinctrl-ns.c index d7f8175d2c1c..e79690bd8b85 100644 --- a/drivers/pinctrl/bcm/pinctrl-ns.c +++ b/drivers/pinctrl/bcm/pinctrl-ns.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -12,6 +13,7 @@ #include #include #include +#include #include #define FLAG_BCM4708 BIT(1) @@ -22,7 +24,8 @@ struct ns_pinctrl { struct device *dev; unsigned int chipset_flag; struct pinctrl_dev *pctldev; - void __iomem *base; + struct regmap *regmap; + u32 offset; struct pinctrl_desc pctldesc; struct ns_pinctrl_group *groups; @@ -229,9 +232,9 @@ static int ns_pinctrl_set_mux(struct pinctrl_dev *pctrl_dev, unset |= BIT(pin_number); } - tmp = readl(ns_pinctrl->base); + regmap_read(ns_pinctrl->regmap, ns_pinctrl->offset, &tmp); tmp &= ~unset; - writel(tmp, ns_pinctrl->base); + regmap_write(ns_pinctrl->regmap, ns_pinctrl->offset, tmp); return 0; } @@ -263,13 +266,13 @@ static const struct of_device_id ns_pinctrl_of_match_table[] = { static int ns_pinctrl_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; const struct of_device_id *of_id; struct ns_pinctrl *ns_pinctrl; struct pinctrl_desc *pctldesc; struct pinctrl_pin_desc *pin; struct ns_pinctrl_group *group; struct ns_pinctrl_function *function; - struct resource *res; int i; ns_pinctrl = devm_kzalloc(dev, sizeof(*ns_pinctrl), GFP_KERNEL); @@ -287,12 +290,18 @@ static int ns_pinctrl_probe(struct platform_device *pdev) return -EINVAL; ns_pinctrl->chipset_flag = (uintptr_t)of_id->data; - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, - "cru_gpio_control"); - ns_pinctrl->base = devm_ioremap_resource(dev, res); - if (IS_ERR(ns_pinctrl->base)) { - dev_err(dev, "Failed to map pinctrl regs\n"); - return PTR_ERR(ns_pinctrl->base); + ns_pinctrl->regmap = syscon_node_to_regmap(of_get_parent(np)); + if (IS_ERR(ns_pinctrl->regmap)) { + int err = PTR_ERR(ns_pinctrl->regmap); + + dev_err(dev, "Failed to map pinctrl regs: %d\n", err); + + return err; + } + + if (of_property_read_u32(np, "offset", &ns_pinctrl->offset)) { + dev_err(dev, "Failed to get register offset\n"); + return -ENOENT; } memcpy(pctldesc, &ns_pinctrl_desc, sizeof(*pctldesc));