From patchwork Tue Jun 14 22:43:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 70063 Delivered-To: patches@linaro.org Received: by 10.140.106.246 with SMTP id e109csp2280671qgf; Tue, 14 Jun 2016 15:43:44 -0700 (PDT) X-Received: by 10.36.216.196 with SMTP id b187mr12854314itg.36.1465944219723; Tue, 14 Jun 2016 15:43:39 -0700 (PDT) Return-Path: Received: from mail-pf0-x230.google.com (mail-pf0-x230.google.com. [2607:f8b0:400e:c00::230]) by mx.google.com with ESMTPS id 2si37981223pfh.24.2016.06.14.15.43.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jun 2016 15:43:39 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::230 as permitted sender) client-ip=2607:f8b0:400e:c00::230; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::230 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-pf0-x230.google.com with SMTP id c2so1783437pfa.2 for ; Tue, 14 Jun 2016 15:43:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cdp+RHews4TRybehhkPvgWEx8xDKD9UbdrDXbJLbekE=; b=GjZHM3L/c9fRVut2gkiTyTIRr/7q5vWnlYH8xiaLYjwoJEa7dYg4vOO4+7KK84tfi0 /vaxDFP2m7ndsGYRpnByqKyeFXTEKHWbGoIP/hAmxc33gVtpAbRQeQefjp7Obiq1RfQo 6Xay0V12xPt4BjoxYHDUCoORl9QDgb4tDrfYg= 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=cdp+RHews4TRybehhkPvgWEx8xDKD9UbdrDXbJLbekE=; b=Pd5oVW7bhEvFkxvasY4OeHZHQMiWtBAyYMq/5JWnXzE8Bb/V3mwwXnMT/b0ytsssYv 4l8iKpFTzI+WxaBs3oarTFE7lKWcHNlp06fvH//7qmcaQNsG8ep7EYIGQkU5XD4V85XN bVLUUZsGKWqj31wnJbz7oKyhO5TMuXEwN9ZiU+dshXfZ02A02UROPlbhtSiZZJu//5BL v62g7JNtTSZDbE63UH7BOAfj52ZmSphaQ3OA6kwIbAhVQsGkAXXPSvThX5KQhMgRAKjU kuLG1PYjU/s6DrcZ8qVkjejng7VKJI8ywiBjJOZ0DBjdEsVngzqyS/xI/HjK35JDAMTP LMHA== X-Gm-Message-State: ALyK8tIz3lRCI0XvOtyJlxUqv1z7aiRdyBT3hWSugZgqUOA7mUVEx8maEb72oW2PIO61eff79JI= X-Received: by 10.98.149.10 with SMTP id p10mr48525pfd.88.1465944219389; Tue, 14 Jun 2016 15:43:39 -0700 (PDT) Return-Path: Received: from localhost.localdomain (c-73-67-244-238.hsd1.or.comcast.net. [73.67.244.238]) by smtp.gmail.com with ESMTPSA id q88sm47789676pfj.4.2016.06.14.15.43.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Jun 2016 15:43:38 -0700 (PDT) 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> 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(-) -- 1.9.1 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);