From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752841AbcFNWnw (ORCPT ); Tue, 14 Jun 2016 18:43:52 -0400 Received: from mail-pf0-f170.google.com ([209.85.192.170]:33729 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751190AbcFNWnk (ORCPT ); Tue, 14 Jun 2016 18:43:40 -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 4/4] mfd: hi655x-pmic: Add powerkey device to hi655x PMIC driver Date: Tue, 14 Jun 2016 15:43:32 -0700 Message-Id: <1465944212-17079-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465944212-17079-1-git-send-email-john.stultz@linaro.org> References: <1465944212-17079-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 --- v4: Cleaned up magic values and realigned regulator entry to be a onliner drivers/mfd/hi655x-pmic.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/hi655x-pmic.c b/drivers/mfd/hi655x-pmic.c index 072e6fe..e955a0c 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_MASK }, { .reg_offset = 0, .mask = VSYS_2P5_R_INT_MASK }, @@ -56,6 +52,34 @@ static struct regmap_config hi655x_regmap_config = { .max_register = HI655X_BUS_ADDR(0xFFF), }; +static struct resource pwrkey_resources[] = { + { + .name = "down", + .start = PWRON_D20R_INT, + .end = PWRON_D20R_INT, + .flags = IORESOURCE_IRQ, + }, { + .name = "up", + .start = PWRON_D20F_INT, + .end = PWRON_D20F_INT, + .flags = IORESOURCE_IRQ, + }, { + .name = "hold 4s", + .start = PWRON_D4SR_INT, + .end = PWRON_D4SR_INT, + .flags = IORESOURCE_IRQ, + }, +}; + +static const struct mfd_cell hi655x_pmic_devs[] = { + { + .name = "hi65xx-powerkey", + .num_resources = ARRAY_SIZE(pwrkey_resources), + .resources = &pwrkey_resources[0], + }, + { .name = "hi655x-regulator", }, +}; + static void hi655x_local_irq_clear(struct regmap *map) { int i; @@ -124,7 +148,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