From patchwork Fri May 29 22:19:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 6511671 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AF872C0020 for ; Fri, 29 May 2015 22:24:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A17722061C for ; Fri, 29 May 2015 22:24:42 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9144E20612 for ; Fri, 29 May 2015 22:24:41 +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 1YySfl-0005qJ-0x; Fri, 29 May 2015 22:22:37 +0000 Received: from mail-pd0-f177.google.com ([209.85.192.177]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YySfJ-0005dW-DK for linux-arm-kernel@lists.infradead.org; Fri, 29 May 2015 22:22:10 +0000 Received: by pdbki1 with SMTP id ki1so63010610pdb.1 for ; Fri, 29 May 2015 15:21:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=M5A5LikH1/frq9BzYeDbILnPOj7Ki9pEZTx6rQ+kj0g=; b=J8x0UxJYKSv/O4hhrTz4nQuN2HyXyd3OlzEGNiTDxQbzKH+nUhK9x9fyipiBspmcF+ NQ2R4LAUWspp2vq78j/JwTplGgSAuX3+SdDvf6Fk08JwVYPQ7knxUKSXmJjDh93qZaX4 /kEW0dZgxjmjvmxM942cZjVQ/kId4eZXNGFUi7dD+6/Ke5RjBqJsMGeaFtH9jRPoQJQ7 yKkXAPNhHJ2AS+3KKEQ3Jdr7wjdCZLEI7l1brNMo8NI6AgmonZjrc3vo6JRIgbhxXJg/ //V8FwI4DzP7lsnmNMe+z7oEq2KvqmvWJPlE7GX61h4873jhYMN+Wd5maATdO4tc9Sqy WRmA== X-Gm-Message-State: ALoCoQkhzWk0c6qF3C3uRukkVIsLZRV9L7ADAkwwHU6CbdgRxr0GbPLHn7lv+icVfyIlbtr7ra3a X-Received: by 10.70.45.16 with SMTP id i16mr18730812pdm.51.1432938108505; Fri, 29 May 2015 15:21:48 -0700 (PDT) Received: from localhost.localdomain ([202.62.77.106]) by mx.google.com with ESMTPSA id nb10sm6605761pdb.76.2015.05.29.15.21.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 May 2015 15:21:47 -0700 (PDT) From: Vaibhav Hiremath To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/4] mfd: 88pm800: add device tree support Date: Sat, 30 May 2015 03:49:19 +0530 Message-Id: <1432937962-4537-2-git-send-email-vaibhav.hiremath@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1432937962-4537-1-git-send-email-vaibhav.hiremath@linaro.org> References: <1432937962-4537-1-git-send-email-vaibhav.hiremath@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150529_152209_549079_1CA6AD66 X-CRM114-Status: GOOD ( 16.11 ) X-Spam-Score: -1.8 (-) Cc: devicetree@vger.kernel.org, sameo@linux.intel.com, rtc-linux@googlegroups.com, a.zummo@towertech.it, linux-kernel@vger.kernel.org, Vaibhav Hiremath , robh+dt@kernel.org, alexandre.belloni@free-electrons.com, Chao Xie , lee.jones@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Add DT support to the 88pm800 driver along with below properties - marvell,88pm800-irq-write-clear : Idicates whether interrupt status is cleared by write Also, creates the DT binding text file, Documentation/devicetree/bindings/mfd/88pm800.txt Signed-off-by: Chao Xie Signed-off-by: Vaibhav Hiremath --- Documentation/devicetree/bindings/mfd/88pm800.txt | 57 +++++++++++++++++++++++ drivers/mfd/88pm800.c | 39 ++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/88pm800.txt diff --git a/Documentation/devicetree/bindings/mfd/88pm800.txt b/Documentation/devicetree/bindings/mfd/88pm800.txt new file mode 100644 index 0000000..094951b --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/88pm800.txt @@ -0,0 +1,57 @@ +* Marvell 88PM800 Power Management IC + +Required parent device properties: +- compatible : "marvell,88pm800" +- reg : the I2C slave address for the 88pm800 chip +- interrupts : IRQ line for the 88pm800 chip +- interrupt-controller: describes the 88pm800 as an interrupt controller +- #interrupt-cells : should be 1. + - The cell is the 88pm800 local IRQ number + +Optional parent device properties: +- marvell,88pm800-irq-write-clr: indicates whether interrupt status is cleared by write + +88pm800 consists of a large and varied group of sub-devices: + +Device Supply Names Description +------ ------------ ----------- +88pm80x-onkey : : On key +88pm80x-rtc : : RTC +88pm80x : : Regulators + +Note: More device list will follow + +Example: + + pmic: 88pm800@30 { + compatible = "marvell,88pm800"; + reg = <0x30>; + interrupts = <0 77 0x4>; + interrupt-parent = <&gic>; + interrupt-controller; + #interrupt-cells = <1>; + + marvell,88pm800-irq-write-clr; + + regulators { + compatible = "marvell,88pm80x-regulator"; + + buck1a: BUCK1A { + regulator-compatible = "88PM800-BUCK1A"; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + regulator-always-on; + }; + ldo1: LDO1 { + regulator-compatible = "88PM800-LDO1"; + regulator-min-microvolt = <1700000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + }; + rtc { + compatible = "marvell,88pm80x-rtc"; + }; + }; diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c index 841717a..06ee058 100644 --- a/drivers/mfd/88pm800.c +++ b/drivers/mfd/88pm800.c @@ -27,6 +27,7 @@ #include #include #include +#include /* Interrupt Registers */ #define PM800_INT_STATUS1 (0x05) @@ -121,6 +122,11 @@ static const struct i2c_device_id pm80x_id_table[] = { }; MODULE_DEVICE_TABLE(i2c, pm80x_id_table); +static const struct of_device_id pm80x_of_match_table[] = { + { .compatible = "marvell,88pm800", }, + {}, +}; + static struct resource rtc_resources[] = { { .name = "88pm80x-rtc", @@ -133,6 +139,7 @@ static struct resource rtc_resources[] = { static struct mfd_cell rtc_devs[] = { { .name = "88pm80x-rtc", + .of_compatible = "marvell,88pm80x-rtc", .num_resources = ARRAY_SIZE(rtc_resources), .resources = &rtc_resources[0], .id = -1, @@ -151,6 +158,7 @@ static struct resource onkey_resources[] = { static const struct mfd_cell onkey_devs[] = { { .name = "88pm80x-onkey", + .of_compatible = "marvell,88pm80x-onkey", .num_resources = 1, .resources = &onkey_resources[0], .id = -1, @@ -160,6 +168,7 @@ static const struct mfd_cell onkey_devs[] = { static const struct mfd_cell regulator_devs[] = { { .name = "88pm80x-regulator", + .of_compatible = "marvell,88pm80x-regulator", .id = -1, }, }; @@ -538,14 +547,43 @@ out: return ret; } +static int pm800_probe_dt(struct device_node *np, + struct device *dev, + struct pm80x_platform_data *pdata) +{ + pdata->irq_mode = + of_property_read_bool(np, "marvell,88pm800-irq-write-clear"); + + return 0; +} + + static int pm800_probe(struct i2c_client *client, const struct i2c_device_id *id) { int ret = 0; struct pm80x_chip *chip; struct pm80x_platform_data *pdata = dev_get_platdata(&client->dev); + struct device_node *node = client->dev.of_node; struct pm80x_subchip *subchip; + if (!pdata && !node) { + dev_err(&client->dev, + "pm80x requires platform data or of_node\n"); + return -EINVAL; + } + + if (!pdata) { + pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) { + dev_err(&client->dev, "failed to allocaate memory\n"); + return -ENOMEM; + } + ret = pm800_probe_dt(node, &client->dev, pdata); + if (ret) + return ret; + } + ret = pm80x_init(client); if (ret) { dev_err(&client->dev, "pm800_init fail\n"); @@ -611,6 +649,7 @@ static struct i2c_driver pm800_driver = { .name = "88PM800", .owner = THIS_MODULE, .pm = &pm80x_pm_ops, + .of_match_table = pm80x_of_match_table, }, .probe = pm800_probe, .remove = pm800_remove,