Use i2c_new_dummy_device() to register pm8008-regulator
client present at a different address space, instead of
defining a separate DT node. This avoids calling the probe
twice for the same chip, once for each client pm8008-infra
and pm8008-regulator.
As a part of this define pm8008_regmap_init() to do regmap
init for both the clients and define pm8008_get_regmap() to
pass the regmap to the regulator driver.
Signed-off-by: Satya Priya <[email protected]>
---
Changes in V11:
- Remove the for loop and register dummy directly as there are
only 2 clients.
- Define pm8008_regmap_init() API to do the redundant init part.
Changes in V10:
- Implement i2c_new_dummy_device to register extra clients.
drivers/mfd/qcom-pm8008.c | 31 +++++++++++++++++++++++++++++--
include/linux/mfd/qcom_pm8008.h | 8 ++++++++
2 files changed, 37 insertions(+), 2 deletions(-)
create mode 100644 include/linux/mfd/qcom_pm8008.h
diff --git a/drivers/mfd/qcom-pm8008.c b/drivers/mfd/qcom-pm8008.c
index 40a67f0..25e8d0b 100644
--- a/drivers/mfd/qcom-pm8008.c
+++ b/drivers/mfd/qcom-pm8008.c
@@ -57,6 +57,7 @@ enum {
struct pm8008_data {
struct device *dev;
+ struct regmap *regulators_regmap;
int irq;
struct regmap_irq_chip_data *irq_data;
};
@@ -150,6 +151,11 @@ static struct regmap_config qcom_mfd_regmap_cfg = {
.max_register = 0xFFFF,
};
+struct regmap *pm8008_get_regmap(struct pm8008_data *chip)
+{
+ return chip->regulators_regmap;
+}
+
static int pm8008_init(struct regmap *regmap)
{
int rc;
@@ -217,11 +223,25 @@ static int pm8008_probe_irq_peripherals(struct pm8008_data *chip,
return 0;
}
+static struct regmap *pm8008_regmap_init(struct i2c_client *client,
+ struct pm8008_data *chip)
+{
+ struct regmap *regmap;
+
+ regmap = devm_regmap_init_i2c(client, &qcom_mfd_regmap_cfg);
+ if (!regmap)
+ return NULL;
+
+ i2c_set_clientdata(client, chip);
+ return regmap;
+}
+
static int pm8008_probe(struct i2c_client *client)
{
int rc;
struct pm8008_data *chip;
struct gpio_desc *reset_gpio;
+ struct i2c_client *regulators_client;
struct regmap *regmap;
chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
@@ -229,11 +249,18 @@ static int pm8008_probe(struct i2c_client *client)
return -ENOMEM;
chip->dev = &client->dev;
- regmap = devm_regmap_init_i2c(client, &qcom_mfd_regmap_cfg);
+ regmap = pm8008_regmap_init(client, chip);
if (!regmap)
return -ENODEV;
- i2c_set_clientdata(client, chip);
+ regulators_client = i2c_new_dummy_device(client->adapter, client->addr + 1);
+ if (IS_ERR(regulators_client)) {
+ dev_err(&client->dev, "can't attach client\n");
+ return PTR_ERR(regulators_client);
+ }
+ chip->regulators_regmap = pm8008_regmap_init(regulators_client, chip);
+ if (!chip->regulators_regmap)
+ return -ENODEV;
if (of_property_read_bool(chip->dev->of_node, "interrupt-controller")) {
rc = pm8008_probe_irq_peripherals(chip, regmap, client->irq);
diff --git a/include/linux/mfd/qcom_pm8008.h b/include/linux/mfd/qcom_pm8008.h
new file mode 100644
index 0000000..e79e578
--- /dev/null
+++ b/include/linux/mfd/qcom_pm8008.h
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __QCOM_PM8008_H__
+#define __QCOM_PM8008_H__
+
+struct pm8008_data;
+struct regmap *pm8008_get_regmap(struct pm8008_data *chip);
+
+#endif
--
2.7.4
Quoting Satya Priya (2022-05-05 02:25:36)
> diff --git a/drivers/mfd/qcom-pm8008.c b/drivers/mfd/qcom-pm8008.c
> index 40a67f0..25e8d0b 100644
> --- a/drivers/mfd/qcom-pm8008.c
> +++ b/drivers/mfd/qcom-pm8008.c
> @@ -150,6 +151,11 @@ static struct regmap_config qcom_mfd_regmap_cfg = {
> .max_register = 0xFFFF,
> };
>
> +struct regmap *pm8008_get_regmap(struct pm8008_data *chip)
can chip be const?
> +{
> + return chip->regulators_regmap;
> +}
EXPORT_SYMBOL_GPL please. And the include is needed to avoid sparse
warning.
> +
> static int pm8008_init(struct regmap *regmap)
> {
> int rc;
Hi Satya,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on lee-mfd/for-mfd-next]
[also build test WARNING on robh/for-next broonie-regulator/for-next v5.18-rc5 next-20220505]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Satya-Priya/Add-Qualcomm-Technologies-Inc-PM8008-regulator-driver/20220505-173045
base: https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git for-mfd-next
config: m68k-allyesconfig (https://download.01.org/0day-ci/archive/20220505/[email protected]/config)
compiler: m68k-linux-gcc (GCC) 11.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/28e91eacf6442c72c4f1ca25e5ad90fedc73ab73
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Satya-Priya/Add-Qualcomm-Technologies-Inc-PM8008-regulator-driver/20220505-173045
git checkout 28e91eacf6442c72c4f1ca25e5ad90fedc73ab73
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross W=1 O=build_dir ARCH=m68k SHELL=/bin/bash drivers/mfd/
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <[email protected]>
All warnings (new ones prefixed by >>):
>> drivers/mfd/qcom-pm8008.c:154:16: warning: no previous prototype for 'pm8008_get_regmap' [-Wmissing-prototypes]
154 | struct regmap *pm8008_get_regmap(struct pm8008_data *chip)
| ^~~~~~~~~~~~~~~~~
vim +/pm8008_get_regmap +154 drivers/mfd/qcom-pm8008.c
153
> 154 struct regmap *pm8008_get_regmap(struct pm8008_data *chip)
155 {
156 return chip->regulators_regmap;
157 }
158
--
0-DAY CI Kernel Test Service
https://01.org/lkp