From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932378AbcFJFez (ORCPT ); Fri, 10 Jun 2016 01:34:55 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:35745 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932343AbcFJFev (ORCPT ); Fri, 10 Jun 2016 01:34:51 -0400 From: John Stultz To: lkml Cc: John Stultz , Dmitry Torokhov , Rob Herring , Lee Jones , Jorge Ramirez-Ortiz , Feng Chen , Wei Xu , Guodong Xu Subject: [PATCH 3/3] mfd: hi655x-pmic: Add powerkey device to hi655x PMIC driver Date: Thu, 9 Jun 2016 22:34:37 -0700 Message-Id: <1465536877-18452-4-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465536877-18452-1-git-send-email-john.stultz@linaro.org> References: <1465536877-18452-1-git-send-email-john.stultz@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Wire up the powerkey driver functionality for the hi655x PMIC. Cc: Dmitry Torokhov Cc: Rob Herring Cc: Lee Jones Cc: Jorge Ramirez-Ortiz Cc: Feng Chen Cc: Wei Xu Cc: Guodong Xu Signed-off-by: John Stultz --- drivers/mfd/hi655x-pmic.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/hi655x-pmic.c b/drivers/mfd/hi655x-pmic.c index 68ab370..f3f6bfe2 100644 --- a/drivers/mfd/hi655x-pmic.c +++ b/drivers/mfd/hi655x-pmic.c @@ -24,10 +24,6 @@ #include #include -static const struct mfd_cell hi655x_pmic_devs[] = { - { .name = "hi655x-regulator", }, -}; - static const struct regmap_irq hi655x_irqs[] = { { .reg_offset = 0, .mask = OTMP_D1R_INT }, { .reg_offset = 0, .mask = VSYS_2P5_R_INT }, @@ -56,6 +52,36 @@ static struct regmap_config hi655x_regmap_config = { .max_register = HI655X_BUS_ADDR(0xFFF), }; +static struct resource pwrkey_resources[] = { + { + .name = "down", + .start = 6, + .end = 6, + .flags = IORESOURCE_IRQ, + }, { + .name = "up", + .start = 5, + .end = 5, + .flags = IORESOURCE_IRQ, + }, { + .name = "hold 4s", + .start = 4, + .end = 4, + .flags = IORESOURCE_IRQ, + }, +}; + +static const struct mfd_cell hi655x_pmic_devs[] = { + { + .name = "hi655x-regulator", + }, + { + .name = "hi65xx-powerkey", + .num_resources = ARRAY_SIZE(pwrkey_resources), + .resources = &pwrkey_resources[0], + }, +}; + static void hi655x_local_irq_clear(struct regmap *map) { int i; @@ -124,7 +150,8 @@ static int hi655x_pmic_probe(struct platform_device *pdev) platform_set_drvdata(pdev, pmic); ret = mfd_add_devices(dev, PLATFORM_DEVID_AUTO, hi655x_pmic_devs, - ARRAY_SIZE(hi655x_pmic_devs), NULL, 0, NULL); + ARRAY_SIZE(hi655x_pmic_devs), NULL, 0, + regmap_irq_get_domain(pmic->irq_data)); if (ret) { dev_err(dev, "Failed to register device %d\n", ret); regmap_del_irq_chip(gpio_to_irq(pmic->gpio), pmic->irq_data); -- 1.9.1