power: pmic: axp: Provide a variant ID in the driver data

Subordinate regulator drivers can use this enumerated ID instead of
matching the compatible string again.

Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>

diff --git a/drivers/power/pmic/axp.c b/drivers/power/pmic/axp.c
index 0f2b24a8b5f312b6153e26ad4f52397978f200b0..e0005994e219cafc409938e474b472d8f49c48fd 100644 (file)
--- a/drivers/power/pmic/axp.c
+++ b/drivers/power/pmic/axp.c
@@ -64,15 +64,15 @@ static int axp_pmic_bind(struct udevice *dev)
 }
 
 static const struct udevice_id axp_pmic_ids[] = {
-       { .compatible = "x-powers,axp152" },
-       { .compatible = "x-powers,axp202" },
-       { .compatible = "x-powers,axp209" },
-       { .compatible = "x-powers,axp221" },
-       { .compatible = "x-powers,axp223" },
-       { .compatible = "x-powers,axp803" },
-       { .compatible = "x-powers,axp806" },
-       { .compatible = "x-powers,axp809" },
-       { .compatible = "x-powers,axp813" },
+       { .compatible = "x-powers,axp152", .data = AXP152_ID },
+       { .compatible = "x-powers,axp202", .data = AXP202_ID },
+       { .compatible = "x-powers,axp209", .data = AXP209_ID },
+       { .compatible = "x-powers,axp221", .data = AXP221_ID },
+       { .compatible = "x-powers,axp223", .data = AXP223_ID },
+       { .compatible = "x-powers,axp803", .data = AXP803_ID },
+       { .compatible = "x-powers,axp806", .data = AXP806_ID },
+       { .compatible = "x-powers,axp809", .data = AXP809_ID },
+       { .compatible = "x-powers,axp813", .data = AXP813_ID },
        { }
 };
 

diff --git a/include/axp_pmic.h b/include/axp_pmic.h
index 01ebba63479241f1cc5a0bb2875559ba6587e4f0..4ac64865831d6b9c00c24b89dc558c978ddbe001 100644 (file)
--- a/include/axp_pmic.h
+++ b/include/axp_pmic.h
@@ -26,6 +26,18 @@
 #define AXP_PMIC_SEC_DEVICE_ADDR       0x745
 #define AXP_PMIC_SEC_RUNTIME_ADDR      0x3a
 
+enum {
+       AXP152_ID,
+       AXP202_ID,
+       AXP209_ID,
+       AXP221_ID,
+       AXP223_ID,
+       AXP803_ID,
+       AXP806_ID,
+       AXP809_ID,
+       AXP813_ID,
+};
+
 int axp_set_dcdc1(unsigned int mvolt);
 int axp_set_dcdc2(unsigned int mvolt);
 int axp_set_dcdc3(unsigned int mvolt);