From patchwork Mon Apr 15 07:47:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 16130 Return-Path: X-Original-To: linaro@staging.patches.linaro.org Delivered-To: linaro@staging.patches.linaro.org Received: from mail-gh0-f197.google.com (mail-gh0-f197.google.com [209.85.160.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4FFF820F46 for ; Mon, 15 Apr 2013 07:48:09 +0000 (UTC) Received: by mail-gh0-f197.google.com with SMTP id r17sf7052912ghr.8 for ; Mon, 15 Apr 2013 00:47:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :from:to:cc:subject:date:message-id:x-mailer:mime-version :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=xyetdmm+eqpyLkQJc4o0QEEaT8Ofs9c4gZuZgJLTxBE=; b=DOSVGKMQzmXyDDsEw+rLNU40PmsB6YxnrVyjwJp2/oRB/jPPBlZy9oLMJEnB9Wh9tN +lUQ4VRt0ykFPF6L+WG+ehOJqHj8E2Z9phQjUFe7/69gXgqVoe/SXAhXfEvrxnot8QEe x2b+oQOacEZu9988v0qVs66+hdhdKQdklDmYufPKcJDUhfJu0mjb4niZ2gd3Iq4SQimc BjnwR+G0+hFltDBrRrECcV6aKuvoOeQFXqGghI8lhbzweqicq+eUlwJdCBsQLf+j+08s T74n8hdlaxvB99C2/4Z6Trn2h5Sr8f0Bfot4uX5dynvDpy1qxOaK6uGTbhQJMfE3hENB QhlA== X-Received: by 10.224.18.132 with SMTP id w4mr12731008qaa.1.1366012059199; Mon, 15 Apr 2013 00:47:39 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.49.98 with SMTP id t2ls455520qen.30.gmail; Mon, 15 Apr 2013 00:47:39 -0700 (PDT) X-Received: by 10.58.213.37 with SMTP id np5mr4845074vec.54.1366012058971; Mon, 15 Apr 2013 00:47:38 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id gr6si4817178vdc.65.2013.04.15.00.47.38 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Apr 2013 00:47:38 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id hv10so3643897vcb.37 for ; Mon, 15 Apr 2013 00:47:38 -0700 (PDT) X-Received: by 10.52.71.4 with SMTP id q4mr12926792vdu.8.1366012058717; Mon, 15 Apr 2013 00:47:38 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp154260veb; Mon, 15 Apr 2013 00:47:37 -0700 (PDT) X-Received: by 10.15.36.2 with SMTP id h2mr59832684eev.2.1366012057093; Mon, 15 Apr 2013 00:47:37 -0700 (PDT) Received: from eu1sys200aog112.obsmtp.com (eu1sys200aog112.obsmtp.com [207.126.144.133]) by mx.google.com with SMTP id m7si27307551eey.124.2013.04.15.00.47.32 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 15 Apr 2013 00:47:37 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.133 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.133; Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob112.postini.com ([207.126.147.11]) with SMTP ID DSNKUWuwku1bznmYzQPZo/pHfi6Boi8nSwUO@postini.com; Mon, 15 Apr 2013 07:47:36 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id C3E993D; Mon, 15 Apr 2013 07:46:12 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id CD2473F; Mon, 15 Apr 2013 01:01:06 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id AC89DA8083; Mon, 15 Apr 2013 09:47:01 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.279.5; Mon, 15 Apr 2013 09:47:04 +0200 From: Linus Walleij To: Samuel Ortiz , Cc: Anmar Oueja , Linus Walleij , Arnd Bergmann Subject: [PATCH v3] MFD: ab8500: pass AB8500 IRQ to debugfs code by resource Date: Mon, 15 Apr 2013 09:47:01 +0200 Message-ID: <1366012021-9039-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmRWejjFQ8vOKg00vfTGA/LnUtBPW01SF1hdq1+59ZVxdlJCIfQ2H0r83PqY2B2oYqtx6ru X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Linus Walleij The AB8500 debug code which was merged in parallel with the multiplatform work incidentally introduced a new instance using the header which is now deleted, causing this build regression: drivers/mfd/ab8500-debugfs.c:95:23: fatal error: mach/irqs.h: No such file or directory compilation terminated. make[4]: *** [drivers/mfd/ab8500-debugfs.o] Error 1 The code most certainly never worked with device tree either since that does not rely on this kind of hard-coded interrupt numbers. Fix the problem at the root by passing it as a named resource from the ab8500-core driver. Use an untyped resource to stop the MFD core from remapping this IRQ relative to the AB8500 irqdomain. Cc: Arnd Bergmann Acked-by: Lee Jones Signed-off-by: Linus Walleij --- ChangeLov v2->v3: - Fix typos. ChangeLog v1->v2: - Pass an untyped resource to avoid problems due to IRQ remapping. Sam this would have to go into the v3.10-targetted stuff... Either immediately before you send it upstream or as a fixup. --- drivers/mfd/ab8500-core.c | 15 +++++++++++++++ drivers/mfd/ab8500-debugfs.c | 16 ++++++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c index 8e8a016..42abd3a 100644 --- a/drivers/mfd/ab8500-core.c +++ b/drivers/mfd/ab8500-core.c @@ -868,6 +868,15 @@ static struct resource ab8500_chargalg_resources[] = {}; #ifdef CONFIG_DEBUG_FS static struct resource ab8500_debug_resources[] = { { + .name = "IRQ_AB8500", + /* + * Number will be filled in. NOTE: this is deliberately + * not flagged as an IRQ in order to avoid remapping using + * the irqdomain in the MFD core, so that this IRQ passes + * unremapped to the debug code. + */ + }, + { .name = "IRQ_FIRST", .start = AB8500_INT_MAIN_EXT_CH_NOT_OK, .end = AB8500_INT_MAIN_EXT_CH_NOT_OK, @@ -1712,6 +1721,12 @@ static int ab8500_probe(struct platform_device *pdev) if (ret) return ret; +#if CONFIG_DEBUG_FS + /* Pass to debugfs */ + ab8500_debug_resources[0].start = ab8500->irq; + ab8500_debug_resources[0].end = ab8500->irq; +#endif + if (is_ab9540(ab8500)) ret = mfd_add_devices(ab8500->dev, 0, ab9540_devs, ARRAY_SIZE(ab9540_devs), NULL, diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c index b88bbbc..37b7ce4 100644 --- a/drivers/mfd/ab8500-debugfs.c +++ b/drivers/mfd/ab8500-debugfs.c @@ -91,12 +91,10 @@ #include #endif -/* TODO: this file should not reference IRQ_DB8500_AB8500! */ -#include - static u32 debug_bank; static u32 debug_address; +static int irq_ab8500; static int irq_first; static int irq_last; static u32 *irq_count; @@ -1589,7 +1587,7 @@ void ab8500_debug_register_interrupt(int line) { if (line < num_interrupt_lines) { num_interrupts[line]++; - if (suspend_test_wake_cause_interrupt_is_mine(IRQ_DB8500_AB8500)) + if (suspend_test_wake_cause_interrupt_is_mine(irq_ab8500)) num_wake_interrupts[line]++; } } @@ -2941,6 +2939,7 @@ static int ab8500_debug_probe(struct platform_device *plf) struct dentry *file; int ret = -ENOMEM; struct ab8500 *ab8500; + struct resource *res; debug_bank = AB8500_MISC; debug_address = AB8500_REV_REG & 0x00FF; @@ -2959,6 +2958,15 @@ static int ab8500_debug_probe(struct platform_device *plf) if (!event_name) goto out_freedev_attr; + res = platform_get_resource_byname(plf, 0, "IRQ_AB8500"); + if (!res) { + dev_err(&plf->dev, "AB8500 irq not found, err %d\n", + irq_first); + ret = -ENXIO; + goto out_freeevent_name; + } + irq_ab8500 = res->start; + irq_first = platform_get_irq_byname(plf, "IRQ_FIRST"); if (irq_first < 0) { dev_err(&plf->dev, "First irq not found, err %d\n",