From patchwork Fri Oct 8 20:59:36 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: 12546449 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D09CC433EF for ; Fri, 8 Oct 2021 21:01:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2641960F44 for ; Fri, 8 Oct 2021 21:01:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2641960F44 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ZK8hc+RTreCuzSZ71H5NrDa2y7rhVJgL2f0BD6r3o3Y=; b=mKvJFTDnty7kl7 3N8qSCyOb0xKmBo67MQ61lxqKrD7ooM/arGVa+m5ULUsDWmam7Dx/ITNTHDDVY1wcI1e8mpykyB3D 9iTHNQG0M0IQE9apQZuwisVNhhHEQbbQLuxBHvrjBE6qft+jlN0PThnZ3JnxSewCxKIeTsKFpeLgV yfEtivvVOdyNWAA2kxfzYZoAcoonK1gWoU5+m4O/LynEDRY7mAJVZt3EAvs/5hj/hYXTdxDwoq2oV IqbAEUbYqypouBh/iIUNCkmJ1R3P8o3AtX4X/NyB5QMoEXRhPtAPX+awnnAKVnI3q3BMRDa0FwQxF 6eLdUckZ923SyBbS8Q5Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYwy6-004Apb-MN; Fri, 08 Oct 2021 20:59:50 +0000 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYwy2-004Aox-TJ for linux-arm-kernel@lists.infradead.org; Fri, 08 Oct 2021 20:59:48 +0000 Received: by mail-lf1-x130.google.com with SMTP id j21so26313290lfe.0 for ; Fri, 08 Oct 2021 13:59:46 -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=YG9Ar+cG6qU5gjsx0O70Gv7O+SgzCIkgLxuZkibpVvY=; b=OElyHJIsIrtKb6Iz3Sx7oswZi2H0JvslLpNLrL1Wa0s5lrt/GDREY5V2c4Opvv7Dde 1eBMS67FyAzMW0P/0JD8A6o08qoJSPx1/PChIt3SCnqODF6mubEEChPV8G9uOeSGbJyi LaZF5Ayp7GKQJaMDOBfcGl3yBGCBcf1ReIb1A9/nbUjvJqlMMo1JRjnMI/Aj8/Eiwzig jc31kp++8q0Y6IqbnPnRojCClnbjikba2uXE3AUfsPrqZHv29fXKwdP77s/gBCo2l5iG KFam9QhQt8Pmk11/Kzaev0athOVsHI4yDT9frKzByC5tVbkbDYAefB+92vjhOWf7Rp1s OwVA== 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=YG9Ar+cG6qU5gjsx0O70Gv7O+SgzCIkgLxuZkibpVvY=; b=IMrXs23yd2EL/aCln+U1NLUW2v770vwtSazuuvv7d//rV6S1mFPhnVMsUzzYSXZ+yI LqG+qSlnd7eIXz7Uh6h5SK+U8XS3WZJUD/B7+UHdGNEqTpIoC2svi+WEm5lFdMdLS7i0 fNNrK2+68zyL7uAlgL4ZWlPNa994+FRH8/HWA8bcXQfl4rtO+4/uetjt+ll1/4nlmcJ0 uWYkVJT538rOlk8DShLua7DLw6dxcnC7txvX5PqcNnAL9FU1w+AmtSDA/vwoKwL/bIRW u0uOxQ6cy7+3iiDySCQea2rAHxmtWmn0f8nQ0G2J5fxggoYsin90iUxUQ+a6j83GHgpE 0X1A== X-Gm-Message-State: AOAM532qN8jMqcKeHSTormsVKMQOLkYMNevH66SAxlHYwEfoXaHnqHu2 /GjHoPO8+FaWEYy19yIqqTc= X-Google-Smtp-Source: ABdhPJybJouLVsN1ONXMug915a3mBrlzSSdqG2IaISSwBDZkAOo0y+5P9L+b0IOBWL7lBxMGSlU4+Q== X-Received: by 2002:a2e:a367:: with SMTP id i7mr6160510ljn.435.1633726784866; Fri, 08 Oct 2021 13:59:44 -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 a21sm31862lfg.194.2021.10.08.13.59.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 13:59:44 -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 V3 linux-pinctrl 1/3] Revert "dt-bindings: pinctrl: bcm4708-pinmux: rework binding to use syscon" Date: Fri, 8 Oct 2021 22:59:36 +0200 Message-Id: <20211008205938.29925-1-zajec5@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211008_135946_978627_99534A11 X-CRM114-Status: GOOD ( 16.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 Reviewed-by: Rob Herring --- V2: Update brcm,cru.yaml to avoid new yamllint warnings/errors --- .../devicetree/bindings/mfd/brcm,cru.yaml | 11 +++++---- .../bindings/pinctrl/brcm,ns-pinmux.yaml | 23 +++++++++++-------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Documentation/devicetree/bindings/mfd/brcm,cru.yaml b/Documentation/devicetree/bindings/mfd/brcm,cru.yaml index fc1317ab3226..28ac60acf4ac 100644 --- a/Documentation/devicetree/bindings/mfd/brcm,cru.yaml +++ b/Documentation/devicetree/bindings/mfd/brcm,cru.yaml @@ -32,13 +32,13 @@ properties: "#size-cells": const: 1 - pinctrl: - $ref: ../pinctrl/brcm,ns-pinmux.yaml - patternProperties: '^clock-controller@[a-f0-9]+$': $ref: ../clock/brcm,iproc-clocks.yaml + '^pin-controller@[a-f0-9]+$': + $ref: ../pinctrl/brcm,ns-pinmux.yaml + '^thermal@[a-f0-9]+$': $ref: ../thermal/brcm,ns-thermal.yaml @@ -73,9 +73,10 @@ examples: "iprocfast", "sata1", "sata2"; }; - pinctrl { + pin-controller@1c0 { compatible = "brcm,bcm4708-pinmux"; - offset = <0x1c0>; + reg = <0x1c0 0x24>; + reg-names = "cru_gpio_control"; }; thermal@2c0 { 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";