platform/x86: int3472: Pass tps68470_regulator_platform_data to the tps68470-regulato...

Pass tps68470_regulator_platform_data to the tps68470-regulator
MFD-cell, specifying the voltages of the various regulators and
tying the regulators to the sensor supplies so that sensors which use
the TPS68470 can find their regulators.

Since the voltages and supply connections are board-specific, this
introduces a DMI matches int3472_tps68470_board_data struct which
contains the necessary per-board info.

This per-board info also includes GPIO lookup information for the
sensor IO lines which may be connected to the tps68470 GPIOs.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20211203102857.44539-11-hdegoede@redhat.com

diff --git a/drivers/platform/x86/intel/int3472/Makefile b/drivers/platform/x86/intel/int3472/Makefile
index 771e720528a06518ef4179929afb1fcf49ae9e6a..cfec7784c5c93d83bacc5368e987b25d66f9548e 100644 (file)
--- a/drivers/platform/x86/intel/int3472/Makefile
+++ b/drivers/platform/x86/intel/int3472/Makefile
@@ -1,4 +1,4 @@
 obj-$(CONFIG_INTEL_SKL_INT3472)                += intel_skl_int3472_discrete.o \
                                           intel_skl_int3472_tps68470.o
 intel_skl_int3472_discrete-y           := discrete.o clk_and_regulator.o common.o
-intel_skl_int3472_tps68470-y           := tps68470.o common.o
+intel_skl_int3472_tps68470-y           := tps68470.o tps68470_board_data.o common.o

diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c
index d0a3659a34eabd5e5f265369eaf62314a49deb58..64b961fe628cf46f7c003149597b50c3002cf3d8 100644 (file)
--- a/drivers/platform/x86/intel/int3472/tps68470.c
+++ b/drivers/platform/x86/intel/int3472/tps68470.c
@@ -2,13 +2,16 @@
 /* Author: Dan Scally <djrscally@gmail.com> */
 
 #include <linux/i2c.h>
+#include <linux/kernel.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/tps68470.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/tps68470.h>
 #include <linux/regmap.h>
+#include <linux/string.h>
 
 #include "common.h"
+#include "tps68470.h"
 
 #define DESIGNED_FOR_CHROMEOS          1
 #define DESIGNED_FOR_WINDOWS           2
@@ -95,6 +98,7 @@ static int skl_int3472_tps68470_calc_type(struct acpi_device *adev)
 static int skl_int3472_tps68470_probe(struct i2c_client *client)
 {
        struct acpi_device *adev = ACPI_COMPANION(&client->dev);
+       const struct int3472_tps68470_board_data *board_data;
        struct tps68470_clk_platform_data clk_pdata = {};
        struct mfd_cell *cells;
        struct regmap *regmap;
@@ -123,6 +127,10 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client)
        device_type = skl_int3472_tps68470_calc_type(adev);
        switch (device_type) {
        case DESIGNED_FOR_WINDOWS:
+               board_data = int3472_tps68470_get_board_data(dev_name(&client->dev));
+               if (!board_data)
+                       return dev_err_probe(&client->dev, -ENODEV, "No board-data found for this model\n");
+
                cells = kcalloc(TPS68470_WIN_MFD_CELL_COUNT, sizeof(*cells), GFP_KERNEL);
                if (!cells)
                        return -ENOMEM;
@@ -137,12 +145,20 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client)
                cells[0].platform_data = &clk_pdata;
                cells[0].pdata_size = sizeof(clk_pdata);
                cells[1].name = "tps68470-regulator";
+               cells[1].platform_data = (void *)board_data->tps68470_regulator_pdata;
+               cells[1].pdata_size = sizeof(struct tps68470_regulator_platform_data);
                cells[2].name = "tps68470-gpio";
 
+               gpiod_add_lookup_table(board_data->tps68470_gpio_lookup_table);
+
                ret = devm_mfd_add_devices(&client->dev, PLATFORM_DEVID_NONE,
                                           cells, TPS68470_WIN_MFD_CELL_COUNT,
                                           NULL, 0, NULL);
                kfree(cells);
+
+               if (ret)
+                       gpiod_remove_lookup_table(board_data->tps68470_gpio_lookup_table);
+
                break;
        case DESIGNED_FOR_CHROMEOS:
                ret = devm_mfd_add_devices(&client->dev, PLATFORM_DEVID_NONE,
@@ -157,6 +173,17 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client)
        return ret;
 }
 
+static int skl_int3472_tps68470_remove(struct i2c_client *client)
+{
+       const struct int3472_tps68470_board_data *board_data;
+
+       board_data = int3472_tps68470_get_board_data(dev_name(&client->dev));
+       if (board_data)
+               gpiod_remove_lookup_table(board_data->tps68470_gpio_lookup_table);
+
+       return 0;
+}
+
 static const struct acpi_device_id int3472_device_id[] = {
        { "INT3472", 0 },
        { }
@@ -169,6 +196,7 @@ static struct i2c_driver int3472_tps68470 = {
                .acpi_match_table = int3472_device_id,
        },
        .probe_new = skl_int3472_tps68470_probe,
+       .remove = skl_int3472_tps68470_remove,
 };
 module_i2c_driver(int3472_tps68470);
 

diff --git a/drivers/platform/x86/intel/int3472/tps68470.h b/drivers/platform/x86/intel/int3472/tps68470.h
new file mode 100644 (file)
index 0000000..cfd33eb
--- /dev/null
+++ b/drivers/platform/x86/intel/int3472/tps68470.h
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * TI TPS68470 PMIC platform data definition.
+ *
+ * Copyright (c) 2021 Red Hat Inc.
+ *
+ * Red Hat authors:
+ * Hans de Goede <hdegoede@redhat.com>
+ */
+
+#ifndef _INTEL_SKL_INT3472_TPS68470_H
+#define _INTEL_SKL_INT3472_TPS68470_H
+
+struct gpiod_lookup_table;
+struct tps68470_regulator_platform_data;
+
+struct int3472_tps68470_board_data {
+       const char *dev_name;
+       struct gpiod_lookup_table *tps68470_gpio_lookup_table;
+       const struct tps68470_regulator_platform_data *tps68470_regulator_pdata;
+};
+
+const struct int3472_tps68470_board_data *int3472_tps68470_get_board_data(const char *dev_name);
+
+#endif

diff --git a/drivers/platform/x86/intel/int3472/tps68470_board_data.c b/drivers/platform/x86/intel/int3472/tps68470_board_data.c
new file mode 100644 (file)
index 0000000..faa5570
--- /dev/null
+++ b/drivers/platform/x86/intel/int3472/tps68470_board_data.c
@@ -0,0 +1,145 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * TI TPS68470 PMIC platform data definition.
+ *
+ * Copyright (c) 2021 Dan Scally <djrscally@gmail.com>
+ * Copyright (c) 2021 Red Hat Inc.
+ *
+ * Red Hat authors:
+ * Hans de Goede <hdegoede@redhat.com>
+ */
+
+#include <linux/dmi.h>
+#include <linux/gpio/machine.h>
+#include <linux/platform_data/tps68470.h>
+#include <linux/regulator/machine.h>
+#include "tps68470.h"
+
+static struct regulator_consumer_supply int347a_core_consumer_supplies[] = {
+       REGULATOR_SUPPLY("dvdd", "i2c-INT347A:00"),
+};
+
+static struct regulator_consumer_supply int347a_ana_consumer_supplies[] = {
+       REGULATOR_SUPPLY("avdd", "i2c-INT347A:00"),
+};
+
+static struct regulator_consumer_supply int347a_vcm_consumer_supplies[] = {
+       REGULATOR_SUPPLY("vdd", "i2c-INT347A:00-VCM"),
+};
+
+static struct regulator_consumer_supply int347a_vsio_consumer_supplies[] = {
+       REGULATOR_SUPPLY("dovdd", "i2c-INT347A:00"),
+       REGULATOR_SUPPLY("vsio", "i2c-INT347A:00-VCM"),
+};
+
+static const struct regulator_init_data surface_go_tps68470_core_reg_init_data = {
+       .constraints = {
+               .min_uV = 1200000,
+               .max_uV = 1200000,
+               .apply_uV = true,
+               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+       },
+       .num_consumer_supplies = ARRAY_SIZE(int347a_core_consumer_supplies),
+       .consumer_supplies = int347a_core_consumer_supplies,
+};
+
+static const struct regulator_init_data surface_go_tps68470_ana_reg_init_data = {
+       .constraints = {
+               .min_uV = 2815200,
+               .max_uV = 2815200,
+               .apply_uV = true,
+               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+       },
+       .num_consumer_supplies = ARRAY_SIZE(int347a_ana_consumer_supplies),
+       .consumer_supplies = int347a_ana_consumer_supplies,
+};
+
+static const struct regulator_init_data surface_go_tps68470_vcm_reg_init_data = {
+       .constraints = {
+               .min_uV = 2815200,
+               .max_uV = 2815200,
+               .apply_uV = true,
+               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+       },
+       .num_consumer_supplies = ARRAY_SIZE(int347a_vcm_consumer_supplies),
+       .consumer_supplies = int347a_vcm_consumer_supplies,
+};
+
+/* Ensure the always-on VIO regulator has the same voltage as VSIO */
+static const struct regulator_init_data surface_go_tps68470_vio_reg_init_data = {
+       .constraints = {
+               .min_uV = 1800600,
+               .max_uV = 1800600,
+               .apply_uV = true,
+               .always_on = true,
+       },
+};
+
+static const struct regulator_init_data surface_go_tps68470_vsio_reg_init_data = {
+       .constraints = {
+               .min_uV = 1800600,
+               .max_uV = 1800600,
+               .apply_uV = true,
+               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+       },
+       .num_consumer_supplies = ARRAY_SIZE(int347a_vsio_consumer_supplies),
+       .consumer_supplies = int347a_vsio_consumer_supplies,
+};
+
+static const struct tps68470_regulator_platform_data surface_go_tps68470_pdata = {
+       .reg_init_data = {
+               [TPS68470_CORE] = &surface_go_tps68470_core_reg_init_data,
+               [TPS68470_ANA]  = &surface_go_tps68470_ana_reg_init_data,
+               [TPS68470_VCM]  = &surface_go_tps68470_vcm_reg_init_data,
+               [TPS68470_VIO] = &surface_go_tps68470_vio_reg_init_data,
+               [TPS68470_VSIO] = &surface_go_tps68470_vsio_reg_init_data,
+       },
+};
+
+static struct gpiod_lookup_table surface_go_tps68470_gpios = {
+       .dev_id = "i2c-INT347A:00",
+       .table = {
+               GPIO_LOOKUP("tps68470-gpio", 9, "reset", GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP("tps68470-gpio", 7, "powerdown", GPIO_ACTIVE_LOW)
+       }
+};
+
+static const struct int3472_tps68470_board_data surface_go_tps68470_board_data = {
+       .dev_name = "i2c-INT3472:05",
+       .tps68470_gpio_lookup_table = &surface_go_tps68470_gpios,
+       .tps68470_regulator_pdata = &surface_go_tps68470_pdata,
+};
+
+static const struct dmi_system_id int3472_tps68470_board_data_table[] = {
+       {
+               .matches = {
+                       DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
+                       DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Go"),
+               },
+               .driver_data = (void *)&surface_go_tps68470_board_data,
+       },
+       {
+               .matches = {
+                       DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
+                       DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Go 2"),
+               },
+               .driver_data = (void *)&surface_go_tps68470_board_data,
+       },
+       { }
+};
+
+const struct int3472_tps68470_board_data *int3472_tps68470_get_board_data(const char *dev_name)
+{
+       const struct int3472_tps68470_board_data *board_data;
+       const struct dmi_system_id *match;
+
+       for (match = dmi_first_match(int3472_tps68470_board_data_table);
+            match;
+            match = dmi_first_match(match + 1)) {
+               board_data = match->driver_data;
+               if (strcmp(board_data->dev_name, dev_name) == 0)
+                       return board_data;
+       }
+
+       return NULL;
+}