From patchwork Fri Jun 10 05:34:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 69744 Delivered-To: patches@linaro.org Received: by 10.140.106.246 with SMTP id e109csp122823qgf; Thu, 9 Jun 2016 22:34:54 -0700 (PDT) X-Received: by 10.66.144.228 with SMTP id sp4mr220847pab.107.1465536891373; Thu, 09 Jun 2016 22:34:51 -0700 (PDT) Return-Path: Received: from mail-pf0-x233.google.com (mail-pf0-x233.google.com. [2607:f8b0:400e:c00::233]) by mx.google.com with ESMTPS id 192si11445108pfw.92.2016.06.09.22.34.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Jun 2016 22:34:51 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::233 as permitted sender) client-ip=2607:f8b0:400e:c00::233; 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::233 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-pf0-x233.google.com with SMTP id y124so20211626pfy.0 for ; Thu, 09 Jun 2016 22:34:51 -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=oI3u/b3PLMdtp4NfptgykGB50e7xbYEfpQVo7jxrR2E=; b=jt5xkMLHTHgT0EB1nMsOhhMkPOgAYrsOVbkD0UA8LBtbOVHJHj6+uUYZas5fED5ikg 4Mct7sdT+aZNO7oH61eeIYv9weT9hDAs5DoZLVmFnjsIrp4T7UMM3N4bwq+LFD8G3TBm NOpQDfOr5dTWXc++LOq0eVtX5ZKOYI/0dVzZI= 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=oI3u/b3PLMdtp4NfptgykGB50e7xbYEfpQVo7jxrR2E=; b=Sdsi0xXxVPkVTxoh/WkaZf97pkj+P/acr/e/yXsLt/qIVVUD+kMXnxXtR20BzYkwbP MefVOfPAuPBZU/LB5dFuVtQ0p0SYhl+apckqTmg47qw4IeRdeJ+yZDCyjECLvGeX765u X4+9G4unBabJhjUAv26T0FvDsMOA6k/tVwNcwC+jJ7QC9j03ZuK0gpRoz/3czL+gks5g KRHsvmNoP4loBSoeBDndlYWTmo7zkZdi4hfpwLgeH3cGFmKsKv1AFQ+xzGrKZsk0gwIt 4bFU1vVYibE4curuBwsW5EYF98a4eVozC2m2l7ftFdz8eFm8CFQNXGr5DY5mHjpgzw7h hj2Q== X-Gm-Message-State: ALyK8tJtucQRB/S02l1Wm+T6p2LMT2mROlMZ5b3FR0x48hM4EUFQOFEaBew1D1Ar7sCxua4SbpU= X-Received: by 10.98.62.15 with SMTP id l15mr292818pfa.24.1465536891066; Thu, 09 Jun 2016 22:34:51 -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 c15sm14072566pfj.65.2016.06.09.22.34.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jun 2016 22:34:50 -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 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> 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(-) -- 1.9.1 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);