[PATCH] regulator: pf8x00: Use specific compatible strings for devices

[PATCH] regulator: pf8x00: Use specific compatible strings for devices

[Mark Brown]

The pf8x00 driver supports three devices, the DT compatible strings
and I2C IDs should enumerate these specifically rather than using a
wildcard so that we don't collide with anything incompatible in the
same ID range in the future and so that we can handle any software
visible differences between the variants we find.

Signed-off-by: Mark Brown <broonie@kernel.org>
---
 .../bindings/regulator/nxp,pf8x00-regulator.yaml          | 6 ++++--
 drivers/regulator/pf8x00-regulator.c                      | 8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml b/Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
index a6c259ce9785..956156fe52a3 100644
--- a/Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
@@ -19,7 +19,9 @@ description: |
 properties:
   compatible:
     enum:
-      - nxp,pf8x00
+      - nxp,pf8100
+      - nxp,pf8121a
+      - nxp,pf8200
 
   reg:
     maxItems: 1
@@ -118,7 +120,7 @@ examples:
         #size-cells = <0>;
 
         pmic@8 {
-            compatible = "nxp,pf8x00";
+            compatible = "nxp,pf8100";
             reg = <0x08>;
 
             regulators {
diff --git a/drivers/regulator/pf8x00-regulator.c b/drivers/regulator/pf8x00-regulator.c
index 308c27fa6ea8..af9918cd27aa 100644
--- a/drivers/regulator/pf8x00-regulator.c
+++ b/drivers/regulator/pf8x00-regulator.c
@@ -469,13 +469,17 @@ static int pf8x00_i2c_probe(struct i2c_client *client)
 }
 
 static const struct of_device_id pf8x00_dt_ids[] = {
-	{ .compatible = "nxp,pf8x00",},
+	{ .compatible = "nxp,pf8100",},
+	{ .compatible = "nxp,pf8121a",},
+	{ .compatible = "nxp,pf8200",},
 	{ }
 };
 MODULE_DEVICE_TABLE(of, pf8x00_dt_ids);
 
 static const struct i2c_device_id pf8x00_i2c_id[] = {
-	{ "pf8x00", 0 },
+	{ "pf8100", 0 },
+	{ "pf8121a", 0 },
+	{ "pf8200", 0 },
 	{},
 };
 MODULE_DEVICE_TABLE(i2c, pf8x00_i2c_id);
-- 
2.20.1

Re: [PATCH] regulator: pf8x00: Use specific compatible strings for devices

[Jagan Teki]

On Tue, Dec 15, 2020 at 6:50 PM Mark Brown <broonie@kernel.org> wrote:
>
> The pf8x00 driver supports three devices, the DT compatible strings
> and I2C IDs should enumerate these specifically rather than using a
> wildcard so that we don't collide with anything incompatible in the
> same ID range in the future and so that we can handle any software
> visible differences between the variants we find.

Thanks for the patch.

>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
>  .../bindings/regulator/nxp,pf8x00-regulator.yaml          | 6 ++++--
>  drivers/regulator/pf8x00-regulator.c                      | 8 ++++++--

I think the bindings patch would be separate? otherwise,

Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>

Re: [PATCH] regulator: pf8x00: Use specific compatible strings for devices

[Mark Brown]

On Tue, 15 Dec 2020 13:20:24 +0000, Mark Brown wrote:
> The pf8x00 driver supports three devices, the DT compatible strings
> and I2C IDs should enumerate these specifically rather than using a
> wildcard so that we don't collide with anything incompatible in the
> same ID range in the future and so that we can handle any software
> visible differences between the variants we find.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next

Thanks!

[1/1] regulator: pf8x00: Use specific compatible strings for devices
      commit: df9716ec9ade3d2e190a2aac199557d30a3a8416

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark