From nobody Thu Dec 18 22:25:24 2025 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1AF0C1E1A16; Wed, 30 Apr 2025 07:07:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996838; cv=none; b=oQxkF1QppBbw0QOaTo0pfOSLF3Uo/cRF88sFXoLDm6wqE5UvwFLUMSTXKt58ZyjWcmrG3MMYKn4Am33d50FNXMkEctxQZi9qcjo7IYDkRVgs95yDCjn8e4WB/cwa9S3FMA78D2eyowP0bTv1+J9SadiwuLWn5AZ9kZig2I49MLo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996838; c=relaxed/simple; bh=ju68suXj1FdMPTHt/69qtVE6zoVM1v0L/Oo4fVZxJiY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Gk2zI6zotNNELk4KB3tf8MAiT11myawuYjRRlqQa4A2BiIXkYITZe1iz8b9/syJfyr+vMToEVVgA3KaMNCPmNdd9/G+RecGSyLgZURuqccqWmz5ypZWX68o03tMLCx57dY3nDOOuhzU6jb198ZXUijOypIopV9jIlz7iz6/Y2Tg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=b02NfKDd; arc=none smtp.client-ip=209.85.208.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b02NfKDd" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-5f3f04b5dbcso11031531a12.1; Wed, 30 Apr 2025 00:07:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745996835; x=1746601635; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=j+wS3VO76uiWIMKpgH/YayG/py8IuihOzEQEPls+nPs=; b=b02NfKDdvvL+NCqMPCfj47EpRCz9OMeKHnF5wGTntm4ml4OshAL9sMg+mhXZeQBgE4 8pM1kQe9bp9EHHB6DkEupk8M8M9ysipCW8+cE5RkCRclOXdDImmJZsLeRhQVnKZbc55n yRJ8HEbdZYAdaujr57NkhQo9OUsLI1NMMQmMZLr2lD2v0/qfDw4sqtW5RPuIfLByWoO1 d6Vn9XPpbrr5og1belKX3DxXS1pic+5FrguXP9RTGNQHyT54r1RvSx866SRli52fS8Ov y+V8fJBUjN/HnTwsEu6KQyo1jm4unzJSuJvK7XNxhcBP6bntFE5kf/NijUK/x5SAi0gz OA/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745996835; x=1746601635; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j+wS3VO76uiWIMKpgH/YayG/py8IuihOzEQEPls+nPs=; b=SLwDph0zoWVJNTdIYtcdAQwa0oYrETTtvqZrKsgHalxycPI63rI9yugTCZDP+phaOb Xstx71M87+GbVMtQwAj6Tv3by4mSWjolL69zcn/O3G2QHknzg93J7BH/ABRvdVNUVbId r+o1BMcW2OyZdrK2lin1yRRU5BRzD5TmqlSBDomNiwKGue+0Gm/eIX0a2nSXf08/LNZa mjfuB+UQ/UQHds8F28Or+0zfz+0bOh7O7/t/gxq9WjdDAXqKD7wD/uLra7rj5bcsDsH0 zvHuQa550KUD0yO4fCVoE3rkMSTDP3WkdgCTPfOZH9OTo6WhweUygONTuakpp3lA7OKX TyXA== X-Forwarded-Encrypted: i=1; AJvYcCU7OF6msnjlrykNO8urA2q0lQW15kQb2kO8nxlDMBMCyIejKqgJgaZa5Sc8aOHzqUBB1ch1DYznWI7C@vger.kernel.org, AJvYcCX4jHTEucpFfZR5DR4jlPZYJr9AOuLhUiJ5a9EYZjXTPBT22gcIMxxVZp/Bu3fX8Ctvsgswh7MxL3tPPLcp@vger.kernel.org X-Gm-Message-State: AOJu0Yw79BOcEr/0TFasEf3gda6W36pDRK8+7NFhNcoXEFW26QCYgN8n xQaUjMXrbBIevv8krnsMMy1yqdZnluzjgRa6zjpzlqMT6JRvH4299T9xGw== X-Gm-Gg: ASbGncuM/T6X+Nbf0jbqeD9++vuhWcm1kJMMsC0wYqWP5WA6+a3WhhubZtAr61LTLTd RV5GUBAinteHtz6zgxqzVRfunmKmzsXTzefMHEOziBYbY6js3u+2sxR/oIgUFW9cN/QIZfGR44b QfBOBdlGFHe5Xp56H1EEcgrDc8AC4UBsoDHiGkBuwCtGbSuwBAopFvSMU+9YWrlv014vleR7Rtb EL1+f4X7wE66iQ5dB0Q1KfdHOtxJkds+APtKxDsKWp696eMFNf1npLy6KTXt+8zsIV5BzJrFKDC GO49imracm7XXmt/uFwrhBoQung75szCfCXDiz48nEwSW39hq+HIrhYMs9dTHzAWFpskwseXuIV G1hdjnSeFQN0= X-Google-Smtp-Source: AGHT+IF8YcdVIQsW+av/zWPED4/GHseUdFL2jDaJFueKLvx4eO70MR2lAPoD1hagrMkiNDrWXsCT1g== X-Received: by 2002:a05:6402:1ed1:b0:5f7:2ac6:c280 with SMTP id 4fb4d7f45d1cf-5f89bf16568mr1538686a12.25.1745996835194; Wed, 30 Apr 2025 00:07:15 -0700 (PDT) Received: from hex.my.domain (83.8.121.197.ipv4.supernova.orange.pl. [83.8.121.197]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f7013fec3csm8334314a12.19.2025.04.30.00.07.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 00:07:14 -0700 (PDT) From: Artur Weber Date: Wed, 30 Apr 2025 09:07:05 +0200 Subject: [PATCH v8 1/9] dt-bindings: mfd: brcm,bcm59056: Convert to YAML Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250430-bcm59054-v8-1-e4cf638169a4@gmail.com> References: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> In-Reply-To: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> To: Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Liam Girdwood , Mark Brown , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list Cc: Stanislav Jakubek , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745996831; l=6215; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=ju68suXj1FdMPTHt/69qtVE6zoVM1v0L/Oo4fVZxJiY=; b=sEbrd2fyF3UCVeEPTC6UFVUrpDMVxzLCz1y+D4iZMYb+dYiNCqah1008aGiiefT6H9jkjbRM2 FxqL/0feelDATxscPAhgncK14jjYc5mLyd1cZZq1JBzO6XNVlXQ9qjA X-Developer-Key: i=aweber.kernel@gmail.com; a=ed25519; pk=RhDBfWbJEHqDibXbhNEBAnc9FMkyznGxX/hwfhL8bv8= Convert devicetree bindings for the Broadcom BCM59056 PMU MFD from TXT to YAML format. This patch does not change any functionality; the bindings remain the same. The bindings have been split into two parts: the MFD binding and a separate binding for the regulator node, to simplify the addition of other models later (which have different regulators). Reviewed-by: Rob Herring (Arm) Signed-off-by: Artur Weber Reviewed-by: Stanislav Jakubek --- Changes in v6: - Replace mfd/brcm,bcm590xx.yaml with mfd/brcm,bcm59056.yaml Changes in v5: - Replace mfd/brcm,bcm59056.yaml with mfd/brcm,bcm590xx.yaml in regulator binding description Changes in v4: - Made $ref use full schema path - Cleaned up example - Dropped regulator name list comment - Changed description of regulator binding to mention BCM59056 explicitly - Changed "Power Management IC" to "Power Management Unit" to match official Broadcom naming - Renamed mfd/brcm,bcm59056.yaml to mfd/brcm,bcm590xx.yaml Changes in v3: - Moved regulator node to separate binding - Removed quotes around compatibles/vbus property - Style fixes for example --- .../devicetree/bindings/mfd/brcm,bcm59056.txt | 39 ---------------- .../devicetree/bindings/mfd/brcm,bcm59056.yaml | 54 ++++++++++++++++++= ++++ .../bindings/regulator/brcm,bcm59056.yaml | 51 ++++++++++++++++++= ++ 3 files changed, 105 insertions(+), 39 deletions(-) diff --git a/Documentation/devicetree/bindings/mfd/brcm,bcm59056.txt b/Docu= mentation/devicetree/bindings/mfd/brcm,bcm59056.txt deleted file mode 100644 index be51a15e05f926913b3a473648d977b25f1a2fbc..000000000000000000000000000= 0000000000000 --- a/Documentation/devicetree/bindings/mfd/brcm,bcm59056.txt +++ /dev/null @@ -1,39 +0,0 @@ -------------------------------- -BCM590xx Power Management Units -------------------------------- - -Required properties: -- compatible: "brcm,bcm59056" -- reg: I2C slave address -- interrupts: interrupt for the PMU. Generic interrupt client node bindings - are described in interrupt-controller/interrupts.txt - ------------------- -Voltage Regulators ------------------- - -Optional child nodes: -- regulators: container node for regulators following the generic - regulator binding in regulator/regulator.txt - - The valid regulator node names for BCM59056 are: - rfldo, camldo1, camldo2, simldo1, simldo2, sdldo, sdxldo, - mmcldo1, mmcldo2, audldo, micldo, usbldo, vibldo, - csr, iosr1, iosr2, msr, sdsr1, sdsr2, vsr, - gpldo1, gpldo2, gpldo3, gpldo4, gpldo5, gpldo6, - vbus - -Example: - pmu: bcm59056@8 { - compatible =3D "brcm,bcm59056"; - reg =3D <0x08>; - interrupts =3D ; - regulators { - rfldo_reg: rfldo { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <3300000>; - }; - - ... - }; - }; diff --git a/Documentation/devicetree/bindings/mfd/brcm,bcm59056.yaml b/Doc= umentation/devicetree/bindings/mfd/brcm,bcm59056.yaml new file mode 100644 index 0000000000000000000000000000000000000000..b387ef9885c3ac524e0782545db= ca9c0e81a556c --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/brcm,bcm59056.yaml @@ -0,0 +1,54 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mfd/brcm,bcm59056.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Broadcom BCM590xx Power Management Units + +maintainers: + - Artur Weber + +properties: + compatible: + const: brcm,bcm59056 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + regulators: + type: object + $ref: /schemas/regulator/brcm,bcm59056.yaml# + +required: + - compatible + - reg + - interrupts + +additionalProperties: false + +examples: + - | + #include + #include + + i2c { + #address-cells =3D <1>; + #size-cells =3D <0>; + + pmic@8 { + compatible =3D "brcm,bcm59056"; + reg =3D <0x08>; + interrupts =3D ; + + regulators { + rfldo { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <3300000>; + }; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/regulator/brcm,bcm59056.yaml= b/Documentation/devicetree/bindings/regulator/brcm,bcm59056.yaml new file mode 100644 index 0000000000000000000000000000000000000000..7a5e36394d216232e0a2070fb20= d09dcc1ea8056 --- /dev/null +++ b/Documentation/devicetree/bindings/regulator/brcm,bcm59056.yaml @@ -0,0 +1,51 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/regulator/brcm,bcm59056.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Broadcom BCM59056 Power Management Unit regulators + +description: | + This is a part of device tree bindings for the BCM59056 power + management unit. + + See Documentation/devicetree/bindings/mfd/brcm,bcm59056.yaml for + additional information and example. + +maintainers: + - Artur Weber + +patternProperties: + "^(cam|sim|mmc)ldo[1-2]$": + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false + + "^(rf|sd|sdx|aud|mic|usb|vib)ldo$": + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false + + "^(c|m|v)sr$": + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false + + "^(io|sd)sr[1-2]$": + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false + + "^gpldo[1-6]$": + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false + +properties: + vbus: + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false + +additionalProperties: false --=20 2.49.0 From nobody Thu Dec 18 22:25:24 2025 Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A73F41F03FB; Wed, 30 Apr 2025 07:07:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996841; cv=none; b=P2cP30PKQaDf374ZvzXblZLfFE495141nJRu3OiR+b9LHv7BGR9FfeNLtsEeJ7x1o0AcDEuAJS8LAyNwhbxsBioTuTxeTsGc/NSLPcW4V2DsAP3PpguEhw8GtbEH3zGC+eKqV4LK2coradj7UJgxguUyUFEuGHga9U2MpGUJ8fA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996841; c=relaxed/simple; bh=C0axKSujZ/Zy3i7sWIyGn35sKk7Z8FY2faVK4kpx4RQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=h008YDYbZR6bykV/gu0U3I2GC65BkU/4xqnZn0opUtGIhRAhLgWK7O0P/hf1Pb+vhUzTbLlK8LegxHr+rFKeKGisH0MulK7Uw/x+1Id2D1vRAOkUIhcmRj+BbTxg5nkab/Ji2IX2OI/0zLhSsb6wjhCK8WXaYK5LZmQtTBMLFYw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JvtHAanR; arc=none smtp.client-ip=209.85.208.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JvtHAanR" Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-5e5cded3e2eso10688198a12.0; Wed, 30 Apr 2025 00:07:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745996837; x=1746601637; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=AsdoJSin8peETgUZX/EH4A7o3cuAiQtJzSEsM3DCxTg=; b=JvtHAanRCWfzFUU1hRuMkYmccn38GfaYhEP9kpTegDWZMqjrrxgpHJUlleDps9R4Gn balwnTjavsX5SMzJ2mIp+Ei/uJJ0bDP6NN6tjR0a+8n2m0Nynh7olm8/sih50NXa5Ckc zZnHZIhOS1umkirTlFr2tMW0qtmAD/NKK03AY6ETE3by5HtRkhJF1bgAXFKiYNIw0H7H hgjbRo69WwXOmgfTk4PC8jhE3Mqg+U19ukmn1F19ooccp8F6dEq566EDf7F9Fr+wKnKN tQeDforEJAfaL5E7cPVaLeUHnraSgbX5rTSDJqyfw1oWzS4A1JskywBLdgvO4VYBe2uu xP5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745996837; x=1746601637; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AsdoJSin8peETgUZX/EH4A7o3cuAiQtJzSEsM3DCxTg=; b=MvEa9khqa5FXMF+vHdQE22sy8NQQ4aZTvNd95iNVKDgWP49AFB/+3KR3vuud64WwpM eNftDGwVY5eYC4uzE0aNG88DlqdiMtR+KxzGd71h5eYlZGuPvWscOorA4UQLdq8jZTyE DLDIl1raNWWLQwHwhvECi/uv4iT6PJVuAAcq8lqDah4SZ2Bgk19TIZcfmL9Cblmp2BM1 E6bzSvqTLQXW5QrNRh+m2s1qbanu+tmFUDg/j7g+uV1KyOWfDQI+SI2rwmARxpfggtZb 84Gv4/kZkHsXhGXA6aey0qDvH4PTWoo/O72CDN5c7N0OC8J3FBI6VdYH5m7+A5gxm2Ef oaxw== X-Forwarded-Encrypted: i=1; AJvYcCVqX3UDJ8/FgsnR88b6i5oUwfXV7Bota7Yy6Th4GPzbJiV3TQ38mrBTOkqSgSs+KR4Ml0OkNsiRRF3M@vger.kernel.org, AJvYcCW421+7AG4VhLadjrhctNlMxi09KXSwUFf/Y8WoaYCCthqPLXlBWhUoEclJHkG+kaP0/HBjmH5WxKbMistk@vger.kernel.org X-Gm-Message-State: AOJu0Yw2kNiohfbr1r3ZMtu48q/bGyBj+VcDEfjMq5o/NbAfG3Jh3qXH NQMZMuvG+wMO+vYv8FzgkwmOSQucsWlR2YzIbwdPuf0u8ucAZbUE X-Gm-Gg: ASbGncuDr++d2x+r2uY7EIXEKc4HQuaUIEgPaJmddHyNvOKfpkWAoMtUyvrRTNuaoit f5fhAjer0ayUH/KkQIKHQbPYzgtyrA9SAydE1oRs3s2TQvBIA18oa1zUUPFLUJMDAmhyfWYX6Kt p+4uP3R2jiNHy2GRz7sB0MVDxp3IXK5sxhJxT02TsUUfD6IJLafXXKhKWrF0ibfx48PPTotLx0l 4FM9iRD9NaDNlvwXrVMqy/r+wN5gda83LvG5GeYAenU2AMBK4JIsuCHJ+giuCe8jREuLEpbH1R2 KtarsUezDnMI88IJrZxSPOsu4TNsVExtOuUrjR2ifpXNkEr2QomzZbRFTBvArAvpJcNkgCc2Gpy RE84Q3t4D/HXcSjNxzHT8kA== X-Google-Smtp-Source: AGHT+IH7C3G6uB8DnhJutIPeMwYVSq5CWSioYsidNZcpPZr8cTBg9evZWDUTGYfQNanBPXB4XkSYMQ== X-Received: by 2002:a05:6402:50c8:b0:5f5:f890:3dd5 with SMTP id 4fb4d7f45d1cf-5f89b254ac1mr1398704a12.15.1745996836582; Wed, 30 Apr 2025 00:07:16 -0700 (PDT) Received: from hex.my.domain (83.8.121.197.ipv4.supernova.orange.pl. [83.8.121.197]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f7013fec3csm8334314a12.19.2025.04.30.00.07.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 00:07:16 -0700 (PDT) From: Artur Weber Date: Wed, 30 Apr 2025 09:07:06 +0200 Subject: [PATCH v8 2/9] dt-bindings: mfd: brcm,bcm59056: Add compatible for BCM59054 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250430-bcm59054-v8-2-e4cf638169a4@gmail.com> References: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> In-Reply-To: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> To: Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Liam Girdwood , Mark Brown , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list Cc: Stanislav Jakubek , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745996831; l=4488; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=C0axKSujZ/Zy3i7sWIyGn35sKk7Z8FY2faVK4kpx4RQ=; b=ZjctfsXHvdz8eCGR8T1uMb9UeGC0Dtwn8c4b/zVMbMkqpVQdFUZo85lGKSMxyKnvJ3f+6tKV7 NZhT5i8hmMjCYU2eQJV+z92eomdu6uKk5snBgSNrjU5BIAvwB/BH56d X-Developer-Key: i=aweber.kernel@gmail.com; a=ed25519; pk=RhDBfWbJEHqDibXbhNEBAnc9FMkyznGxX/hwfhL8bv8= The BCM59054 MFD is fairly similar to the BCM59056, and will use the same driver. Add compatible and specify the allowed regulator nodes. Reviewed-by: Rob Herring (Arm) Signed-off-by: Artur Weber Reviewed-by: Stanislav Jakubek --- Changes in v6: - Replace mfd/brcm,bcm590xx.yaml with mfd/brcm,bcm59056.yaml Changes in v5: - Replace mfd/brcm,bcm59056.yaml with mfd/brcm,bcm590xx.yaml in regulator bindings description Changes in v4: - Fix yamllint errors (missing unevaluatedProperties) - Drop comment with regulator name list - Use full schema paths for $reg - Change description of regulator binding to mention BCM59054 explicitly - Drop quotes around vbus reg name - Change "Power Management IC" to "Power Management Unit" to match official Broadcom naming Note that I did not end up moving the regulator refs from allOf compatible matches; I explained my reasoning in [1]. [1] https://lore.kernel.org/lkml/ab853605-859d-44c6-8cbd-44391cd677e6@gmail= .com/ Changes in v3: - Split regulator node into separate file - Removed quotes around compatible --- .../devicetree/bindings/mfd/brcm,bcm59056.yaml | 26 +++++++++- .../bindings/regulator/brcm,bcm59054.yaml | 56 ++++++++++++++++++= ++++ 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/mfd/brcm,bcm59056.yaml b/Doc= umentation/devicetree/bindings/mfd/brcm,bcm59056.yaml index b387ef9885c3ac524e0782545dbca9c0e81a556c..b67d7a723fc242869e5bdc6b360= 2785f62af45bd 100644 --- a/Documentation/devicetree/bindings/mfd/brcm,bcm59056.yaml +++ b/Documentation/devicetree/bindings/mfd/brcm,bcm59056.yaml @@ -11,7 +11,9 @@ maintainers: =20 properties: compatible: - const: brcm,bcm59056 + enum: + - brcm,bcm59054 + - brcm,bcm59056 =20 reg: maxItems: 1 @@ -21,7 +23,6 @@ properties: =20 regulators: type: object - $ref: /schemas/regulator/brcm,bcm59056.yaml# =20 required: - compatible @@ -30,6 +31,27 @@ required: =20 additionalProperties: false =20 +allOf: + - if: + properties: + compatible: + contains: + const: brcm,bcm59054 + then: + properties: + regulators: + $ref: /schemas/regulator/brcm,bcm59054.yaml# + + - if: + properties: + compatible: + contains: + const: brcm,bcm59056 + then: + properties: + regulators: + $ref: /schemas/regulator/brcm,bcm59056.yaml# + examples: - | #include diff --git a/Documentation/devicetree/bindings/regulator/brcm,bcm59054.yaml= b/Documentation/devicetree/bindings/regulator/brcm,bcm59054.yaml new file mode 100644 index 0000000000000000000000000000000000000000..5b46d7fca05e21aa1eae991b5f9= f60b444f20c1c --- /dev/null +++ b/Documentation/devicetree/bindings/regulator/brcm,bcm59054.yaml @@ -0,0 +1,56 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/regulator/brcm,bcm59054.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Broadcom BCM59054 Power Management Unit regulators + +description: | + This is a part of device tree bindings for the BCM59054 power + management unit. + + See Documentation/devicetree/bindings/mfd/brcm,bcm59056.yaml for + additional information and example. + +maintainers: + - Artur Weber + +patternProperties: + "^(cam|sim|mmc)ldo[1-2]$": + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false + + "^(rf|sd|sdx|aud|mic|usb|vib|tcx)ldo$": + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false + + "^(c|mm|v)sr$": + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false + + "^(io|sd)sr[1-2]$": + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false + + "^gpldo[1-3]$": + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false + + "^lvldo[1-2]$": + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false + +properties: + vbus: + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false + +additionalProperties: false --=20 2.49.0 From nobody Thu Dec 18 22:25:24 2025 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD5711F098F; Wed, 30 Apr 2025 07:07:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996841; cv=none; b=OgpUAmTiictWCkGePDw9jKydY5Zq7OjjAmeYkYQahoT3zL90deYnu+1pzZuu77d1sV58YOFOD28v2c7AmzR8rR0rln1sZN7OdHmcf440HReY3FmmTp2QkIfttb7uTdfWFvqVm7xA28nMJrOD4JMPHBDqNyZfl9md8CRhZxGXyFs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996841; c=relaxed/simple; bh=gWHaYIo9B3VudHVZ8I6m6gLwDBRYmLzx2Lunvk1Jg8U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=akGx+tNqDE3hybYbGM9CaWEUAdVDRck5u5BT6iBNx1GqZ7eVjDwad6WSnErKfXUzvmMCeJSDRw+I9+aXmwfcKHHTs+p8vFAjp+K9M7icohJfVMm+Od2bvNpWw2DNOHufFyramDoq5BQIOUqqGoEMn/nsHN45Lx7fI+jS0Cm5V0k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CG+KYfTY; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CG+KYfTY" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-5f63ac6ef0fso1320264a12.1; Wed, 30 Apr 2025 00:07:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745996838; x=1746601638; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=QtDdKSd6hN5lH6sDk00ZJYQhob5LTcjf68AShtqVBV8=; b=CG+KYfTYW9p1ftw3YLbZhrTucPbM0WHlr0KyMYSlkaq+YKGWzir6tfmUvhvN37+0Z+ 6AXpiWewQF9pRQKjcGpNE5JTgSH8pzMfjTivVzVEn4jpO5W7gTzlyBbI87MFNtS8zIBF Tn9S1mNRHKaDDksyX86HhputQVoLkKL7A6uWuItIJrudfT29nn1phybcy2Ls+Qmx148l otKQHKnkKZad+/c4W8SlFKsHldIjIw/sh8QtULLb8X83WaGwgZnc5/UYisyYFv1fNVJQ XYS3mwepOBCzTUOLJ6c6Tq+X7nI046NaTXWjcAVyQe6I0SToabyWeuh3AcizbUqqa0yQ 9eRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745996838; x=1746601638; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QtDdKSd6hN5lH6sDk00ZJYQhob5LTcjf68AShtqVBV8=; b=ht5LQjoT3TrrsmkKA1Fv55I6qlTt/sCXjOnZlitqOzYX/2fRF1PKy6eheLmTbUAg4d 6GUhEnwrDh31SpvSAq1hwZ5evRiVrf0rj3b3W2A4pjjmY0+qxUVXl9cAZdHkYOwNLaZD PZ8q3NsmzL4FgdgWEXkz9UvXdLXr6iugLVqKmWVNiP5BBwRe5n9MBzuacc6yIvFStYAl Dy4LGnXyyXr9b31uc8Yg2pHXtx1tE2MTHwotDkt47BxX1Cfj3XKPWyNNVmw2bF0slx2r rGzfuALP6MnBSPzt2WDLX+X7/CkhRMH3fLj0DkXk6Ih9PW4WDq3Mi2TEnpfw7S+n2Q6c ljow== X-Forwarded-Encrypted: i=1; AJvYcCWIoAOBGDKjxMlmp8iTrscdEmReokvy/N2J62A4fCEILUJ1mgEjCZ9zQNuvRpw8DkKd53yT5prOTBGqd3kU@vger.kernel.org, AJvYcCXTiLUPnSCZZYJ4wc3LPaOqGI58erDqG7CgwE8XYBFqT0l7HgQ3S48DTy7M99KGSg2XnbFkCk8w2TeF@vger.kernel.org X-Gm-Message-State: AOJu0YxiA+lmyx8dYp6v3LZxe+8Yy7p5PSkDBayQvG+eiR+KDwXdOnme nL7FVlVJJq4o6m+jACJ89qHXH8GNZ/EZCWXY7sO/NCFTyOD0VKX1 X-Gm-Gg: ASbGncv5n7VaOFHiWcgY3G2EBCnOqoEGWU0ChX2I41wDiedVGQHNT3PPUpS09r78UMp 4p7QvuG0AryddKJJNxeDKD96DHHw7l70Fe8KrqbWEA67Zld1BhO9eKcZ5qDCL611xFvjxzpCFL0 3g7IgQueu3TV92B7VzrfOKhnzfBHdmuvV2emfs3Oops6JeNGCXW3rhNxwOItZlmVJZhKclVs7rv Ds/gQFXdeXOBysx+UqWdoRy6ijT+eWt4JESzpCbWZbedmTWt9tEsrgrc2aHhX4HrtiVmx+fF22+ R0/LbKDgCuu5kG7Z7LT7Xb3CmJ3N/iYXfWy6j9PdyXvbqbpDpFxANMJfHl6SZhxft++B2Kak96Q ECy9Vv7xqK/4= X-Google-Smtp-Source: AGHT+IGLsEQ2XB9GY0oZX93R83Gm/kDCuM0Gfi+QTVfEqedLRsCSzqXsS1050oalSdYUuJ19J55ccg== X-Received: by 2002:a05:6402:51d2:b0:5e4:d52b:78a2 with SMTP id 4fb4d7f45d1cf-5f89fe7004amr1565048a12.15.1745996838003; Wed, 30 Apr 2025 00:07:18 -0700 (PDT) Received: from hex.my.domain (83.8.121.197.ipv4.supernova.orange.pl. [83.8.121.197]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f7013fec3csm8334314a12.19.2025.04.30.00.07.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 00:07:17 -0700 (PDT) From: Artur Weber Date: Wed, 30 Apr 2025 09:07:07 +0200 Subject: [PATCH v8 3/9] ARM: dts: Drop DTS for BCM59056 PMU Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250430-bcm59054-v8-3-e4cf638169a4@gmail.com> References: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> In-Reply-To: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> To: Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Liam Girdwood , Mark Brown , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list Cc: Stanislav Jakubek , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745996831; l=4265; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=gWHaYIo9B3VudHVZ8I6m6gLwDBRYmLzx2Lunvk1Jg8U=; b=9YDN793N1EYkLoW7/rTMIWadtYdPcuFWIfUbe5118bJ35AYqfaDAHoRth/dpGV9LgREn/B8y/ KZXTO9opxm3D9iEBhezjtHc3sJ7TellQdkMGWZ2Z+iOxNf085fYk8jF X-Developer-Key: i=aweber.kernel@gmail.com; a=ed25519; pk=RhDBfWbJEHqDibXbhNEBAnc9FMkyznGxX/hwfhL8bv8= The BCM59056 PMU has its own separate DTSI, meant to be included in a DTS file after defining the pmu node on some I2C bus. This seems rather unintuitive; drop the DTS in favor of adding the BCM59056 PMU node directly into the device DTS files. If the amount of subdevices supported by the BCM590xx grows, and a common device tree turns out to be beneficial, it can be reintroduced in the future. Signed-off-by: Artur Weber Reviewed-by: Stanislav Jakubek --- Changes in v4: - PMIC -> PMU in commit message --- arch/arm/boot/dts/broadcom/bcm28155-ap.dts | 68 +++++++++++----------- arch/arm/boot/dts/broadcom/bcm59056.dtsi | 91 --------------------------= ---- 2 files changed, 32 insertions(+), 127 deletions(-) diff --git a/arch/arm/boot/dts/broadcom/bcm28155-ap.dts b/arch/arm/boot/dts= /broadcom/bcm28155-ap.dts index 2f3634545e64978888cd0b47fd5647a5e2eb8e07..cefaa9a3c45c9c90bffc08f7391= 61d8ea21d98dd 100644 --- a/arch/arm/boot/dts/broadcom/bcm28155-ap.dts +++ b/arch/arm/boot/dts/broadcom/bcm28155-ap.dts @@ -37,7 +37,39 @@ &pmu_bsc { status =3D "okay"; =20 pmu: pmu@8 { + compatible =3D "brcm,bcm59056"; + interrupts =3D ; reg =3D <0x08>; + + regulators { + camldo1_reg: camldo1 { + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + regulator-always-on; + }; + + sdldo_reg: sdldo { + regulator-min-microvolt =3D <3000000>; + regulator-max-microvolt =3D <3000000>; + }; + + sdxldo_reg: sdxldo { + regulator-min-microvolt =3D <2700000>; + regulator-max-microvolt =3D <3300000>; + }; + + usbldo_reg: usbldo { + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + regulator-always-on; + }; + + iosr1_reg: iosr1 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + regulator-always-on; + }; + }; }; }; =20 @@ -74,39 +106,3 @@ &usbotg { &usbphy { status =3D "okay"; }; - -#include "bcm59056.dtsi" - -&pmu { - compatible =3D "brcm,bcm59056"; - interrupts =3D ; - regulators { - camldo1_reg: camldo1 { - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; - regulator-always-on; - }; - - sdldo_reg: sdldo { - regulator-min-microvolt =3D <3000000>; - regulator-max-microvolt =3D <3000000>; - }; - - sdxldo_reg: sdxldo { - regulator-min-microvolt =3D <2700000>; - regulator-max-microvolt =3D <3300000>; - }; - - usbldo_reg: usbldo { - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; - regulator-always-on; - }; - - iosr1_reg: iosr1 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - regulator-always-on; - }; - }; -}; diff --git a/arch/arm/boot/dts/broadcom/bcm59056.dtsi b/arch/arm/boot/dts/b= roadcom/bcm59056.dtsi deleted file mode 100644 index a9bb7ad81378d88811c4473763c579d3d2c006a1..000000000000000000000000000= 0000000000000 --- a/arch/arm/boot/dts/broadcom/bcm59056.dtsi +++ /dev/null @@ -1,91 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* -* Copyright 2014 Linaro Limited -* Author: Matt Porter -*/ - -&pmu { - compatible =3D "brcm,bcm59056"; - regulators { - rfldo_reg: rfldo { - }; - - camldo1_reg: camldo1 { - }; - - camldo2_reg: camldo2 { - }; - - simldo1_reg: simldo1 { - }; - - simldo2_reg: simldo2 { - }; - - sdldo_reg: sdldo { - }; - - sdxldo_reg: sdxldo { - }; - - mmcldo1_reg: mmcldo1 { - }; - - mmcldo2_reg: mmcldo2 { - }; - - audldo_reg: audldo { - }; - - micldo_reg: micldo { - }; - - usbldo_reg: usbldo { - }; - - vibldo_reg: vibldo { - }; - - csr_reg: csr { - }; - - iosr1_reg: iosr1 { - }; - - iosr2_reg: iosr2 { - }; - - msr_reg: msr { - }; - - sdsr1_reg: sdsr1 { - }; - - sdsr2_reg: sdsr2 { - }; - - vsr_reg: vsr { - }; - - gpldo1_reg: gpldo1 { - }; - - gpldo2_reg: gpldo2 { - }; - - gpldo3_reg: gpldo3 { - }; - - gpldo4_reg: gpldo4 { - }; - - gpldo5_reg: gpldo5 { - }; - - gpldo6_reg: gpldo6 { - }; - - vbus_reg: vbus { - }; - }; -}; --=20 2.49.0 From nobody Thu Dec 18 22:25:24 2025 Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0FF8220C01C; Wed, 30 Apr 2025 07:07:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996844; cv=none; b=lPHPmCENAtECkhUK3ApuJh84XH5QuC/Wb1tRFM4RgqXUKij/i8ua3pvjevBHSozssG6MJs1jtde9Lya5nyGoT9J1ZDkHNbU+Ue1RvOHqkEmP5BTfyBUusD8wRjt4kKTbzD/tXzFTmjRxkkgRc9SCYK4D5ubLmkNf1jkOQuoTioc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996844; c=relaxed/simple; bh=Kyf+JgIs1pOl50ZzUQw3gg0eoEVgfjFo16SyHRTN6/Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ltdN2P/clLP+OjQTdl3RTLRPjhLEAsig6t/3QNMQA0qU9RqALAoFRNUK5FDU0HBZuE5DX2lPv6uaUJljdsG+pkQdpT9gb3I1mi+nYdSoX0wLa9zknnPFSmJ+3FmIRqwSYzsxx1GcknbYbw3kXSYh2j8OroQVSpKay3MAlAhLGKs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dzUC9wPg; arc=none smtp.client-ip=209.85.208.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dzUC9wPg" Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-5e5e22e6ed2so11099788a12.3; Wed, 30 Apr 2025 00:07:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745996841; x=1746601641; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=mc99szM5NS9if/cxxc1jYyxG/jdxQF7Jhbt7r7vKNzw=; b=dzUC9wPgmuFmtFwvWFOS8TyjdYPGychUsyhhqy7GrryjbKN/odpQYJGALRGG4jUaWa KlSI/L9XI18adsH+S46+HehABbtVOG5ygZh/21N9cpHs4b4IujoF0QXfnbK0koxvOIwO Ox0mL2WiCHb3f9vMXWMoqrm6+CpVjpbLrF0nrQmBnAqS9e+L1QfGzWvb0ns1qOUzdZMq KcsQpZQRvdhx8c0ZIKjuc1NZ4Y82ZH6E3i8E/GAquO+DObg9z7mnS2EpiaNsfYPgqta2 WS3tqJ7nqIGcQypzE5xqge0zLGu56LotV/+/QSmpgVtHQDSrS2zEMvOUaHweD+8HgXWK Siig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745996841; x=1746601641; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mc99szM5NS9if/cxxc1jYyxG/jdxQF7Jhbt7r7vKNzw=; b=YMTzV77O9mMj1OC4rnjb/YZ6AiDkvlK3WuiIbAL7I2/4wtDr7iVYSDXJRBXQIiQ0xz OAN3NAEvuNmVxawpM6UoFx3WFQbAK7JeUyEQQcS7tlgrel9u6YHfApt123g5NyeE6BCz 9/7x8PIsxbUjEkKrRFx5mr2mGjpAl3ZQEdO/nMqt0uC6ybCJltiBDf1sQI1L1cfJ9RZm WywnpxmTicocXkAUfLp7AkYhpx7GEDeMMKWEQhrP84JIF92tTUd5BOrUsFbJA4PNum/X DZ3G7FXRggs2Ypwbs2hh5/vQalxfWBiJgyosKwKhrDnj+7GyOCOzOOj9J+4hogPwaCDK taEQ== X-Forwarded-Encrypted: i=1; AJvYcCU4rcOswHvlGGSKwOKysZwU9qHXFBDcS9j4uMJ9+vFsfGgKupCOF+fSCmSPteVuMPmv78mi72MWLLRviLcS@vger.kernel.org, AJvYcCVU0gUAv5HkHyR0IY16mh5ypkN9eyMUrmMueRHLez5KWTqmrtWJ55pbUqBYk7h7vGrQVqJHq6uZms3K@vger.kernel.org X-Gm-Message-State: AOJu0YzX6ouNXXS97AX/pQ4o3cCQLdZBTDTk6Pl8guPfZf30CJrIybqq 6gJg93a2P5SClEj1LwiLwBsQnsElbJ7FaGwCFcINQpCLvrV6OuPuqq2QcA== X-Gm-Gg: ASbGncvG3TQM80JwUR4pK0wyKaKYxOT/mWnKFfk4kQM9Fq3+gidEqXH5f0TsLzBbOz8 tW4XRbGZ/i+PFKx1WwvsjVBynRaI6O8sr83Oz0snkoHcjl1dp5wUXP9IIOUtCJlbEBIvFKZZMcq xIAj3mPn/8WWrNZvONQEdvgSBZgjkaaypL5Br8IMshwfdTo8NtgC56UyYpeQzZOBSXsRpZMTmuI PmaLBgat4amdEKrT2rPjIcVV1yxCscLb/n1T0eKT3SOIS0xgrhixVhEQ4dOZI/K8C6Dm5fcjD+T FB9kryb+w5e3OcSZK1ijJKyLYx6/kuUdo6kC4+mGVGFOeRm4i6DhBrIaOEJ+EUARqK/jKB9vJ2d GpxgBZE0Dz2c= X-Google-Smtp-Source: AGHT+IE9B7O3f2Zx9SbVPfFNhUAxKNJ1v598E122nhb3axEh52sxGI9kcl490JCRu0J7Tp/swxS71w== X-Received: by 2002:a05:6402:5205:b0:5f6:dc67:639d with SMTP id 4fb4d7f45d1cf-5f89b446757mr1412264a12.15.1745996840053; Wed, 30 Apr 2025 00:07:20 -0700 (PDT) Received: from hex.my.domain (83.8.121.197.ipv4.supernova.orange.pl. [83.8.121.197]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f7013fec3csm8334314a12.19.2025.04.30.00.07.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 00:07:19 -0700 (PDT) From: Artur Weber Date: Wed, 30 Apr 2025 09:07:08 +0200 Subject: [PATCH v8 4/9] mfd: bcm590xx: Add support for multiple device types + BCM59054 compatible Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250430-bcm59054-v8-4-e4cf638169a4@gmail.com> References: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> In-Reply-To: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> To: Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Liam Girdwood , Mark Brown , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list Cc: Stanislav Jakubek , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745996831; l=3092; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=Kyf+JgIs1pOl50ZzUQw3gg0eoEVgfjFo16SyHRTN6/Q=; b=RcNBgUy/EgquttJsiJmhHwzgwB5v+B923kqzWeEaTLVETU8zGG4yVb3HtOTi01hx70EOwijBP 0g9wZ0RdlmcD4NZtbfhVFBJsOljxuVw83FB2IYX0bHZnMz3jbRe0Q/w X-Developer-Key: i=aweber.kernel@gmail.com; a=ed25519; pk=RhDBfWbJEHqDibXbhNEBAnc9FMkyznGxX/hwfhL8bv8= The BCM59054 is another chip from the BCM590xx line of PMUs, commonly used on devices with the BCM21664/BCM23550 chipsets. Prepare the BCM590xx driver for supporting other devices by adding the PMUID register values for supported chip types and store them in the MFD data struct as "pmu_id". (These will be checked against the actual PMUID register values in a later commit.) Then, add a DT compatible for the BCM59054, and provide the PMU ID as OF match data. Signed-off-by: Artur Weber Reviewed-by: Stanislav Jakubek --- Changes in v6: - Move PMUID value to MFD header - Use PMUID value as OF data/device type value - Add bcm59054 to I2C ID table Changes in v4: - Rewrite commit message description - Rename "device_type" member to "dev_type" - Drop awkward line break to fit function call - Add PMU ID/revision parsing function Changes in v3: - Fix compilation warning about device_type pointer cast type - Name the device types enum and use it as the type in the MFD struct --- drivers/mfd/bcm590xx.c | 12 +++++++++++- include/linux/mfd/bcm590xx.h | 7 +++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/bcm590xx.c b/drivers/mfd/bcm590xx.c index 8b56786d85d0182acf91da203b5f943556c08422..4620eed0066fbf1dd691a2e392e= 967747b4d125b 100644 --- a/drivers/mfd/bcm590xx.c +++ b/drivers/mfd/bcm590xx.c @@ -50,6 +50,8 @@ static int bcm590xx_i2c_probe(struct i2c_client *i2c_pri) bcm590xx->dev =3D &i2c_pri->dev; bcm590xx->i2c_pri =3D i2c_pri; =20 + bcm590xx->pmu_id =3D (uintptr_t) of_device_get_match_data(bcm590xx->dev); + bcm590xx->regmap_pri =3D devm_regmap_init_i2c(i2c_pri, &bcm590xx_regmap_config_pri); if (IS_ERR(bcm590xx->regmap_pri)) { @@ -91,12 +93,20 @@ static int bcm590xx_i2c_probe(struct i2c_client *i2c_pr= i) } =20 static const struct of_device_id bcm590xx_of_match[] =3D { - { .compatible =3D "brcm,bcm59056" }, + { + .compatible =3D "brcm,bcm59054", + .data =3D (void *)BCM590XX_PMUID_BCM59054, + }, + { + .compatible =3D "brcm,bcm59056", + .data =3D (void *)BCM590XX_PMUID_BCM59056, + }, { } }; MODULE_DEVICE_TABLE(of, bcm590xx_of_match); =20 static const struct i2c_device_id bcm590xx_i2c_id[] =3D { + { "bcm59054" }, { "bcm59056" }, { } }; diff --git a/include/linux/mfd/bcm590xx.h b/include/linux/mfd/bcm590xx.h index c614d1b1d8a217ac2f212908a4c19ae71fa56f63..8d146e3b102a7dbce6f4dbab9f8= ae5a9c4e68c0e 100644 --- a/include/linux/mfd/bcm590xx.h +++ b/include/linux/mfd/bcm590xx.h @@ -13,6 +13,10 @@ #include #include =20 +/* PMU ID register values; also used as device type */ +#define BCM590XX_PMUID_BCM59054 0x54 +#define BCM590XX_PMUID_BCM59056 0x56 + /* max register address */ #define BCM590XX_MAX_REGISTER_PRI 0xe7 #define BCM590XX_MAX_REGISTER_SEC 0xf0 @@ -23,6 +27,9 @@ struct bcm590xx { struct i2c_client *i2c_sec; struct regmap *regmap_pri; struct regmap *regmap_sec; + + /* PMU ID value; also used as device type */ + u8 pmu_id; }; =20 #endif /* __LINUX_MFD_BCM590XX_H */ --=20 2.49.0 From nobody Thu Dec 18 22:25:24 2025 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EDC1A1EEA49; Wed, 30 Apr 2025 07:07:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996845; cv=none; b=j3awS7/XRPJ3nGgUwrpxrbwx+4TYyea43S6i6PQhhP8N16xbtLVcOyFn9k5Ld8uGhkgNLqtZgAOZAMUyyBkQhTuG3v1/jxGVKGIaPXKLWTdEA3+002zv820WKyvSCKGXswIsknTODFcL3rNghrDGf+RQ10c8igq+POCYKjNvGWg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996845; c=relaxed/simple; bh=oshNtINoRsSFDWTdpPPGeVt4iGXHtOoyizgpkqWGffU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=c/5Fo6m+ON9adaBdjgVW5yh3BQcnPoFvVfY7A7rYABgRNvR7HGTkvIA/bU/xMh/Kr8Tr5N0J/7510NWvEEN3aIOoehPR6x8KuS0yMiB/hwCa6PG3II7GLt2aOHSrS1et+igZR051bE+Kag5E2RF+Cp1fni7VqY3xsgbxocawsKc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Ec9x780f; arc=none smtp.client-ip=209.85.208.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ec9x780f" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-5f7ec0e4978so6707090a12.1; Wed, 30 Apr 2025 00:07:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745996842; x=1746601642; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=cD6ImneTbZLgrwokJknYjihekSDmHnvYNrVpdSfEU20=; b=Ec9x780fE/nSfQD17UV17E3ttnBp9utGTXX8obmRSw+xWztwDLKRE1etlM5Mkn1bj8 q0BAyQWR8udJMFIqEV5vSPdKeG68WO8KIZ4zCsuYrOFKddxevzkv07ef8bx3Kct2cx6C 6NnvGlnDVKjLuk8ENy/rr+rFROqt1eQ+MMZR2P1kcXxAwK4jsYOxH/QlqFTycWeZ3QIk G0W71mVVOdLsu8+gzcn7pf3szhc/wG2UgWSxl8VqNxZkF4rm9L1BUIg0oFAWsASByar3 ANH6XijNyHfsvxGfuSVDYZLOXLZjYu3uv4uKHvrtiCswAQjt1Kb7Zc4kpgyCnUri42od deDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745996842; x=1746601642; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cD6ImneTbZLgrwokJknYjihekSDmHnvYNrVpdSfEU20=; b=bWuqLruDbhNxmdrsINrjkWT91Up2N8g0yCz+2IW0PUJU4iMuGrfHinSzuksurDGooj WCv+RwMiV8A4Y7t1/bXJXo6T5Z1b6MWC5LrYHL3a9Njr0Rw4doXq4mXXZtkZeeda29xD UX4/YkO1cNJk5qkkRCwAr0ICJPo4ThRQj6+tun5DmGrSY2q0xXP4df1bNhMTtjoiFpDE FEa39S3FArtmofW/2ejVG/RsXdjbVIfZnrR836IuoUEiQKmY45j2zji4/edSM+jmmsM4 oTgdi8YOzoiPgGA8AUt4GOYZxE71G7O47pgns+HAFGnx1gFnxXQNKhQ/rZsjRKvXvS+l HayA== X-Forwarded-Encrypted: i=1; AJvYcCUXtjcETVLq70bKY3acfNzpREq97g50ahdrponTn/CpxQ2na/SIcHseL2iaZjs16uptiveRxz+TqXSR@vger.kernel.org, AJvYcCVo4TryW64ljoJyo6oE78/NgASarHGrthjtTr0SHf82ff/YbN0kaUBmmenMjONf78g/9ir381I+E6RMwCke@vger.kernel.org X-Gm-Message-State: AOJu0YwiZGINNWz29Q7XLaXxnkdR7VRa7NmlhgiFiNBHSl/cRtJuS4vG OU/GpDHesf1GzoO0Lt5an5p7wEGP+A6oqAWg0uzIS5J2Kegcp0MsDF360A== X-Gm-Gg: ASbGnct8SMd/5waZ8Qayr3GFGCGgTWMPlSGtQsj/u8WSmvLsJCeIaBfBExua0Hg5Z6H y9DKkKpRHHbP0SIilTa35KuJRlsMSx5gvm/yjgBu0AcNoV0KHGIau87lgr51YkL8fnx6sLGEyj/ lgTjabQeHFOC1mmRWh84tvEFf83OCXyUhIcTPjbLxOsctElY/oaI47d0kKbMWeMDny97mes5WW8 8bV3HJ1FrQyfcBKMJN7O6GXQwOruLKG4VR70tFAF89JaoGRgSbVAGxuxNuYgFkXxezMx8M9r3lu +T+ImlrWd6O26lawRht+eLT71YR2xa4Us7SaK1O7HhLsn3iNUpFiQXvvsFZEm4B4pahqlX4j8eb u0roQhg6Z/rE= X-Google-Smtp-Source: AGHT+IGTmonP8lEQxPUe4+oqb7+h22XT+VgaurBIKax7fSsbyEcBfqFkDB+r6vn3YQ8nh6mF4wMIGQ== X-Received: by 2002:a05:6402:3908:b0:5de:dfd0:9d22 with SMTP id 4fb4d7f45d1cf-5f89be215b0mr1696983a12.22.1745996842190; Wed, 30 Apr 2025 00:07:22 -0700 (PDT) Received: from hex.my.domain (83.8.121.197.ipv4.supernova.orange.pl. [83.8.121.197]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f7013fec3csm8334314a12.19.2025.04.30.00.07.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 00:07:21 -0700 (PDT) From: Artur Weber Date: Wed, 30 Apr 2025 09:07:09 +0200 Subject: [PATCH v8 5/9] mfd: bcm590xx: Add PMU ID/revision parsing function Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250430-bcm59054-v8-5-e4cf638169a4@gmail.com> References: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> In-Reply-To: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> To: Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Liam Girdwood , Mark Brown , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list Cc: Stanislav Jakubek , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745996831; l=4951; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=oshNtINoRsSFDWTdpPPGeVt4iGXHtOoyizgpkqWGffU=; b=NDvp2UQqXb+hpcsJM/1xalrnDkt5HfT8naRR1sH9LrdV5bfruYkKVT+pgO/qdI2Fp9jnpAiJw KUHZsQj+6vyBkR2lKABbq+NGQpETqiEjFKp5iHU27TFNrXkBH+6wVl4 X-Developer-Key: i=aweber.kernel@gmail.com; a=ed25519; pk=RhDBfWbJEHqDibXbhNEBAnc9FMkyznGxX/hwfhL8bv8= The BCM590xx PMUs have two I2C registers for reading the PMU ID and revision. The revision is useful for subdevice drivers, since different revisions may have slight differences in behavior (for example - BCM59054 has different regulator configurations for revision A0 and A1). Check the PMU ID register and make sure it matches the DT compatible. Fetch the digital and analog revision from the PMUREV register so that it can be used in subdevice drivers. Also add some known revision values to bcm590xx.h, for convenience when writing subdevice drivers. Signed-off-by: Artur Weber Reviewed-by: Stanislav Jakubek --- Changes in v8: - Change PMU ID print from dev_info to dev_dbg - Unwrap some lines and let them go up to 100 chars - Drop comment above bcm590xx_parse_version (keep the comments inside the function, they make it a bit more clear what's happening since it's doing two separate things) Changes in v7: - Return -ENODEV on PMU ID mismatch - Drop "Check your DT compatible" from ID mismatch error message Changes in v6: - Adapt to PMUID being passed as device type value - Rename rev_dig and rev_ana to rev_digital and rev_analog - Rewrite commit message Changes in v5: - Add REG_ prefix to register offset constant names Changes in v4: - Added this commit --- drivers/mfd/bcm590xx.c | 55 ++++++++++++++++++++++++++++++++++++++++= ++++ include/linux/mfd/bcm590xx.h | 14 +++++++++++ 2 files changed, 69 insertions(+) diff --git a/drivers/mfd/bcm590xx.c b/drivers/mfd/bcm590xx.c index 4620eed0066fbf1dd691a2e392e967747b4d125b..12d0db4237e79fcfcb2af4a0d93= 961b6239a3863 100644 --- a/drivers/mfd/bcm590xx.c +++ b/drivers/mfd/bcm590xx.c @@ -17,6 +17,15 @@ #include #include =20 +/* Under primary I2C address: */ +#define BCM590XX_REG_PMUID 0x1e + +#define BCM590XX_REG_PMUREV 0x1f +#define BCM590XX_PMUREV_DIG_MASK 0xF +#define BCM590XX_PMUREV_DIG_SHIFT 0 +#define BCM590XX_PMUREV_ANA_MASK 0xF0 +#define BCM590XX_PMUREV_ANA_SHIFT 4 + static const struct mfd_cell bcm590xx_devs[] =3D { { .name =3D "bcm590xx-vregs", @@ -37,6 +46,48 @@ static const struct regmap_config bcm590xx_regmap_config= _sec =3D { .cache_type =3D REGCACHE_MAPLE, }; =20 +/* Map PMU ID value to model name string */ +static const char * const bcm590xx_names[] =3D { + [BCM590XX_PMUID_BCM59054] =3D "BCM59054", + [BCM590XX_PMUID_BCM59056] =3D "BCM59056", +}; + +static int bcm590xx_parse_version(struct bcm590xx *bcm590xx) +{ + unsigned int id, rev; + int ret; + + /* Get PMU ID and verify that it matches compatible */ + ret =3D regmap_read(bcm590xx->regmap_pri, BCM590XX_REG_PMUID, &id); + if (ret) { + dev_err(bcm590xx->dev, "failed to read PMU ID: %d\n", ret); + return ret; + } + + if (id !=3D bcm590xx->pmu_id) { + dev_err(bcm590xx->dev, "Incorrect ID for %s: expected %x, got %x.\n", + bcm590xx_names[bcm590xx->pmu_id], bcm590xx->pmu_id, id); + return -ENODEV; + } + + /* Get PMU revision and store it in the info struct */ + ret =3D regmap_read(bcm590xx->regmap_pri, BCM590XX_REG_PMUREV, &rev); + if (ret) { + dev_err(bcm590xx->dev, "failed to read PMU revision: %d\n", ret); + return ret; + } + + bcm590xx->rev_digital =3D (rev & BCM590XX_PMUREV_DIG_MASK) >> BCM590XX_PM= UREV_DIG_SHIFT; + + bcm590xx->rev_analog =3D (rev & BCM590XX_PMUREV_ANA_MASK) >> BCM590XX_PMU= REV_ANA_SHIFT; + + dev_dbg(bcm590xx->dev, "PMU ID 0x%x (%s), revision: digital %d, analog %d= ", + id, bcm590xx_names[id], + bcm590xx->rev_digital, bcm590xx->rev_analog); + + return 0; +} + static int bcm590xx_i2c_probe(struct i2c_client *i2c_pri) { struct bcm590xx *bcm590xx; @@ -78,6 +129,10 @@ static int bcm590xx_i2c_probe(struct i2c_client *i2c_pr= i) goto err; } =20 + ret =3D bcm590xx_parse_version(bcm590xx); + if (ret) + goto err; + ret =3D devm_mfd_add_devices(&i2c_pri->dev, -1, bcm590xx_devs, ARRAY_SIZE(bcm590xx_devs), NULL, 0, NULL); if (ret < 0) { diff --git a/include/linux/mfd/bcm590xx.h b/include/linux/mfd/bcm590xx.h index 8d146e3b102a7dbce6f4dbab9f8ae5a9c4e68c0e..fbc458e94bef923ca1b69afe2ca= c944adf6fedf8 100644 --- a/include/linux/mfd/bcm590xx.h +++ b/include/linux/mfd/bcm590xx.h @@ -17,6 +17,16 @@ #define BCM590XX_PMUID_BCM59054 0x54 #define BCM590XX_PMUID_BCM59056 0x56 =20 +/* Known chip revision IDs */ +#define BCM59054_REV_DIGITAL_A1 1 +#define BCM59054_REV_ANALOG_A1 2 + +#define BCM59056_REV_DIGITAL_A0 1 +#define BCM59056_REV_ANALOG_A0 1 + +#define BCM59056_REV_DIGITAL_B0 2 +#define BCM59056_REV_ANALOG_B0 2 + /* max register address */ #define BCM590XX_MAX_REGISTER_PRI 0xe7 #define BCM590XX_MAX_REGISTER_SEC 0xf0 @@ -30,6 +40,10 @@ struct bcm590xx { =20 /* PMU ID value; also used as device type */ u8 pmu_id; + + /* Chip revision, read from PMUREV reg */ + u8 rev_digital; + u8 rev_analog; }; =20 #endif /* __LINUX_MFD_BCM590XX_H */ --=20 2.49.0 From nobody Thu Dec 18 22:25:24 2025 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8EDE20E03C; Wed, 30 Apr 2025 07:07:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996847; cv=none; b=TL2V7l+tMGCjVg7q8+wL8Ay192FeThB6Jiaflni6exTTahzfvd5kj989MTs3R1ioNAn4Vplh7hyTbT5l1nomsF9itkPmPXk48J3X4CRN4itxCRpn8JkFUMUPPH5IWnB+DURF3EQjcJUbYT6R/1E/8YWGm1yx5vw7lAgvqJ73RY4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996847; c=relaxed/simple; bh=3p4uTNZuJCVCY04RngL3HijVPVoeTTwZHmaA3AfSjYs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Gf8v416WwZ6jVAhvC+LkOPCNDSXQheuhQ+tjBsqW2iMhlKVebqPxS1jKq3vkCWT90MYLWcYFwbXZzRYXIqfRlENyIMqj6gDUnKdCAyIUs7U5a5ujahH0rZFA7t46Iul6Lwv/JdcW87BTP4h1fi9/gFUQX39bwe+VwirEHlymdoA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kZ5dxnmP; arc=none smtp.client-ip=209.85.208.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kZ5dxnmP" Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-5efe8d9eb12so10851451a12.1; Wed, 30 Apr 2025 00:07:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745996844; x=1746601644; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=bjD6o/anWPJqHcfWOgZVCotzX69raOWCDkK+7Q297NU=; b=kZ5dxnmPFBqJr5iLDqG6xG5sQ7dH0JZqz9bfTWjS9ddmTQBYMayYbwGptBFr9YMGFT E41iiUDLZKAYd38VIBBmwAtKY2l1wdfkmRQ3PN76d/CSmBsXqR5JZw4q1x7CudDT6olm cbH9LHfVMWXhNgjOg32KNQ65uwPOnzvXl8mtXpDUh8Hv0TpNrZnqEjFO3UbMNL2UGctJ OftSepRzECUypvs0u2Wnhsnt/nCueDaRJwLa5200Ps04AnqVFQtN6ECsmaXm6nO3rrg4 oevf1gnOTiJ3McRY63C0BPjNCaKtVS1Vzb6BRLFT3IMoefs+lHuWjL+q5fFYRf+6IIrd uvSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745996844; x=1746601644; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bjD6o/anWPJqHcfWOgZVCotzX69raOWCDkK+7Q297NU=; b=aZl8WVzQw9y/VkIWzDfPn5xcIE/y3l4fQQp0Nu5Kd9GnzEj4lyJB9cLidq6US2Dg9F qPTZ9L0jHo7D3Wd7uyrUL9WXtXDsWngVsc33nJ2u7rLD9ApHH+320nSx8FUQYti6ACJD H6KdH3GWCZAzl722cHPwbRU2OwhiWjNJvJzops7zS783n/VN14y2ylAHG1uc0apeKKJK OHrQFZ5BYGwaTIZ552WkMf0uM8suimzZfL2bxK1C5iRToihtyOhPEEyZwnOmMVQ/JmPK 5OdEo0jF4SZrG+YOvVg4XN/70mObneAh21oyTh/2tjSSCHsa9lp3nfp7eP26raPU3IUX +oMw== X-Forwarded-Encrypted: i=1; AJvYcCUFIqXQmXOYPZtp1h34BvQ9RxOQHfPTtTCbRQBAcl7npn8/o/ngL3WhOmHKmuGT6s22cAHWb0SbfwOkY/9R@vger.kernel.org, AJvYcCX+7svjeheFgKQiz1F/1QQvygOsSIUOAMC3PhOHesc3pc5XXrj00Kx1ch7lYeSabbUgBxPXgHRO0XZJ@vger.kernel.org X-Gm-Message-State: AOJu0YzmPJ1uVBPgsClYGpPqrDub9QlkqKBagwvz+NXGPn70NBKjLS76 JVBHQOyH3HjraVR5tLiW7HsASZK2tmR50aymYDQfxKwpW79v5qYn X-Gm-Gg: ASbGncsZL3xklCSGnkeasjydAq49oAen01GttOd9/rVOYwf36s3KmorLUsGT5KrL3Ci MbhVUpcD0jDRTkUivUrlvgmfDYLAaHcEoLz4cfWHIY3aeTd6fNKFL96I5zO+uGnImDOVq3MdwAf J9Q1DPsTIsIrg40VPYaJom+tExXVSWg7dbe7k/u892IzhBtoo6AZ3kEPULz9HhaJPLV0+eEF9KV o/NNuThA3wVPOJwinzGQxH6+YNvr2zA14F//uUvWNLx9wdrkDuR5lgDEjkan5by/MpwO3M9HZxD aSY2ui8fyu117sKtgts9tqqeq+HM+af/daSUqLwMG2me1V5lkIfOF/zeb+o9Ji0BkYfr7++GbYk VZreGOgFFqTw= X-Google-Smtp-Source: AGHT+IGy8lPaSG6g3uyt1tMJXqadrwwZjz+zmAhTL9j+tzHaJW6EPVja61ZR7mlmlOOJA5VlbLXZkQ== X-Received: by 2002:a05:6402:2345:b0:5ed:2762:727a with SMTP id 4fb4d7f45d1cf-5f8aef7ef1cmr1055997a12.11.1745996844210; Wed, 30 Apr 2025 00:07:24 -0700 (PDT) Received: from hex.my.domain (83.8.121.197.ipv4.supernova.orange.pl. [83.8.121.197]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f7013fec3csm8334314a12.19.2025.04.30.00.07.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 00:07:23 -0700 (PDT) From: Artur Weber Date: Wed, 30 Apr 2025 09:07:10 +0200 Subject: [PATCH v8 6/9] regulator: bcm590xx: Use dev_err_probe for regulator register error Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250430-bcm59054-v8-6-e4cf638169a4@gmail.com> References: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> In-Reply-To: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> To: Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Liam Girdwood , Mark Brown , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list Cc: Stanislav Jakubek , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745996831; l=1115; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=3p4uTNZuJCVCY04RngL3HijVPVoeTTwZHmaA3AfSjYs=; b=MOZ5SfrNp5aZLJw/b/aGeXsAUTZ17aBm26czPcfPC/rsnP9lCtVIG2WEwzAz/UKJZKJW8a77j sUmuysLSACwAV/xddDwZIeLUK4T10EpC+ayGvk4hardmmeSUtchMS2j X-Developer-Key: i=aweber.kernel@gmail.com; a=ed25519; pk=RhDBfWbJEHqDibXbhNEBAnc9FMkyznGxX/hwfhL8bv8= Instead of calling dev_err() and returning PTR_ERR(...) separately, use a single "return dev_err_probe" statement. Signed-off-by: Artur Weber Reviewed-by: Stanislav Jakubek --- Changes in v4: - Added this commit --- drivers/regulator/bcm590xx-regulator.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/regulator/bcm590xx-regulator.c b/drivers/regulator/bcm= 590xx-regulator.c index 9f0cda46b01506080ae5fa709104a8df4d174a8d..a17311fa30e4d48c0a4925778d7= bed486ac7a982 100644 --- a/drivers/regulator/bcm590xx-regulator.c +++ b/drivers/regulator/bcm590xx-regulator.c @@ -340,12 +340,10 @@ static int bcm590xx_probe(struct platform_device *pde= v) =20 rdev =3D devm_regulator_register(&pdev->dev, &pmu->desc[i], &config); - if (IS_ERR(rdev)) { - dev_err(bcm590xx->dev, - "failed to register %s regulator\n", - pdev->name); - return PTR_ERR(rdev); - } + if (IS_ERR(rdev)) + return dev_err_probe(bcm590xx->dev, PTR_ERR(rdev), + "failed to register %s regulator\n", + pdev->name); } =20 return 0; --=20 2.49.0 From nobody Thu Dec 18 22:25:24 2025 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2BF1020F085; Wed, 30 Apr 2025 07:07:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996850; cv=none; b=W/h6mIIOBqtnxORuiTpdA6BEJ6gQ+pHcTx1uhklg2f9ZM4VRt6hqoo3zrzSPJieJaFO+G0aMbA3s2XY9JliddZ0WfsAEgLHMOCe4/k+MvehKUWGwZOsb0lY+OKXoXk4FD4VbgosNYU5i5bBzNt/erbE9uEddRdlYAWQ3cAoiReA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996850; c=relaxed/simple; bh=/Q91RirYuDa4CyGsT2dDmowKYblY20IPto+sIcETrxQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RY8pG9sd4sGwagXkpDTlYPuIvMUlx/Sw3/Cf2gxHZbwSzP2wiYpnXgHOGOW1Xc9rrvJGXwapa69B6HxFNr50s5qr1JDwRN1SaEpk7ndyDlgxNp+OIfkysSUs8dtWLou/LLmJ43y18tTJJJDYPzqjkIJSqxSYjFU+GnuyERyjwuc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EH1Pw/D/; arc=none smtp.client-ip=209.85.208.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EH1Pw/D/" Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-5f4d6d6aaabso10834733a12.2; Wed, 30 Apr 2025 00:07:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745996846; x=1746601646; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=y0K6UVLuw68YjijDGDb9esqM0Bo7S4QeSoh8RnRa+xc=; b=EH1Pw/D/57Jb2Hn4YoAb44H7DUSihbC1lQv807Yx3wmCZ4hhwtBNxpcCz0OdACRx+/ 3wKiLoG+8TxjhU42eY3SzeyNU2nnH5kYEhhPBQm0y/7n1uxH0+dhekuTqFzBV8+0fkCw ysx1Gz7g9OhV2W+e2NCxHtOBHg1s3dcTjDq7w+tRME35m1cQCXIQzflIHiD7LV8CMnIW ZgJ73KTvuagcT3tdpFBdirczVV9pvoyTvdo70ujGL7PUIJGXtIlM9k+lxYBydvttwRq0 bPcBQfJEQrOOrKCMDIgM72LdFoFBM/vyEDZWN7NQr3lYsNDeks2pFl+XW3p3fv2FV9nE Ry1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745996846; x=1746601646; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y0K6UVLuw68YjijDGDb9esqM0Bo7S4QeSoh8RnRa+xc=; b=p0IpW12E/9a9P261oIGZfU+MH8AsJvEcgtX01pCpprVvITwl0Z6ZFbgzQivr7SaC/e hw6U3rBVHCOTd6H+Se+2AweN5lUntzmc4ZoX1yMp0P+kZXYa/yqY+CkUG9PVD1yW22EQ itBL8dxv8uVlW9IjlSqvhbPxdJfaxRGKHODTdWorIJtSNoOCLAkPI3TaqkwWj+fBxT2T WklNkAibh/m9j2vh3FMNZB8KzDfiAEidnPQV+Av6+u/Zk2zMRbtGQWqBnp+CCYIP7bBV uvo+QMp+o3rk6iXtaqE20jyCMZdR+6Xw11R8i0d1DY4IYxzbkeaO7L3tpfB2Dc9wXZQ2 U55Q== X-Forwarded-Encrypted: i=1; AJvYcCWB5syb0Vu9We668F+X2OIXj8kMHsdmxyJfnoLTIQ8jfTjsEVIBjxVP4eQ6g07egtZR7/QHEWZe+BdSzNoA@vger.kernel.org, AJvYcCX4ClToRDMBib9UmpWju189RCUrouBxksBTA1SpH4ub7EAMc2wT9qOF3SO48nTFi+S9fONhvUqCpdT8@vger.kernel.org X-Gm-Message-State: AOJu0YzGKq22NS3LZHEEPIfMXNf6WqRWSekhdjHpynfCH0+JQiBrxZvP T7vEUDProc0woBnSRNGdJqrf8FvCaFJJctIRz3uD4l4shgZUFDhI X-Gm-Gg: ASbGncu1zEwjTd19gQoBdJkhhNRp/+AJHdCF+OBLpD0MeG+jICoVD1bnRFPoHjX5Qac RpSKtYMkU0idhC7A0Z8Ckr5IW8wiMFI5MLTfpoNQiDztIv8H409Io/ws4FTPzyft9/l4HrjD0PB W+eq6d73Jcejx9RoNZyU7Vxmw/6mAbU50TOQ5mkXh/feKdF8tX9wnb7ONYS1z8RkQ3IAFAtcmpu gAQKKIyX2NWhwUUvTnhOLhTazV43Nf8R5Nq74hk7F5swLzVLS2Wq0G/PSMb54Fn4e63x9nQr6Q9 QcZb2U75PsTR2sk0KpCtB+kz8FcXMbc/s4mhlgzNPsY8XSTDBS2ZHc3Zeb/iRVJm5ZsRNGl3Hbg R+CAwOV0ToZAwIG5wnOXUOw== X-Google-Smtp-Source: AGHT+IFoUHVlIIaOjOsnbrvYC50AFoNPx+nSXJNxxI2Dyv0Ch0Y8S8mvP4fiX7q7arbQLL6kdSdaNA== X-Received: by 2002:a05:6402:3549:b0:5ed:1d8d:c6d8 with SMTP id 4fb4d7f45d1cf-5f89ae5b4f5mr1454961a12.9.1745996846347; Wed, 30 Apr 2025 00:07:26 -0700 (PDT) Received: from hex.my.domain (83.8.121.197.ipv4.supernova.orange.pl. [83.8.121.197]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f7013fec3csm8334314a12.19.2025.04.30.00.07.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 00:07:26 -0700 (PDT) From: Artur Weber Date: Wed, 30 Apr 2025 09:07:11 +0200 Subject: [PATCH v8 7/9] regulator: bcm590xx: Store regulator descriptions in table Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250430-bcm59054-v8-7-e4cf638169a4@gmail.com> References: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> In-Reply-To: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> To: Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Liam Girdwood , Mark Brown , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list Cc: Stanislav Jakubek , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745996831; l=16568; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=/Q91RirYuDa4CyGsT2dDmowKYblY20IPto+sIcETrxQ=; b=ouui3SM3dIBczGPZWL6ZJPBdYCq3WxASLe3Y4BAtLyP3bZrrzSEMaXoZ6Od/zggCDY/qL+ANO R8pkw1hqqeVBEAlMCc7PqJNIUJy4N/QQ5iAt5w9BtlHh5LBV6r3fUwv X-Developer-Key: i=aweber.kernel@gmail.com; a=ed25519; pk=RhDBfWbJEHqDibXbhNEBAnc9FMkyznGxX/hwfhL8bv8= Instead of filling in the regulator description programatically, store the data in a struct. This will make it a bit nicer to introduce support for other BCM590xx chips besides the BCM59056. To do this, add a new struct type, bcm590xx_reg_data, to store all of the necessary information. Drop the old IS_LDO, IS_GPLDO... macros in favor of the "type" field in this struct. Adapt the old bcm590xx_reg struct to the new types. Signed-off-by: Artur Weber Reviewed-by: Stanislav Jakubek --- Changes in v6: - Adapt to changes in MFD header Changes in v5: - Move the bcm590xx_regmap_type enum to the bcm590xx.h header - Rename bcm590xx_reg_info to bcm590xx_reg_data Changes in v4: - Replace incorrect return in regmap selection error handling - Use switch statement for regmap selection Changes in v3: - Added this commit --- drivers/regulator/bcm590xx-regulator.c | 473 ++++++++++++++++++++++-------= ---- include/linux/mfd/bcm590xx.h | 6 + 2 files changed, 322 insertions(+), 157 deletions(-) diff --git a/drivers/regulator/bcm590xx-regulator.c b/drivers/regulator/bcm= 590xx-regulator.c index a17311fa30e4d48c0a4925778d7bed486ac7a982..c2427ea166626bdc1eb7cfb9999= 7d95e5125ed91 100644 --- a/drivers/regulator/bcm590xx-regulator.c +++ b/drivers/regulator/bcm590xx-regulator.c @@ -20,6 +20,18 @@ =20 /* I2C slave 0 registers */ #define BCM590XX_RFLDOPMCTRL1 0x60 +#define BCM590XX_CAMLDO1PMCTRL1 0x62 +#define BCM590XX_CAMLDO2PMCTRL1 0x64 +#define BCM590XX_SIMLDO1PMCTRL1 0x66 +#define BCM590XX_SIMLDO2PMCTRL1 0x68 +#define BCM590XX_SDLDOPMCTRL1 0x6a +#define BCM590XX_SDXLDOPMCTRL1 0x6c +#define BCM590XX_MMCLDO1PMCTRL1 0x6e +#define BCM590XX_MMCLDO2PMCTRL1 0x70 +#define BCM590XX_AUDLDOPMCTRL1 0x72 +#define BCM590XX_MICLDOPMCTRL1 0x74 +#define BCM590XX_USBLDOPMCTRL1 0x76 +#define BCM590XX_VIBLDOPMCTRL1 0x78 #define BCM590XX_IOSR1PMCTRL1 0x7a #define BCM590XX_IOSR2PMCTRL1 0x7c #define BCM590XX_CSRPMCTRL1 0x7e @@ -28,7 +40,25 @@ #define BCM590XX_MSRPMCTRL1 0x8a #define BCM590XX_VSRPMCTRL1 0x8e #define BCM590XX_RFLDOCTRL 0x96 +#define BCM590XX_CAMLDO1CTRL 0x97 +#define BCM590XX_CAMLDO2CTRL 0x98 +#define BCM590XX_SIMLDO1CTRL 0x99 +#define BCM590XX_SIMLDO2CTRL 0x9a +#define BCM590XX_SDLDOCTRL 0x9b +#define BCM590XX_SDXLDOCTRL 0x9c +#define BCM590XX_MMCLDO1CTRL 0x9d +#define BCM590XX_MMCLDO2CTRL 0x9e +#define BCM590XX_AUDLDOCTRL 0x9f +#define BCM590XX_MICLDOCTRL 0xa0 +#define BCM590XX_USBLDOCTRL 0xa1 +#define BCM590XX_VIBLDOCTRL 0xa2 #define BCM590XX_CSRVOUT1 0xc0 +#define BCM590XX_IOSR1VOUT1 0xc3 +#define BCM590XX_IOSR2VOUT1 0xc6 +#define BCM590XX_MSRVOUT1 0xc9 +#define BCM590XX_SDSR1VOUT1 0xcc +#define BCM590XX_SDSR2VOUT1 0xcf +#define BCM590XX_VSRVOUT1 0xd2 =20 /* I2C slave 1 registers */ #define BCM590XX_GPLDO5PMCTRL1 0x16 @@ -94,11 +124,6 @@ =20 #define BCM590XX_NUM_REGS 27 =20 -#define BCM590XX_REG_IS_LDO(n) (n < BCM590XX_REG_CSR) -#define BCM590XX_REG_IS_GPLDO(n) \ - ((n > BCM590XX_REG_VSR) && (n < BCM590XX_REG_VBUS)) -#define BCM590XX_REG_IS_VBUS(n) (n =3D=3D BCM590XX_REG_VBUS) - /* LDO group A: supported voltages in microvolts */ static const unsigned int ldo_a_table[] =3D { 1200000, 1800000, 2500000, 2700000, 2800000, @@ -111,10 +136,6 @@ static const unsigned int ldo_c_table[] =3D { 2900000, 3000000, 3300000, }; =20 -static const unsigned int ldo_vbus[] =3D { - 5000000, -}; - /* DCDC group CSR: supported voltages in microvolts */ static const struct linear_range dcdc_csr_ranges[] =3D { REGULATOR_LINEAR_RANGE(860000, 2, 50, 10000), @@ -137,115 +158,25 @@ static const struct linear_range dcdc_sdsr1_ranges[]= =3D { REGULATOR_LINEAR_RANGE(900000, 52, 63, 0), }; =20 -struct bcm590xx_info { - const char *name; - const char *vin_name; - u8 n_voltages; - const unsigned int *volt_table; - u8 n_linear_ranges; - const struct linear_range *linear_ranges; +enum bcm590xx_reg_type { + BCM590XX_REG_TYPE_LDO, + BCM590XX_REG_TYPE_GPLDO, + BCM590XX_REG_TYPE_SR, + BCM590XX_REG_TYPE_VBUS }; =20 -#define BCM590XX_REG_TABLE(_name, _table) \ - { \ - .name =3D #_name, \ - .n_voltages =3D ARRAY_SIZE(_table), \ - .volt_table =3D _table, \ - } - -#define BCM590XX_REG_RANGES(_name, _ranges) \ - { \ - .name =3D #_name, \ - .n_voltages =3D 64, \ - .n_linear_ranges =3D ARRAY_SIZE(_ranges), \ - .linear_ranges =3D _ranges, \ - } - -static struct bcm590xx_info bcm590xx_regs[] =3D { - BCM590XX_REG_TABLE(rfldo, ldo_a_table), - BCM590XX_REG_TABLE(camldo1, ldo_c_table), - BCM590XX_REG_TABLE(camldo2, ldo_c_table), - BCM590XX_REG_TABLE(simldo1, ldo_a_table), - BCM590XX_REG_TABLE(simldo2, ldo_a_table), - BCM590XX_REG_TABLE(sdldo, ldo_c_table), - BCM590XX_REG_TABLE(sdxldo, ldo_a_table), - BCM590XX_REG_TABLE(mmcldo1, ldo_a_table), - BCM590XX_REG_TABLE(mmcldo2, ldo_a_table), - BCM590XX_REG_TABLE(audldo, ldo_a_table), - BCM590XX_REG_TABLE(micldo, ldo_a_table), - BCM590XX_REG_TABLE(usbldo, ldo_a_table), - BCM590XX_REG_TABLE(vibldo, ldo_c_table), - BCM590XX_REG_RANGES(csr, dcdc_csr_ranges), - BCM590XX_REG_RANGES(iosr1, dcdc_iosr1_ranges), - BCM590XX_REG_RANGES(iosr2, dcdc_iosr1_ranges), - BCM590XX_REG_RANGES(msr, dcdc_iosr1_ranges), - BCM590XX_REG_RANGES(sdsr1, dcdc_sdsr1_ranges), - BCM590XX_REG_RANGES(sdsr2, dcdc_iosr1_ranges), - BCM590XX_REG_RANGES(vsr, dcdc_iosr1_ranges), - BCM590XX_REG_TABLE(gpldo1, ldo_a_table), - BCM590XX_REG_TABLE(gpldo2, ldo_a_table), - BCM590XX_REG_TABLE(gpldo3, ldo_a_table), - BCM590XX_REG_TABLE(gpldo4, ldo_a_table), - BCM590XX_REG_TABLE(gpldo5, ldo_a_table), - BCM590XX_REG_TABLE(gpldo6, ldo_a_table), - BCM590XX_REG_TABLE(vbus, ldo_vbus), +struct bcm590xx_reg_data { + enum bcm590xx_reg_type type; + enum bcm590xx_regmap_type regmap; + const struct regulator_desc desc; }; =20 struct bcm590xx_reg { - struct regulator_desc *desc; struct bcm590xx *mfd; + unsigned int n_regulators; + const struct bcm590xx_reg_data *regs; }; =20 -static int bcm590xx_get_vsel_register(int id) -{ - if (BCM590XX_REG_IS_LDO(id)) - return BCM590XX_RFLDOCTRL + id; - else if (BCM590XX_REG_IS_GPLDO(id)) - return BCM590XX_GPLDO1CTRL + id; - else - return BCM590XX_CSRVOUT1 + (id - BCM590XX_REG_CSR) * 3; -} - -static int bcm590xx_get_enable_register(int id) -{ - int reg =3D 0; - - if (BCM590XX_REG_IS_LDO(id)) - reg =3D BCM590XX_RFLDOPMCTRL1 + id * 2; - else if (BCM590XX_REG_IS_GPLDO(id)) - reg =3D BCM590XX_GPLDO1PMCTRL1 + id * 2; - else - switch (id) { - case BCM590XX_REG_CSR: - reg =3D BCM590XX_CSRPMCTRL1; - break; - case BCM590XX_REG_IOSR1: - reg =3D BCM590XX_IOSR1PMCTRL1; - break; - case BCM590XX_REG_IOSR2: - reg =3D BCM590XX_IOSR2PMCTRL1; - break; - case BCM590XX_REG_MSR: - reg =3D BCM590XX_MSRPMCTRL1; - break; - case BCM590XX_REG_SDSR1: - reg =3D BCM590XX_SDSR1PMCTRL1; - break; - case BCM590XX_REG_SDSR2: - reg =3D BCM590XX_SDSR2PMCTRL1; - break; - case BCM590XX_REG_VSR: - reg =3D BCM590XX_VSRPMCTRL1; - break; - case BCM590XX_REG_VBUS: - reg =3D BCM590XX_OTG_CTRL; - break; - } - - - return reg; -} - static const struct regulator_ops bcm590xx_ops_ldo =3D { .is_enabled =3D regulator_is_enabled_regmap, .enable =3D regulator_enable_regmap, @@ -272,73 +203,301 @@ static const struct regulator_ops bcm590xx_ops_vbus = =3D { .disable =3D regulator_disable_regmap, }; =20 +#define BCM590XX_REG_DESC(_name, _name_lower) \ + .id =3D BCM590XX_REG_##_name, \ + .name =3D #_name_lower, \ + .of_match =3D of_match_ptr(#_name_lower), \ + .regulators_node =3D of_match_ptr("regulators"), \ + .type =3D REGULATOR_VOLTAGE, \ + .owner =3D THIS_MODULE \ + +#define BCM590XX_LDO_DESC(_name, _name_lower, _table) \ + BCM590XX_REG_DESC(_name, _name_lower), \ + .ops =3D &bcm590xx_ops_ldo, \ + .n_voltages =3D ARRAY_SIZE(_table), \ + .volt_table =3D _table, \ + .vsel_reg =3D BCM590XX_##_name##CTRL, \ + .vsel_mask =3D BCM590XX_LDO_VSEL_MASK, \ + .enable_reg =3D BCM590XX_##_name##PMCTRL1, \ + .enable_mask =3D BCM590XX_REG_ENABLE, \ + .enable_is_inverted =3D true + +#define BCM590XX_SR_DESC(_name, _name_lower, _ranges) \ + BCM590XX_REG_DESC(_name, _name_lower), \ + .ops =3D &bcm590xx_ops_dcdc, \ + .n_voltages =3D 64, \ + .linear_ranges =3D _ranges, \ + .n_linear_ranges =3D ARRAY_SIZE(_ranges), \ + .vsel_reg =3D BCM590XX_##_name##VOUT1, \ + .vsel_mask =3D BCM590XX_SR_VSEL_MASK, \ + .enable_reg =3D BCM590XX_##_name##PMCTRL1, \ + .enable_mask =3D BCM590XX_REG_ENABLE, \ + .enable_is_inverted =3D true + +static const struct bcm590xx_reg_data bcm590xx_regs[BCM590XX_NUM_REGS] =3D= { + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_LDO_DESC(RFLDO, rfldo, ldo_a_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_LDO_DESC(CAMLDO1, camldo1, ldo_c_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_LDO_DESC(CAMLDO2, camldo2, ldo_c_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_LDO_DESC(SIMLDO1, simldo1, ldo_a_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_LDO_DESC(SIMLDO2, simldo2, ldo_a_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_LDO_DESC(SDLDO, sdldo, ldo_c_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_LDO_DESC(SDXLDO, sdxldo, ldo_a_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_LDO_DESC(MMCLDO1, mmcldo1, ldo_a_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_LDO_DESC(MMCLDO2, mmcldo2, ldo_a_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_LDO_DESC(AUDLDO, audldo, ldo_a_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_LDO_DESC(MICLDO, micldo, ldo_a_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_LDO_DESC(USBLDO, usbldo, ldo_a_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_LDO_DESC(VIBLDO, vibldo, ldo_c_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_SR_DESC(CSR, csr, dcdc_csr_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_SR_DESC(IOSR1, iosr1, dcdc_iosr1_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_SR_DESC(IOSR2, iosr2, dcdc_iosr1_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_SR_DESC(MSR, msr, dcdc_iosr1_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_SR_DESC(SDSR1, sdsr1, dcdc_sdsr1_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_SR_DESC(SDSR2, sdsr2, dcdc_iosr1_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM590XX_SR_DESC(VSR, vsr, dcdc_iosr1_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM590XX_LDO_DESC(GPLDO1, gpldo1, ldo_a_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM590XX_LDO_DESC(GPLDO2, gpldo2, ldo_a_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM590XX_LDO_DESC(GPLDO3, gpldo3, ldo_a_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM590XX_LDO_DESC(GPLDO4, gpldo4, ldo_a_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM590XX_LDO_DESC(GPLDO5, gpldo5, ldo_a_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM590XX_LDO_DESC(GPLDO6, gpldo6, ldo_a_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_VBUS, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM590XX_REG_DESC(VBUS, vbus), + .ops =3D &bcm590xx_ops_vbus, + .n_voltages =3D 1, + .fixed_uV =3D 5000000, + .enable_reg =3D BCM590XX_OTG_CTRL, + .enable_mask =3D BCM590XX_VBUS_ENABLE, + }, + }, +}; + static int bcm590xx_probe(struct platform_device *pdev) { struct bcm590xx *bcm590xx =3D dev_get_drvdata(pdev->dev.parent); struct bcm590xx_reg *pmu; + const struct bcm590xx_reg_data *info; struct regulator_config config =3D { }; - struct bcm590xx_info *info; struct regulator_dev *rdev; - int i; + unsigned int i; =20 pmu =3D devm_kzalloc(&pdev->dev, sizeof(*pmu), GFP_KERNEL); if (!pmu) return -ENOMEM; =20 pmu->mfd =3D bcm590xx; + pmu->n_regulators =3D BCM590XX_NUM_REGS; + pmu->regs =3D bcm590xx_regs; =20 platform_set_drvdata(pdev, pmu); =20 - pmu->desc =3D devm_kcalloc(&pdev->dev, - BCM590XX_NUM_REGS, - sizeof(struct regulator_desc), - GFP_KERNEL); - if (!pmu->desc) - return -ENOMEM; - - info =3D bcm590xx_regs; - - for (i =3D 0; i < BCM590XX_NUM_REGS; i++, info++) { - /* Register the regulators */ - pmu->desc[i].name =3D info->name; - pmu->desc[i].of_match =3D of_match_ptr(info->name); - pmu->desc[i].regulators_node =3D of_match_ptr("regulators"); - pmu->desc[i].supply_name =3D info->vin_name; - pmu->desc[i].id =3D i; - pmu->desc[i].volt_table =3D info->volt_table; - pmu->desc[i].n_voltages =3D info->n_voltages; - pmu->desc[i].linear_ranges =3D info->linear_ranges; - pmu->desc[i].n_linear_ranges =3D info->n_linear_ranges; - - if ((BCM590XX_REG_IS_LDO(i)) || (BCM590XX_REG_IS_GPLDO(i))) { - pmu->desc[i].ops =3D &bcm590xx_ops_ldo; - pmu->desc[i].vsel_mask =3D BCM590XX_LDO_VSEL_MASK; - } else if (BCM590XX_REG_IS_VBUS(i)) - pmu->desc[i].ops =3D &bcm590xx_ops_vbus; - else { - pmu->desc[i].ops =3D &bcm590xx_ops_dcdc; - pmu->desc[i].vsel_mask =3D BCM590XX_SR_VSEL_MASK; - } - - if (BCM590XX_REG_IS_VBUS(i)) - pmu->desc[i].enable_mask =3D BCM590XX_VBUS_ENABLE; - else { - pmu->desc[i].vsel_reg =3D bcm590xx_get_vsel_register(i); - pmu->desc[i].enable_is_inverted =3D true; - pmu->desc[i].enable_mask =3D BCM590XX_REG_ENABLE; - } - pmu->desc[i].enable_reg =3D bcm590xx_get_enable_register(i); - pmu->desc[i].type =3D REGULATOR_VOLTAGE; - pmu->desc[i].owner =3D THIS_MODULE; + /* Register the regulators */ + for (i =3D 0; i < pmu->n_regulators; i++) { + info =3D &pmu->regs[i]; =20 config.dev =3D bcm590xx->dev; config.driver_data =3D pmu; - if (BCM590XX_REG_IS_GPLDO(i) || BCM590XX_REG_IS_VBUS(i)) - config.regmap =3D bcm590xx->regmap_sec; - else + + switch (info->regmap) { + case BCM590XX_REGMAP_PRI: config.regmap =3D bcm590xx->regmap_pri; + break; + case BCM590XX_REGMAP_SEC: + config.regmap =3D bcm590xx->regmap_sec; + break; + default: + dev_err(bcm590xx->dev, + "invalid regmap for %s regulator; this is a driver bug\n", + pdev->name); + return -EINVAL; + } =20 - rdev =3D devm_regulator_register(&pdev->dev, &pmu->desc[i], + rdev =3D devm_regulator_register(&pdev->dev, &info->desc, &config); if (IS_ERR(rdev)) return dev_err_probe(bcm590xx->dev, PTR_ERR(rdev), diff --git a/include/linux/mfd/bcm590xx.h b/include/linux/mfd/bcm590xx.h index fbc458e94bef923ca1b69afe2cac944adf6fedf8..5a5783abd47b9a6bb6f9bb3a8ca= fddbd01aa7fcc 100644 --- a/include/linux/mfd/bcm590xx.h +++ b/include/linux/mfd/bcm590xx.h @@ -27,6 +27,12 @@ #define BCM59056_REV_DIGITAL_B0 2 #define BCM59056_REV_ANALOG_B0 2 =20 +/* regmap types */ +enum bcm590xx_regmap_type { + BCM590XX_REGMAP_PRI, + BCM590XX_REGMAP_SEC, +}; + /* max register address */ #define BCM590XX_MAX_REGISTER_PRI 0xe7 #define BCM590XX_MAX_REGISTER_SEC 0xf0 --=20 2.49.0 From nobody Thu Dec 18 22:25:24 2025 Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40CFC1EFF81; Wed, 30 Apr 2025 07:07:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996852; cv=none; b=JMH6YuUHN66HTaLzm3zNP+pFrOTSb14R9UdLXoG5gQG7yn+PuCYYUpvrwzgiFpym+u8GnUCnDeaXp7zcfvYxW3yd6aoTi05rqMNNB9l0pPBcvX2Ci1VcFja7m/UR32JC5mbE1Z+XKOHMMlvp3dh/eKWR8reqof7vazxE5CHPtuw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996852; c=relaxed/simple; bh=c0tJmmCnUeOZyIArkXvIiUpPqsv4cYLd1LFqYmvQkiQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uHq8rGBbbou5/ZhW4HF1goYm0y2UciIqw3j9fiWH4bsfoihI9VRKpQvvAo7w+RyjPOpmVNgX76bTYghjG3Golaxq7rQSHpFHusoFW8ooSdKcAvqjT/pfmG4Svgn8WIgCPVz6WLzxYViI/ZoRV+hQQbuHlDTU4jqBm6Auv2xpJC8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PNflhehP; arc=none smtp.client-ip=209.85.208.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PNflhehP" Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-5f3f04b5dbcso11031865a12.1; Wed, 30 Apr 2025 00:07:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745996848; x=1746601648; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=9cqpEx5IlRI4YMVXAf0TsRZsn7b3lNTh3Rru00ptozE=; b=PNflhehPs2vkUWjMlgemx4CRpXj8zddiioQ9B2eJORAd9R1uay7ra10JH8O1sLTkKz BFOtgToLQkGNo8xMgQWYn08pi+Zb7DYnz/qLyYaS5RDKE8nQPD2Zy79JBcbkHuf6xuL3 qF5f8jwT9P3P5qJBVD1Uk2Ri3CPKEomSWqCu6b2aRuOjLOJftcUMGrl5q6BWtNq/1Wvp eqDtAvtyahHvtgV7qKNxY2l/d7/W9FfC7QReGm0DN941TpZMvwea4yUaUy/h2VMJjAGP +UC7eSb6n7Z9OnIqcMGjFCnsThWTPus0zNnyMotQA/F1CHUYMXspum0oOxAjTa2ZWqoO Gd9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745996848; x=1746601648; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9cqpEx5IlRI4YMVXAf0TsRZsn7b3lNTh3Rru00ptozE=; b=rUVhFbhT7P9axHCjEo0klEUPCKk9cUOpSq8dhRoNkxsueXAWZO/zDP4opPPe3gDjYh 2ZtJ74OKZcTRkcH5U1EcUjJZ9aRqyMS/GjuEny4ORoSOqj/+Epoju+cCbPH/x8cdgEni ApNVuZc8zHqhj3l20kg8ytxXWoVXciM4LZpBTjeWJk6CT4e4q8e5YD8NKlkf9YC3TIZ3 v6F7jKM4Qsvt7MWoOuGatyQbeMXkSLZAcvgQvVHXgFsG8iv0N5jfH8lPkbMOjiC6znIP jzbDbOrDGKjeWsKvtZYNAp/rQklabEOLiKP1PS0sdbHwuNEk+UlPYvMKdlAfcIGlOgdx GmQw== X-Forwarded-Encrypted: i=1; AJvYcCVmxffJBy71TINs9JDgfzPB30exhG64i3goqSHJrodW7ZHtqqfs+LmXw/chK476mvwBL4lOH+Pvxr3vik0S@vger.kernel.org, AJvYcCWYQAFyKA/o9isVFduU0ljthGf5l54DoytgTY5uZfmhyf0iLqyBPZnjfOVq245WEXQgREvJ3+isCA3q@vger.kernel.org X-Gm-Message-State: AOJu0YymU8qIIyuj0qy/H0pD0s9AiXyIQbBOseEdVr7msHe1Oqafx+U8 AR2fkwd5LGFrgSTuhWhrwbh9ZEJVNGzCNAFSDU3y0aCzj3uafe81 X-Gm-Gg: ASbGncvFfxKxp1GF/h4A/PBniR8IcNakwA7ZDB/WPsRMiTJ2GWptTG/j+fgpq714yRI FhGoguzA0ExOOwMBzozgC1M7o8xiCQ6tFhIvHcoKXSpIx/3jmDA2Ch90TkT+tNrcLfb23l0Tk/q H9ydRuzP9nGMk46CJqFnwkPzca9XUCj59pMi8FjPAjQeB/sbm2BwpBAOciJ6H7OKqo3IPlFbcZC eenzZ4oU2M77W1sdXJG8uhTEvJCAnTWKnuK0e/YQHTYIXiuQPSUT0CoERFnEPwG4E6Iodewc95Y gjZUab7edtM4ICGUolPzG5Vt7n13VqZ4jE8LasrHFOaWr7tGE6yVJOBTZTF0wFT9HqYh/vVVT4J NkUN/3lk9fJw= X-Google-Smtp-Source: AGHT+IHtIyQrgA81OxhQpz8Ef3LQQfXlVZmgS9b4cayUg7aqSAsn7+4VqLKjjIsWlZSloqYCcnEN2A== X-Received: by 2002:a05:6402:28c4:b0:5ed:2e84:4f1f with SMTP id 4fb4d7f45d1cf-5f89bf170cfmr1490027a12.22.1745996848449; Wed, 30 Apr 2025 00:07:28 -0700 (PDT) Received: from hex.my.domain (83.8.121.197.ipv4.supernova.orange.pl. [83.8.121.197]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f7013fec3csm8334314a12.19.2025.04.30.00.07.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 00:07:28 -0700 (PDT) From: Artur Weber Date: Wed, 30 Apr 2025 09:07:12 +0200 Subject: [PATCH v8 8/9] regulator: bcm590xx: Rename BCM59056-specific data as such Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250430-bcm59054-v8-8-e4cf638169a4@gmail.com> References: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> In-Reply-To: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> To: Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Liam Girdwood , Mark Brown , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list Cc: Stanislav Jakubek , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745996831; l=21159; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=c0tJmmCnUeOZyIArkXvIiUpPqsv4cYLd1LFqYmvQkiQ=; b=dEzz4NTq4us0Tk75LB7vROJb9/60JlMpRqITYoYjPc1uZJU0yJcYLFNfGYwwLXzTG5yMUs4tc 3xp5SABibjtBXzf2lKAEwOJo7OvTuk8L0Tba5NbHQKN12BsKrvkmqRX X-Developer-Key: i=aweber.kernel@gmail.com; a=ed25519; pk=RhDBfWbJEHqDibXbhNEBAnc9FMkyznGxX/hwfhL8bv8= Previously, the driver used the BCM590XX prefix for register data specific to the BCM59056. As we will be introducing other regulators to this driver as well, make the BCM59056-specific values use the BCM59056 prefix. Signed-off-by: Artur Weber Reviewed-by: Stanislav Jakubek --- Changes in v5: - Adapt to rename of bcm590xx_reg_info to bcm590xx_reg_data Changes in v4: - Drop unused BCM590XX_MAX_NUM_REGS constant Changes in v3: - Added this commit --- drivers/regulator/bcm590xx-regulator.c | 369 +++++++++++++++++------------= ---- 1 file changed, 189 insertions(+), 180 deletions(-) diff --git a/drivers/regulator/bcm590xx-regulator.c b/drivers/regulator/bcm= 590xx-regulator.c index c2427ea166626bdc1eb7cfb99997d95e5125ed91..f35b2b72e46f70496e16be52445= 29a5d95d0546d 100644 --- a/drivers/regulator/bcm590xx-regulator.c +++ b/drivers/regulator/bcm590xx-regulator.c @@ -18,146 +18,11 @@ #include #include =20 -/* I2C slave 0 registers */ -#define BCM590XX_RFLDOPMCTRL1 0x60 -#define BCM590XX_CAMLDO1PMCTRL1 0x62 -#define BCM590XX_CAMLDO2PMCTRL1 0x64 -#define BCM590XX_SIMLDO1PMCTRL1 0x66 -#define BCM590XX_SIMLDO2PMCTRL1 0x68 -#define BCM590XX_SDLDOPMCTRL1 0x6a -#define BCM590XX_SDXLDOPMCTRL1 0x6c -#define BCM590XX_MMCLDO1PMCTRL1 0x6e -#define BCM590XX_MMCLDO2PMCTRL1 0x70 -#define BCM590XX_AUDLDOPMCTRL1 0x72 -#define BCM590XX_MICLDOPMCTRL1 0x74 -#define BCM590XX_USBLDOPMCTRL1 0x76 -#define BCM590XX_VIBLDOPMCTRL1 0x78 -#define BCM590XX_IOSR1PMCTRL1 0x7a -#define BCM590XX_IOSR2PMCTRL1 0x7c -#define BCM590XX_CSRPMCTRL1 0x7e -#define BCM590XX_SDSR1PMCTRL1 0x82 -#define BCM590XX_SDSR2PMCTRL1 0x86 -#define BCM590XX_MSRPMCTRL1 0x8a -#define BCM590XX_VSRPMCTRL1 0x8e -#define BCM590XX_RFLDOCTRL 0x96 -#define BCM590XX_CAMLDO1CTRL 0x97 -#define BCM590XX_CAMLDO2CTRL 0x98 -#define BCM590XX_SIMLDO1CTRL 0x99 -#define BCM590XX_SIMLDO2CTRL 0x9a -#define BCM590XX_SDLDOCTRL 0x9b -#define BCM590XX_SDXLDOCTRL 0x9c -#define BCM590XX_MMCLDO1CTRL 0x9d -#define BCM590XX_MMCLDO2CTRL 0x9e -#define BCM590XX_AUDLDOCTRL 0x9f -#define BCM590XX_MICLDOCTRL 0xa0 -#define BCM590XX_USBLDOCTRL 0xa1 -#define BCM590XX_VIBLDOCTRL 0xa2 -#define BCM590XX_CSRVOUT1 0xc0 -#define BCM590XX_IOSR1VOUT1 0xc3 -#define BCM590XX_IOSR2VOUT1 0xc6 -#define BCM590XX_MSRVOUT1 0xc9 -#define BCM590XX_SDSR1VOUT1 0xcc -#define BCM590XX_SDSR2VOUT1 0xcf -#define BCM590XX_VSRVOUT1 0xd2 - -/* I2C slave 1 registers */ -#define BCM590XX_GPLDO5PMCTRL1 0x16 -#define BCM590XX_GPLDO6PMCTRL1 0x18 -#define BCM590XX_GPLDO1CTRL 0x1a -#define BCM590XX_GPLDO2CTRL 0x1b -#define BCM590XX_GPLDO3CTRL 0x1c -#define BCM590XX_GPLDO4CTRL 0x1d -#define BCM590XX_GPLDO5CTRL 0x1e -#define BCM590XX_GPLDO6CTRL 0x1f -#define BCM590XX_OTG_CTRL 0x40 -#define BCM590XX_GPLDO1PMCTRL1 0x57 -#define BCM590XX_GPLDO2PMCTRL1 0x59 -#define BCM590XX_GPLDO3PMCTRL1 0x5b -#define BCM590XX_GPLDO4PMCTRL1 0x5d - #define BCM590XX_REG_ENABLE BIT(7) #define BCM590XX_VBUS_ENABLE BIT(2) #define BCM590XX_LDO_VSEL_MASK GENMASK(5, 3) #define BCM590XX_SR_VSEL_MASK GENMASK(5, 0) =20 -/* - * RFLDO to VSR regulators are - * accessed via I2C slave 0 - */ - -/* LDO regulator IDs */ -#define BCM590XX_REG_RFLDO 0 -#define BCM590XX_REG_CAMLDO1 1 -#define BCM590XX_REG_CAMLDO2 2 -#define BCM590XX_REG_SIMLDO1 3 -#define BCM590XX_REG_SIMLDO2 4 -#define BCM590XX_REG_SDLDO 5 -#define BCM590XX_REG_SDXLDO 6 -#define BCM590XX_REG_MMCLDO1 7 -#define BCM590XX_REG_MMCLDO2 8 -#define BCM590XX_REG_AUDLDO 9 -#define BCM590XX_REG_MICLDO 10 -#define BCM590XX_REG_USBLDO 11 -#define BCM590XX_REG_VIBLDO 12 - -/* DCDC regulator IDs */ -#define BCM590XX_REG_CSR 13 -#define BCM590XX_REG_IOSR1 14 -#define BCM590XX_REG_IOSR2 15 -#define BCM590XX_REG_MSR 16 -#define BCM590XX_REG_SDSR1 17 -#define BCM590XX_REG_SDSR2 18 -#define BCM590XX_REG_VSR 19 - -/* - * GPLDO1 to VBUS regulators are - * accessed via I2C slave 1 - */ - -#define BCM590XX_REG_GPLDO1 20 -#define BCM590XX_REG_GPLDO2 21 -#define BCM590XX_REG_GPLDO3 22 -#define BCM590XX_REG_GPLDO4 23 -#define BCM590XX_REG_GPLDO5 24 -#define BCM590XX_REG_GPLDO6 25 -#define BCM590XX_REG_VBUS 26 - -#define BCM590XX_NUM_REGS 27 - -/* LDO group A: supported voltages in microvolts */ -static const unsigned int ldo_a_table[] =3D { - 1200000, 1800000, 2500000, 2700000, 2800000, - 2900000, 3000000, 3300000, -}; - -/* LDO group C: supported voltages in microvolts */ -static const unsigned int ldo_c_table[] =3D { - 3100000, 1800000, 2500000, 2700000, 2800000, - 2900000, 3000000, 3300000, -}; - -/* DCDC group CSR: supported voltages in microvolts */ -static const struct linear_range dcdc_csr_ranges[] =3D { - REGULATOR_LINEAR_RANGE(860000, 2, 50, 10000), - REGULATOR_LINEAR_RANGE(1360000, 51, 55, 20000), - REGULATOR_LINEAR_RANGE(900000, 56, 63, 0), -}; - -/* DCDC group IOSR1: supported voltages in microvolts */ -static const struct linear_range dcdc_iosr1_ranges[] =3D { - REGULATOR_LINEAR_RANGE(860000, 2, 51, 10000), - REGULATOR_LINEAR_RANGE(1500000, 52, 52, 0), - REGULATOR_LINEAR_RANGE(1800000, 53, 53, 0), - REGULATOR_LINEAR_RANGE(900000, 54, 63, 0), -}; - -/* DCDC group SDSR1: supported voltages in microvolts */ -static const struct linear_range dcdc_sdsr1_ranges[] =3D { - REGULATOR_LINEAR_RANGE(860000, 2, 50, 10000), - REGULATOR_LINEAR_RANGE(1340000, 51, 51, 0), - REGULATOR_LINEAR_RANGE(900000, 52, 63, 0), -}; - enum bcm590xx_reg_type { BCM590XX_REG_TYPE_LDO, BCM590XX_REG_TYPE_GPLDO, @@ -203,43 +68,187 @@ static const struct regulator_ops bcm590xx_ops_vbus = =3D { .disable =3D regulator_disable_regmap, }; =20 -#define BCM590XX_REG_DESC(_name, _name_lower) \ - .id =3D BCM590XX_REG_##_name, \ +#define BCM590XX_REG_DESC(_model, _name, _name_lower) \ + .id =3D _model##_REG_##_name, \ .name =3D #_name_lower, \ .of_match =3D of_match_ptr(#_name_lower), \ .regulators_node =3D of_match_ptr("regulators"), \ .type =3D REGULATOR_VOLTAGE, \ .owner =3D THIS_MODULE \ =20 -#define BCM590XX_LDO_DESC(_name, _name_lower, _table) \ - BCM590XX_REG_DESC(_name, _name_lower), \ +#define BCM590XX_LDO_DESC(_model, _model_lower, _name, _name_lower, _table= ) \ + BCM590XX_REG_DESC(_model, _name, _name_lower), \ .ops =3D &bcm590xx_ops_ldo, \ - .n_voltages =3D ARRAY_SIZE(_table), \ - .volt_table =3D _table, \ - .vsel_reg =3D BCM590XX_##_name##CTRL, \ + .n_voltages =3D ARRAY_SIZE(_model_lower##_##_table), \ + .volt_table =3D _model_lower##_##_table, \ + .vsel_reg =3D _model##_##_name##CTRL, \ .vsel_mask =3D BCM590XX_LDO_VSEL_MASK, \ - .enable_reg =3D BCM590XX_##_name##PMCTRL1, \ + .enable_reg =3D _model##_##_name##PMCTRL1, \ .enable_mask =3D BCM590XX_REG_ENABLE, \ .enable_is_inverted =3D true =20 -#define BCM590XX_SR_DESC(_name, _name_lower, _ranges) \ - BCM590XX_REG_DESC(_name, _name_lower), \ +#define BCM590XX_SR_DESC(_model, _model_lower, _name, _name_lower, _ranges= ) \ + BCM590XX_REG_DESC(_model, _name, _name_lower), \ .ops =3D &bcm590xx_ops_dcdc, \ .n_voltages =3D 64, \ - .linear_ranges =3D _ranges, \ - .n_linear_ranges =3D ARRAY_SIZE(_ranges), \ - .vsel_reg =3D BCM590XX_##_name##VOUT1, \ + .linear_ranges =3D _model_lower##_##_ranges, \ + .n_linear_ranges =3D ARRAY_SIZE(_model_lower##_##_ranges), \ + .vsel_reg =3D _model##_##_name##VOUT1, \ .vsel_mask =3D BCM590XX_SR_VSEL_MASK, \ - .enable_reg =3D BCM590XX_##_name##PMCTRL1, \ + .enable_reg =3D _model##_##_name##PMCTRL1, \ .enable_mask =3D BCM590XX_REG_ENABLE, \ .enable_is_inverted =3D true =20 -static const struct bcm590xx_reg_data bcm590xx_regs[BCM590XX_NUM_REGS] =3D= { +#define BCM59056_REG_DESC(_name, _name_lower) \ + BCM590XX_REG_DESC(BCM59056, _name, _name_lower) +#define BCM59056_LDO_DESC(_name, _name_lower, _table) \ + BCM590XX_LDO_DESC(BCM59056, bcm59056, _name, _name_lower, _table) +#define BCM59056_SR_DESC(_name, _name_lower, _ranges) \ + BCM590XX_SR_DESC(BCM59056, bcm59056, _name, _name_lower, _ranges) + +/* BCM59056 data */ + +/* I2C slave 0 registers */ +#define BCM59056_RFLDOPMCTRL1 0x60 +#define BCM59056_CAMLDO1PMCTRL1 0x62 +#define BCM59056_CAMLDO2PMCTRL1 0x64 +#define BCM59056_SIMLDO1PMCTRL1 0x66 +#define BCM59056_SIMLDO2PMCTRL1 0x68 +#define BCM59056_SDLDOPMCTRL1 0x6a +#define BCM59056_SDXLDOPMCTRL1 0x6c +#define BCM59056_MMCLDO1PMCTRL1 0x6e +#define BCM59056_MMCLDO2PMCTRL1 0x70 +#define BCM59056_AUDLDOPMCTRL1 0x72 +#define BCM59056_MICLDOPMCTRL1 0x74 +#define BCM59056_USBLDOPMCTRL1 0x76 +#define BCM59056_VIBLDOPMCTRL1 0x78 +#define BCM59056_IOSR1PMCTRL1 0x7a +#define BCM59056_IOSR2PMCTRL1 0x7c +#define BCM59056_CSRPMCTRL1 0x7e +#define BCM59056_SDSR1PMCTRL1 0x82 +#define BCM59056_SDSR2PMCTRL1 0x86 +#define BCM59056_MSRPMCTRL1 0x8a +#define BCM59056_VSRPMCTRL1 0x8e +#define BCM59056_RFLDOCTRL 0x96 +#define BCM59056_CAMLDO1CTRL 0x97 +#define BCM59056_CAMLDO2CTRL 0x98 +#define BCM59056_SIMLDO1CTRL 0x99 +#define BCM59056_SIMLDO2CTRL 0x9a +#define BCM59056_SDLDOCTRL 0x9b +#define BCM59056_SDXLDOCTRL 0x9c +#define BCM59056_MMCLDO1CTRL 0x9d +#define BCM59056_MMCLDO2CTRL 0x9e +#define BCM59056_AUDLDOCTRL 0x9f +#define BCM59056_MICLDOCTRL 0xa0 +#define BCM59056_USBLDOCTRL 0xa1 +#define BCM59056_VIBLDOCTRL 0xa2 +#define BCM59056_CSRVOUT1 0xc0 +#define BCM59056_IOSR1VOUT1 0xc3 +#define BCM59056_IOSR2VOUT1 0xc6 +#define BCM59056_MSRVOUT1 0xc9 +#define BCM59056_SDSR1VOUT1 0xcc +#define BCM59056_SDSR2VOUT1 0xcf +#define BCM59056_VSRVOUT1 0xd2 + +/* I2C slave 1 registers */ +#define BCM59056_GPLDO5PMCTRL1 0x16 +#define BCM59056_GPLDO6PMCTRL1 0x18 +#define BCM59056_GPLDO1CTRL 0x1a +#define BCM59056_GPLDO2CTRL 0x1b +#define BCM59056_GPLDO3CTRL 0x1c +#define BCM59056_GPLDO4CTRL 0x1d +#define BCM59056_GPLDO5CTRL 0x1e +#define BCM59056_GPLDO6CTRL 0x1f +#define BCM59056_OTG_CTRL 0x40 +#define BCM59056_GPLDO1PMCTRL1 0x57 +#define BCM59056_GPLDO2PMCTRL1 0x59 +#define BCM59056_GPLDO3PMCTRL1 0x5b +#define BCM59056_GPLDO4PMCTRL1 0x5d + +/* + * RFLDO to VSR regulators are + * accessed via I2C slave 0 + */ + +/* LDO regulator IDs */ +#define BCM59056_REG_RFLDO 0 +#define BCM59056_REG_CAMLDO1 1 +#define BCM59056_REG_CAMLDO2 2 +#define BCM59056_REG_SIMLDO1 3 +#define BCM59056_REG_SIMLDO2 4 +#define BCM59056_REG_SDLDO 5 +#define BCM59056_REG_SDXLDO 6 +#define BCM59056_REG_MMCLDO1 7 +#define BCM59056_REG_MMCLDO2 8 +#define BCM59056_REG_AUDLDO 9 +#define BCM59056_REG_MICLDO 10 +#define BCM59056_REG_USBLDO 11 +#define BCM59056_REG_VIBLDO 12 + +/* DCDC regulator IDs */ +#define BCM59056_REG_CSR 13 +#define BCM59056_REG_IOSR1 14 +#define BCM59056_REG_IOSR2 15 +#define BCM59056_REG_MSR 16 +#define BCM59056_REG_SDSR1 17 +#define BCM59056_REG_SDSR2 18 +#define BCM59056_REG_VSR 19 + +/* + * GPLDO1 to VBUS regulators are + * accessed via I2C slave 1 + */ + +#define BCM59056_REG_GPLDO1 20 +#define BCM59056_REG_GPLDO2 21 +#define BCM59056_REG_GPLDO3 22 +#define BCM59056_REG_GPLDO4 23 +#define BCM59056_REG_GPLDO5 24 +#define BCM59056_REG_GPLDO6 25 +#define BCM59056_REG_VBUS 26 + +#define BCM59056_NUM_REGS 27 + +/* LDO group A: supported voltages in microvolts */ +static const unsigned int bcm59056_ldo_a_table[] =3D { + 1200000, 1800000, 2500000, 2700000, 2800000, + 2900000, 3000000, 3300000, +}; + +/* LDO group C: supported voltages in microvolts */ +static const unsigned int bcm59056_ldo_c_table[] =3D { + 3100000, 1800000, 2500000, 2700000, 2800000, + 2900000, 3000000, 3300000, +}; + +/* DCDC group CSR: supported voltages in microvolts */ +static const struct linear_range bcm59056_dcdc_csr_ranges[] =3D { + REGULATOR_LINEAR_RANGE(860000, 2, 50, 10000), + REGULATOR_LINEAR_RANGE(1360000, 51, 55, 20000), + REGULATOR_LINEAR_RANGE(900000, 56, 63, 0), +}; + +/* DCDC group IOSR1: supported voltages in microvolts */ +static const struct linear_range bcm59056_dcdc_iosr1_ranges[] =3D { + REGULATOR_LINEAR_RANGE(860000, 2, 51, 10000), + REGULATOR_LINEAR_RANGE(1500000, 52, 52, 0), + REGULATOR_LINEAR_RANGE(1800000, 53, 53, 0), + REGULATOR_LINEAR_RANGE(900000, 54, 63, 0), +}; + +/* DCDC group SDSR1: supported voltages in microvolts */ +static const struct linear_range bcm59056_dcdc_sdsr1_ranges[] =3D { + REGULATOR_LINEAR_RANGE(860000, 2, 50, 10000), + REGULATOR_LINEAR_RANGE(1340000, 51, 51, 0), + REGULATOR_LINEAR_RANGE(900000, 52, 63, 0), +}; + +static const struct bcm590xx_reg_data bcm59056_regs[BCM59056_NUM_REGS] =3D= { { .type =3D BCM590XX_REG_TYPE_LDO, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_LDO_DESC(RFLDO, rfldo, ldo_a_table), + BCM59056_LDO_DESC(RFLDO, rfldo, ldo_a_table), }, }, =20 @@ -247,7 +256,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_LDO, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_LDO_DESC(CAMLDO1, camldo1, ldo_c_table), + BCM59056_LDO_DESC(CAMLDO1, camldo1, ldo_c_table), }, }, =20 @@ -255,7 +264,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_LDO, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_LDO_DESC(CAMLDO2, camldo2, ldo_c_table), + BCM59056_LDO_DESC(CAMLDO2, camldo2, ldo_c_table), }, }, =20 @@ -263,7 +272,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_LDO, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_LDO_DESC(SIMLDO1, simldo1, ldo_a_table), + BCM59056_LDO_DESC(SIMLDO1, simldo1, ldo_a_table), }, }, =20 @@ -271,7 +280,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_LDO, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_LDO_DESC(SIMLDO2, simldo2, ldo_a_table), + BCM59056_LDO_DESC(SIMLDO2, simldo2, ldo_a_table), }, }, =20 @@ -279,7 +288,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_LDO, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_LDO_DESC(SDLDO, sdldo, ldo_c_table), + BCM59056_LDO_DESC(SDLDO, sdldo, ldo_c_table), }, }, =20 @@ -287,7 +296,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_LDO, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_LDO_DESC(SDXLDO, sdxldo, ldo_a_table), + BCM59056_LDO_DESC(SDXLDO, sdxldo, ldo_a_table), }, }, =20 @@ -295,7 +304,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_LDO, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_LDO_DESC(MMCLDO1, mmcldo1, ldo_a_table), + BCM59056_LDO_DESC(MMCLDO1, mmcldo1, ldo_a_table), }, }, =20 @@ -303,7 +312,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_LDO, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_LDO_DESC(MMCLDO2, mmcldo2, ldo_a_table), + BCM59056_LDO_DESC(MMCLDO2, mmcldo2, ldo_a_table), }, }, =20 @@ -311,7 +320,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_LDO, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_LDO_DESC(AUDLDO, audldo, ldo_a_table), + BCM59056_LDO_DESC(AUDLDO, audldo, ldo_a_table), }, }, =20 @@ -319,7 +328,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_LDO, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_LDO_DESC(MICLDO, micldo, ldo_a_table), + BCM59056_LDO_DESC(MICLDO, micldo, ldo_a_table), }, }, =20 @@ -327,7 +336,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_LDO, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_LDO_DESC(USBLDO, usbldo, ldo_a_table), + BCM59056_LDO_DESC(USBLDO, usbldo, ldo_a_table), }, }, =20 @@ -335,7 +344,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_LDO, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_LDO_DESC(VIBLDO, vibldo, ldo_c_table), + BCM59056_LDO_DESC(VIBLDO, vibldo, ldo_c_table), }, }, =20 @@ -343,7 +352,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_SR, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_SR_DESC(CSR, csr, dcdc_csr_ranges), + BCM59056_SR_DESC(CSR, csr, dcdc_csr_ranges), }, }, =20 @@ -351,7 +360,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_SR, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_SR_DESC(IOSR1, iosr1, dcdc_iosr1_ranges), + BCM59056_SR_DESC(IOSR1, iosr1, dcdc_iosr1_ranges), }, }, =20 @@ -359,7 +368,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_SR, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_SR_DESC(IOSR2, iosr2, dcdc_iosr1_ranges), + BCM59056_SR_DESC(IOSR2, iosr2, dcdc_iosr1_ranges), }, }, =20 @@ -367,7 +376,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_SR, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_SR_DESC(MSR, msr, dcdc_iosr1_ranges), + BCM59056_SR_DESC(MSR, msr, dcdc_iosr1_ranges), }, }, =20 @@ -375,7 +384,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_SR, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_SR_DESC(SDSR1, sdsr1, dcdc_sdsr1_ranges), + BCM59056_SR_DESC(SDSR1, sdsr1, dcdc_sdsr1_ranges), }, }, =20 @@ -383,7 +392,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_SR, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_SR_DESC(SDSR2, sdsr2, dcdc_iosr1_ranges), + BCM59056_SR_DESC(SDSR2, sdsr2, dcdc_iosr1_ranges), }, }, =20 @@ -391,7 +400,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_SR, .regmap =3D BCM590XX_REGMAP_PRI, .desc =3D { - BCM590XX_SR_DESC(VSR, vsr, dcdc_iosr1_ranges), + BCM59056_SR_DESC(VSR, vsr, dcdc_iosr1_ranges), }, }, =20 @@ -399,7 +408,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_GPLDO, .regmap =3D BCM590XX_REGMAP_SEC, .desc =3D { - BCM590XX_LDO_DESC(GPLDO1, gpldo1, ldo_a_table), + BCM59056_LDO_DESC(GPLDO1, gpldo1, ldo_a_table), }, }, =20 @@ -407,7 +416,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_GPLDO, .regmap =3D BCM590XX_REGMAP_SEC, .desc =3D { - BCM590XX_LDO_DESC(GPLDO2, gpldo2, ldo_a_table), + BCM59056_LDO_DESC(GPLDO2, gpldo2, ldo_a_table), }, }, =20 @@ -415,7 +424,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_GPLDO, .regmap =3D BCM590XX_REGMAP_SEC, .desc =3D { - BCM590XX_LDO_DESC(GPLDO3, gpldo3, ldo_a_table), + BCM59056_LDO_DESC(GPLDO3, gpldo3, ldo_a_table), }, }, =20 @@ -423,7 +432,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_GPLDO, .regmap =3D BCM590XX_REGMAP_SEC, .desc =3D { - BCM590XX_LDO_DESC(GPLDO4, gpldo4, ldo_a_table), + BCM59056_LDO_DESC(GPLDO4, gpldo4, ldo_a_table), }, }, =20 @@ -431,7 +440,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_GPLDO, .regmap =3D BCM590XX_REGMAP_SEC, .desc =3D { - BCM590XX_LDO_DESC(GPLDO5, gpldo5, ldo_a_table), + BCM59056_LDO_DESC(GPLDO5, gpldo5, ldo_a_table), }, }, =20 @@ -439,7 +448,7 @@ static const struct bcm590xx_reg_data bcm590xx_regs[BCM= 590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_GPLDO, .regmap =3D BCM590XX_REGMAP_SEC, .desc =3D { - BCM590XX_LDO_DESC(GPLDO6, gpldo6, ldo_a_table), + BCM59056_LDO_DESC(GPLDO6, gpldo6, ldo_a_table), }, }, =20 @@ -447,11 +456,11 @@ static const struct bcm590xx_reg_data bcm590xx_regs[B= CM590XX_NUM_REGS] =3D { .type =3D BCM590XX_REG_TYPE_VBUS, .regmap =3D BCM590XX_REGMAP_SEC, .desc =3D { - BCM590XX_REG_DESC(VBUS, vbus), + BCM59056_REG_DESC(VBUS, vbus), .ops =3D &bcm590xx_ops_vbus, .n_voltages =3D 1, .fixed_uV =3D 5000000, - .enable_reg =3D BCM590XX_OTG_CTRL, + .enable_reg =3D BCM59056_OTG_CTRL, .enable_mask =3D BCM590XX_VBUS_ENABLE, }, }, @@ -471,8 +480,8 @@ static int bcm590xx_probe(struct platform_device *pdev) return -ENOMEM; =20 pmu->mfd =3D bcm590xx; - pmu->n_regulators =3D BCM590XX_NUM_REGS; - pmu->regs =3D bcm590xx_regs; + pmu->n_regulators =3D BCM59056_NUM_REGS; + pmu->regs =3D bcm59056_regs; =20 platform_set_drvdata(pdev, pmu); =20 --=20 2.49.0 From nobody Thu Dec 18 22:25:24 2025 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D3D4E20E03C; Wed, 30 Apr 2025 07:07:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996854; cv=none; b=feHpG4w8J+RExYSin/Zb7hhTLniK9ahqsE7rVrluGXsu3p7029UvRKsuHipezdA8t6siGLYgTqSlohQxGBpdQZZUCwjwPZaznsiPF3SNgpz7DKjtL9mvXZo1MtjJAhoukGL2eLQSwS2XXEKqp9dJpN2x13GFttSYjd39VHL8aZs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745996854; c=relaxed/simple; bh=agKJKSQoy/h65HXXyPmdEN8H3Bu0XKA/Ew8f7G8wWts=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BusWqnKdcw6aIFgKOIsUU5SWtnMuPqfaq1utley/SglHTVVN5hpK7OkXaX70Jp3Y43zAZM1CeMe5JaJ4mTSx9jGnwFBVXmK3KfTvdXUSsopfJM+zD5DQvRDNtU4jrs4/50O/qQD7QAYA+YIn9AHmP3drUHoxDmF6Ts5NTL0aoKQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EG0BVgKd; arc=none smtp.client-ip=209.85.208.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EG0BVgKd" Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-5f63ac6ef0fso1320566a12.1; Wed, 30 Apr 2025 00:07:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745996850; x=1746601650; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=DjhsWWBzjDFTHJTQxgnpEOa0O96IiC/jWcMtoEb6m6k=; b=EG0BVgKdWnWnlu4qIOnOBrPH1QogrRIbTOklxT9QnsiAa5sLDZZD8psoOH+vNUNq39 aspl6yVVvRm9VqLri7lx8I9jPFbCxzPmOGhclqkcVfil2kLZCHu62dp3TQrQH/kNe7lG beSgEcdKx77b1+h2+RhLNoBGpnJCzFN6aBY9pCzJJNTKbVAiJStHANIbL5Yok44J5rSZ 0quJyp42Qz89xRE7sUPWlFthQh26l2+nu4u8UGEOnxCw+Xe9u8cX1hLDyXs3/OwyjFhy wZD7qcO5p/cgmLa0TfjUmvX29bT0YIZb0XSQHjthofmYMhIpzcRY5LjGKFZVq3DjK03c 6RIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745996850; x=1746601650; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DjhsWWBzjDFTHJTQxgnpEOa0O96IiC/jWcMtoEb6m6k=; b=rPIUNdZbEA5v+rpcy6vlJPZKMoL3N5Wks6pTo0wl7h+72DgoWi16058FL25QuAXFwY GRU44q2rk77l99ccu0N5xGhiH8fHmWn31dWNibguWrA9p2gpJ9g/Jb62248djMdiM4Vb NlXhepyrkxEoduCvvOgipSwARVQg1Qexuo2/R8iVHNdo07/s3mr6o08HPRWdTlnSpZ1r feeiWnH2zgK1AG0YIGNe14hRtwskX6EiRmB+z9b/6qnotA6FxCfxF0qU5RDtg+2PdVIV 1YXccsLAniHJmVPC6EiH0ZZ2NEAd7CgYlaigV5CCAVdDG4yl1bhbUc4TzEgj7UMDPHgl HC6g== X-Forwarded-Encrypted: i=1; AJvYcCUmLei/1zBaz8pJjcBJfEnH/Eg+MWWUS2+aBj2wl8WOimVNIzODIcU4rK0CqNsRpx5tfgKzybD8pjOM@vger.kernel.org, AJvYcCUp9FFj3yKGbrWa5JZrGv9zAQB1cQJfvNVkptYM8E58pppFaqNdfYMDW+F53FSYUDUg5bEKSwdHPYVUif4e@vger.kernel.org X-Gm-Message-State: AOJu0YzjHTri0/A0ulUgh/FInbK+9GABlCY5UJf7CLFPi9vp5FKE6K2d kwCwKeu5KcVcdFNyrnlo4NrbWxfJFZLZAYwp0OeOZK1yq3+dL649ZsofOw== X-Gm-Gg: ASbGncu8cBlQasme6xVlTvScVNrciNYnFO+tTCcAA4XpXs2TGB+P1s5+tEbNpOOEMeW R1D4l0/JQ7jBkNp+rGMwatjwwAzpKRotJw/szEo3faogAv7PZHYHLm8l4SHu/JTM5x7VRNo0kGe GMtxDR32LbPmyBxylwr1+HmmgC/2PKd0HGlM926+VCIK9nQCNwU3oD0WhvH67X49CrcoGvYS73u Pq8YN2PCT/3rJ6wcVdLt2a9dpP1MQdg7kPdlwb3uDK8r5gIKlF5LYQQjkkOmSPt1iYbrCVFOiEG tF+4v5Bq3qwFmr+L88/kUTcFNn5sPttwZvL2SBYuS/ggIyF3+msXtg52WwpjU8ZJa5qHyDtXcTU XzPGSP2txGgk= X-Google-Smtp-Source: AGHT+IHaMM72TBz5nQQLKxE8Gf46uuaVCzdj7MoPRYBFiQA6cMmTkmaQPdHPe71ZbY8YmqvnAqDrWg== X-Received: by 2002:a05:6402:2345:b0:5f4:35c7:ff37 with SMTP id 4fb4d7f45d1cf-5f89efa5b9cmr1757236a12.1.1745996849839; Wed, 30 Apr 2025 00:07:29 -0700 (PDT) Received: from hex.my.domain (83.8.121.197.ipv4.supernova.orange.pl. [83.8.121.197]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f7013fec3csm8334314a12.19.2025.04.30.00.07.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 00:07:29 -0700 (PDT) From: Artur Weber Date: Wed, 30 Apr 2025 09:07:13 +0200 Subject: [PATCH v8 9/9] regulator: bcm590xx: Add support for BCM59054 regulators Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250430-bcm59054-v8-9-e4cf638169a4@gmail.com> References: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> In-Reply-To: <20250430-bcm59054-v8-0-e4cf638169a4@gmail.com> To: Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Liam Girdwood , Mark Brown , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list Cc: Stanislav Jakubek , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745996831; l=17812; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=agKJKSQoy/h65HXXyPmdEN8H3Bu0XKA/Ew8f7G8wWts=; b=/IvtFPqlt4YkzvrYtavDqe4aO0d1b4CWC+Asd3lOiDUm32RQ4bfhqwMBF5MZXcdW0EI4l1fvm Gw3PRdu5NhOAu4B8YT0viNB6B/fz4C49LmVFFwIBUESW+hWhvtElFna X-Developer-Key: i=aweber.kernel@gmail.com; a=ed25519; pk=RhDBfWbJEHqDibXbhNEBAnc9FMkyznGxX/hwfhL8bv8= The BCM59056 and BCM59054 are very similar in terms of regulators. Add the register definitions for the BCM59054 and enable support for it in the driver. Signed-off-by: Artur Weber Reviewed-by: Stanislav Jakubek --- Changes in v6: - dev_type -> pmu_id conversion, rev_ana -> rev_analog rename Changes in v5: - Adapt to regmap type enum being moved/value names being renamed - Adapt to rename of bcm590xx_reg_info to bcm590xx_reg_data Changes in v4: - Lock MICLDO at 1.8v to match vendor kernel behavior - Set different voltage table for VSR based on PMU revision - Fix incorrect table being used for LVLDO1 - Add missing newline to "unknown device type" error message Changes in v3: - Adapt to regulator info being moved to tables --- drivers/regulator/bcm590xx-regulator.c | 649 +++++++++++++++++++++++++++++= +++- 1 file changed, 647 insertions(+), 2 deletions(-) diff --git a/drivers/regulator/bcm590xx-regulator.c b/drivers/regulator/bcm= 590xx-regulator.c index f35b2b72e46f70496e16be5244529a5d95d0546d..50414f4cb10958bb33a9fcfa5ed= 5aaecde9d0715 100644 --- a/drivers/regulator/bcm590xx-regulator.c +++ b/drivers/regulator/bcm590xx-regulator.c @@ -52,6 +52,17 @@ static const struct regulator_ops bcm590xx_ops_ldo =3D { .map_voltage =3D regulator_map_voltage_iterate, }; =20 +/* + * LDO ops without voltage selection, used for MICLDO on BCM59054. + * (These are currently the same as VBUS ops, but will be different + * in the future once full PMMODE support is implemented.) + */ +static const struct regulator_ops bcm590xx_ops_ldo_novolt =3D { + .is_enabled =3D regulator_is_enabled_regmap, + .enable =3D regulator_enable_regmap, + .disable =3D regulator_disable_regmap, +}; + static const struct regulator_ops bcm590xx_ops_dcdc =3D { .is_enabled =3D regulator_is_enabled_regmap, .enable =3D regulator_enable_regmap, @@ -106,6 +117,13 @@ static const struct regulator_ops bcm590xx_ops_vbus = =3D { #define BCM59056_SR_DESC(_name, _name_lower, _ranges) \ BCM590XX_SR_DESC(BCM59056, bcm59056, _name, _name_lower, _ranges) =20 +#define BCM59054_REG_DESC(_name, _name_lower) \ + BCM590XX_REG_DESC(BCM59054, _name, _name_lower) +#define BCM59054_LDO_DESC(_name, _name_lower, _table) \ + BCM590XX_LDO_DESC(BCM59054, bcm59054, _name, _name_lower, _table) +#define BCM59054_SR_DESC(_name, _name_lower, _ranges) \ + BCM590XX_SR_DESC(BCM59054, bcm59054, _name, _name_lower, _ranges) + /* BCM59056 data */ =20 /* I2C slave 0 registers */ @@ -466,6 +484,617 @@ static const struct bcm590xx_reg_data bcm59056_regs[B= CM59056_NUM_REGS] =3D { }, }; =20 +/* BCM59054 data */ + +/* I2C slave 0 registers */ +#define BCM59054_RFLDOPMCTRL1 0x60 +#define BCM59054_CAMLDO1PMCTRL1 0x62 +#define BCM59054_CAMLDO2PMCTRL1 0x64 +#define BCM59054_SIMLDO1PMCTRL1 0x66 +#define BCM59054_SIMLDO2PMCTRL1 0x68 +#define BCM59054_SDLDOPMCTRL1 0x6a +#define BCM59054_SDXLDOPMCTRL1 0x6c +#define BCM59054_MMCLDO1PMCTRL1 0x6e +#define BCM59054_MMCLDO2PMCTRL1 0x70 +#define BCM59054_AUDLDOPMCTRL1 0x72 +#define BCM59054_MICLDOPMCTRL1 0x74 +#define BCM59054_USBLDOPMCTRL1 0x76 +#define BCM59054_VIBLDOPMCTRL1 0x78 +#define BCM59054_IOSR1PMCTRL1 0x7a +#define BCM59054_IOSR2PMCTRL1 0x7c +#define BCM59054_CSRPMCTRL1 0x7e +#define BCM59054_SDSR1PMCTRL1 0x82 +#define BCM59054_SDSR2PMCTRL1 0x86 +#define BCM59054_MMSRPMCTRL1 0x8a +#define BCM59054_VSRPMCTRL1 0x8e +#define BCM59054_RFLDOCTRL 0x96 +#define BCM59054_CAMLDO1CTRL 0x97 +#define BCM59054_CAMLDO2CTRL 0x98 +#define BCM59054_SIMLDO1CTRL 0x99 +#define BCM59054_SIMLDO2CTRL 0x9a +#define BCM59054_SDLDOCTRL 0x9b +#define BCM59054_SDXLDOCTRL 0x9c +#define BCM59054_MMCLDO1CTRL 0x9d +#define BCM59054_MMCLDO2CTRL 0x9e +#define BCM59054_AUDLDOCTRL 0x9f +#define BCM59054_MICLDOCTRL 0xa0 +#define BCM59054_USBLDOCTRL 0xa1 +#define BCM59054_VIBLDOCTRL 0xa2 +#define BCM59054_CSRVOUT1 0xc0 +#define BCM59054_IOSR1VOUT1 0xc3 +#define BCM59054_IOSR2VOUT1 0xc6 +#define BCM59054_MMSRVOUT1 0xc9 +#define BCM59054_SDSR1VOUT1 0xcc +#define BCM59054_SDSR2VOUT1 0xcf +#define BCM59054_VSRVOUT1 0xd2 + +/* I2C slave 1 registers */ +#define BCM59054_LVLDO1PMCTRL1 0x16 +#define BCM59054_LVLDO2PMCTRL1 0x18 +#define BCM59054_GPLDO1CTRL 0x1a +#define BCM59054_GPLDO2CTRL 0x1b +#define BCM59054_GPLDO3CTRL 0x1c +#define BCM59054_TCXLDOCTRL 0x1d +#define BCM59054_LVLDO1CTRL 0x1e +#define BCM59054_LVLDO2CTRL 0x1f +#define BCM59054_OTG_CTRL 0x40 +#define BCM59054_GPLDO1PMCTRL1 0x57 +#define BCM59054_GPLDO2PMCTRL1 0x59 +#define BCM59054_GPLDO3PMCTRL1 0x5b +#define BCM59054_TCXLDOPMCTRL1 0x5d + +/* + * RFLDO to VSR regulators are + * accessed via I2C slave 0 + */ + +/* LDO regulator IDs */ +#define BCM59054_REG_RFLDO 0 +#define BCM59054_REG_CAMLDO1 1 +#define BCM59054_REG_CAMLDO2 2 +#define BCM59054_REG_SIMLDO1 3 +#define BCM59054_REG_SIMLDO2 4 +#define BCM59054_REG_SDLDO 5 +#define BCM59054_REG_SDXLDO 6 +#define BCM59054_REG_MMCLDO1 7 +#define BCM59054_REG_MMCLDO2 8 +#define BCM59054_REG_AUDLDO 9 +#define BCM59054_REG_MICLDO 10 +#define BCM59054_REG_USBLDO 11 +#define BCM59054_REG_VIBLDO 12 + +/* DCDC regulator IDs */ +#define BCM59054_REG_CSR 13 +#define BCM59054_REG_IOSR1 14 +#define BCM59054_REG_IOSR2 15 +#define BCM59054_REG_MMSR 16 +#define BCM59054_REG_SDSR1 17 +#define BCM59054_REG_SDSR2 18 +#define BCM59054_REG_VSR 19 + +/* + * GPLDO1 to VBUS regulators are + * accessed via I2C slave 1 + */ + +#define BCM59054_REG_GPLDO1 20 +#define BCM59054_REG_GPLDO2 21 +#define BCM59054_REG_GPLDO3 22 +#define BCM59054_REG_TCXLDO 23 +#define BCM59054_REG_LVLDO1 24 +#define BCM59054_REG_LVLDO2 25 +#define BCM59054_REG_VBUS 26 + +#define BCM59054_NUM_REGS 27 + +/* LDO group 1: supported voltages in microvolts */ +static const unsigned int bcm59054_ldo_1_table[] =3D { + 1200000, 1800000, 2500000, 2700000, 2800000, + 2900000, 3000000, 3300000, +}; + +/* LDO group 2: supported voltages in microvolts */ +static const unsigned int bcm59054_ldo_2_table[] =3D { + 3100000, 1800000, 2500000, 2700000, 2800000, + 2900000, 3000000, 3300000, +}; + +/* LDO group 3: supported voltages in microvolts */ +static const unsigned int bcm59054_ldo_3_table[] =3D { + 1000000, 1107000, 1143000, 1214000, 1250000, + 1464000, 1500000, 1786000, +}; + +/* DCDC group SR: supported voltages in microvolts */ +static const struct linear_range bcm59054_dcdc_sr_ranges[] =3D { + REGULATOR_LINEAR_RANGE(0, 0, 1, 0), + REGULATOR_LINEAR_RANGE(860000, 2, 60, 10000), + REGULATOR_LINEAR_RANGE(1500000, 61, 61, 0), + REGULATOR_LINEAR_RANGE(1800000, 62, 62, 0), + REGULATOR_LINEAR_RANGE(900000, 63, 63, 0), +}; + +/* DCDC group VSR (BCM59054A1): supported voltages in microvolts */ +static const struct linear_range bcm59054_dcdc_vsr_a1_ranges[] =3D { + REGULATOR_LINEAR_RANGE(0, 0, 1, 0), + REGULATOR_LINEAR_RANGE(860000, 2, 59, 10000), + REGULATOR_LINEAR_RANGE(1700000, 60, 60, 0), + REGULATOR_LINEAR_RANGE(1500000, 61, 61, 0), + REGULATOR_LINEAR_RANGE(1800000, 62, 62, 0), + REGULATOR_LINEAR_RANGE(1600000, 63, 63, 0), +}; + +/* DCDC group CSR: supported voltages in microvolts */ +static const struct linear_range bcm59054_dcdc_csr_ranges[] =3D { + REGULATOR_LINEAR_RANGE(700000, 0, 1, 100000), + REGULATOR_LINEAR_RANGE(860000, 2, 60, 10000), + REGULATOR_LINEAR_RANGE(900000, 61, 63, 0), +}; + +static const struct bcm590xx_reg_data bcm59054_regs[BCM59054_NUM_REGS] =3D= { + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(RFLDO, rfldo, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(CAMLDO1, camldo1, ldo_2_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(CAMLDO2, camldo2, ldo_2_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(SIMLDO1, simldo1, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(SIMLDO2, simldo2, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(SDLDO, sdldo, ldo_2_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(SDXLDO, sdxldo, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(MMCLDO1, mmcldo1, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(MMCLDO2, mmcldo2, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(AUDLDO, audldo, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_REG_DESC(MICLDO, micldo), + .ops =3D &bcm590xx_ops_ldo_novolt, + /* MICLDO is locked at 1.8V */ + .n_voltages =3D 1, + .fixed_uV =3D 1800000, + .enable_reg =3D BCM59054_MICLDOPMCTRL1, + .enable_mask =3D BCM590XX_REG_ENABLE, + .enable_is_inverted =3D true, + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(USBLDO, usbldo, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(VIBLDO, vibldo, ldo_2_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_SR_DESC(CSR, csr, dcdc_csr_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_SR_DESC(IOSR1, iosr1, dcdc_sr_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_SR_DESC(IOSR2, iosr2, dcdc_sr_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_SR_DESC(MMSR, mmsr, dcdc_sr_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_SR_DESC(SDSR1, sdsr1, dcdc_sr_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_SR_DESC(SDSR2, sdsr2, dcdc_sr_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_SR_DESC(VSR, vsr, dcdc_sr_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM59054_LDO_DESC(GPLDO1, gpldo1, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM59054_LDO_DESC(GPLDO2, gpldo2, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM59054_LDO_DESC(GPLDO3, gpldo3, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM59054_LDO_DESC(TCXLDO, tcxldo, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM59054_LDO_DESC(LVLDO1, lvldo1, ldo_3_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM59054_LDO_DESC(LVLDO2, lvldo2, ldo_3_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_VBUS, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM59054_REG_DESC(VBUS, vbus), + .ops =3D &bcm590xx_ops_vbus, + .n_voltages =3D 1, + .fixed_uV =3D 5000000, + .enable_reg =3D BCM59054_OTG_CTRL, + .enable_mask =3D BCM590XX_VBUS_ENABLE, + }, + }, +}; + +/* + * BCM59054A1 regulators; same as previous revision, but with different + * VSR voltage table. + */ +static const struct bcm590xx_reg_data bcm59054_a1_regs[BCM59054_NUM_REGS] = =3D { + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(RFLDO, rfldo, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(CAMLDO1, camldo1, ldo_2_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(CAMLDO2, camldo2, ldo_2_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(SIMLDO1, simldo1, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(SIMLDO2, simldo2, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(SDLDO, sdldo, ldo_2_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(SDXLDO, sdxldo, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(MMCLDO1, mmcldo1, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(MMCLDO2, mmcldo2, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(AUDLDO, audldo, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_REG_DESC(MICLDO, micldo), + .ops =3D &bcm590xx_ops_ldo_novolt, + /* MICLDO is locked at 1.8V */ + .n_voltages =3D 1, + .fixed_uV =3D 1800000, + .enable_reg =3D BCM59054_MICLDOPMCTRL1, + .enable_mask =3D BCM590XX_REG_ENABLE, + .enable_is_inverted =3D true, + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(USBLDO, usbldo, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_LDO, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_LDO_DESC(VIBLDO, vibldo, ldo_2_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_SR_DESC(CSR, csr, dcdc_csr_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_SR_DESC(IOSR1, iosr1, dcdc_sr_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_SR_DESC(IOSR2, iosr2, dcdc_sr_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_SR_DESC(MMSR, mmsr, dcdc_sr_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_SR_DESC(SDSR1, sdsr1, dcdc_sr_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_SR_DESC(SDSR2, sdsr2, dcdc_sr_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_SR, + .regmap =3D BCM590XX_REGMAP_PRI, + .desc =3D { + BCM59054_SR_DESC(VSR, vsr, dcdc_vsr_a1_ranges), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM59054_LDO_DESC(GPLDO1, gpldo1, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM59054_LDO_DESC(GPLDO2, gpldo2, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM59054_LDO_DESC(GPLDO3, gpldo3, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM59054_LDO_DESC(TCXLDO, tcxldo, ldo_1_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM59054_LDO_DESC(LVLDO1, lvldo1, ldo_3_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_GPLDO, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM59054_LDO_DESC(LVLDO2, lvldo2, ldo_3_table), + }, + }, + + { + .type =3D BCM590XX_REG_TYPE_VBUS, + .regmap =3D BCM590XX_REGMAP_SEC, + .desc =3D { + BCM59054_REG_DESC(VBUS, vbus), + .ops =3D &bcm590xx_ops_vbus, + .n_voltages =3D 1, + .fixed_uV =3D 5000000, + .enable_reg =3D BCM59054_OTG_CTRL, + .enable_mask =3D BCM590XX_VBUS_ENABLE, + }, + }, +}; + static int bcm590xx_probe(struct platform_device *pdev) { struct bcm590xx *bcm590xx =3D dev_get_drvdata(pdev->dev.parent); @@ -480,8 +1109,24 @@ static int bcm590xx_probe(struct platform_device *pde= v) return -ENOMEM; =20 pmu->mfd =3D bcm590xx; - pmu->n_regulators =3D BCM59056_NUM_REGS; - pmu->regs =3D bcm59056_regs; + + switch (pmu->mfd->pmu_id) { + case BCM590XX_PMUID_BCM59054: + pmu->n_regulators =3D BCM59054_NUM_REGS; + if (pmu->mfd->rev_analog =3D=3D BCM59054_REV_ANALOG_A1) + pmu->regs =3D bcm59054_a1_regs; + else + pmu->regs =3D bcm59054_regs; + break; + case BCM590XX_PMUID_BCM59056: + pmu->n_regulators =3D BCM59056_NUM_REGS; + pmu->regs =3D bcm59056_regs; + break; + default: + dev_err(bcm590xx->dev, + "unknown device type, could not initialize\n"); + return -EINVAL; + } =20 platform_set_drvdata(pdev, pmu); =20 --=20 2.49.0