From patchwork Wed Oct 14 16:32:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 7397081 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A9F979F1B9 for ; Wed, 14 Oct 2015 16:41:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A06BA20878 for ; Wed, 14 Oct 2015 16:41:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9AD082073F for ; Wed, 14 Oct 2015 16:41:04 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZmP55-0001HJ-0i; Wed, 14 Oct 2015 16:39:11 +0000 Received: from smtp.csie.ntu.edu.tw ([140.112.30.61]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZmP4J-0000dA-Ab for linux-arm-kernel@lists.infradead.org; Wed, 14 Oct 2015 16:38:25 +0000 Received: from mirror2.csie.ntu.edu.tw (mirror2.csie.ntu.edu.tw [140.112.30.76]) (Authenticated sender: b93043) by smtp.csie.ntu.edu.tw (Postfix) with ESMTPSA id 9B2C920435; Thu, 15 Oct 2015 00:38:00 +0800 (CST) Received: by mirror2.csie.ntu.edu.tw (Postfix, from userid 1000) id 5C22C5F954; Thu, 15 Oct 2015 00:38:00 +0800 (CST) From: Chen-Yu Tsai To: Maxime Ripard , Samuel Ortiz , Lee Jones , Liam Girdwood , Mark Brown , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala Subject: [PATCH 3/6] mfd: axp20x: Add support for RSB based AXP223 PMIC Date: Thu, 15 Oct 2015 00:32:19 +0800 Message-Id: <1444840342-9233-4-git-send-email-wens@csie.org> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1444840342-9233-1-git-send-email-wens@csie.org> References: <1444840342-9233-1-git-send-email-wens@csie.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151014_093824_071860_35E51439 X-CRM114-Status: GOOD ( 18.50 ) X-Spam-Score: -4.2 (----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, Hans de Goede , Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The AXP223 is a new PMIC commonly paired with Allwinner A23/A33 SoCs. It is functionally identical to AXP221; only the regulator default voltage/status and the external host interface are different. Signed-off-by: Chen-Yu Tsai --- drivers/mfd/Kconfig | 12 ++++++ drivers/mfd/Makefile | 1 + drivers/mfd/axp20x-core.c | 2 + drivers/mfd/axp20x-rsb.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++ include/linux/mfd/axp20x.h | 1 + 5 files changed, 109 insertions(+) create mode 100644 drivers/mfd/axp20x-rsb.c diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 9ba3feb3f2fc..6e5edb61d42e 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -84,6 +84,7 @@ config MFD_BCM590XX config MFD_AXP20X bool "X-Powers AXP series PMICs" select MFD_AXP20X_I2C + select MFD_AXP20X_RSB config MFD_AXP20X_CORE bool @@ -102,6 +103,17 @@ config MFD_AXP20X_I2C components like regulators or the PEK (Power Enable Key) under the corresponding menus. +config MFD_AXP20X_RSB + bool "X-Powers AXP series RSB PMICs" + select MFD_AXP20X_CORE + depends on SUNXI_RSB=y + help + If you say Y here you get support for the X-Powers AXP series RSB + based power management ICs (PMICs). + This driver include only the core APIs. You have to select individual + components like regulators or the PEK (Power Enable Key) under the + corresponding menus. + config MFD_CROS_EC tristate "ChromeOS Embedded Controller" select MFD_CORE diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index ce3ad5fd4e2f..1eb278619dd6 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -108,6 +108,7 @@ obj-$(CONFIG_MFD_DA9052_SPI) += da9052-spi.o obj-$(CONFIG_MFD_DA9052_I2C) += da9052-i2c.o obj-$(CONFIG_MFD_AXP20X_CORE) += axp20x-core.o obj-$(CONFIG_MFD_AXP20X_I2C) += axp20x-i2c.o +obj-$(CONFIG_MFD_AXP20X_RSB) += axp20x-rsb.o obj-$(CONFIG_MFD_LP3943) += lp3943.o obj-$(CONFIG_MFD_LP8788) += lp8788.o lp8788-irq.o diff --git a/drivers/mfd/axp20x-core.c b/drivers/mfd/axp20x-core.c index dd33548d93c4..baecccb6d400 100644 --- a/drivers/mfd/axp20x-core.c +++ b/drivers/mfd/axp20x-core.c @@ -32,6 +32,7 @@ static const char * const axp20x_model_names[] = { "AXP202", "AXP209", "AXP221", + "AXP223", "AXP288", }; @@ -575,6 +576,7 @@ int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev) axp20x->regmap_irq_chip = &axp20x_regmap_irq_chip; break; case AXP221_ID: + case AXP223_ID: axp20x->nr_cells = ARRAY_SIZE(axp22x_cells); axp20x->cells = axp22x_cells; axp20x->regmap_cfg = &axp22x_regmap_config; diff --git a/drivers/mfd/axp20x-rsb.c b/drivers/mfd/axp20x-rsb.c new file mode 100644 index 000000000000..5d053d177717 --- /dev/null +++ b/drivers/mfd/axp20x-rsb.c @@ -0,0 +1,93 @@ +/* + * axp20x-rsb.c - RSB driver for the X-Powers' Power Management ICs + * + * AXP20x typically comprises an adaptive USB-Compatible PWM charger, BUCK DC-DC + * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature + * as well as configurable GPIOs. + * + * This driver supports the RSB variants. + * + * Author: Chen-Yu Tsai + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +static const struct of_device_id axp20x_sunxi_rsb_of_match[] = { + { .compatible = "x-powers,axp223", .data = (void *) AXP223_ID }, + { }, +}; +MODULE_DEVICE_TABLE(of, axp20x_sunxi_rsb_of_match); + +static int axp20x_sunxi_rsb_match_device(struct axp20x_dev *axp20x, + struct device *dev) +{ + const struct of_device_id *of_id; + + of_id = of_match_device(axp20x_sunxi_rsb_of_match, dev); + if (!of_id) { + dev_err(dev, "Unable to match OF ID\n"); + return -ENODEV; + } + axp20x->variant = (long) of_id->data; + + return axp20x_match_device(axp20x, dev); +} + +static int axp20x_sunxi_rsb_probe(struct sunxi_rsb_device *rdev) +{ + struct axp20x_dev *axp20x; + int ret; + + axp20x = devm_kzalloc(&rdev->dev, sizeof(*axp20x), GFP_KERNEL); + if (!axp20x) + return -ENOMEM; + + ret = axp20x_sunxi_rsb_match_device(axp20x, &rdev->dev); + if (ret) + return ret; + + axp20x->dev = &rdev->dev; + axp20x->irq = rdev->irq; + sunxi_rsb_device_set_drvdata(rdev, axp20x); + + axp20x->regmap = devm_regmap_init_sunxi_rsb(rdev, axp20x->regmap_cfg); + if (IS_ERR(axp20x->regmap)) { + ret = PTR_ERR(axp20x->regmap); + dev_err(&rdev->dev, "regmap init failed: %d\n", ret); + return ret; + } + + return axp20x_device_probe(axp20x); +} + +static int axp20x_sunxi_rsb_remove(struct sunxi_rsb_device *rdev) +{ + struct axp20x_dev *axp20x = sunxi_rsb_device_get_drvdata(rdev); + + return axp20x_device_remove(axp20x); +} + +static struct sunxi_rsb_driver axp20x_sunxi_rsb_driver = { + .driver = { + .name = "axp20x-sunxi-rsb", + .of_match_table = of_match_ptr(axp20x_sunxi_rsb_of_match), + }, + .probe = axp20x_sunxi_rsb_probe, + .remove = axp20x_sunxi_rsb_remove, +}; +module_sunxi_rsb_driver(axp20x_sunxi_rsb_driver); + +MODULE_DESCRIPTION("PMIC MFD sunXi RSB driver for AXP20X"); +MODULE_AUTHOR("Chen-Yu Tsai "); +MODULE_LICENSE("GPL v2"); diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h index 908f97f6e2d7..fef8dea18e66 100644 --- a/include/linux/mfd/axp20x.h +++ b/include/linux/mfd/axp20x.h @@ -18,6 +18,7 @@ enum { AXP202_ID, AXP209_ID, AXP221_ID, + AXP223_ID, AXP288_ID, NR_AXP20X_VARIANTS, };