From patchwork Tue Mar 6 05:30:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 144843 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E5A2BB6FAA for ; Tue, 6 Mar 2012 16:32:57 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1S4myV-0004Ut-3F; Tue, 06 Mar 2012 05:30:15 +0000 Received: from mail-pw0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1S4myR-0004Uf-Pj for linux-arm-kernel@lists.infradead.org; Tue, 06 Mar 2012 05:30:12 +0000 Received: by pbcun4 with SMTP id un4so1449899pbc.36 for ; Mon, 05 Mar 2012 21:30:09 -0800 (PST) Received-SPF: pass (google.com: domain of haojian.zhuang@gmail.com designates 10.68.227.228 as permitted sender) client-ip=10.68.227.228; Authentication-Results: mr.google.com; spf=pass (google.com: domain of haojian.zhuang@gmail.com designates 10.68.227.228 as permitted sender) smtp.mail=haojian.zhuang@gmail.com; dkim=pass header.i=haojian.zhuang@gmail.com Received: from mr.google.com ([10.68.227.228]) by 10.68.227.228 with SMTP id sd4mr57859153pbc.33.1331011809812 (num_hops = 1); Mon, 05 Mar 2012 21:30:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=fgiuS0BWkehu+bY1EDutHPqooywwgyC70jMRHXsvRAI=; b=Y2GzdRToGNXEf0RTLy4V8tW+lhVyw0sYgBd2zmX6MGT4vJVIwwYCxtfNQda9FYJb/P kKs7JollkPZl+R5KZSPZuj8HwFbw8d6+qjDSLmRfxf1EAlDwTkI+5/oLugKVh3atZar6 Ke4LTSoseRS+7U5xFVHI9Y65FsFTjwB+cg6rs1HaO8U3OnUDkk4cKs7y9ZxN5Z/7iOML 5rY9JhbT4+vAYiIaouP2MZXclK4maBdcFXHlZzC56icgPyf1DUXQhAr0Z2I1pvD5rhR1 8ucPtuGKjOVoxPqKR8WjtFV6JcEw76qh247g0oTWmKxrUp/FjcigkBISlz6QoU3SLdUT nzQA== Received: by 10.68.227.228 with SMTP id sd4mr49437174pbc.33.1331011809764; Mon, 05 Mar 2012 21:30:09 -0800 (PST) Received: from localhost ([61.172.9.185]) by mx.google.com with ESMTPS id 4sm15285943pbp.76.2012.03.05.21.30.05 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Mar 2012 21:30:09 -0800 (PST) From: Haojian Zhuang To: linux-arm-kernel@lists.infradead.org, sameo@linux.intel.com Subject: [PATCH] mfd: pcap: depend on arch-pxa Date: Tue, 6 Mar 2012 13:30:08 +0800 Message-Id: <1331011808-28307-1-git-send-email-haojian.zhuang@gmail.com> X-Mailer: git-send-email 1.7.5.4 MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (haojian.zhuang[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Haojian Zhuang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org drivers/mfd/ezx-pcap.c: In function ‘pcap_isr_work’: drivers/mfd/ezx-pcap.c:206:2: error: implicit declaration of function ‘pxa_irq_to_gpio’ make[2]: *** [drivers/mfd/ezx-pcap.o] Error 1 PCAP driver invokes irq_to_gpio() directly. This function isn't common function in most silicons. PCAP driver is enabled for EZX machine with arch-pxa. Now use pxa_irq_to_gpio() instead. It's only a workaround for this issue. Acutally the best solution is using thread irq to fix this issue. Signed-off-by: Haojian Zhuang --- drivers/mfd/Kconfig | 2 +- drivers/mfd/ezx-pcap.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index f147395..e88d315 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -619,7 +619,7 @@ config AB3100_OTP config EZX_PCAP bool "PCAP Support" - depends on GENERIC_HARDIRQS && SPI_MASTER + depends on GENERIC_HARDIRQS && SPI_MASTER && ARCH_PXA help This enables the PCAP ASIC present on EZX Phones. This is needed for MMC, TouchScreen, Sound, USB, etc.. diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c index 43a76c4..e9320e2 100644 --- a/drivers/mfd/ezx-pcap.c +++ b/drivers/mfd/ezx-pcap.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #define PCAP_ADC_MAXQ 8 @@ -202,7 +203,7 @@ static void pcap_isr_work(struct work_struct *work) } local_irq_enable(); ezx_pcap_write(pcap, PCAP_REG_MSR, pcap->msr); - } while (gpio_get_value(irq_to_gpio(pcap->spi->irq))); + } while (gpio_get_value(pxa_irq_to_gpio(pcap->spi->irq))); } static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc)