From patchwork Fri Apr 12 15:02:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 16118 Return-Path: X-Original-To: linaro@staging.patches.linaro.org Delivered-To: linaro@staging.patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B101926EB0 for ; Fri, 12 Apr 2013 15:29:06 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id j34sf3875645qco.3 for ; Fri, 12 Apr 2013 08:28:42 -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=bjHaco9vutWGDzhk/VI49NfQ+SdpsB9TQkPSB5/K//k=; b=SWsvXfV0y+LTSHsS2xlkJmh/5V3y3MdJzZOQpxMQnCodV+znPuko3BgKRnsgzb6xNC mLXbwNJ5YLDDcomDrGjCQLyp2xd76BzbjR5nS01RNgnSWCNrZ73TpbbMNkNGxn4o3adL MM5qLIEYMy/Bt4ovXicuLNfDXQYxZNHaK0ZSUkJzDRJAMPeBlk7xW7jlpNcVsG/mUahl uLwRu8nWtiL9ixmjQdYytazkB1pSXbpyEbp/4byeQ34rP+jUu/SwhXPVUrHI7Cr2pLsZ UzxiXAsRr0XYrrlaSc3VBn5e8bid5GSZGEt4aPV81AEsesSviT7dZb8A7wJ2zJFeKW+e KLvw== X-Received: by 10.236.14.233 with SMTP id d69mr3825026yhd.51.1365780522439; Fri, 12 Apr 2013 08:28:42 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.134.100 with SMTP id pj4ls1469393qeb.70.gmail; Fri, 12 Apr 2013 08:28:42 -0700 (PDT) X-Received: by 10.220.161.4 with SMTP id p4mr8899569vcx.32.1365780522116; Fri, 12 Apr 2013 08:28:42 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id b4si6784584vdw.18.2013.04.12.08.28.41 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Apr 2013 08:28:41 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id pa12so2480540veb.26 for ; Fri, 12 Apr 2013 08:28:41 -0700 (PDT) X-Received: by 10.220.39.69 with SMTP id f5mr8918168vce.45.1365780521723; Fri, 12 Apr 2013 08:28:41 -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 nf2csp70643veb; Fri, 12 Apr 2013 08:28:40 -0700 (PDT) X-Received: by 10.14.181.196 with SMTP id l44mr22082165eem.44.1365780519779; Fri, 12 Apr 2013 08:28:39 -0700 (PDT) Received: from eu1sys200aog113.obsmtp.com (eu1sys200aog113.obsmtp.com [207.126.144.135]) by mx.google.com with SMTP id b4si12344533eef.188.2013.04.12.08.28.35 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 12 Apr 2013 08:28:39 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.135 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.135; Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob113.postini.com ([207.126.147.11]) with SMTP ID DSNKUWgoIafb3xDKR1aHtqGj1YM+vyvwkDMT@postini.com; Fri, 12 Apr 2013 15:28:39 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 6B4F8373; Fri, 12 Apr 2013 15:02:16 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id E20735524; Fri, 12 Apr 2013 15:02:13 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 88A32A8094; Fri, 12 Apr 2013 17:02:09 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.279.5; Fri, 12 Apr 2013 17:02:15 +0200 From: Linus Walleij To: Samuel Ortiz , Cc: Anmar Oueja , Linus Walleij , Arnd Bergmann , Lee Jones Subject: [PATCH v2] MFD: ab8500: pass AB8500 IRQ to debugfs code by resource Date: Fri, 12 Apr 2013 17:02:09 +0200 Message-ID: <1365778929-27168-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: ALoCoQnGwjuVfG5dyZFw/KB+Jp7FO9y7CCBEDlfey58NI9HwXAoVGs4epwGWZlRbajbpuEcKy5fZ X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.181 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 parallell 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 Cc: Lee Jones Signed-off-by: Linus Walleij --- 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..65cd46b 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 ordet 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",