From patchwork Fri Oct 8 08:29:31 2021 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: 1538265 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=poefWLp6; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4HQhFg6Bxwz9t0k for ; Fri, 8 Oct 2021 19:29:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234114AbhJHIbt (ORCPT ); Fri, 8 Oct 2021 04:31:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233993AbhJHIbr (ORCPT ); Fri, 8 Oct 2021 04:31:47 -0400 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D38EC061570; Fri, 8 Oct 2021 01:29:52 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id y26so36453277lfa.11; Fri, 08 Oct 2021 01:29:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Lkb1rpTxp3ezL8W0CzTqYzbSnbCPEH62gOKXD45LUwI=; b=poefWLp6aXgSyy/BL1sqVpqpaxXamaYwTrj//ErZkBKT0FfIZbNtXk6TE2JTxjdDWX oFSG6sDm9E3UC88GSSOrDAtlNtR69B3+clLsRDOl3WdwlLnkTOi7aom+yxW+wq4oZEvC EtXsMpWkNyPM9qeAF0hxd+NHKEPf8fHn5ZrTvtLIZnuJjyZzxWwCY9D74GzaA+3iYTXN HPwHCcJyZlARKh3rz+x7/CjbeCmCda+9MJcmax3CyMxR99k/Q1CiWQjhpx3lBS6TDnCa k+WuPTrxIb35PpKVexDVTb4c6/FbyQwLAVH11xLDuBTyy0fZvJtqycbTFOzWeTwS7KQk 6Kiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Lkb1rpTxp3ezL8W0CzTqYzbSnbCPEH62gOKXD45LUwI=; b=C0d5oKB4NlejclmJJfRieEiHSvEqJQHDwb1KDV0EIak2R4UKPUna+Ef/UDNkq+t9PB aZujSYRgFGl9sRyNeCxSzJuAPcc7kF4jd5Ib6yCGEQZ8GDs1rRsjm22XHODMyWy0XuIj BqN+2XiQXV6JGkxpPZpR87nw5fShQpkgqcKknIHCDUrPw3vcazEP5O96Zh36tIRlWxpZ y+Mbq9i3pLsmOnybPnT/fAEzWvw+7W8z0+7XBCcgjyzKhxLNWqgItwC+1I+g/4f+lpe6 M85kN0pH/qMMaHz3UBsU2NJU6huHQbqqjfa8LtrPuQKUd+zZ5s5ZZdEGJA02MICvReao drgA== X-Gm-Message-State: AOAM533+X+uRWixBBG1A52nPlmCdd5H6R16DHoYHO8Ec3dw2aMvTbzEV nBYc1HNQzzITYRIbtY5Ju1c= X-Google-Smtp-Source: ABdhPJxjxeS3yG78Os9mx5PkCqbTxZpo+GPucqTwrhLqIHq+ADlBhrV3ZS0jYcpvZ5VLecVPl6BoOw== X-Received: by 2002:ac2:509a:: with SMTP id f26mr2838559lfm.563.1633681790434; Fri, 08 Oct 2021 01:29:50 -0700 (PDT) Received: from localhost.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id z24sm219930ljz.93.2021.10.08.01.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 01:29:49 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Linus Walleij , Rob Herring Cc: Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH linux-pinctrl 1/2] Revert "dt-bindings: pinctrl: bcm4708-pinmux: rework binding to use syscon" Date: Fri, 8 Oct 2021 10:29:31 +0200 Message-Id: <20211008082932.1370-1-zajec5@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Rafał Miłecki This reverts commit 2ae80900f239484069569380e1fc4340fd6e0089. My rework was unneeded & wrong. It replaced a clear & correct "reg" property usage with a custom "offset" one. Back then I didn't understand how to properly handle CRU block binding. I heard / read about syscon and tried to use it in a totally invalid way. That change also missed Rob's review (obviously). Northstar's pin controller is a simple consistent hardware block that can be cleanly mapped using a 0x24 long reg space. Since the rework commit there wasn't any follow up modifying in-kernel DTS files to use the new binding. Broadcom also isn't known to use that bugged binding. There is close to zero chance this revert may actually cause problems / regressions. This commit is a simple revert. Example binding may (should) be updated / cleaned up but that can be handled separately. Signed-off-by: Rafał Miłecki --- .../bindings/pinctrl/brcm,ns-pinmux.yaml | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/Documentation/devicetree/bindings/pinctrl/brcm,ns-pinmux.yaml b/Documentation/devicetree/bindings/pinctrl/brcm,ns-pinmux.yaml index 470aff599c27..78600a8fe403 100644 --- a/Documentation/devicetree/bindings/pinctrl/brcm,ns-pinmux.yaml +++ b/Documentation/devicetree/bindings/pinctrl/brcm,ns-pinmux.yaml @@ -17,9 +17,6 @@ description: A list of pins varies across chipsets so few bindings are available. - Node of the pinmux must be nested in the CRU (Central Resource Unit) "syscon" - node. - properties: compatible: enum: @@ -27,10 +24,11 @@ properties: - brcm,bcm4709-pinmux - brcm,bcm53012-pinmux - offset: - description: offset of pin registers in the CRU block + reg: maxItems: 1 - $ref: /schemas/types.yaml#/definitions/uint32-array + + reg-names: + const: cru_gpio_control patternProperties: '-pins$': @@ -72,19 +70,24 @@ allOf: uart1_grp ] required: - - offset + - reg + - reg-names additionalProperties: false examples: - | cru@1800c100 { - compatible = "syscon", "simple-mfd"; + compatible = "simple-bus"; reg = <0x1800c100 0x1a4>; + ranges; + #address-cells = <1>; + #size-cells = <1>; - pinctrl { + pin-controller@1c0 { compatible = "brcm,bcm4708-pinmux"; - offset = <0xc0>; + reg = <0x1c0 0x24>; + reg-names = "cru_gpio_control"; spi-pins { function = "spi"; From patchwork Fri Oct 8 08:29:32 2021 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: 1538266 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=lCgVtYF3; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4HQhFh1glKz9t0p for ; Fri, 8 Oct 2021 19:30:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234072AbhJHIbw (ORCPT ); Fri, 8 Oct 2021 04:31:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234103AbhJHIbt (ORCPT ); Fri, 8 Oct 2021 04:31:49 -0400 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2126BC061760; Fri, 8 Oct 2021 01:29:54 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id t9so35075828lfd.1; Fri, 08 Oct 2021 01:29:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gDyEXWIeYRFxChu9VxQR3xwCXz9T0mgyC95BWcs1m1I=; b=lCgVtYF39TaetQX+fP3GgnGa5ZwZiUbkeGZGtvAJ5h8TRigPsH2vpVX0W2XS+2YMFn +Uvr1r9M0n5AMLxWFsVdfZssif2j/qszowJ8ZjlbMl/w1GzU/9aoCh7izCp0bMJOf4mz zOAyC3AfjSi1QgjZCmDLSWLj+FUJztU9f7ss7TrS6+pY4EjBjzjS5LoIF5/zkY8/yvfg U3yFwqdN7cvKqtDvpoRQ8EVfIGIL3l3nWlYLHPQs1Q1bcs7eYnpZ8Tw9y/lJJQXLCChK 8odGC8gGiAuli41jgiKi+Z0yxzy91viTbfD8MY/KuKx+0F/p/D4u/eKghoU/hZuV/PRK 1B0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gDyEXWIeYRFxChu9VxQR3xwCXz9T0mgyC95BWcs1m1I=; b=ItC0lSeDFKmLSMqL2MHV8VZRDtq0bKe0uWAcwqRFgVXITlSo+cIpIehbYJK7CxpgL1 RBvgCaWOH9Lj8meTHbgg3SPDMQf2KzV44328RovAoDXc5YnllSB2orWLyYqHJ2HS224T 5HvjwQQC/c0XRSVg74M0KHOZijD9oL7TFG31bi3LcBon/jGwKVvohI+WihrmXNXdYZzw Syfx7UdHaKLiuiqpJCoExLLVOlm3SZgABvNT61/0/l6mzlXcPoQJCOrqsDsPJW1P5cr0 90ybdceucI7TzRCyh/bIs/vL/Hr3N7hsAhpWNKQcqMCjCJC7iYcK1BCWTrm3ROyCqADh DtDQ== X-Gm-Message-State: AOAM533cyoefn+c0hih3mXirkDaoYKEktwYcysnzD3u8pMN/2d6DM9F+ TBoKpDJYYBa9LaXxd2r69wA= X-Google-Smtp-Source: ABdhPJy8dX3FZ5iZPNCKX4bM1LtXOtx/Ccq2bAUoN7MfR8nKH0e6+EyqSpSJRzccPT5p7PaD1rC/SQ== X-Received: by 2002:a05:6512:3084:: with SMTP id z4mr8902913lfd.195.1633681792422; Fri, 08 Oct 2021 01:29:52 -0700 (PDT) Received: from localhost.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id z24sm219930ljz.93.2021.10.08.01.29.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 01:29:52 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Linus Walleij , Rob Herring Cc: Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH linux-pinctrl 2/2] Revert "pinctrl: bcm: ns: support updated DT binding as syscon subnode" Date: Fri, 8 Oct 2021 10:29:32 +0200 Message-Id: <20211008082932.1370-2-zajec5@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211008082932.1370-1-zajec5@gmail.com> References: <20211008082932.1370-1-zajec5@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Rafał Miłecki This reverts commit a49d784d5a8272d0f63c448fe8dc69e589db006e. The updated binding was wrong / invalid and has been reverted. There isn't any upstream kernel DTS using it and Broadcom isn't known to use it neither. There is close to zero chance this will cause regression for anyone. Actually in-kernel bcm5301x.dtsi still uses the old good binding and so it's broken since the driver update. This revert fixes it. Signed-off-by: Rafał Miłecki --- drivers/pinctrl/bcm/pinctrl-ns.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/drivers/pinctrl/bcm/pinctrl-ns.c b/drivers/pinctrl/bcm/pinctrl-ns.c index e79690bd8b85..d7f8175d2c1c 100644 --- a/drivers/pinctrl/bcm/pinctrl-ns.c +++ b/drivers/pinctrl/bcm/pinctrl-ns.c @@ -5,7 +5,6 @@ #include #include -#include #include #include #include @@ -13,7 +12,6 @@ #include #include #include -#include #include #define FLAG_BCM4708 BIT(1) @@ -24,8 +22,7 @@ struct ns_pinctrl { struct device *dev; unsigned int chipset_flag; struct pinctrl_dev *pctldev; - struct regmap *regmap; - u32 offset; + void __iomem *base; struct pinctrl_desc pctldesc; struct ns_pinctrl_group *groups; @@ -232,9 +229,9 @@ static int ns_pinctrl_set_mux(struct pinctrl_dev *pctrl_dev, unset |= BIT(pin_number); } - regmap_read(ns_pinctrl->regmap, ns_pinctrl->offset, &tmp); + tmp = readl(ns_pinctrl->base); tmp &= ~unset; - regmap_write(ns_pinctrl->regmap, ns_pinctrl->offset, tmp); + writel(tmp, ns_pinctrl->base); return 0; } @@ -266,13 +263,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); @@ -290,18 +287,12 @@ static int ns_pinctrl_probe(struct platform_device *pdev) return -EINVAL; ns_pinctrl->chipset_flag = (uintptr_t)of_id->data; - 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; + 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); } memcpy(pctldesc, &ns_pinctrl_desc, sizeof(*pctldesc));