From patchwork Fri Feb 15 12:56:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14910 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E88A623E01 for ; Fri, 15 Feb 2013 12:58:16 +0000 (UTC) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by fiordland.canonical.com (Postfix) with ESMTP id 9AC27A197C4 for ; Fri, 15 Feb 2013 12:58:16 +0000 (UTC) Received: by mail-ve0-f174.google.com with SMTP id pb11so3027697veb.33 for ; Fri, 15 Feb 2013 04:58:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=rBIpMjuU9Oe5apJoWyTJsfgn8LXyo+Wte86ROwYFByI=; b=Pn1OXW1t1+QJKZKsFIxFctD1G6IJ9F24aJlIInB4N0AYkAhqSVG96Lx8OW4VujU0Fv JCIzVY5EcnmAf8/J53drmYOsIDViAnNom4TY3VgfQMLvulgEegpobmNLC24tFRlNd2hq g4yFWyE3x0SS+5YgNloxXPYGuOjQwYK9OmMDLY7/0B+PYjDhl66c/XbPqcJguZnk9jVv ph6i4N/t/Y1GU3hPIg8SslyKKQhkm6eXUj88XCGHS4+PRVIc/yhbsWyvBOEkFGWFGeqy YSM7iGZX6ehonBZ69bFPEA5KZM2nazG9z7O8jPo8PDrbL4jUHfukO3nGe89wIx9Zk2BF +94Q== X-Received: by 10.52.33.167 with SMTP id s7mr2546135vdi.52.1360933096134; Fri, 15 Feb 2013 04:58:16 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.221.4.5 with SMTP id oa5csp11419vcb; Fri, 15 Feb 2013 04:58:11 -0800 (PST) X-Received: by 10.194.103.163 with SMTP id fx3mr3929787wjb.58.1360933090947; Fri, 15 Feb 2013 04:58:10 -0800 (PST) Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by mx.google.com with ESMTPS id j8si4365785wjb.217.2013.02.15.04.58.10 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Feb 2013 04:58:10 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.45 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.45; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.45 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wg0-f45.google.com with SMTP id dq12so2847739wgb.24 for ; Fri, 15 Feb 2013 04:58:10 -0800 (PST) X-Received: by 10.180.92.129 with SMTP id cm1mr5858967wib.10.1360933090156; Fri, 15 Feb 2013 04:58:10 -0800 (PST) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id j4sm2852410wiz.10.2013.02.15.04.58.07 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Feb 2013 04:58:09 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, sameo@linux.intel.com Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones Subject: [PATCH 25/35] mfd: ab8500-core: Add additional resources to ab8505_iddet_resources Date: Fri, 15 Feb 2013 12:56:56 +0000 Message-Id: <1360933026-30325-26-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360933026-30325-1-git-send-email-lee.jones@linaro.org> References: <1360933026-30325-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnLFhaxtJpcKXfHuWbuswetspNb+3pRtwYPpKFaZrjQyqxVm7/SAgUKZUUtqXmeVRI6Cutb Add VBUS_DET_R, VBUS_DET_F IRQ, ID_DET_PLUGR and ID_DET_PLUGF IRQ information to ab8505_iddet_resources. These are required to get interrupts for AB8505 cut-2. Signed-off-by: Lee Jones --- drivers/mfd/ab8500-core.c | 24 ++++++++++++++++++++++++ include/linux/mfd/abx500/ab8500.h | 2 ++ 2 files changed, 26 insertions(+) diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c index bbbd6e4..17187c3 100644 --- a/drivers/mfd/ab8500-core.c +++ b/drivers/mfd/ab8500-core.c @@ -963,6 +963,30 @@ static struct resource ab8505_iddet_resources[] = { .end = AB8505_INT_KEYSTUCK, .flags = IORESOURCE_IRQ, }, + { + .name = "VBUS_DET_R", + .start = AB8500_INT_VBUS_DET_R, + .end = AB8500_INT_VBUS_DET_R, + .flags = IORESOURCE_IRQ, + }, + { + .name = "VBUS_DET_F", + .start = AB8500_INT_VBUS_DET_F, + .end = AB8500_INT_VBUS_DET_F, + .flags = IORESOURCE_IRQ, + }, + { + .name = "ID_DET_PLUGR", + .start = AB8500_INT_ID_DET_PLUGR, + .end = AB8500_INT_ID_DET_PLUGR, + .flags = IORESOURCE_IRQ, + }, + { + .name = "ID_DET_PLUGF", + .start = AB8500_INT_ID_DET_PLUGF, + .end = AB8500_INT_ID_DET_PLUGF, + .flags = IORESOURCE_IRQ, + }, }; static struct resource ab8500_temp_resources[] = { diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h index 3e9131f..46418f3 100644 --- a/include/linux/mfd/abx500/ab8500.h +++ b/include/linux/mfd/abx500/ab8500.h @@ -163,12 +163,14 @@ enum ab8500_version { #define AB8500_INT_SRP_DETECT 88 #define AB8500_INT_USB_CHARGER_NOT_OKR 89 #define AB8500_INT_ID_WAKEUP_R 90 +#define AB8500_INT_ID_DET_PLUGR 91 /* 8505/9540 cut2.0 */ #define AB8500_INT_ID_DET_R1R 92 #define AB8500_INT_ID_DET_R2R 93 #define AB8500_INT_ID_DET_R3R 94 #define AB8500_INT_ID_DET_R4R 95 /* ab8500_irq_regoffset[12] -> IT[Source|Latch|Mask]21 */ #define AB8500_INT_ID_WAKEUP_F 96 /* not 8505/9540 */ +#define AB8500_INT_ID_DET_PLUGF 97 /* 8505/9540 cut2.0 */ #define AB8500_INT_ID_DET_R1F 98 /* not 8505/9540 */ #define AB8500_INT_ID_DET_R2F 99 /* not 8505/9540 */ #define AB8500_INT_ID_DET_R3F 100 /* not 8505/9540 */