Register mfd cell ID and name for each of the 7 pm8008 LDOs to probe them through mfd driver without needing a separate compatible for regulator driver. Also, add a different compatible for the mfd node that contains regulators to make sure that the LDOs are registered with the correct mfd device. Signed-off-by: Satya Priya <quic_c_skakit@xxxxxxxxxxx> --- Changes in V5: - Changes newly added from V5. drivers/mfd/qcom-pm8008.c | 59 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/qcom-pm8008.c b/drivers/mfd/qcom-pm8008.c index c472d7f..e8569cc 100644 --- a/drivers/mfd/qcom-pm8008.c +++ b/drivers/mfd/qcom-pm8008.c @@ -8,6 +8,7 @@ #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/irqdomain.h> +#include <linux/mfd/core.h> #include <linux/module.h> #include <linux/of_device.h> #include <linux/of_platform.h> @@ -27,6 +28,37 @@ #define INT_EN_CLR_OFFSET 0x16 #define INT_LATCHED_STS_OFFSET 0x18 +static const struct mfd_cell pm8008_regulator_devs[] = { + { + .name = "qcom,pm8008-regulators", + .id = 0, + }, + { + .name = "qcom,pm8008-regulators", + .id = 1, + }, + { + .name = "qcom,pm8008-regulators", + .id = 2, + }, + { + .name = "qcom,pm8008-regulators", + .id = 3, + }, + { + .name = "qcom,pm8008-regulators", + .id = 4, + }, + { + .name = "qcom,pm8008-regulators", + .id = 5, + }, + { + .name = "qcom,pm8008-regulators", + .id = 6, + }, +}; + enum { PM8008_MISC, PM8008_TEMP_ALARM, @@ -35,6 +67,17 @@ enum { PM8008_NUM_PERIPHS, }; +enum { + PM8008_INFRA, + PM8008_REGULATORS, +}; + +static const struct of_device_id pm8008_match[] = { + { .compatible = "qcom,pm8008", .data = (void *)PM8008_INFRA}, + { .compatible = "qcom,pm8008-regulators", .data = (void *)PM8008_REGULATORS}, + { }, +}; + #define PM8008_PERIPH_0_BASE 0x900 #define PM8008_PERIPH_1_BASE 0x2400 #define PM8008_PERIPH_2_BASE 0xC000 @@ -221,6 +264,7 @@ static int pm8008_probe(struct i2c_client *client) { int rc; struct pm8008_data *chip; + const struct of_device_id *id; chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL); if (!chip) @@ -239,14 +283,19 @@ static int pm8008_probe(struct i2c_client *client) dev_err(chip->dev, "Failed to probe irq periphs: %d\n", rc); } + id = of_match_node(pm8008_match, chip->dev->of_node); + if (id->data == (void *)PM8008_REGULATORS) { + rc = mfd_add_devices(chip->dev, 0, pm8008_regulator_devs, + ARRAY_SIZE(pm8008_regulator_devs), NULL, 0, NULL); + if (rc) { + dev_err(chip->dev, "Failed to add children: %d\n", rc); + return rc; + } + } + return devm_of_platform_populate(chip->dev); } -static const struct of_device_id pm8008_match[] = { - { .compatible = "qcom,pm8008", }, - { }, -}; - static struct i2c_driver pm8008_mfd_driver = { .driver = { .name = "pm8008", -- 2.7.4