From nobody Wed Dec 17 17:26:26 2025 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (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 722E41C8635; Sun, 16 Mar 2025 18:19:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149160; cv=none; b=eTbeIdUh4lze/LZCfRho12r4nmnXr1NXyHDVdUxj3i4z2Kq2+nTTrqYU+k7cdPuctPF12JFG2bW/ddmBX556V+hTSe/qUoc18FLLyj2FtuypDrozMMa00z1LeyNH0LQw64hKOH0OZx/MbqVuQiSwWeJ9xbXqMv61B/S3GN8ehd4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149160; c=relaxed/simple; bh=OAWctLwMdQDVOcNCm5hoBkP7a2fkK16oIvczHEI20U4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=la9s+ow2Y9fFgx7IgP2G+PtmV4YtQxfeSkYBXjTqptqDBTG7++jccYHMQvBiPf7tdRawx4imQ28vMGqU/RIIiR7WjGtfZps3JMN3We23cMqwSHsRwJFCmqdnQmqDkSuXCyFA5mHm6fxe466caDr1Xk7Z6boMRFp75TucRq+raPU= 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=PyGuIn+T; arc=none smtp.client-ip=209.85.218.54 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="PyGuIn+T" Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-aaf0f1adef8so168553566b.3; Sun, 16 Mar 2025 11:19:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742149157; x=1742753957; 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=gnMpyxPQIH7YdCLtFOVkIdJffwSUtpS774knyvD88J0=; b=PyGuIn+TmZNhIrUe3uHGf8oRHh9or0K9ofjhVErRWOXf54EVO74elz8fFhPowc1mUG yMF/HeAlqrQLBsnQliBtVlvKpUOg+Ei5CEcNNbS2jFLhmDCjW3OJbivo5BcAG0PCWEAC nRjHUUKSMWRR3L4onuoibGsx4l4oqPFEyPIveJ6tHHf3cHcs6W5JGATvvaURXZ85e3Vh sFdnXdaxrgHnRQFoPXvRJAU+VXMQgdsA+lAxPzASFt7MyFVq4B+lgdbynp2oUAIzyyC7 2zgO2ndWsYxWLxXoiKIs+ywouLZ9rSlSwJvhewx7+xNAnTGq+hvzdGszbzYnoPzsd22+ EiTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742149157; x=1742753957; 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=gnMpyxPQIH7YdCLtFOVkIdJffwSUtpS774knyvD88J0=; b=QMmYVrGPvLCxgCvEaTjOAsKEp4UDljcYHChQ1tWu2rxMYOFN+0XrqaSRnbI5kmkJO4 OW4XqmCSdJEuxo5eilH3e9WvMSKINurZdZwFgnMoiNVUKge0eCuPAXFVrAOx7frHzFI8 lYZ84Am2B1ZCtdyqnOsfxllRI8JGpIJ5mKYQukdo2Gds1S6xmXyPc0wzYNhdRIlS7kh0 M8s9Z+ZpwzDiPfGYJWt5hzBcyu3qQtIBzwAsRha5UKCWoN6m5WBqRew5e4z/R5HYSM9y kxkQA3ZqbTctdPHsDwkziNDAB8+A+cNOYjUol6Ggt57Omppaoi7YBN6DiqBrt+eeXhCg MVSg== X-Forwarded-Encrypted: i=1; AJvYcCV+ye7AYbKY1q8ZT2qpj9cnmSfmpcOUy5B5WOlFDI/Cx/8AQjqht5qW/ygbtGA8SjSXr1plO0GRoCk2@vger.kernel.org, AJvYcCXFl3agqGZEM4v/dERh6nhFyJ6KM7FVzkwaVB8tPWrs7bXAHG56dIi0a88BNRbtA+wmRx5Oo+0nyf7CU56A@vger.kernel.org X-Gm-Message-State: AOJu0YzrL3QmOF2yii5C5gc6noiDYfDjAww42tVcbidpuM1rmwmcP6DD 2fMzbASopRUO+GolqumBg6AGDC7seaOLkJVrq2aYKrLtsdr/gM4P X-Gm-Gg: ASbGncsvu4KF4wTgr0vnRdJdoHjmycOUuZQ6EoKEGH3AEgwbMIXz5H9A+cwCQnDsj9N GipD4nKFD0Qia0t8arnPLpj0l8w4pzJ6ky0Byi/HeIadh8HDFxZePTPzcZWjUeT6x7Be3fEYASS q1eSuuqK7Lfivqc3P/k5OlvUk52PH3EzNHQmEkWoktkWwZlpWLT8lnoOyEFVwMeLWpO2kRXWZ5P vlCiJw9LnqiP2+UN6oPjhMRZ1KhTfcFaNdtdSTXrjGcCR2/qURfQmSuHNtts3ANsTRpVLud4Iw0 v9VPMFAXpPPN/F3zKvYdoUsiZNcLRJPTmsNDIGKN54nbyMSyvdYO23u/qn4HAc+mOX81a3YXXgu 0nL0FlF+Ixr03fYUquw== X-Google-Smtp-Source: AGHT+IFQAhr70MJ4XwZ6DKDUDwIJn3vYtCtIUh7Dn7cupIJ8YeYxNF7Cr6QT7zLTbnqkFB/NFOs/Qw== X-Received: by 2002:a17:907:2ce1:b0:ac2:ede5:d0d3 with SMTP id a640c23a62f3a-ac3302f37damr1115698166b.27.1742149156524; Sun, 16 Mar 2025 11:19:16 -0700 (PDT) Received: from hex.my.domain (83.11.178.210.ipv4.supernova.orange.pl. [83.11.178.210]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac314a48b51sm537951266b.149.2025.03.16.11.19.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Mar 2025 11:19:15 -0700 (PDT) From: Artur Weber Date: Sun, 16 Mar 2025 19:18:49 +0100 Subject: [PATCH v7 01/10] 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: <20250316-bcm59054-v7-1-4281126be1b8@gmail.com> References: <20250316-bcm59054-v7-0-4281126be1b8@gmail.com> In-Reply-To: <20250316-bcm59054-v7-0-4281126be1b8@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=1742149152; l=6215; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=OAWctLwMdQDVOcNCm5hoBkP7a2fkK16oIvczHEI20U4=; b=SYTovKYVmUN/Yga/71mRrYPExyZ0hy2UFA5UVlzIDC53yY67XKpMpsziy/MPtO6JHUGa3dA4p rJJ9u9LELjnA/mkQ4cJgKrgYWixfCEf/VcuE2fvhi9avPghRcBfr1Sz 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 --- 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.48.1 From nobody Wed Dec 17 17:26:26 2025 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.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 B50241E1E1B; Sun, 16 Mar 2025 18:19:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149162; cv=none; b=LynXLT8T5k1EZ4t9qPCIN0wm4q8DSf24bCQOALvl9wtrmMWyncxnWyISPJpog1f3DaaRSW7g9A3D8xv/svLtlt4soDOH9XViscuIXgdb1Nd+eoeKsFNFD7OboXACJs5tlii3mcIOatm8thkP72v3PbnL/DhrjVjYCeOFMsBcyCE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149162; c=relaxed/simple; bh=dm7aREBrSuogWhHL7IYSSu3jO/9Oq8Tet0hiRF+dXhE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=j856iCP2mFTy/B3hXU/HaOoDjfIa+Z9xCvteoAMG33cW1YckOh+gX883MhksZ/2l8u2XL+OIWXXohOhwxkBucL3F1CY+1keRfZWMNhGlf6wlax69tFhON9WggIDHpmP9eSfaa5EwKeiqe5uvzhBzp2u25qznFOFCn/G/7RvENN8= 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=ODuy/eit; arc=none smtp.client-ip=209.85.218.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="ODuy/eit" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-aaf900cc7fbso705317166b.3; Sun, 16 Mar 2025 11:19:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742149159; x=1742753959; 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=a2a5kh801vl9iToE3scZElc09JqjoduUAaLOK7aaGhA=; b=ODuy/eitaiNa3dwk6St4QMs78JsFuWWU8gTJGENpic8B++zLP1LagpujD2B3WpSNCZ WpOjxLPZMXPQh7Q1LATj3DjOtxOyUiadMAR9RqzMkIQlPeECl1m+Ph6PIA0E6Mpol5Ux TPDUSoWp+2Y7CGi6VoCDjEb3BA5aUVeTrVH5B/lW7SDO3GNQ3O7Y7hyUsjw5WBZ4y3Fo TTS73+uHEns0gEwluyPM+ka8lVyz8k03zepgwLcXB7xe/rcCY3SqhosGslOeYYnHYVbE wayKhU/z/2ole7ZnP0gxdcB5mOPgoXLuYqF5oKRv48sYYbIu1dQR3fAZfT+hZQcrSbyB Mt/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742149159; x=1742753959; 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=a2a5kh801vl9iToE3scZElc09JqjoduUAaLOK7aaGhA=; b=Vh/d2D8R1RWD6y/nAakALjXxkzczCkimS0wUItoiHhpnM8unKbhQoZPbl0nH8IAmqS NX8fGpr0Ywm7Ry7AM7EL+h7NAUyM7Nt0cbZZPM3JzLGjS3Q6xpoG8BOxK+ble9h+Uhrg bWTBUczy1kmo3euZ/NUzMN/tL4eZi1hIGSIsTBKRihEDHVeireaZzd8cC4w9O6Y6WgVV 8tRKT7Sto9hK/+pcwQNLHGZXJzkgLOvygt6h7peGHDVNzDN1XWZZg7wOb8dy4l4eo1lx ohrFbgpB+tmXqRYhY7yutauPKS5aL3kXe8uxT2VtR6dGsyvVMhUGKJjhmNaysORJ1+Sj jMJQ== X-Forwarded-Encrypted: i=1; AJvYcCVP4FDiuFvEYgR6SZTu9oKF1XyCYJQ4rn42xK9bOuHInPygkdDnUHntd965wTNWuTctBZQWezMrTOZ4RqNO@vger.kernel.org, AJvYcCWvQXQH7MnbKgQUEW9o7p6oDq8YZtVHZJ/kR6r2kAByJOMbDrdVFxNTm5CNO/bAsNv5PgKT2tVOtwv+@vger.kernel.org X-Gm-Message-State: AOJu0YzffqE7ZrSd/5cmCj/AkjUAJjFX7/fY9KOcndJPtFXVw69gRnOe 69AQv+qWlhFN4ySxj62q8oZ63Oemrxlcyi2Bx64Knux+/eg+RBND X-Gm-Gg: ASbGnct6XQLqXZU5rJTMCuDs/XiEcbUF2EhIY/2htD93ogaN5ETgz+gFL0yNrO8vgeu kkUOz6s53EsLUgP9CCmYqv8Vcau/+E1pc8pMVoI8MlmEu8iTqgnD++1anZmDlzONLPkLEc6+3Xt pWzUFzF01hu6r8nuFryPAFVjl2nWtHIZ6eduUpM2MjMwQLqc+wxCHMDhI3Oaud/dEjKYzTZI8iA yL5qz6I/0Ytf9H8BNj19Y+7jXwFJpslYX0HCV4dMbIOQSn5aXZsaze9ULLUMvk3uQiVhtCbnoVZ UXWHXxELoXclLScrdgJT2W4F9NEpfmHoDMP/j+pkVzTkhNX5WLS2NxMgfoQJQFUxOcr2z1PjPA8 I7w2kB3o49khVkazJ0w== X-Google-Smtp-Source: AGHT+IGTb97sCzpYsDhmihcnk9Aluh4vlMNE+WF/B/S4d9ZBrV6Q8S6OHoKG9rtKiJt+ZbLxdPSc0A== X-Received: by 2002:a17:907:72cd:b0:ac2:6837:6248 with SMTP id a640c23a62f3a-ac3301e8dacmr745340066b.30.1742149158591; Sun, 16 Mar 2025 11:19:18 -0700 (PDT) Received: from hex.my.domain (83.11.178.210.ipv4.supernova.orange.pl. [83.11.178.210]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac314a48b51sm537951266b.149.2025.03.16.11.19.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Mar 2025 11:19:18 -0700 (PDT) From: Artur Weber Date: Sun, 16 Mar 2025 19:18:50 +0100 Subject: [PATCH v7 02/10] 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: <20250316-bcm59054-v7-2-4281126be1b8@gmail.com> References: <20250316-bcm59054-v7-0-4281126be1b8@gmail.com> In-Reply-To: <20250316-bcm59054-v7-0-4281126be1b8@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=1742149152; l=4488; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=dm7aREBrSuogWhHL7IYSSu3jO/9Oq8Tet0hiRF+dXhE=; b=BNVI0vy3mD8vTpNEq1/ixssqPwEcWdvXJtBIodlHWEgY3UXpyNC+0tDbUipAzCn6j1Pk4sRzP 8IME8svoMkSDR5V2lL5PggUyCBWMHc8pg1hoK8l6ZvPkouu27kMK1dh 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 --- 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.48.1 From nobody Wed Dec 17 17:26:26 2025 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (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 36FA71EEA5D; Sun, 16 Mar 2025 18:19:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149165; cv=none; b=mCuDaPGdIJopAIs2r7hMJaTcyQXVKwYSme8k8LoHYvC8LUiQ17gGT+nkMuGDe0w2vHdkjt8RZ5OKY9ep/y0IWLVbJsm0t2V9Vg7Fqt4bUbbqs3Y0ZtpFkSi3xf38DtbKQNJGEEjdxgNRmugjbSdZJsfbEwbR+kvVonA6qMMoL78= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149165; c=relaxed/simple; bh=oSsgHxWm93UX4Dr0gTfLMbljoK+SAeJiEhBDHrh1GCg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=J9k/G7SsumqylFScm3edZs9bgConm3zJ9N44sQ93gvLWI6DIDy6Q0cschRk75aDL4tsohQ3IC5dWWxUsnLNHFKQVhyGs/yndZ7xfrIvJHY+bA+pCbHLpx3w2IOMjcOtl3cHhmT+6EB7fAQWM/uskecx29VIY8TaI+vX7ivtl1e8= 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=CeSYdcH0; arc=none smtp.client-ip=209.85.218.53 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="CeSYdcH0" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-ac2b10bea16so70094666b.0; Sun, 16 Mar 2025 11:19:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742149161; x=1742753961; 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=97ERf3V/Bpk7MgoHGPJsnvkiQqZJeJp/kSKmJml6+us=; b=CeSYdcH0c2gZQm79AB0b2qb56u3FmBI4AXi0X9clHjHzH/4HHkVJ0xGV+1vUp1XZ9P j3OT/AICgizMpUxWucgqNjwtY7heFVgMxhaBoFX9ufprqDCcS0jdTF9XqhzpIWG4gpcR LZTu1Mi7yXAhQk70Hxj4PPAhPFiklKQaHO0HbzabNmdy1o+up5kS7Q8B9poOEPozUTr0 p1Pg5zsIjCidq4bZjJUFvufPmQYTDS9RoBfEZpSkSMR9h2/gJlscg/8EfctWjA0xT/Y3 X9tf74v5AtKlVGr5PaMHccLRmcBpHB4sUE4BSLuBSgE1+6jH0JsDripTt+/uLKPBhT09 6WMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742149161; x=1742753961; 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=97ERf3V/Bpk7MgoHGPJsnvkiQqZJeJp/kSKmJml6+us=; b=E9IcBw1nU3s9UAEzQy2XrElvbNCSJWsMG0wpLLvMatwAZwsorWgUmgTH1Dww0wfLgQ rPOcfQCx7Aiqb/shSppQAD39timIwFAOYw/TZ6cncA7lxvpjk5AbIB8ktOFHMyo9BRLo oY5Hq2XLdHAgY49iEPvuzIcC+6EqJAbu0cNOM6SGEdccBhnA/vg9g/Qu9DwWOrDzmJMr s6+i4qf11OE7XoOC6uCd+Jwi6mCKJLeLCQtqTj0OvmdDLqwooMv50+fj/fzkM5U+KU/b K/fKskbGUeizQXu7Hr/vWdyoghdp9pU94088+3ve5qw3BAhQlCViaQlSjlhFItZWUz68 7Hwg== X-Forwarded-Encrypted: i=1; AJvYcCVP0etmFQanO1A+nF1ZSIDmzQe+TrkIP+oj8Rw3hjrRC5nAt4LuNu2bIViNA0N2XjVf+8wd6pGGHSZm@vger.kernel.org, AJvYcCWp+YdZ7DoOuoi0uvHOfa2gLHPdVJrF/4PSzD44STkw90PSoFhzmRundaNq+TzGNfNCQg2yUVtJxYCOi8jL@vger.kernel.org X-Gm-Message-State: AOJu0Ywj4oBw9RWA9czBPYsy2Y3bS3kNPO1IUg2+WxlhZ34LFjDtFq5/ z9KPiFN2HKl2pfl/G0ay6UxTS5yHMGUr63gd2DzfU2xJTmXh3Lbf X-Gm-Gg: ASbGnct1/VkVrk/SX/WdTANSQINiDLL1Pg6EUQleFzL9k2TCjvjKzFE117AlTs2doOr 3/D9gK5oBUlL8fhXkbZFwo6vzMl2eRHFmyvPkRs4HOCaL4t6PjPivjgZTB7Dv7T/x7HCR1HmxBE /g+TX+BaUuc2BeOk3i8f58YxZLtUrtyeJ9EYJd67CUoalhDiKKjIUd0owK59GittBLgUf5h9Yab 3EgGvgmD0dvVE675qW0BQ+4PcqOYnHtjYhSnHkEgVIom6no1t+/6H+uP1+RN2sSNPx3mjlzv5LK hee6ZtZYIKtd7BEoulH2ZwoFdHarWl4f3TotXOBgYxMzwVLKh3tfZ9omDVbY8BcSWcga5ckUyyO QfTTLckLdKHLIMpzLqYlf0uk2k2Bx X-Google-Smtp-Source: AGHT+IG+83lChTiI1RBzCDIq8j9lOSoKKPoy8P0LCpgfYgJS30USvkARqAJeFOkKxSUjVu6YQZtMmg== X-Received: by 2002:a17:906:c10d:b0:ac2:7cf9:7193 with SMTP id a640c23a62f3a-ac3304195a3mr1071132166b.48.1742149161249; Sun, 16 Mar 2025 11:19:21 -0700 (PDT) Received: from hex.my.domain (83.11.178.210.ipv4.supernova.orange.pl. [83.11.178.210]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac314a48b51sm537951266b.149.2025.03.16.11.19.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Mar 2025 11:19:20 -0700 (PDT) From: Artur Weber Date: Sun, 16 Mar 2025 19:18:51 +0100 Subject: [PATCH v7 03/10] 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: <20250316-bcm59054-v7-3-4281126be1b8@gmail.com> References: <20250316-bcm59054-v7-0-4281126be1b8@gmail.com> In-Reply-To: <20250316-bcm59054-v7-0-4281126be1b8@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=1742149152; l=4265; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=oSsgHxWm93UX4Dr0gTfLMbljoK+SAeJiEhBDHrh1GCg=; b=uoPcsxaopSegQjH9DQN9ffpNUBszrF6XR3Yfteih7WnBU+g5Uxpu+0gJ8JZ1h9wWSkHq5IKf6 sEzCZxVbjVVD8ZkiVSjgHenP5iu/z5HFP8/kOgswtj2KHgqNxsMLRgJ 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 --- 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.48.1 From nobody Wed Dec 17 17:26:26 2025 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.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 AA4F11F4179; Sun, 16 Mar 2025 18:19:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149166; cv=none; b=iaNkH0kTSv6DpVuOBnlhVGiZlqikyhJ7xFg9EWSghaMk1DYukMswGj0WfOc3iXAL3z7Zb59Z4VC2y8+Bvkc5k5ffuPDTzan3vA5UoYQX5ylwMTYpmljlDDwtUqP096FyVHbQlscmNlvmdigfBLo9HmKTct8XdLDCdpm6Ek3C8R0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149166; c=relaxed/simple; bh=shsY8picWdauNM7HAi5QIbN1+/obURFOkQY2q4XNRbc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qz3N4WGLwISmLXXFX930PDQQnvxClh1T2kp1UL4+SmwCM43vCFG8ucuvQlAIU/Xp8wZfANx1F4WBb2O5hp7exRQ2f9T21KzB4aRmOu6xEPB2Y1k12YRQeFaNnSj5JlWGWdlFaxwVnsEJGlRxACKohNT9/Og4ESnbrFnt3QhWkFs= 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=J+DiE7TO; arc=none smtp.client-ip=209.85.218.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="J+DiE7TO" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-ac2ed007aacso732042766b.0; Sun, 16 Mar 2025 11:19:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742149163; x=1742753963; 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=Xva56AKX2brNKS42OhnyZtYq2t1leFGV1oKmYOkZd/E=; b=J+DiE7TOSOGpxIH+zOdU4RykXlyBNYo3KnDJAEPQ0KH6Xz46qvKsf7H37p6+kQ8+a1 cDPzQ54HXvjX4mZNiLS2O+th+IgKztkXa4oaUqM52BaEKqA9UtRWpaN/oSr0cmF52zmA DKAnSV3Xd87MzAW88l1JZEwGWsosx8TgwmxczAgWhKSS2zpwivNX4B1/PRasLiif6H6n ItvCaxV46u/ENH3gsJ7euhnXAjOW/kdvIQ0tWdnUY/IC6tS31EG4dJ4GJk1cYoecQkAj pCPumS1PqrHOKZRdFWIIkYApQN5dr4pF/zwMGgO2wNBl6V283GzjQHofaff0vDffVT9u RJTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742149163; x=1742753963; 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=Xva56AKX2brNKS42OhnyZtYq2t1leFGV1oKmYOkZd/E=; b=mUlfywEVtX6KFG1tLsGuSJJqHuh5W4DiA/jNfdjxEx3vLcVeNFa54fJGw8X3era/R7 Ro644Sqye3y3HSHEFQSWnVNfZnFufgK3CnJUFujwKgsv4gcp/Mc//ALvTu5v0qSD+hm6 iJzDIl/1uibYd9B/zWSYOYM359+0SSJ46Ulbj5gjGoJdGiLyy4RW0zxFA7wPGNBzP9km 2iGbd5WTp1TO0Qhjosc2Ab/5Vw/2cfb+sjOnkp+qBTbkPhk22/6OMdvvO4EOPscNVxjy c201e4vjdkzapRU4yRf6IRCqSeyxADoLpPqVz/TUinBIzZZ3HP7kguAol00bXmFahJFk BNRQ== X-Forwarded-Encrypted: i=1; AJvYcCUTURfCS9tnlvTe40Iovt51sZYjgOw/D8vRFI9orOEUZaBlQ2vOtP+IY34efXLm6tPg0mvK8Spg9TfJ6nzO@vger.kernel.org, AJvYcCXERKDHIEIS3GJbCV5WmSnfkuHVTCvnEq77dTBYVDyIpBlx7tiyWYAO/LQFsS+gaSmrsVxs+28l9nbH@vger.kernel.org X-Gm-Message-State: AOJu0YyI/Gys+wAYRLlvcMN8TmbXCnZOkISDWKUIPn1R2CfvebMeg7E5 H8nBHKNrvmFbqJOCDw0ilRH4QoYOzJYU6qFKLlUJ2bl3l6vZOLLd X-Gm-Gg: ASbGncsjPG5FRLgiDBfIUmjH+DhyGijt109RL8SbDyH1YjbfQzwtG8Ik2g7DLdjNeF0 drad1NnJMal7C942EsOIN/cgDQ4+13Bpga5L9GAN3acP8H7zhrwLWzMMRGO/XORNiKpEP9uWfRI EOs6lKiAGkX74OPVIPkE9SG+b8aoPik3etMaiy7Tl8YWQfIP/yXrKsx5Ow2Djqv/wXpMKxrusuD S1Pg9faZiA7SntXXEttnQD+8NmWRpziR06GLF8naIi0RPlVWxhGevPva1Az0i0rLeWLj1HGyKA3 6X+cVunts2nNMYuqbGePyJeipp6n8cJI+iteZCOmQpEofptCVC/RBmXPfKuMAf/DSfj2fBB0TUr DevBRbDDxoD82rCFymABkfJQbVFc1 X-Google-Smtp-Source: AGHT+IEW6mwbZ0mIlUOCzUaC2OsZ+OTum5RA4mVckjatFCdtgV+nmDBy9x3IRRsoTUB+6DxdKM96QA== X-Received: by 2002:a17:906:5fc1:b0:ac3:3f11:b49c with SMTP id a640c23a62f3a-ac33f1203bcmr672618066b.7.1742149162583; Sun, 16 Mar 2025 11:19:22 -0700 (PDT) Received: from hex.my.domain (83.11.178.210.ipv4.supernova.orange.pl. [83.11.178.210]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac314a48b51sm537951266b.149.2025.03.16.11.19.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Mar 2025 11:19:22 -0700 (PDT) From: Artur Weber Date: Sun, 16 Mar 2025 19:18:52 +0100 Subject: [PATCH v7 04/10] mfd: bcm590xx: Drop unused "id" member of bcm590xx MFD struct 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: <20250316-bcm59054-v7-4-4281126be1b8@gmail.com> References: <20250316-bcm59054-v7-0-4281126be1b8@gmail.com> In-Reply-To: <20250316-bcm59054-v7-0-4281126be1b8@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=1742149152; l=805; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=shsY8picWdauNM7HAi5QIbN1+/obURFOkQY2q4XNRbc=; b=rDbh+AGUMQmTqrTWquPXt0bGmiEn//jNa4ylElnxOs5ntrSzd4IpDqsafHt4svb6BYQbXBycJ S4LJMyByqXFC2UnuVmWhYPaos/F4ixaCnRYxz2qv11xVBAMggZd6toO X-Developer-Key: i=aweber.kernel@gmail.com; a=ed25519; pk=RhDBfWbJEHqDibXbhNEBAnc9FMkyznGxX/hwfhL8bv8= The "id" member of the bcm590xx struct is unused and will be confusing once we add an actual PMU ID storage value. Drop it; a replacement will be introduced in a future commit. Signed-off-by: Artur Weber --- Changes in v6: - Add this commit --- include/linux/mfd/bcm590xx.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/linux/mfd/bcm590xx.h b/include/linux/mfd/bcm590xx.h index 6b8791da6119b22514447bf1572238b71c8b0e97..c614d1b1d8a217ac2f212908a4c= 19ae71fa56f63 100644 --- a/include/linux/mfd/bcm590xx.h +++ b/include/linux/mfd/bcm590xx.h @@ -23,7 +23,6 @@ struct bcm590xx { struct i2c_client *i2c_sec; struct regmap *regmap_pri; struct regmap *regmap_sec; - unsigned int id; }; =20 #endif /* __LINUX_MFD_BCM590XX_H */ --=20 2.48.1 From nobody Wed Dec 17 17:26:26 2025 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.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 CA0BA1F4725; Sun, 16 Mar 2025 18:19:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149167; cv=none; b=RRyoJ23v9KUlsHsexY/r8AqdKih0UCZUrTVI7+yVYXGsNRFvotlJHmNJNDLROll/yyIFffkoVp7tM9eHV91Y2a5lGq2C40CCXcy2MmyiDSuKNRyR7M426X8SGfXTKn3aqDaLluSFnVruhYlzdrX3rPNd8UoIqk0bIs6tWLuBI3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149167; c=relaxed/simple; bh=Vau+qtkiLKbsSAyta7HK/1aydJ9QZlhuWFoLqVhFrJQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=L0ZjBweGervUEQiGo0sDhI9VENZgGhjFy95u2oAAM8O1tos3DWXp7wwZgaPlX6a9kVgcuQauSd43JfC1M1JXMaBiLjKHERwCdtU+DMqVd9AkpMRa7Tqw3jaS1o5Pb9Ci5qpUC8WkGWB5Ge7nrQPte/EFQAOtea2kaovhLcc/fHo= 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=WLE02i59; arc=none smtp.client-ip=209.85.218.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="WLE02i59" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-ac297cbe017so875886666b.0; Sun, 16 Mar 2025 11:19:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742149164; x=1742753964; 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=3+2M+lUouAH0+Jr+nyjeHl+wxA0K/oLUPdCGmVRRMGE=; b=WLE02i59rYg12OVKBwiDxNoTW9/bq5Aieo49e8aTGl8wVVeo5NVuKkL92ent+Z0FWu pph/5bCFL2WsuSblMk1UeW2bkDbH5yyRkYElGuBGoqu/AtYFKlJ5V19yD5rRr8sIRyss pySYF1LCmlEtYH0Qsdzvhugg4fckWmREWV4R+NBmZESJWfkpoSNXs1q79GqzxGC7S/ft KZNO2tQRBT1tIabusqwZom9pjInDfDwe6eprrdwZMX/nL2MpewqH3hKXuvKk4klAnELr xFUL0mwGht8LQ/B1SVkng61Z4PnERCmS3y1fs45qSpBSaR1GhBT4WJMFIm/aFKOM75GU badw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742149164; x=1742753964; 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=3+2M+lUouAH0+Jr+nyjeHl+wxA0K/oLUPdCGmVRRMGE=; b=wMx/EUPBpOsuOiSo0Y5Y8M3Ajyi80cZgt45S9hAD0Cp+v9WHFzNp9XXcXQZAf9dzSs AHRwlQXpO7UlDimbu5voQVkE6cHzQZ1stSHy3bT4u5TY8woztlqhbVSg33MJ3J97qvmE MEfGJKlyDZy1xMT7A0h4rE02MQzOMXnPbOqiRfF4ARQp0HSuGKGZi2sGQdYTvcPDV7ct lTF75kJ/zk5cdhpXhAMbN/Lfb2YYpIYX1UnSPDLXOl05l93wPGmr+jTozyrRMEWbNShx sEFUT7boFyqsfsB2Zua60GzuGTESPPPISTOT8rfbMIViibF484UKOOV9PLGrU15IBMJv gqvQ== X-Forwarded-Encrypted: i=1; AJvYcCUW44DqaLiBkHHi4EnfOLpA/1nakdpXpIYq0NAlBcECat4dp0hnbONrhVbd4iSgwApHM7RlrI5+0lOUhBhJ@vger.kernel.org, AJvYcCWlLJ57CtnkOmOXJSQCCCyC30TY9239XFI3OXcSVPX0x42PjqbsdZEHAdEd1s9uc4VzInS3zBkSbmn0@vger.kernel.org X-Gm-Message-State: AOJu0Yx9VQzErOAWaqoqjjDOXXH3r5YvrcJ/pYfezsmSSISA11zTRp6i xVHyyiQQ2cnfGbtrfj7UsD+5uEQrdnuF9Km+eAjQecou3h4WUrku1Bebqw== X-Gm-Gg: ASbGncu1JWHRpguu1zJwKoW9sPx4CGU3NacjqhDBeRbjX/1xyVh11vi36KRAfGB6BY5 mkoztB+ZLtVjQzwtTfUkVfhwFSL1crEN1EfTf+Onpw8udLta2SMylJDM1eMK8YmxqLhL/voj4O1 m5qNXQcMcL8BDpSiBfG+V6pOFMmDhuZAGDiIgNM6dRlraSO/UZxDqG+ODCD0XTGA7n7pVoTUxqb aYJrXMAAhRmzPnOhg6be0IdbxN3zFu/sJYCMP50e6oMCAk2xzjiudXVtMYK5KegwLFfKaFHgYld Pga8mBUFjZITxvUzqdjq+m1UbusCh8XX8hT3w+BeVkNaXCVeWyUHt0RC72X6CAIlMJhGH6+xZSd JbzWFoOgNkABOJQyFUQ== X-Google-Smtp-Source: AGHT+IFsTvbuptCDYunQGEX3V0GFkwHGo4NapBLiRy6Vd2DahCTU9/K1cdfNQ0FqD/7wqDp8TOiXNw== X-Received: by 2002:a17:907:c5c3:b0:abf:6f95:22fc with SMTP id a640c23a62f3a-ac31250d4edmr1435495666b.28.1742149163867; Sun, 16 Mar 2025 11:19:23 -0700 (PDT) Received: from hex.my.domain (83.11.178.210.ipv4.supernova.orange.pl. [83.11.178.210]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac314a48b51sm537951266b.149.2025.03.16.11.19.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Mar 2025 11:19:23 -0700 (PDT) From: Artur Weber Date: Sun, 16 Mar 2025 19:18:53 +0100 Subject: [PATCH v7 05/10] 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: <20250316-bcm59054-v7-5-4281126be1b8@gmail.com> References: <20250316-bcm59054-v7-0-4281126be1b8@gmail.com> In-Reply-To: <20250316-bcm59054-v7-0-4281126be1b8@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=1742149152; l=3092; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=Vau+qtkiLKbsSAyta7HK/1aydJ9QZlhuWFoLqVhFrJQ=; b=Puz/3rKPW+vwQzNF9UX3IyuvqUyjRTbdWltpxzMJVrt/04G9WW1WaR+0YI8snfqoouVhlGiHZ k8OUNSztcexBGxV73E4xGFmXY1qw2F3+nF0cL/yVTd+++L2hKHw87Ft 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 --- 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.48.1 From nobody Wed Dec 17 17:26:26 2025 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (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 BC90F1F76C0; Sun, 16 Mar 2025 18:19:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149169; cv=none; b=OHC6D6D0/BUtl2LzqEBpvjoZ8KVushapq9A1qkRqj/d/MgWr1iGXwotXtj3uuNjRXVS5vByyook0PsdP0p2op7sfeY0iCtlc1PvogMEoOGvi2mPyu2Kb8LOw+gCh2kff7nEn+T7aSSmLnuv8gibzMXi54fVXvd+8Nm7tyVudEto= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149169; c=relaxed/simple; bh=v7kmhFS4/FCZzYhNN4jZO2ljmvejdJbM30D2qESzPQQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=F/rrJSPnekp2veJIkn+Zjuu95WkzOJLH+yLwKofM1URXimaWhG1w9YwQBbup5EvAHe/3y9laIh3SmM781pvwqML7JMv83mUlcSgmbDphZgYaS7+ZgbONwZXw/LM8i8zlJhXdzMX+LxUtkiXU1mCdgL88ql5eP3fXJ3yNGoqy+bI= 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=ii4odJ/9; arc=none smtp.client-ip=209.85.218.53 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="ii4odJ/9" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-ac2963dc379so631346366b.2; Sun, 16 Mar 2025 11:19:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742149166; x=1742753966; 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=U2WGpLSZw0pQ2JyUw8cq5eE/wZXTd4ilCeNkW1xDF4Y=; b=ii4odJ/9D76MelOkktEEgmBezrUA4aj3f3DgdHvHLvsYMUbD6SI+j60HWFdkFnPJIB JHBtDnDS1OpKPOqWtgTnQnlIOYM9HusFSqerIyiEsF7G/Cvq+SQ0sFA0Nyq9W67i/xwT GSsFfPpfheNX/QdQnbkYpKTARczD0flbhMht/JLedQRCv5wWCGMfIG4PgqqlqM3HJVEV 7yopbopemSnk65w2alVS9WENIfbClld1qauNSrO/tZNMiqfZ1hPPNizHnOLwcdHCr37a NZTTEGsSwQfXyuM+K/LfjsB4ZzqWCjhtYVJ0DMkRbr+HUEFOE4uXhE/mx13MoBZ9hFLU GVFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742149166; x=1742753966; 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=U2WGpLSZw0pQ2JyUw8cq5eE/wZXTd4ilCeNkW1xDF4Y=; b=dsa+I47bhuqDvUtUiXkS+nx2vKjuOVBbyzsJZYAVoJkNkijB9sSCr54vv2naMqh2g2 hQENWJMqPn48R1iHJZrTdNjj8RXZ0ECSfehaRx1XFkwH7uQvS6m/tH8DX7slPLFVVit5 BeF6lR0FAP7QCyJRn7GotrxdR9ssYoXTv8WKjTN/3FS4LFj56LPwA/7lSaco31SK1Qq6 2tiTFLq3IKwau4YuraqGhJUMu//+62nd/nFiSObgyGGR5dlAYuP7oqjDvsPXbsIx3Pgb ibpZg8NEIw9KOsF1UlXtokqGQwT+/TAoueNlWJMxumx4dUVvl0kCgvmOOr1XMsGGSrwZ qzrQ== X-Forwarded-Encrypted: i=1; AJvYcCVNPBaFxQVh6S7wfd1Hp7Mx3PyTg+4HjfX15mBxiIBPZY340KonJu2nUYxt9pKMdD1FmG84RN1n/cCVHLRD@vger.kernel.org, AJvYcCXiHlluAHJ5YJ0kjx1c3b5DM09s7dZ4kNbmlZ+7fcXW8GGX4/jx4Kn/4hVVDedp0SFIGWP+si/Ne8Wr@vger.kernel.org X-Gm-Message-State: AOJu0Yz6yBz1j5kE0SSarlndi7PQ2LnzqfQ4Y48ttO6hu0JlwnBVMMaJ 3R4VFm86MUTh6FZmqWWXdxVX+an2mmTJh/fvhn7fKu9phuL3pqi+ X-Gm-Gg: ASbGnctPLalU7VxU/KfcEyMPsazS1FxO+heQ2l8QidC3rDGXpOkkxKb0Nb92N0mY+wn tm/OWIDvNyNiamyoej70GeKbIJGtbj04nzd60hJFnZhZ8WQAMZAVZVPpCm2WCYLy570Gt4XIR/Y Vd19u/URonCVSrjv3txOAa8F5/LwaLggwOrGa80CAxPbaClZ/QTlQgW74bPQDPT9pur0YVJ/dj4 M0HYvg9+Gpx2xF3bar/OaxAfbVR+FfIOPySghlcH+2ZgsHOWmBCk/cIRZasd6R+KNnhS61k8XRx EhtZ6Zy3gLBGJcT/ExLxTFWHX40MITSrmTLHEv8VXdzC/VR81HT4LMdIpASz2TL42qMBSB8A8qf j4ygCL3bqciKdRm5eRQ== X-Google-Smtp-Source: AGHT+IGXOWQRDAcYMd/Exc8yvwI1iOo50BCvMmRGoY19tx/OzEDExs7J9Jn98aan+JZt52qJvtFkHg== X-Received: by 2002:a17:906:4795:b0:abf:78ff:e26a with SMTP id a640c23a62f3a-ac3303f76c3mr950349766b.35.1742149165906; Sun, 16 Mar 2025 11:19:25 -0700 (PDT) Received: from hex.my.domain (83.11.178.210.ipv4.supernova.orange.pl. [83.11.178.210]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac314a48b51sm537951266b.149.2025.03.16.11.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Mar 2025 11:19:24 -0700 (PDT) From: Artur Weber Date: Sun, 16 Mar 2025 19:18:54 +0100 Subject: [PATCH v7 06/10] 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: <20250316-bcm59054-v7-6-4281126be1b8@gmail.com> References: <20250316-bcm59054-v7-0-4281126be1b8@gmail.com> In-Reply-To: <20250316-bcm59054-v7-0-4281126be1b8@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=1742149152; l=4816; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=v7kmhFS4/FCZzYhNN4jZO2ljmvejdJbM30D2qESzPQQ=; b=kpXrClBmSYX3k1C5REpTgl5jPoh4zXLAQG26nF1819if64hNZGWA3wSHsZe41WMoHOycIlE2d DESPqq4/UARCSY2ttuRfnQ9tHHMH2xv2GhtDQlym1/DgAO+6eZ5nmcB 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 --- 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 | 63 ++++++++++++++++++++++++++++++++++++++++= ++++ include/linux/mfd/bcm590xx.h | 14 ++++++++++ 2 files changed, 77 insertions(+) diff --git a/drivers/mfd/bcm590xx.c b/drivers/mfd/bcm590xx.c index 4620eed0066fbf1dd691a2e392e967747b4d125b..140107263599777b30cce4cfc0f= 86a9278907d34 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,56 @@ 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", +}; + +/* + * Parse the version from version registers and make sure it matches + * the device type passed to the compatible. + */ +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_PMUREV_DIG_SHIFT; + + bcm590xx->rev_analog =3D (rev & BCM590XX_PMUREV_ANA_MASK) + >> BCM590XX_PMUREV_ANA_SHIFT; + + dev_info(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 +137,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.48.1 From nobody Wed Dec 17 17:26:26 2025 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (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 A82281F4179; Sun, 16 Mar 2025 18:19:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149171; cv=none; b=XTWPAvNAfLOjyYgoHsP//odH0URaR3ydtJFTX0fHjz34HdZeQp3MfCK4AUubICy6SXuzERMdJXrG2KqS8JZ73Gy2GOKKRTcn0flJ+HC0f0BhwxZbqk+Cumj7KPSRbbmy3KFXtqbvTD3rqe9FrHT2KEye3j/o4YBT8SPGg3NznO0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149171; c=relaxed/simple; bh=By/MtmZFNRfjDngs4ERybGWRLb6s1X3+TidkVsSq1AQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DEaCOV7pnWpULhXjTWKMT+XNPjHPlaVe7ih7ipsEVwtu45FsErsyCyXaZbgi43zJxXMtd0t30YP4s6RQThQcPE9lqr2UrbNM6v0XfcN7KGzTi4YmWFnQ1lPOfKwuPnVSggb261zyxW6ilcQRbiKFSBUnLcPqc2CrwMpuESPaXhI= 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=RerlYVVs; arc=none smtp.client-ip=209.85.218.54 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="RerlYVVs" Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-ac2a81e41e3so832445166b.1; Sun, 16 Mar 2025 11:19:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742149168; x=1742753968; 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=p8i2lzKiQXFgJCM32Stuyrr5VV9AUaCS/hseyM/SiD4=; b=RerlYVVsGFdHE07ZpoOV/trJH8JRLpnhb158y5Z2cBkut2gZknzTSgfrsCp+6xwg+l 60ruFH25K3RsUReOBRhkQ+xNKo0gE0EfGaX/HUoX1lgFuO2lthrO8BfA8BymaysgZupm 46vcQLSNDiClAe3yChOhnfa5LOuDEcKZZY8YnqXq0fziuOF5We2F4OKO3hgr4PV6IJkX m6Ppw72qMjSumZf5UZN5ssp6KVzXuWcmhzndZths3Rsmx57ru31I5xX1lQPywjbLqLyz 1e0UntJ27seczVjx97rhBpmecGbbqDjEVkGzDk8NbAD5TqiLBnzRrIrMdKqWXdpXgLFt n3EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742149168; x=1742753968; 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=p8i2lzKiQXFgJCM32Stuyrr5VV9AUaCS/hseyM/SiD4=; b=RZ4WN3CNaEF1xz+uJdQUsGodqJ059x3RSgAKHfRUXLI+OqxuJGqYdjHTgprZezc4Ib CIYrHpHWiNpu0gB07wgMw/f8hTi7sM3mEWiaKTUqY+mwnORMYZbO3cBpz2bqvTJncyeu 1DaZMfuBVQHx0TDPyKCJE0/nV00jeX0UxbWmJyfXF4as7nb6toXUVudaguO2DWGGN621 MZPBspTZzuJDNfS+SJU2qUIp/3Iyi719K4QqLVYgdR7FsYSt7Fd+i9tShbksmViQl8JO hwtXqoxLpFcFH4Y203J0yEDfUyACA56pGVQpviFKWJnZ/CXhqrrYywQJdXZ6y9O2rjt8 qjNg== X-Forwarded-Encrypted: i=1; AJvYcCUHTdr3kW5lQlDEjv9blpBe3fXTFmcfV0N0MRxB8n5F6osSmw5MrmTm0+DjltQvK/znmc3yl4SIIh77@vger.kernel.org, AJvYcCXF8b5PszHREPomGNyVOawFSa4TMlA4DTNz3kM1pZxpiOZZ6AFROQcFDd0sco8+p6tPtn9IVyTu9f7bmFYi@vger.kernel.org X-Gm-Message-State: AOJu0YxkJqTtcrlSamKTHX1dPP7cr8/P8j5T02hK1Qm7RCn+tycPNjfY YfZEW4erjSYpgR2EuqHmw0yn+6SY6mRCc5y08BiJZcAo3c7Y4Q0M X-Gm-Gg: ASbGncsng0m9aSaZptN4hHpzmDypjjtS0cMMQ0X789uxb0ifybgRjghO3W/xYGsUS8I V0jItJTsbgaeLTrs3Di8OYrZ89MMNVpAS7JBsa6VODc4XQaYAQf+qBtHuUFJlRgZ1d1zhkZiL0M ctK33u678QHmaJ8z70nYQ7LmBOgawjlWIUiCWSqGbJDSSHkU5TyZkDDfrfIiNN2+1JB6d3QT5RG BYPTV81kws4MlOVI/TJOnLvg6d3De+EZH8D4UCzFbD21yRASp2ML1VE/le9fAcKtVAPCa9ipS4t wu433p3VOGxWenyBgZLmOBV+73xPak+si7qkvt+GG8P+ES8pp6nsk0ll6BDGHK+qrRT8ca+1TVv HLMKea/MEkMH983Eavw== X-Google-Smtp-Source: AGHT+IEv1VDRXxX1pGR0UQxt+AjO6mxGqoEmUs/RgC1vV2jOgv03SzF5RsrY2ijlnCEH58tY+1xEwg== X-Received: by 2002:a17:907:d0c:b0:ac3:45c1:34be with SMTP id a640c23a62f3a-ac345c13c3emr673566966b.9.1742149167892; Sun, 16 Mar 2025 11:19:27 -0700 (PDT) Received: from hex.my.domain (83.11.178.210.ipv4.supernova.orange.pl. [83.11.178.210]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac314a48b51sm537951266b.149.2025.03.16.11.19.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Mar 2025 11:19:26 -0700 (PDT) From: Artur Weber Date: Sun, 16 Mar 2025 19:18:55 +0100 Subject: [PATCH v7 07/10] 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: <20250316-bcm59054-v7-7-4281126be1b8@gmail.com> References: <20250316-bcm59054-v7-0-4281126be1b8@gmail.com> In-Reply-To: <20250316-bcm59054-v7-0-4281126be1b8@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=1742149152; l=1115; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=By/MtmZFNRfjDngs4ERybGWRLb6s1X3+TidkVsSq1AQ=; b=/3MOGtkV9moDIs4AaSZwT7fVsK4xl03s0Y5kDJkIsdUz4faBuNZczOS0L4cRok9hGHOI+GH+S X4LtS4QORlRAtIjdZ33SCklSeNG7l9bJn1vFpknSR++9UuC2Jh0huxK 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 --- 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.48.1 From nobody Wed Dec 17 17:26:26 2025 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (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 CEC251FECC6; Sun, 16 Mar 2025 18:19:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149174; cv=none; b=hIOl+f5IXzzn485lEDCfAmjLBUftAhVmPkegJ438DqsxYSOyxNVR9JQ5S1Ezd2RNzDiNnBYOqcTvd6IVBNV+0aoCJVaM/NoS97hZKVC+rmB6kEKASj/c6nmI8GAhECrUuKZk5HhppxT9Ys9u4zjcGF5KuBoOB+Y8laeGuv8nLTw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149174; c=relaxed/simple; bh=GNdM5JMwEsZys9Gnl/ee+dTEs4h0iUU0Ghm/nQXH/xs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=F7d8VSGZiN/IJSNCow9F53rqB+1fPl44Y7CqouX4/PKTViq+uTsX+6CIfQ0VtLkqnQIkQe5C4+MDD2S19SRhvbyC9Ow67MwGviiQyANrIUkzEiScmc63NoQO59caMRU473hW4q9jH79iYdH4r1z6/W+4m62SBoDeYt5oQEehqYo= 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=cl3c3LzQ; arc=none smtp.client-ip=209.85.218.51 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="cl3c3LzQ" Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-ab771575040so905036166b.1; Sun, 16 Mar 2025 11:19:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742149170; x=1742753970; 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=kw4iz1UTiNOOq8JGEbYmPx0iiOi3I3/FxjgthphhYEA=; b=cl3c3LzQy/uMQdNLK5gZV/sgnfnZv6/G3lLEM1CoXwO0h+1DBWD/qo5jSwNBkJ0++b Uk6l0APKhd8G7V1P7z1B0CWy8V0SPWYex14XpsG53Hba5RR01i0XveNyB7iEHzxY3GQv KZa2dBriLjjjYW4u2M0epoX9h+mvvzMmL+qw7uRDW/hdXLtX24seEtUA5CHWztNDCIH0 +bBcWAuZF64gLDyYjSIaW7xgpUlg3h6rJvS6Bef/nIBsjfYHEoD4OE7Oig1f0g5ZCZLD 8K8+/kCP4R7eM/Taywj4brqO23y3EQbPecul04Uwiy5LKWyQCa+dMsm4xUPeIkRv03Lo WwSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742149170; x=1742753970; 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=kw4iz1UTiNOOq8JGEbYmPx0iiOi3I3/FxjgthphhYEA=; b=o3mzarc9Qx0ZExXX26HHwYkjceEJMurtTeefveXD7tlqAsigpstSCruew6SqdArPBW JzasU1pVv2FqtvB5X+QEzbEYGzhAAY6q///YDnH9+0EycS1lHnqxa7iGlqjhtNI0mtcS 7X36gpSSI6B/+gtkE68P92vnZMq8oKW6+CSdhiGtSTMmOzrku9tnVkbY1MjnGBywnWJi 9CYvwAtJ9yLAW68mMikGJ2dvSVtOq2b517UxNkVIgQQVYmAwMVLrsQqcSlvvvqdKQnA4 ZXlcYZ7NTOO0ZD+FeCpoc1fp0H+9bci4G7xdLO4gp5uEHN/xTN1yL8V6VG35fMFb45bX PhBg== X-Forwarded-Encrypted: i=1; AJvYcCVQxOLv0FICrGO8zj2NmwF/AKjHVJAekKDSJVONImdBLoEZSR1QfwR1gAlUicprzjE1BrR9Y4J9hB+b@vger.kernel.org, AJvYcCX/8BwfvGHk7iN7SvO1gNNp2+wkFzpNOpKBinOxTxTvIiUVDemLd1qFus0yLgDEnAnWjLhhDzG40igu/O6A@vger.kernel.org X-Gm-Message-State: AOJu0Yw5xVjG2KGlBtuynB0rWhbFReWPwIW6pnERUjWvvwrZyzGCw5so mCsjuSy3T7KSKFnG/DJb2FPiMtV1kY6SABdh9EleNuHWZinzltM8lBGgoA== X-Gm-Gg: ASbGncufhxR18pWj0/9GjnS1Wu16+n0fuas9jdXMdGVKscPaceVheTdChLPTzd7SDQx UKIDrcp4iYadreXciM67nn7vlaxpDDJaW+JF2UXKsYPDiY1BGzpLqGxc9eryk8Ti28dCeJ8wj/7 3CU256DhFIUriABMrn/zilOrhEFGqATOsbbhlydZirMEcKSE9xwsObch8iyBhJgiP+uDIMmRVOV SDPLEv5pLbUQR+fP8nyliP7TKL4tf/ECSGqRMLn7urLoQp7ToBgTFJI/BDx3VJwZwFYQRRGHO9y onhpVFHBx6U1stXjnpHu2v9nHvIJJds2Z9sGWsJ92ASRXYqTI7Vgx4WDvrOipLYKzHscPdkKBoX nEtdacDpKM0fCPB8qEw== X-Google-Smtp-Source: AGHT+IGlgFT9lkDADyc97zufmx5nCyT3ZRePeuTB9o0CscBhDi7VEhli6vq88ctW1mrNL8ArAFIX9g== X-Received: by 2002:a17:906:6a0a:b0:ac1:e18d:a738 with SMTP id a640c23a62f3a-ac3311b11d1mr1080027166b.3.1742149169932; Sun, 16 Mar 2025 11:19:29 -0700 (PDT) Received: from hex.my.domain (83.11.178.210.ipv4.supernova.orange.pl. [83.11.178.210]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac314a48b51sm537951266b.149.2025.03.16.11.19.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Mar 2025 11:19:28 -0700 (PDT) From: Artur Weber Date: Sun, 16 Mar 2025 19:18:56 +0100 Subject: [PATCH v7 08/10] 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: <20250316-bcm59054-v7-8-4281126be1b8@gmail.com> References: <20250316-bcm59054-v7-0-4281126be1b8@gmail.com> In-Reply-To: <20250316-bcm59054-v7-0-4281126be1b8@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=1742149152; l=16568; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=GNdM5JMwEsZys9Gnl/ee+dTEs4h0iUU0Ghm/nQXH/xs=; b=djCZdVNcDloT05w3TsivnJlzGZJivc1yD8CQRAHWgKWWD94sJHFXV2RzNp+NIDQJG0xsm/Efs KYHhmps31gRAK+/XzBtgLw48znT2IYVyFYKT1OLwSJko3AtP7Uxy6OA 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 --- 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.48.1 From nobody Wed Dec 17 17:26:26 2025 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (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 ED6E220297D; Sun, 16 Mar 2025 18:19:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149176; cv=none; b=U936SxCZziB0DHq+Vp8BwN1Fqen57vneBBjy2WlRB9v7UYQF4EQsi+XHLo5cQBxKP+yIzm+PKx1EQo14lA5zVgG9AC4cA/ksILNTzKVC5Mu6Rl3Me6PnGSSt9mBaUny+yYRlDreSZ4GXp7m5EziT7LT8Dswb0vEXbBXBcqxzacc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149176; c=relaxed/simple; bh=oxEUTmHEMqFY1U3XRs1IUPrScVAW6Cpse2Hwuls1zg8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QxmFw7ko4yTS0/ceiZlu3J1l9uH0DdgWM1u46nec+/pVdef0sNIqx8cFMLUtq22py/VOzz0XXxNFaX6ffwVLocFlZxj1y1pDGpWigeWSR83TZ600frTeZFA7fJ260MLYQi0GO7EkZJZAbpUZ5TCxwsnKom3cGjVel1MGmmVVTLk= 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=YLjqMsk3; arc=none smtp.client-ip=209.85.208.49 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="YLjqMsk3" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-5e5b56fc863so4995766a12.3; Sun, 16 Mar 2025 11:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742149172; x=1742753972; 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=miYnUngQpr1RBbtYz7RIfEo7Bq9k1QEoiU4vEkueku4=; b=YLjqMsk3YmxZNcDgl/I08fnbrHxgmABvtpnjfklCD92OVIeVO0awJDxgm2AH4EpJT/ kst9ADNIYwZMY2SrCScBiE4yL/q+Ezuj+Nsi9KsR614UfN+x5bqTtDokjQMxE6Ezvhls YZQiqRW6c+k1y6Usbpek5PtcU/0nNgZtveyRGKJo5CO8MAXCIXC0hrtTxcvrOzk82ApZ Z3+oEPBIqs3kX2lVAHw2j2F9mi9SdAJkzg4N8oaHMJ0NEnkqJm4uEJ8aJUhXuQfAj2z9 Ts1eL12yoy83goH2JZ0Dv8wT88T4IEvdhbUY8qbKW6x385XO5JwB/baKVYn7BtfVhuS8 KGSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742149172; x=1742753972; 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=miYnUngQpr1RBbtYz7RIfEo7Bq9k1QEoiU4vEkueku4=; b=ppMfydlQGcOYnNY+Nzqjlkc1GMdexbAbl+BmryM/EjtRIKpXFdKoInV1gqeCwje50P la2zJv4xAMfhX03CPiQgUyzTdpM1JTK6wi0SCj0UMsylVbWk8Ci43x12Xz161uJ4hleq T2cKKkQLjM8lW9K/MgsW3ZSO72ctiVGx24gxJj+t8btdDV+yhkxXWpSRjCr1atyMPTSQ q0Kch6ImjryTd+tMNx3JrWiRx/RMxcPDQOLFiXNXTM5qo8thWx59OLgnFjCSQCRmNA7A k0zpuyCRBGH5jvse7qPapb/fJDpkwQztnPY53NQ0Ch6nnEj+4nYieBe9RzZAxHUlEfNG cU+Q== X-Forwarded-Encrypted: i=1; AJvYcCWW6OFuqEKPyCwsu85JvYqlanJnQxa3vShmwrDZ0zT4twcTZcBziqtqOyRyu4jtLYftPDF5BTeW/BV0@vger.kernel.org, AJvYcCWjmvCm6K6vmBNwZltwyaaIjZHFv5rQJTM0ncPVOkuLin5h9vKSF9n3/2t6EHNEgqwMC0oBnawH5jIhU3I6@vger.kernel.org X-Gm-Message-State: AOJu0YyZvRNK/M4p0woCWqG+sl9zVPtpFhKNL2x9Kz+gD8EDWCEii0bq u9TPCq5B2g0i5pKcb92NOfzEQiKnK60zD3KGHQOyLXbMozr6Bzgl X-Gm-Gg: ASbGncvyIT+DUuelILA93c4Vrfwt5EH3sLM/jh2iyNxWfB6aAjan4wxzIEg2pVgcSVT 6Bz5rEw7hHxIQUQvJugfRwpWuBcCcGMPuO8nb6NSi00y+0cmvYhf2ThH2FgzaF7s4Hc9Kdl1ckx BX+xeZcknc3gnc351C6D3CseZ4ES7XUCxmtzLUfdPtJpIF/an9upFOBs0okKdjoaGPFcyCYhD0j NcWfrDy6dhtKeE4yujI7IfYrB+cGRgowLLMtNhPBz2uhSRSlDrhLj9eK968xZto2WKbaLqjcVH5 Zed+AX3D3J25lE5nzgLCpALMDlwiLzKTvnW8fq4T14ZDg9rLCEByd+xiG2CHFEQJliJj0wSnVFe M4k/DVWoggUseX3k1Cw== X-Google-Smtp-Source: AGHT+IEw2Pe6q7ehoCKata6Tk8Z9XOXDWK6SaW5v6rhkmMvYA0xc1Xh/1TYwlnsQBP3F1cOPz8bKLg== X-Received: by 2002:a17:906:4795:b0:ac2:55f2:f939 with SMTP id a640c23a62f3a-ac330104addmr1133286166b.6.1742149172017; Sun, 16 Mar 2025 11:19:32 -0700 (PDT) Received: from hex.my.domain (83.11.178.210.ipv4.supernova.orange.pl. [83.11.178.210]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac314a48b51sm537951266b.149.2025.03.16.11.19.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Mar 2025 11:19:31 -0700 (PDT) From: Artur Weber Date: Sun, 16 Mar 2025 19:18:57 +0100 Subject: [PATCH v7 09/10] 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: <20250316-bcm59054-v7-9-4281126be1b8@gmail.com> References: <20250316-bcm59054-v7-0-4281126be1b8@gmail.com> In-Reply-To: <20250316-bcm59054-v7-0-4281126be1b8@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=1742149152; l=21159; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=oxEUTmHEMqFY1U3XRs1IUPrScVAW6Cpse2Hwuls1zg8=; b=K0GWGd6u8gNTDI/ityTk6zsELosb0h24IJW70LIwz6MvmCCtoJD546q4VmjDnRRBYmCBio6ad i+wiUgGSM0MDUgucTcq2fIgsXPbBm8ro7h38NI2TAnd0w6GLln0KPAI 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 --- 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.48.1 From nobody Wed Dec 17 17:26:26 2025 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.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 E9AEF201004; Sun, 16 Mar 2025 18:19:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149178; cv=none; b=OWngqGInAfDV7HmQD4YqCGPqlk6peB9qL6fOVTcJurS8Lxt+O9EyP7NpoSvCCei8gPcczhWZvRbpRgnVG1/qALsnQx7PyOcDehIsrmjoy2+p8uMm+vcgn3hCoN0ldJeQAqI9sT46a7/VJqe/gCaEOIMNaek+BpT3rWbDfqcf9Tg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742149178; c=relaxed/simple; bh=LP/C5IojHuNw7vhHpiuPpAUrBkJdBS43MpQdBCqEy2s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NhL/WEQH8vw1WXyrw7EXgKasZq3K4vHluqM/9gAYgzWkkgEhl+QjmavN5qGIi0g9M5J+sIVsjb0LZHr/+8wZv6SJwn6rkHWyGA9tCaKEcsF0QMtpWYzNAk1h2rMIRcm8quXF5iPKLhGOyNqNBNs6pcwLoyeca5BVtj3tkIO32d0= 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=Qp6JsN8V; arc=none smtp.client-ip=209.85.218.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="Qp6JsN8V" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-aaee2c5ee6eso554042666b.1; Sun, 16 Mar 2025 11:19:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742149174; x=1742753974; 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=amKNxxzUeViOk51zJOZcbxy0m9EKEBmNEdChg+G2/50=; b=Qp6JsN8VNM4Xg3JpuYkDmkO3TIUXkcMESvJD8p+k0JL0dfpz8sXJnriNlNgQ6xbtFS 0wS89qRHOTTxtgLTy9nWA9z9xhhKEGK/jBuTWddVzEVMAB6Z0hwE7E8rYsF8PhvDy3H/ nMdQnW/1q05b6kBqE5grXo0zH0HTQxg9Jkqmfeu6QtFBjfN506GotjYJJJs6CYV/LPAI ZaWQoAMaco0Uo8rzIMSdV2I7VSSXuONs1wfX8efBGecTyRXVP9vx4rTEJFbYv1wzq0Zm eNGuOYnyZ4bSlR/Kg5j8J25VRp7KVZ05Z4NRWWHpNjo7ormWav84nrsGzK5FEWi2MU+o M1qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742149174; x=1742753974; 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=amKNxxzUeViOk51zJOZcbxy0m9EKEBmNEdChg+G2/50=; b=TzhlNRiy2YtnY9cfNQYWiBME+F//pYm7FoVkdJhCpGjL8sFF/u98nPxkWQWFNBkVIY Br4ImJoX8AJ79VlEl2nUju/kMOBxXpkDnchFcqljnqiHrE6KEFNI2tN4lCe0NoVHnj8R TyJxENDZL5ixHo3rTGOxUnZPN+qUjQ3CybHZOWKETl0j49HTYLwcoaGgFYU8DHzr4d3R BOVEpCJ96aU4jMkOvSNz4ZRmawiOGuuFuqR3YvxNODhU3TQsR7BEX1+0shv2b+n55kvp r9HGp/iDOUcPRrZvLP/mhpeWwOLpzwRVIi45DLv0jPuZChmWVj7xK+NmYABFcR0JIaxL ND3g== X-Forwarded-Encrypted: i=1; AJvYcCWireiAUSnnfhYEQG8/jxS9ld1MqJGzXIkMtuPeJAp5k3o4w1beLuuvWBR5B13YqYFGX1w0SxkmGxnV@vger.kernel.org, AJvYcCXtgoIGIX3oY6fVyF+3IAd5R5aOB45+ZkuyqywAX5R4RuXrrEQXy20AQNwHJ/oWin6t7+ce9fmOnXPv86ml@vger.kernel.org X-Gm-Message-State: AOJu0YwTnX2qNGg5nKUkEOyw3UgF7ery0daIwMn/JbdcMhW1gY+xKi7f 6kiTpiZxCzo1ZL98726zJ6FYmfTqKBl6S1/AMzUkPPhJZSLT1k5c85COsA== X-Gm-Gg: ASbGncv7XE84+MAfkQMtc8Th1aQBOukhbPqooDk6XiAzfbPJG8fXiEHMJaw/Bf9UpCX bacXI+ve4YX44nAEbHaZNxklMh9uWCb+BAIvoFMMpZKKm9UJCIeBvo41qv9YzxXCaOA9ee8ugWB NT+hwOCfsuiD8H0B9NK/xMGFAVlyiZTTdTxpmC0buEB5qHiC9IVw1553231IrrX8GBtMxK98d1+ D/EFJ85KDVaGqAloIijeKcN0Ici9tkMkpIK/rEnTr1xQPUsBJooRINavt2+0fTVos6bHgN2K+RT xwZs0t58DrCfhex8rO+rplwsYDFSxqhEL4P1COCk8ieiJ9uPRPsn0SZsRmWu8rGe9Vqr9UtY2Pw GCHOQlmerAgJoBx9zSQ== X-Google-Smtp-Source: AGHT+IGoRJAKltltcbINqhFsAUE2+2go4TuA+ktyXtsviYbQJ4PGOLYMnjgdTcwc1M6oBU/H5rXicg== X-Received: by 2002:a17:907:9712:b0:ac3:f06:d221 with SMTP id a640c23a62f3a-ac3301e1c7fmr1140524266b.3.1742149174052; Sun, 16 Mar 2025 11:19:34 -0700 (PDT) Received: from hex.my.domain (83.11.178.210.ipv4.supernova.orange.pl. [83.11.178.210]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac314a48b51sm537951266b.149.2025.03.16.11.19.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Mar 2025 11:19:33 -0700 (PDT) From: Artur Weber Date: Sun, 16 Mar 2025 19:18:58 +0100 Subject: [PATCH v7 10/10] 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: <20250316-bcm59054-v7-10-4281126be1b8@gmail.com> References: <20250316-bcm59054-v7-0-4281126be1b8@gmail.com> In-Reply-To: <20250316-bcm59054-v7-0-4281126be1b8@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=1742149152; l=17812; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=LP/C5IojHuNw7vhHpiuPpAUrBkJdBS43MpQdBCqEy2s=; b=WbuhX2cwPuPqfsZkX4CublsQ/s8DTGRSVhp9OiL5gnx4PjXCXfADLruMAVuhInULId4bz1JVB EKHkxK3R80eA+9/BpdgTbcY/Iiag34YWdk8WjLF8M+osMQqlAK8BoBu 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 --- 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.48.1