From nobody Thu Sep 11 16:48:15 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E3CBC04A94 for ; Fri, 4 Aug 2023 10:28:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231392AbjHDK2A (ORCPT ); Fri, 4 Aug 2023 06:28:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229792AbjHDK14 (ORCPT ); Fri, 4 Aug 2023 06:27:56 -0400 Received: from out28-75.mail.aliyun.com (out28-75.mail.aliyun.com [115.124.28.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88BD649CB; Fri, 4 Aug 2023 03:27:53 -0700 (PDT) X-Alimail-AntiSpam: AC=CONTINUE;BC=0.07436267|-1;CH=green;DM=|CONTINUE|false|;DS=CONTINUE|ham_alarm|0.00591623-0.000349149-0.993735;FP=0|0|0|0|0|-1|-1|-1;HT=ay29a033018047192;MF=like@awinic.com;NM=1;PH=DS;RN=11;RT=11;SR=0;TI=SMTPD_---.U8So1JI_1691144844; Received: from awinic..(mailfrom:like@awinic.com fp:SMTPD_---.U8So1JI_1691144844) by smtp.aliyun-inc.com; Fri, 04 Aug 2023 18:27:48 +0800 From: like@awinic.com To: lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, liweilei@awinic.com, liangdong@awinic.com, wangweidong.a@awinic.com, Alec Li Subject: [PATCH v2 1/2] regulator: aw37503: Remove unneeded fields and switch to using dev_err_probe() Date: Fri, 4 Aug 2023 10:27:02 +0000 Message-ID: <20230804102703.931418-2-like@awinic.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230804102703.931418-1-like@awinic.com> References: <20230804102703.931418-1-like@awinic.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Alec Li These fields are not really need, remove them. Switching to use the dev_err_probe() will be easier. Keep the Kconfig and Makefile sorted. Signed-off-by: Alec Li --- drivers/regulator/Kconfig | 8 + drivers/regulator/Makefile | 1 + drivers/regulator/aw37503-regulator.c | 240 ++++++++++++++++++++++++++ 3 files changed, 249 insertions(+) create mode 100644 drivers/regulator/aw37503-regulator.c diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 823f8e6e4801..6327201e8bb4 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -178,6 +178,14 @@ config REGULATOR_ATC260X ATC260x PMICs. This will enable support for all the software controllable DCDC/LDO regulators. =20 +config REGULATOR_AW37503 + tristate "AWINIC AW37503 Dual Output Power regulators" + depends on I2C && GPIOLIB + select REGMAP_I2C + help + This driver supports AW37503 single inductor - dual output + power supply specifically designed for display panels. + config REGULATOR_AXP20X tristate "X-POWERS AXP20X PMIC Regulators" depends on MFD_AXP20X diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 15e0d614ff66..f0e5cf7350a4 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -27,6 +27,7 @@ obj-$(CONFIG_REGULATOR_ARM_SCMI) +=3D scmi-regulator.o obj-$(CONFIG_REGULATOR_AS3711) +=3D as3711-regulator.o obj-$(CONFIG_REGULATOR_AS3722) +=3D as3722-regulator.o obj-$(CONFIG_REGULATOR_ATC260X) +=3D atc260x-regulator.o +obj-$(CONFIG_REGULATOR_AW37503) +=3D aw37503-regulator.o obj-$(CONFIG_REGULATOR_AXP20X) +=3D axp20x-regulator.o obj-$(CONFIG_REGULATOR_BCM590XX) +=3D bcm590xx-regulator.o obj-$(CONFIG_REGULATOR_BD71815) +=3D bd71815-regulator.o diff --git a/drivers/regulator/aw37503-regulator.c b/drivers/regulator/aw37= 503-regulator.c index 000000000000..e01ef6ad3eb8 --- /dev/null +++ b/drivers/regulator/aw37503-regulator.c @@ -0,0 +1,240 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// AWINIC AW37503 Regulator Driver +// +// Copyright (C) 2023 awinic. All Rights Reserved +// +// Author: + +#include +#include +#include +#include +#include +#include +#include + +#define AW37503_REG_VPOS 0x00 +#define AW37503_REG_VNEG 0x01 +#define AW37503_REG_APPS 0x03 +#define AW37503_REG_CONTROL 0x04 +#define AW37503_REG_WPRTEN 0x21 + +#define AW37503_VOUT_MASK 0x1F +#define AW37503_VOUT_N_VOLTAGE 0x15 +#define AW37503_VOUT_VMIN 4000000 +#define AW37503_VOUT_VMAX 6000000 +#define AW37503_VOUT_STEP 100000 + +#define AW37503_REG_APPS_DIS_VPOS BIT(1) +#define AW37503_REG_APPS_DIS_VNEG BIT(0) + +#define AW37503_REGULATOR_ID_VPOS 0 +#define AW37503_REGULATOR_ID_VNEG 1 +#define AW37503_MAX_REGULATORS 2 + +struct aw37503_reg_pdata { + struct gpio_desc *en_gpiod; + int ena_gpio_state; +}; + +struct aw37503_regulator { + struct device *dev; + struct aw37503_reg_pdata reg_pdata[AW37503_MAX_REGULATORS]; +}; + +static int aw37503_regulator_enable(struct regulator_dev *rdev) +{ + struct aw37503_regulator *chip =3D rdev_get_drvdata(rdev); + int id =3D rdev_get_id(rdev); + struct aw37503_reg_pdata *rpdata =3D &chip->reg_pdata[id]; + int ret; + + if (!IS_ERR(rpdata->en_gpiod)) { + gpiod_set_value_cansleep(rpdata->en_gpiod, 1); + rpdata->ena_gpio_state =3D 1; + } + + /* Hardware automatically enable discharge bit in enable */ + if (rdev->constraints->active_discharge =3D=3D + REGULATOR_ACTIVE_DISCHARGE_DISABLE) { + ret =3D regulator_set_active_discharge_regmap(rdev, false); + if (ret < 0) { + dev_err(chip->dev, "Failed to disable active discharge: %d\n", + ret); + return ret; + } + } + + return 0; +} + +static int aw37503_regulator_disable(struct regulator_dev *rdev) +{ + struct aw37503_regulator *chip =3D rdev_get_drvdata(rdev); + int id =3D rdev_get_id(rdev); + struct aw37503_reg_pdata *rpdata =3D &chip->reg_pdata[id]; + + if (!IS_ERR(rpdata->en_gpiod)) { + gpiod_set_value_cansleep(rpdata->en_gpiod, 0); + rpdata->ena_gpio_state =3D 0; + } + + return 0; +} + +static int aw37503_regulator_is_enabled(struct regulator_dev *rdev) +{ + struct aw37503_regulator *chip =3D rdev_get_drvdata(rdev); + int id =3D rdev_get_id(rdev); + struct aw37503_reg_pdata *rpdata =3D &chip->reg_pdata[id]; + + if (!IS_ERR(rpdata->en_gpiod)) + return rpdata->ena_gpio_state; + + return 1; +} + +static const struct regulator_ops aw37503_regulator_ops =3D { + .enable =3D aw37503_regulator_enable, + .disable =3D aw37503_regulator_disable, + .is_enabled =3D aw37503_regulator_is_enabled, + .list_voltage =3D regulator_list_voltage_linear, + .map_voltage =3D regulator_map_voltage_linear, + .get_voltage_sel =3D regulator_get_voltage_sel_regmap, + .set_voltage_sel =3D regulator_set_voltage_sel_regmap, + .set_active_discharge =3D regulator_set_active_discharge_regmap, +}; + +static int aw37503_of_parse_cb(struct device_node *np, + const struct regulator_desc *desc, + struct regulator_config *config) +{ + struct aw37503_regulator *chip =3D config->driver_data; + struct aw37503_reg_pdata *rpdata =3D &chip->reg_pdata[desc->id]; + int ret; + + rpdata->en_gpiod =3D devm_fwnode_gpiod_get(chip->dev, of_fwnode_handle(np= ), + "enable", GPIOD_OUT_LOW, + "enable"); + + if (IS_ERR(rpdata->en_gpiod)) { + ret =3D PTR_ERR(rpdata->en_gpiod); + + /* Ignore the error other than probe defer */ + if (ret =3D=3D -EPROBE_DEFER) + return ret; + return 0; + } + + return 0; +} + +#define AW37503_REGULATOR_DESC(_id, _name) \ + [AW37503_REGULATOR_ID_##_id] =3D { \ + .name =3D "aw37503-"#_name, \ + .supply_name =3D "vin", \ + .id =3D AW37503_REGULATOR_ID_##_id, \ + .of_match =3D of_match_ptr(#_name), \ + .of_parse_cb =3D aw37503_of_parse_cb, \ + .ops =3D &aw37503_regulator_ops, \ + .n_voltages =3D AW37503_VOUT_N_VOLTAGE, \ + .min_uV =3D AW37503_VOUT_VMIN, \ + .uV_step =3D AW37503_VOUT_STEP, \ + .enable_time =3D 500, \ + .vsel_mask =3D AW37503_VOUT_MASK, \ + .vsel_reg =3D AW37503_REG_##_id, \ + .active_discharge_off =3D 0, \ + .active_discharge_on =3D AW37503_REG_APPS_DIS_##_id, \ + .active_discharge_mask =3D AW37503_REG_APPS_DIS_##_id, \ + .active_discharge_reg =3D AW37503_REG_APPS, \ + .type =3D REGULATOR_VOLTAGE, \ + .owner =3D THIS_MODULE, \ + } + +static const struct regulator_desc aw_regs_desc[AW37503_MAX_REGULATORS] = =3D { + AW37503_REGULATOR_DESC(VPOS, outp), + AW37503_REGULATOR_DESC(VNEG, outn), +}; + +static const struct regmap_range aw37503_no_reg_ranges[] =3D { + regmap_reg_range(AW37503_REG_CONTROL + 1, + AW37503_REG_WPRTEN - 1), +}; + +static const struct regmap_access_table aw37503_no_reg_table =3D { + .no_ranges =3D aw37503_no_reg_ranges, + .n_no_ranges =3D ARRAY_SIZE(aw37503_no_reg_ranges), +}; + +static const struct regmap_config aw37503_regmap_config =3D { + .reg_bits =3D 8, + .val_bits =3D 8, + .max_register =3D AW37503_REG_WPRTEN, + .rd_table =3D &aw37503_no_reg_table, + .wr_table =3D &aw37503_no_reg_table, +}; + +static int aw37503_probe(struct i2c_client *client) +{ + struct device *dev =3D &client->dev; + struct aw37503_regulator *chip; + struct regulator_dev *rdev; + struct regmap *regmap; + struct regulator_config config =3D { }; + int id; + + chip =3D devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL); + if (!chip) + return -ENOMEM; + + regmap =3D devm_regmap_init_i2c(client, &aw37503_regmap_config); + if (IS_ERR(regmap)) + return dev_err_probe(dev, PTR_ERR(regmap), + "Failed to init regmap\n"); + + i2c_set_clientdata(client, chip); + chip->dev =3D dev; + + config.regmap =3D regmap; + config.dev =3D dev; + config.driver_data =3D chip; + + for (id =3D 0; id < AW37503_MAX_REGULATORS; ++id) { + rdev =3D devm_regulator_register(dev, &aw_regs_desc[id], + &config); + if (IS_ERR(rdev)) + return dev_err_probe(dev, PTR_ERR(rdev), + "Failed to register regulator %s\n", + aw_regs_desc[id].name); + } + return 0; +} + +static const struct i2c_device_id aw37503_id[] =3D { + {.name =3D "aw37503",}, + {}, +}; +MODULE_DEVICE_TABLE(i2c, aw37503_id); + +static const struct of_device_id aw37503_of_match[] =3D { + {.compatible =3D "awinic,aw37503",}, + { /* Sentinel */ }, +}; + +MODULE_DEVICE_TABLE(of, aw37503_of_match); + +static struct i2c_driver aw37503_i2c_driver =3D { + .driver =3D { + .name =3D "aw37503", + .of_match_table =3D aw37503_of_match, + }, + .probe_new =3D aw37503_probe, + .id_table =3D aw37503_id, +}; + +module_i2c_driver(aw37503_i2c_driver); + +MODULE_DESCRIPTION("aw37503 regulator driver"); +MODULE_AUTHOR("Alec Li "); +MODULE_LICENSE("GPL"); --=20 2.41.0