From patchwork Sun Feb 11 09:35:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karel Balej X-Patchwork-Id: 771985 Received: from nikam.ms.mff.cuni.cz (nikam.ms.mff.cuni.cz [195.113.20.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D69BB59169; Sun, 11 Feb 2024 09:47:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.113.20.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707644831; cv=none; b=FskPmirwUNm+3I2ZMSbFQXZwQSo354ihpOhJ9VU5Brk9QRoJ3fzT35Vkadiegqsz67XuyP67sZeT56Zbo/kN5cIm6B1b0uIelMm1VqLRV+pgcvUR73oYxoU+P4DyS44LtPve7nUBOdJON7p8v0V5MA7wvuAqWC/DU8frXbZNtQw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707644831; c=relaxed/simple; bh=vJBA+snkJeA8ZMMZk3ajRmCyMOr3OMk9VMLUY62CmNw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dxlp0v8hm2EnorfGk0F9Mg0A/NbqY75Nqnnou19iwKSGI/8ghINDOP0lHVhq9OX94T7iFeblS29Gf8eo1yhwR2scGICo6pi2sHrFQ4kjf6ODKuf5AJmabMwOzRdCLTFUp3YrsNOKhHIR+Jjr/8bFS9m9ThmvEePsKm9iiyJqZ1k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gimli.ms.mff.cuni.cz; spf=pass smtp.mailfrom=gimli.ms.mff.cuni.cz; dkim=pass (1024-bit key) header.d=gimli.ms.mff.cuni.cz header.i=@gimli.ms.mff.cuni.cz header.b=P6ZZRPI/; arc=none smtp.client-ip=195.113.20.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gimli.ms.mff.cuni.cz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gimli.ms.mff.cuni.cz Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=gimli.ms.mff.cuni.cz header.i=@gimli.ms.mff.cuni.cz header.b="P6ZZRPI/" Received: from gimli.ms.mff.cuni.cz (gimli.ms.mff.cuni.cz [195.113.20.176]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by nikam.ms.mff.cuni.cz (Postfix) with ESMTPS id 2186628123E; Sun, 11 Feb 2024 10:47:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gimli.ms.mff.cuni.cz; s=gen1; t=1707644827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/lcbMHbXeGAMc1nxorMXkdeAZcS8Fqwgqu7KtKASeVE=; b=P6ZZRPI/OvMmaca2R2dq6chdzaMYz1YyMFxwKvEMXLqvSFGX5P4S5lNl4lqLSGnR2H6l+U u7uq/dv/+e8dFBXWoHax7o2s/iQhOpUy3KDd6mGo4fDQOr7Mrh9qBOMPtLNoGjE3DCp1BP zZs0JPx/mwkOHSEicO94Rh9BuCI5ETk= Received: from localhost (internet5.mraknet.com [185.200.108.250]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (2048 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: karelb) by gimli.ms.mff.cuni.cz (Postfix) with ESMTPSA id F1B55457D7A; Sun, 11 Feb 2024 10:47:06 +0100 (CET) From: Karel Balej To: Karel Balej , Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Lee Jones , Liam Girdwood , Mark Brown , linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Duje_Mihanovi=C4=87?= , ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org Subject: [RFC PATCH v2 3/6] regulator: add regulators driver for Marvell 88PM886 PMIC Date: Sun, 11 Feb 2024 10:35:53 +0100 Message-ID: <20240211094609.2223-4-karelb@gimli.ms.mff.cuni.cz> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240211094609.2223-1-karelb@gimli.ms.mff.cuni.cz> References: <20240211094609.2223-1-karelb@gimli.ms.mff.cuni.cz> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Karel Balej Support the LDO and buck regulators of the Marvell 88PM886 PMIC. 88PM886 LDOs match those of 88PM880 which also has several more of them. 88PM880 buck regulators descriptions do not match and they sit on a different register page and thus need a separate I2C client and regmap. Signed-off-by: Karel Balej --- Notes: RFC v2: - Drop of_compatible and related code. - Drop unused include. - Remove some abstraction: use only one regmap for all regulators and only mention 88PM886 in Kconfig description. - Reword commit message. drivers/regulator/88pm88x-regulator.c | 206 ++++++++++++++++++++++++++ drivers/regulator/Kconfig | 6 + drivers/regulator/Makefile | 1 + 3 files changed, 213 insertions(+) create mode 100644 drivers/regulator/88pm88x-regulator.c diff --git a/drivers/regulator/88pm88x-regulator.c b/drivers/regulator/88pm88x-regulator.c new file mode 100644 index 000000000000..fd84b9604ac6 --- /dev/null +++ b/drivers/regulator/88pm88x-regulator.c @@ -0,0 +1,206 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include +#include +#include +#include +#include +#include +#include + +#include + +#define PM88X_REG_LDO_EN1 0x09 +#define PM88X_REG_LDO_EN2 0x0a + +#define PM88X_REG_BUCK_EN 0x08 + +#define PM88X_REG_LDO1_VOUT 0x20 +#define PM88X_REG_LDO2_VOUT 0x26 +#define PM88X_REG_LDO3_VOUT 0x2c +#define PM88X_REG_LDO4_VOUT 0x32 +#define PM88X_REG_LDO5_VOUT 0x38 +#define PM88X_REG_LDO6_VOUT 0x3e +#define PM88X_REG_LDO7_VOUT 0x44 +#define PM88X_REG_LDO8_VOUT 0x4a +#define PM88X_REG_LDO9_VOUT 0x50 +#define PM88X_REG_LDO10_VOUT 0x56 +#define PM88X_REG_LDO11_VOUT 0x5c +#define PM88X_REG_LDO12_VOUT 0x62 +#define PM88X_REG_LDO13_VOUT 0x68 +#define PM88X_REG_LDO14_VOUT 0x6e +#define PM88X_REG_LDO15_VOUT 0x74 +#define PM88X_REG_LDO16_VOUT 0x7a + +#define PM886_REG_BUCK1_VOUT 0xa5 +#define PM886_REG_BUCK2_VOUT 0xb3 +#define PM886_REG_BUCK3_VOUT 0xc1 +#define PM886_REG_BUCK4_VOUT 0xcf +#define PM886_REG_BUCK5_VOUT 0xdd + +#define PM88X_LDO_VSEL_MASK 0x0f +#define PM88X_BUCK_VSEL_MASK 0x7f + +struct pm88x_regulator { + struct regulator_desc desc; + int max_uA; +}; + +static int pm88x_regulator_get_ilim(struct regulator_dev *rdev) +{ + struct pm88x_regulator *data = rdev_get_drvdata(rdev); + + if (!data) { + dev_err(&rdev->dev, "Failed to get regulator data\n"); + return -EINVAL; + } + return data->max_uA; +} + +static const struct regulator_ops pm88x_ldo_ops = { + .list_voltage = regulator_list_voltage_table, + .map_voltage = regulator_map_voltage_iterate, + .set_voltage_sel = regulator_set_voltage_sel_regmap, + .get_voltage_sel = regulator_get_voltage_sel_regmap, + .enable = regulator_enable_regmap, + .disable = regulator_disable_regmap, + .is_enabled = regulator_is_enabled_regmap, + .get_current_limit = pm88x_regulator_get_ilim, +}; + +static const struct regulator_ops pm88x_buck_ops = { + .list_voltage = regulator_list_voltage_linear_range, + .map_voltage = regulator_map_voltage_linear_range, + .set_voltage_sel = regulator_set_voltage_sel_regmap, + .get_voltage_sel = regulator_get_voltage_sel_regmap, + .enable = regulator_enable_regmap, + .disable = regulator_disable_regmap, + .is_enabled = regulator_is_enabled_regmap, + .get_current_limit = pm88x_regulator_get_ilim, +}; + +static const unsigned int pm88x_ldo_volt_table1[] = { + 1700000, 1800000, 1900000, 2500000, 2800000, 2900000, 3100000, 3300000, +}; + +static const unsigned int pm88x_ldo_volt_table2[] = { + 1200000, 1250000, 1700000, 1800000, 1850000, 1900000, 2500000, 2600000, + 2700000, 2750000, 2800000, 2850000, 2900000, 3000000, 3100000, 3300000, +}; + +static const unsigned int pm88x_ldo_volt_table3[] = { + 1700000, 1800000, 1900000, 2000000, 2100000, 2500000, 2700000, 2800000, +}; + +static const struct linear_range pm88x_buck_volt_ranges1[] = { + REGULATOR_LINEAR_RANGE(600000, 0, 79, 12500), + REGULATOR_LINEAR_RANGE(1600000, 80, 84, 50000), +}; + +static const struct linear_range pm88x_buck_volt_ranges2[] = { + REGULATOR_LINEAR_RANGE(600000, 0, 79, 12500), + REGULATOR_LINEAR_RANGE(1600000, 80, 114, 50000), +}; + +static struct pm88x_regulator pm88x_ldo2 = { + .desc = { + .name = "LDO2", + .id = PM88X_REGULATOR_ID_LDO2, + .regulators_node = "regulators", + .of_match = "ldo2", + .ops = &pm88x_ldo_ops, + .type = REGULATOR_VOLTAGE, + .enable_reg = PM88X_REG_LDO_EN1, + .enable_mask = BIT(1), + .volt_table = pm88x_ldo_volt_table1, + .n_voltages = ARRAY_SIZE(pm88x_ldo_volt_table1), + .vsel_reg = PM88X_REG_LDO2_VOUT, + .vsel_mask = PM88X_LDO_VSEL_MASK, + }, + .max_uA = 100000, +}; + +static struct pm88x_regulator pm88x_ldo15 = { + .desc = { + .name = "LDO15", + .id = PM88X_REGULATOR_ID_LDO15, + .regulators_node = "regulators", + .of_match = "ldo15", + .ops = &pm88x_ldo_ops, + .type = REGULATOR_VOLTAGE, + .enable_reg = PM88X_REG_LDO_EN2, + .enable_mask = BIT(6), + .volt_table = pm88x_ldo_volt_table2, + .n_voltages = ARRAY_SIZE(pm88x_ldo_volt_table2), + .vsel_reg = PM88X_REG_LDO15_VOUT, + .vsel_mask = PM88X_LDO_VSEL_MASK, + }, + .max_uA = 200000, +}; + +static struct pm88x_regulator pm886_buck2 = { + .desc = { + .name = "buck2", + .id = PM886_REGULATOR_ID_BUCK2, + .regulators_node = "regulators", + .of_match = "buck2", + .ops = &pm88x_buck_ops, + .type = REGULATOR_VOLTAGE, + .n_voltages = 115, + .linear_ranges = pm88x_buck_volt_ranges2, + .n_linear_ranges = ARRAY_SIZE(pm88x_buck_volt_ranges2), + .vsel_reg = PM886_REG_BUCK2_VOUT, + .vsel_mask = PM88X_BUCK_VSEL_MASK, + .enable_reg = PM88X_REG_BUCK_EN, + .enable_mask = BIT(1), + }, + .max_uA = 1200000, +}; + +static struct pm88x_regulator *pm88x_regulators[] = { + [PM88X_REGULATOR_ID_LDO2] = &pm88x_ldo2, + [PM88X_REGULATOR_ID_LDO15] = &pm88x_ldo15, + [PM886_REGULATOR_ID_BUCK2] = &pm886_buck2, +}; + +static int pm88x_regulator_probe(struct platform_device *pdev) +{ + struct pm88x_chip *chip = dev_get_drvdata(pdev->dev.parent); + struct regulator_config rcfg = { }; + struct pm88x_regulator *regulator; + struct regulator_desc *rdesc; + struct regulator_dev *rdev; + int ret; + + if (pdev->id < 0 || pdev->id >= PM88X_REGULATOR_ID_SENTINEL) { + dev_err(&pdev->dev, "Invalid regulator ID: %d\n", pdev->id); + return -EINVAL; + } + + rcfg.dev = pdev->dev.parent; + regulator = pm88x_regulators[pdev->id]; + rdesc = ®ulator->desc; + rcfg.driver_data = regulator; + /* For 88PM886, regmap is the same for LDOs and bucks. */ + rcfg.regmap = chip->regmaps[PM88X_REGMAP_LDO]; + rdev = devm_regulator_register(&pdev->dev, rdesc, &rcfg); + if (IS_ERR(rdev)) { + ret = PTR_ERR(rdev); + dev_err(&pdev->dev, "Failed to register %s: %d", + rdesc->name, ret); + return ret; + } + + return 0; +} + +static struct platform_driver pm88x_regulator_driver = { + .driver = { + .name = "88pm88x-regulator", + }, + .probe = pm88x_regulator_probe, +}; +module_platform_driver(pm88x_regulator_driver); + +MODULE_DESCRIPTION("Marvell 88PM88X PMIC regulator driver"); +MODULE_AUTHOR("Karel Balej "); +MODULE_LICENSE("GPL"); diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 550145f82726..8872d0434412 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -91,6 +91,12 @@ config REGULATOR_88PM8607 help This driver supports 88PM8607 voltage regulator chips. +config REGULATOR_88PM88X + tristate "Marvell 88PM886 voltage regulators" + depends on MFD_88PM88X_PMIC + help + This driver implements support for Marvell 88PM886 voltage regulators. + config REGULATOR_ACT8865 tristate "Active-semi act8865 voltage regulator" depends on I2C diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 46fb569e6be8..6cfe9bb7ba2e 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_REGULATOR_USERSPACE_CONSUMER) += userspace-consumer.o obj-$(CONFIG_REGULATOR_88PG86X) += 88pg86x.o obj-$(CONFIG_REGULATOR_88PM800) += 88pm800-regulator.o obj-$(CONFIG_REGULATOR_88PM8607) += 88pm8607.o +obj-$(CONFIG_REGULATOR_88PM88X) += 88pm88x-regulator.o obj-$(CONFIG_REGULATOR_CROS_EC) += cros-ec-regulator.o obj-$(CONFIG_REGULATOR_CPCAP) += cpcap-regulator.o obj-$(CONFIG_REGULATOR_AAT2870) += aat2870-regulator.o