From patchwork Thu Jan 31 13:38:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790583 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 17774922 for ; Thu, 31 Jan 2019 13:40:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5395E30C21 for ; Thu, 31 Jan 2019 13:40:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42AC130D8E; Thu, 31 Jan 2019 13:40:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D0BA430C21 for ; Thu, 31 Jan 2019 13:40:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1tUgxFpdDsMH4P7MhXv3y1qVFIefTLlwEvbIeRVelOY=; b=g6mFlomMBGnDsl ogJIcW+byoc2P5PMTF6o/wJYHYUm3EzJXb3JAHsum7+C+0DH+Bx4pJBJM99a07z8fniTsO978qJ0f wco5QJVmNo4T9Bzz+dIO0E3u1mSV7/rTDBVR9QQOCEphg1KF34Md505zAg+PocZ6QmQxf1x1+LIle YIBac+71kr/MxplWG/ewgFbLBvc6gCpml+o79c0ufSmw9LSyYCD8zD0GUc+aFRqL9dqeRI07z1FsS IvHObsUIU4vGQNVlMY1VCC+Jit38AHqQKduOyNU+ZwVHTyQrUuds+lzX/6PiWXx/XhD6CHUWCfwGs +jI1qfb+TOm/gu/Fos8Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZR-0004j8-FZ; Thu, 31 Jan 2019 13:39:57 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZD-0004Vg-Mi for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:39:45 +0000 Received: by mail-wr1-x441.google.com with SMTP id t27so3325672wra.6 for ; Thu, 31 Jan 2019 05:39:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gYOoz7sLfOmvnQTTTNScB4YjgZPjHnNJytRdhrJ93Tc=; b=kR8b33DwbGVi80dq56qDYiOVzCpjcWmz+Oo4usclGpeR/XtgWNj2/0oG/J37mMKBc8 vibG6NIVXChxP94HL9cW+fVmTjJy+kwW/Pibxf17VuoG8gW0nKfgi0y2Io+ff6UWQQSM sHv/8aKiT4J5c8qdUMgxnaG/vV9bFlhBMoANb3WtZ3gxXemgDIaRBFLdGhf93wEtyWCr 7zOHgGcwx/9eVh5X7G8tOx4dPbEU1iWdLDmY5IckhEUUTqsfMk8g0KMxzm9rlFPhgYCL YdZ4VkSdWKJ9Frs6stYe1OuZL6ju9IOGDsW0TUpIErQrygTXCh+BHUC2mVJQ1tnti4Je yv3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gYOoz7sLfOmvnQTTTNScB4YjgZPjHnNJytRdhrJ93Tc=; b=sjVoLURqgY+dyKh9vos8hLS8d3/Eup0go8/v+2vEPOY9c99fWhUEiqcdUyCyxQbW/m 2QW570h2AGI4Mt2Cc2kUyav7+I1jCV25Rxkb0w+w2K2qy74tUmv3kV4BtK9Ei02H3fm5 Lh04mdDGhh6paLdv1sd4ORyB9NFUMOoF08aaLInmxSzcYIlkRFhRaZp0dVkenl0shfXf YB6GCiS7z4i1sXxN0Q1cyi8ai2E7kANUlVYgCpb1hoCkiG6e9JEAfTsoFE+hluK6Cjqd YuAlHlb5cbgxei7wk3oqoKbR0u9P/5rdoxlc5mQo0wRlUwSi2rWgT2ele1dbi3NqctR5 xkLA== X-Gm-Message-State: AJcUukc7cFVmB6o4BzTg/5DGBVh57ylv0zoIFJm5TMXaxnzt4YOcJm7R kqmQrGTGjqeUpb5/1F/9fIXW4A== X-Google-Smtp-Source: ALg8bN4elrVkZx/+xtRZqyIM8PbE8pDnzz5A63wKiI9Vhou1RSuYQCaDYuX2DdSfLagFB8lDga9RyA== X-Received: by 2002:a05:6000:8a:: with SMTP id m10mr33726539wrx.79.1548941981798; Thu, 31 Jan 2019 05:39:41 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.39.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:39:41 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 01/35] ARM: davinci: remove intc_host_map from davinci_soc_info struct Date: Thu, 31 Jan 2019 14:38:54 +0100 Message-Id: <20190131133928.17985-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_053943_735229_625DE34C X-CRM114-Status: GOOD ( 12.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski This field is not used by any board. Remove it as part of the interrupt support cleanup. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/cp_intc.c | 5 ----- arch/arm/mach-davinci/include/mach/common.h | 1 - 2 files changed, 6 deletions(-) diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 94085d21018e..67805ca74ff8 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -117,7 +117,6 @@ int __init cp_intc_of_init(struct device_node *node, struct device_node *parent) { u32 num_irq = davinci_soc_info.intc_irq_num; u8 *irq_prio = davinci_soc_info.intc_irq_prios; - u32 *host_map = davinci_soc_info.intc_host_map; unsigned num_reg = BITS_TO_LONGS(num_irq); int i, irq_base; @@ -182,10 +181,6 @@ int __init cp_intc_of_init(struct device_node *node, struct device_node *parent) cp_intc_write(0x0f0f0f0f, CP_INTC_CHAN_MAP(i)); } - if (host_map) - for (i = 0; host_map[i] != -1; i++) - cp_intc_write(host_map[i], CP_INTC_HOST_MAP(i)); - irq_base = irq_alloc_descs(-1, 0, num_irq, 0); if (irq_base < 0) { pr_warn("Couldn't allocate IRQ numbers\n"); diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index b577e13a9c23..944afd57ee38 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -61,7 +61,6 @@ struct davinci_soc_info { int intc_type; u8 *intc_irq_prios; unsigned long intc_irq_num; - u32 *intc_host_map; struct davinci_timer_info *timer_info; int gpio_type; u32 gpio_base; From patchwork Thu Jan 31 13:38:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790589 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4F98591E for ; Thu, 31 Jan 2019 13:40:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F45E30CC2 for ; Thu, 31 Jan 2019 13:40:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32D7530E45; Thu, 31 Jan 2019 13:40:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 048D630CC2 for ; Thu, 31 Jan 2019 13:40:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ujn6MRHHtDuLqmVEXy/BNfJ3Jae03zSvKBONp6+0bOM=; b=GBrceO3oQIUn2G yJCBunP3qrnARjQ/M+sCf5wftdN1vMhQlcRQKeaNvbNGcbfKPaAZk16Au6hAs8dtDkAf1plO5TIpu Jqws6NmewK5hWny+fucU1Y3bcyww4COvwde/2Mf20SOaxK9984XBPSBgRM1AuOXloouvKNJ98yAY1 ZLx+y3zh49ctYJwnz8/0PaQDUGaQ0NXr3nFpFMHUy4sP5uHw1VIGpf5RDxb2AV2LnFSyK/B/r3rta rVyUNyTVoXlNUU33/50Hl8c/OqNB7oD2N2z80XbSgteOhvXhMGsB7oRpHYsr/hyYwZ4CUB9uyB34w zAGmP/S5UjPPVk50sf4w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCaF-0006Xg-73; Thu, 31 Jan 2019 13:40:47 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZE-0004Vy-F6 for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:39:52 +0000 Received: by mail-wr1-x443.google.com with SMTP id p7so3380270wru.0 for ; Thu, 31 Jan 2019 05:39:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5X77WcQ60mqtfJVB+WwYLABh83PR6pOA8m2PXMgwFcg=; b=xH1swiOa4RczcuMoR3Lxo733EPEknZ6C/zYldttIK3Abr6t8wjUroF/hrx4zQL7mWj 5IfDh2jMdtUHGlCmIB3s9z2MCovHefOT+NshILcYymLv3qnhaCjdJ5PAxizUoj6ZYeq6 KLRQQqC0i//AE+nba07I/JVZpdyQVfA0dnOgbrxWJXa5OMcUSjlDQabcZzErbI03c8SV YY0VEk2ReNILuf0zUvXLk/ooUFeRPefE/naFH+yg8yjJc6uwhPTlh+kso75ihEQF+mwS 8WlG2fCufcy9iI3kdhpmw7rpWD25s6XgQleMyRnw7BkZAuhPV74OhoVfuBZvXfBhrZX6 1+ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5X77WcQ60mqtfJVB+WwYLABh83PR6pOA8m2PXMgwFcg=; b=oTld+aU3zEdk/rd9J0yEg5dowtcUdaQzpyTP/QeaT+EvVTL/aXZm7HXPsj13eo1n8J xpWFqSIQFHQD8FIe4NsR0y5SzmEfeUOvbWvQ9uqCFtD+CpMK6/xW+Khd57mA0dBOKhOE 8Me8xSg207Ovuec0jgs9brxdAudsAjc6nDKzhvIzaW8ylN+XMpi8/2+5JIBMBsxThAdS cspc9sDno/4oYpNN1IsiqEOLp6PNeiokUn/tvEFvbTxBl6YgdIw7XVPMKmNkEnDmJt+u bwaYpKgsCYUhUcmSC9Jjf0llQXgU3EUy0ERHI07GOwgUOPoGWPonThEDbDF7UJ/xRlCB 6qgQ== X-Gm-Message-State: AJcUukcF8PL+yxBQ/YJKcF0FoZTaaPn8NZYG7XXHe+4HY5l+RVlZqYHe 21yyDRjiq3h3Mxp3juOGu2AWuw== X-Google-Smtp-Source: ALg8bN4lLGeIz/4xBx5SG7ISq6LF7eqnTZj9/OljxiiAqNRnLzoAy74tv1kNLZERE71s49xFPgLh1g== X-Received: by 2002:adf:b102:: with SMTP id l2mr33375505wra.296.1548941983116; Thu, 31 Jan 2019 05:39:43 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.39.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:39:42 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 02/35] ARM: davinci: select GENERIC_IRQ_MULTI_HANDLER Date: Thu, 31 Jan 2019 14:38:55 +0100 Message-Id: <20190131133928.17985-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_053944_625459_EB6AB772 X-CRM114-Status: GOOD ( 17.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski In order to support SPARSE_IRQ we first need to make davinci use the generic irq handler for ARM. Translate the legacy assembly to C and put the irq handlers into their respective drivers (aintc and cp-intc). Signed-off-by: Bartosz Golaszewski --- arch/arm/Kconfig | 1 + arch/arm/mach-davinci/cp_intc.c | 13 +++++++ .../mach-davinci/include/mach/entry-macro.S | 39 ------------------- arch/arm/mach-davinci/irq.c | 21 ++++++++++ 4 files changed, 35 insertions(+), 39 deletions(-) delete mode 100644 arch/arm/mach-davinci/include/mach/entry-macro.S diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 664e918e2624..f7770fdcad68 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -589,6 +589,7 @@ config ARCH_DAVINCI select GENERIC_ALLOCATOR select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP + select GENERIC_IRQ_MULTI_HANDLER select GPIOLIB select HAVE_IDE select PM_GENERIC_DOMAINS if PM diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 67805ca74ff8..b9aec3c48a6a 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -19,6 +19,7 @@ #include #include +#include #include #include "cp_intc.h" @@ -97,6 +98,16 @@ static struct irq_chip cp_intc_irq_chip = { static struct irq_domain *cp_intc_domain; +static asmlinkage void __exception_irq_entry +cp_intc_handle_irq(struct pt_regs *regs) +{ + int irqnr = cp_intc_read(CP_INTC_PRIO_IDX); + + irqnr &= 0xff; + + handle_domain_irq(cp_intc_domain, irqnr, regs); +} + static int cp_intc_host_map(struct irq_domain *h, unsigned int virq, irq_hw_number_t hw) { @@ -196,6 +207,8 @@ int __init cp_intc_of_init(struct device_node *node, struct device_node *parent) return -EINVAL; } + set_handle_irq(cp_intc_handle_irq); + /* Enable global interrupt */ cp_intc_write(1, CP_INTC_GLOBAL_ENABLE); diff --git a/arch/arm/mach-davinci/include/mach/entry-macro.S b/arch/arm/mach-davinci/include/mach/entry-macro.S deleted file mode 100644 index cf5f573eb5fd..000000000000 --- a/arch/arm/mach-davinci/include/mach/entry-macro.S +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Low-level IRQ helper macros for TI DaVinci-based platforms - * - * Author: Kevin Hilman, MontaVista Software, Inc. - * - * 2007 (c) MontaVista Software, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. - */ -#include - - .macro get_irqnr_preamble, base, tmp - ldr \base, =davinci_intc_base - ldr \base, [\base] - .endm - - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp -#if defined(CONFIG_AINTC) && defined(CONFIG_CP_INTC) - ldr \tmp, =davinci_intc_type - ldr \tmp, [\tmp] - cmp \tmp, #DAVINCI_INTC_TYPE_CP_INTC - beq 1001f -#endif -#if defined(CONFIG_AINTC) - ldr \tmp, [\base, #0x14] - movs \tmp, \tmp, lsr #2 - sub \irqnr, \tmp, #1 - b 1002f -#endif -#if defined(CONFIG_CP_INTC) -1001: ldr \irqnr, [\base, #0x80] /* get irq number */ - mov \tmp, \irqnr, lsr #31 - and \irqnr, \irqnr, #0xff /* irq is in bits 0-9 */ - and \tmp, \tmp, #0x1 - cmp \tmp, #0x1 -#endif -1002: - .endm diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index 952dc126c390..3bbbef78d9ac 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -28,11 +28,13 @@ #include #include #include +#include #define FIQ_REG0_OFFSET 0x0000 #define FIQ_REG1_OFFSET 0x0004 #define IRQ_REG0_OFFSET 0x0008 #define IRQ_REG1_OFFSET 0x000C +#define IRQ_IRQENTRY_OFFSET 0x0014 #define IRQ_ENT_REG0_OFFSET 0x0018 #define IRQ_ENT_REG1_OFFSET 0x001C #define IRQ_INCTL_REG_OFFSET 0x0020 @@ -45,6 +47,11 @@ static inline void davinci_irq_writel(unsigned long value, int offset) __raw_writel(value, davinci_intc_base + offset); } +static inline unsigned long davinci_irq_readl(int offset) +{ + return __raw_readl(davinci_intc_base + offset); +} + static __init void davinci_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num) { @@ -69,6 +76,19 @@ davinci_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num) IRQ_NOREQUEST | IRQ_NOPROBE, 0); } +static asmlinkage void __exception_irq_entry +davinci_handle_irq(struct pt_regs *regs) +{ + int irqnr = davinci_irq_readl(IRQ_IRQENTRY_OFFSET); + struct pt_regs *old_regs = set_irq_regs(regs); + + irqnr >>= 2; + irqnr -= 1; + + generic_handle_irq(irqnr); + set_irq_regs(old_regs); +} + /* ARM Interrupt Controller Initialization */ void __init davinci_irq_init(void) { @@ -114,4 +134,5 @@ void __init davinci_irq_init(void) davinci_alloc_gc(davinci_intc_base + j, i, 32); irq_set_handler(IRQ_TINT1_TINT34, handle_level_irq); + set_handle_irq(davinci_handle_irq); } From patchwork Thu Jan 31 13:38:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790587 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D5735922 for ; Thu, 31 Jan 2019 13:40:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C531E30CC2 for ; Thu, 31 Jan 2019 13:40:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B926130E45; Thu, 31 Jan 2019 13:40:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2FA0A30CC2 for ; Thu, 31 Jan 2019 13:40:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8SWLdTzSQIlYfiw9ByjZBnMNf8BFua8hUmZhfST9wU8=; b=H8h6RSfPln6gWk blYWezULhV2M7TENQ3nbFbl09ZeC5el+9ExcxrOv9Y20DfuczN2dN46u4iHnYRA+3mFk/14bbuL8D WBBjXwg4z6XDBMZ+w/xmRMtPOxARkZI0/3D5fgfU4fhv8fUJMr3az/PGHLDvMp93ksv+W6DkoV8Gx scViwV/EgvptwzKVvm2USz5/SDDbD1raVAOwzmOWGC0Fq2rYWc0zBew5L/Dy49PNtXvXiUkprIlMh pmozRobSMy8IEIvVK+AUqLUsKyurMT8SuD+F7r6OU9HD2MEtKbdMsBzwb1uIcBD0SvcCOFqI6znaG dsAmNMrCDkhR7oefOgMA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCa5-0006O8-N3; Thu, 31 Jan 2019 13:40:37 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZG-0004WX-5i for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:39:51 +0000 Received: by mail-wm1-x344.google.com with SMTP id p6so2603205wmc.1 for ; Thu, 31 Jan 2019 05:39:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4rn7F9pCY08KLVBMiHrxRjQBYdDwuoIM3SNqvllQs3A=; b=UicjhTZQKQ7e8FOSUt2UsVFIKtVSnFQmtUXdQeWHFNGloJYSOix08nTwtf1V4q/cuD bSmqvZQSqINQ6VNbP+P5HxXxdgMzwGaZbvtp235ZppluJu+rTdJ643MnFdj7f2fpheBA ppeAk9OdZV3SzTx+9vmdjxhxdd/NtY0uf1pzZcBjLMyFJWa4jjY1/0gyN01SMkKKWVF2 vFE+uQ95clLuyxLThRTDPN30QoxCEj84d+4CLMqEDj7aAmFDa0FSd7An8JGLORIPIJJO uAcs7rl1nYG5ayxKev2RA/SYnmC5RARP3nhQPLTrmmyT7xsvgcL3QjmzJS+tfR2OqQmW KhRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4rn7F9pCY08KLVBMiHrxRjQBYdDwuoIM3SNqvllQs3A=; b=ElEECz481R3LjKUDprgJjIqqrrAidZctdngSotyIu+RdGM1wj6Xd95DGlfVydUGX25 kIvGO3AEYfCSJoaGo1FQ/4AHiGCra5riBh2zypejAMxEp0umRdgMX9qfMhoHTYpBowqp UXwv3YS1lr34g6yKJxryWO84OzbwOrhUFHqYoopCHDuEZkWB73fw3TKcvThRsnMR7FPI nLrP7V8v5I/PfO60CyCNPPE/hdFCn2TEVbjt8PXp6qqHd1+admQThoMVmMWmbwFLwcF0 qanEGouQfbTtVvO5dqnBbWeZFCT8VjC9iyiUujz9DuYBB+Cfxd+qpnmy6K9x3kOUkk0R q7xA== X-Gm-Message-State: AJcUukdkfRZL0VbynCka3o7kcBt/PSnZPKQTTcwl7eWBUDZHB+NwH9gW 9ClXiltRcURCtFsNzvmIj0renA== X-Google-Smtp-Source: ALg8bN5S0JmSebeUDEKeCIkJWBUwlRk8H2i1oriIrL2Ey19QgKxfo2Lwm87+Vgq23EBYLaORl83Cxw== X-Received: by 2002:a1c:8b09:: with SMTP id n9mr29674415wmd.38.1548941984305; Thu, 31 Jan 2019 05:39:44 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.39.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:39:43 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 03/35] ARM: davinci: remove davinci_intc_type Date: Thu, 31 Jan 2019 14:38:56 +0100 Message-Id: <20190131133928.17985-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_053946_477402_3815694C X-CRM114-Status: GOOD ( 13.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski We now use the generic ARM irq handler on davinci. There are no more users that check davinci_intc_type. Remove the variable and all its references. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/common.c | 1 - arch/arm/mach-davinci/cp_intc.c | 1 - arch/arm/mach-davinci/da830.c | 1 - arch/arm/mach-davinci/da850.c | 1 - arch/arm/mach-davinci/dm355.c | 1 - arch/arm/mach-davinci/dm365.c | 1 - arch/arm/mach-davinci/dm644x.c | 1 - arch/arm/mach-davinci/dm646x.c | 1 - arch/arm/mach-davinci/include/mach/common.h | 2 -- arch/arm/mach-davinci/include/mach/irqs.h | 3 --- arch/arm/mach-davinci/irq.c | 1 - 11 files changed, 14 deletions(-) diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c index e1d0f0d841ff..a87e158a709b 100644 --- a/arch/arm/mach-davinci/common.c +++ b/arch/arm/mach-davinci/common.c @@ -24,7 +24,6 @@ struct davinci_soc_info davinci_soc_info; EXPORT_SYMBOL(davinci_soc_info); void __iomem *davinci_intc_base; -int davinci_intc_type; void davinci_get_mac_addr(struct nvmem_device *nvmem, void *context) { diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index b9aec3c48a6a..fef39d5988d9 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -131,7 +131,6 @@ int __init cp_intc_of_init(struct device_node *node, struct device_node *parent) unsigned num_reg = BITS_TO_LONGS(num_irq); int i, irq_base; - davinci_intc_type = DAVINCI_INTC_TYPE_CP_INTC; if (node) { davinci_intc_base = of_iomap(node, 0); if (of_property_read_u32(node, "ti,intc-size", &num_irq)) diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 2cc9fe4c3a91..9e18b245266b 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -807,7 +807,6 @@ static const struct davinci_soc_info davinci_soc_info_da830 = { .pinmux_pins = da830_pins, .pinmux_pins_num = ARRAY_SIZE(da830_pins), .intc_base = DA8XX_CP_INTC_BASE, - .intc_type = DAVINCI_INTC_TYPE_CP_INTC, .intc_irq_prios = da830_default_priorities, .intc_irq_num = DA830_N_CP_INTC_IRQ, .timer_info = &da830_timer_info, diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index e7b78df2bfef..e823b89e2b7a 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -739,7 +739,6 @@ static const struct davinci_soc_info davinci_soc_info_da850 = { .pinmux_pins = da850_pins, .pinmux_pins_num = ARRAY_SIZE(da850_pins), .intc_base = DA8XX_CP_INTC_BASE, - .intc_type = DAVINCI_INTC_TYPE_CP_INTC, .intc_irq_prios = da850_default_priorities, .intc_irq_num = DA850_N_CP_INTC_IRQ, .timer_info = &da850_timer_info, diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index 4c6e0bef4509..03ce5df28d87 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -705,7 +705,6 @@ static const struct davinci_soc_info davinci_soc_info_dm355 = { .pinmux_pins = dm355_pins, .pinmux_pins_num = ARRAY_SIZE(dm355_pins), .intc_base = DAVINCI_ARM_INTC_BASE, - .intc_type = DAVINCI_INTC_TYPE_AINTC, .intc_irq_prios = dm355_default_priorities, .intc_irq_num = DAVINCI_N_AINTC_IRQ, .timer_info = &dm355_timer_info, diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 01fb2b0c82de..3e034f0478d2 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -722,7 +722,6 @@ static const struct davinci_soc_info davinci_soc_info_dm365 = { .pinmux_pins = dm365_pins, .pinmux_pins_num = ARRAY_SIZE(dm365_pins), .intc_base = DAVINCI_ARM_INTC_BASE, - .intc_type = DAVINCI_INTC_TYPE_AINTC, .intc_irq_prios = dm365_default_priorities, .intc_irq_num = DAVINCI_N_AINTC_IRQ, .timer_info = &dm365_timer_info, diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 38f92b7d413e..66bab4782c62 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -646,7 +646,6 @@ static const struct davinci_soc_info davinci_soc_info_dm644x = { .pinmux_pins = dm644x_pins, .pinmux_pins_num = ARRAY_SIZE(dm644x_pins), .intc_base = DAVINCI_ARM_INTC_BASE, - .intc_type = DAVINCI_INTC_TYPE_AINTC, .intc_irq_prios = dm644x_default_priorities, .intc_irq_num = DAVINCI_N_AINTC_IRQ, .timer_info = &dm644x_timer_info, diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 7dc54b2a610f..45efa715a2c1 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -586,7 +586,6 @@ static const struct davinci_soc_info davinci_soc_info_dm646x = { .pinmux_pins = dm646x_pins, .pinmux_pins_num = ARRAY_SIZE(dm646x_pins), .intc_base = DAVINCI_ARM_INTC_BASE, - .intc_type = DAVINCI_INTC_TYPE_AINTC, .intc_irq_prios = dm646x_default_priorities, .intc_irq_num = DAVINCI_N_AINTC_IRQ, .timer_info = &dm646x_timer_info, diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index 944afd57ee38..34e48de92dcc 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -21,7 +21,6 @@ void davinci_timer_init(struct clk *clk); extern void davinci_irq_init(void); extern void __iomem *davinci_intc_base; -extern int davinci_intc_type; struct davinci_timer_instance { u32 base; @@ -58,7 +57,6 @@ struct davinci_soc_info { const struct mux_config *pinmux_pins; unsigned long pinmux_pins_num; u32 intc_base; - int intc_type; u8 *intc_irq_prios; unsigned long intc_irq_num; struct davinci_timer_info *timer_info; diff --git a/arch/arm/mach-davinci/include/mach/irqs.h b/arch/arm/mach-davinci/include/mach/irqs.h index edb2ca62321a..03c446635301 100644 --- a/arch/arm/mach-davinci/include/mach/irqs.h +++ b/arch/arm/mach-davinci/include/mach/irqs.h @@ -30,9 +30,6 @@ /* Base address */ #define DAVINCI_ARM_INTC_BASE 0x01C48000 -#define DAVINCI_INTC_TYPE_AINTC 0 -#define DAVINCI_INTC_TYPE_CP_INTC 1 - /* Interrupt lines */ #define IRQ_VDINT0 0 #define IRQ_VDINT1 1 diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index 3bbbef78d9ac..3658235c8ee7 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -95,7 +95,6 @@ void __init davinci_irq_init(void) unsigned i, j; const u8 *davinci_def_priorities = davinci_soc_info.intc_irq_prios; - davinci_intc_type = DAVINCI_INTC_TYPE_AINTC; davinci_intc_base = ioremap(davinci_soc_info.intc_base, SZ_4K); if (WARN_ON(!davinci_intc_base)) return; From patchwork Thu Jan 31 13:38:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790591 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A98EC91E for ; Thu, 31 Jan 2019 13:41:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A4E130E48 for ; Thu, 31 Jan 2019 13:41:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E9C030E4D; Thu, 31 Jan 2019 13:41:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2B9F030E48 for ; Thu, 31 Jan 2019 13:41:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dlVy79ZTMTxu0ago2wq0d7hbzHR1olayCFPDCOJ2zXM=; b=N8w8VWs9lI8ucy FbDI8h4um/3TM3DAk5uaSvy0BSiH0I4sln1K3/C2aqGu3QNQm8ZrEwwWWuoMUNcqB2tEMdPnjCUoy 4e8J9VS5R6wwkubVQZIWsGicP8YPUJRrS+rQQjuYH1SCY65L9bgnsSR7F0YHY1ylQ3NNuWuNjB2He CvYloChl8mncIhXzS5rb49qBDnRbqCWgFV65D3krNOTVP/Lu8X8N1oz2tOtpHTHZsYTr8Yq13Xl6v XwF+3BZwTR3l6LeTBKN6BA2sROdOaKEJXYGxafA4j0GZFnvlPt+ARJyjF4jH1bIIeJDmQmxrabsTx xB2RE9/QIYGCag3+OVeQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCaW-0006oR-2H; Thu, 31 Jan 2019 13:41:04 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZH-0004Wv-82 for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:39:58 +0000 Received: by mail-wm1-x341.google.com with SMTP id t200so2634209wmt.0 for ; Thu, 31 Jan 2019 05:39:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MTJcyASTfjESmwjpiKMY5IRrOr8j9890nwSQZijPI4M=; b=E38t3rXwqEYMCfiMuuw4AUZYZJVU+suUix6WOB/ONx+b47GSAOyocC75dTAg/3A2cL 3RP5VeKWo9jC1V9iSHYJ/o/iJGG12UPN2pwbLoMS5Fh6jn9C3GjlZ1qT4LFAC0fi9y8a Aodz8VO9wmktqlSn02PrssdPMBnu/0CBSMJBYTSsAYmiPLuNDu2Z7+xJ0VCLX0UAiItu U3BIwbI4F+U0N0IREVn4+6j9slvFSSASHIr4WWH8mzapctrI2G+Ck2a4s3iv63F+9m5I PPoxncBJhf9pWE3nPKMXyQinrOpzcLv6LzVUf9p6cOyDP+12Niuwj4gcNJT2Owr6K9o0 uYOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MTJcyASTfjESmwjpiKMY5IRrOr8j9890nwSQZijPI4M=; b=hBpNDdadIBz0WQJMg8HK+ganYtZP/fX3QXBZLPHyBdla+yMrDwpnDZpTmSjYiV9q53 DpYrwRqDmHYPDWhjo6nwPD5pHsX3TCc4GW/psu+zzNgTlFLn+BzcH2m+EAaHJZ06UuQ1 lrtyQPtbyeROkskIL7JIMkyKe2YjxpdvuAlh8zR1JiIN2YBenaTx3ZxfDb/5Ynoa+smZ HZLuX3VGRNVtf8sA973F5pgs0K1baK7e2w4WR8sgaGRIuMbaOxXtvyc/woTbojIPcz00 plmlME5xgclwBxQK1HEOaSwpIkISDnyTTjLPweKgFPsa1GgQAZJNiFHatnGu+sMXw2C3 3OSg== X-Gm-Message-State: AJcUukc8s/eDmGQASHEq3T6zL+EtxWVoLQUKI1FROLm24QLGa3gWM9LP uvUUuWHRKm7YwlyNQEYTfdxbQA== X-Google-Smtp-Source: ALg8bN7v7ty/JFXRjSxxNNQVfvMj+rMkRFQJGHxWOmUDB8RyJBZPHgbMPaYEr9XCOBTVASd3TPaRqg== X-Received: by 2002:a1c:7c07:: with SMTP id x7mr29821411wmc.82.1548941985516; Thu, 31 Jan 2019 05:39:45 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.39.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:39:44 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 04/35] ARM: davinci: pull davinci_intc_base into the respective intc drivers Date: Thu, 31 Jan 2019 14:38:57 +0100 Message-Id: <20190131133928.17985-5-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_053947_570223_21E099C3 X-CRM114-Status: GOOD ( 11.89 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski This variable is defined globally in common.c. Define separate local variables for the aintc and cp-intc drivers and remove the global one. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/common.c | 2 -- arch/arm/mach-davinci/cp_intc.c | 2 ++ arch/arm/mach-davinci/include/mach/common.h | 1 - arch/arm/mach-davinci/irq.c | 2 ++ 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c index a87e158a709b..2850ae02aaa4 100644 --- a/arch/arm/mach-davinci/common.c +++ b/arch/arm/mach-davinci/common.c @@ -23,8 +23,6 @@ struct davinci_soc_info davinci_soc_info; EXPORT_SYMBOL(davinci_soc_info); -void __iomem *davinci_intc_base; - void davinci_get_mac_addr(struct nvmem_device *nvmem, void *context) { char *mac_addr = davinci_soc_info.emac_pdata->mac_addr; diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index fef39d5988d9..384b72fbefca 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -23,6 +23,8 @@ #include #include "cp_intc.h" +static void __iomem *davinci_intc_base; + static inline unsigned int cp_intc_read(unsigned offset) { return __raw_readl(davinci_intc_base + offset); diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index 34e48de92dcc..3d45b73b9a64 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -20,7 +20,6 @@ void davinci_timer_init(struct clk *clk); extern void davinci_irq_init(void); -extern void __iomem *davinci_intc_base; struct davinci_timer_instance { u32 base; diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index 3658235c8ee7..e539bc65d4ef 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -42,6 +42,8 @@ #define IRQ_INTPRI0_REG_OFFSET 0x0030 #define IRQ_INTPRI7_REG_OFFSET 0x004C +static void __iomem *davinci_intc_base; + static inline void davinci_irq_writel(unsigned long value, int offset) { __raw_writel(value, davinci_intc_base + offset); From patchwork Thu Jan 31 13:38:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790601 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8CFC1922 for ; Thu, 31 Jan 2019 13:42:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B21F30E54 for ; Thu, 31 Jan 2019 13:42:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CB8330E58; Thu, 31 Jan 2019 13:42:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4B33030E54 for ; Thu, 31 Jan 2019 13:42:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qkNIemBptCZGm9E3FmF1puWnYdn3supYiCLEY20X5SA=; b=hVRP/11Z5yuAw6 KdvMDXlBu/kwWxq6LJ+rukHed68NeB8DfqLTgrxxubitXVn0gU2nyoyjcRuGdyU99mTzg4Jz0+15m NnU7lCp3JMoaOcMf+U2db9ZVxQipzoKoSPkzxhPQ6/jsj5FDkxPqI4JY2ypOXxnx1FGlZRcQJOAIg irz4N4rcEyYtim4V2M/C9vL+Wa7QEaSH5wna7YgE7icWuFdMdtM1tvafS9g8lrNUZvfZr7bo7d49k IuXC1EoaytHKPmet+TAeQYt/DPUeFvGNiVvKFDr7u/wfL9qw7yFLW9hBPoU/8qk9ClsQt75yQbiOM duZDvODgXfwcBitkYbDg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCbS-0007mx-OX; Thu, 31 Jan 2019 13:42:02 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZJ-0004ZD-2D for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:16 +0000 Received: by mail-wr1-x443.google.com with SMTP id q18so3305094wrx.9 for ; Thu, 31 Jan 2019 05:39:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9/cz8Dplt148narhGDwcsNPC9FgaTJHEYozu5GdxH00=; b=o4FtxtKVns7Ab4eM3l8n3yJXPCWhqqQPxcZicRIxBPsTm1CgFyIHY4CLlItjb/Carz E0Izn9pqd/q0NN+HKL+N7l747K4WMIJ5CP/N//vQVAanNvE8nGXJc60r8zs2+Tamexwg 2MwupL4B332jRXVOuGd5bndJYGfInDa8RFHiT+1sIwjWXIg9+ZkNbdIlxrMHa97BwQap g9T1BvzD4YdosydT0asI1ldbWHGOfLD2uZvf0JBhV2GbO5lcknWXW7W1ue3bTTW2kve0 cckzmzvjZKSYdwyy2ambrEjlJPrOiVQHnzzxjmLuId7sQHSK0h18NbUEngWBiDbCZ5Vv jxlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9/cz8Dplt148narhGDwcsNPC9FgaTJHEYozu5GdxH00=; b=cyklc3yN0i8JaETliGHdv/aKv+/EZCK38L8VJbjpSA1HKpx2obyT8/czJ8BhfRYNjX XLdEaP1P45GS4pHDIuTlYOmZbBnZC5dAhEe/TelpFlRibHxE3aNFfgBODif2yCp6nGlQ GZvfXMGP4TxFkwY1pw7FZBAoq4lfAVdYpryWVYLSzfvx/3VyytrUCv/J+j+RTYE62tXE qqA/+N5cHcSP+FR8WRCF7LHqq8/BMk2kLItzFOy7tjTLkbPlKgqSKL8nkzr85Z7p+ZCK 2Npn9u84fQG0JL24yRbLQ0J1eo6ArBugL5M0VREc+x/H8M9WAjpmSEEI4EdJMrLzJFSv z6qg== X-Gm-Message-State: AHQUAuZbiHkK0/v0S+g9CyYM3MU9wwb5UNJARcPgADcpUUBNz6oF4GfO Kt9e+fBGsfSCUR7kbfnQ4rcuSsHcH+c= X-Google-Smtp-Source: AHgI3IZGQJCeQU7MY9EV7hCTQ8T2fk20aSczwKXyyQjrYmS30/bzzlL+eXKztIp5rM3JEWeDDLyOXA== X-Received: by 2002:a5d:4d87:: with SMTP id b7mr10593083wru.316.1548941987491; Thu, 31 Jan 2019 05:39:47 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.39.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:39:46 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 05/35] ARM: davinci: drop irq defines from default_priorites Date: Thu, 31 Jan 2019 14:38:58 +0100 Message-Id: <20190131133928.17985-6-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_053949_553964_2DB04A8A X-CRM114-Status: GOOD ( 11.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski In order to select SPARSE_IRQ we need to make the interrupt numbers dynamic (at least at build-time for the top-level controller). The interrupt numbers are used as array indexes for irq priorities. Drop the defines and just initialize the arrays in a linear manner. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/da830.c | 107 ++++-------------------------- arch/arm/mach-davinci/da850.c | 118 +++++---------------------------- arch/arm/mach-davinci/dm355.c | 74 +++------------------ arch/arm/mach-davinci/dm365.c | 76 +++------------------ arch/arm/mach-davinci/dm644x.c | 76 +++------------------ arch/arm/mach-davinci/dm646x.c | 76 +++------------------ 6 files changed, 69 insertions(+), 458 deletions(-) diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 9e18b245266b..f1e7b6c644e5 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -624,98 +624,19 @@ const short da830_eqep1_pins[] __initconst = { }; /* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */ -static u8 da830_default_priorities[DA830_N_CP_INTC_IRQ] = { - [IRQ_DA8XX_COMMTX] = 7, - [IRQ_DA8XX_COMMRX] = 7, - [IRQ_DA8XX_NINT] = 7, - [IRQ_DA8XX_EVTOUT0] = 7, - [IRQ_DA8XX_EVTOUT1] = 7, - [IRQ_DA8XX_EVTOUT2] = 7, - [IRQ_DA8XX_EVTOUT3] = 7, - [IRQ_DA8XX_EVTOUT4] = 7, - [IRQ_DA8XX_EVTOUT5] = 7, - [IRQ_DA8XX_EVTOUT6] = 7, - [IRQ_DA8XX_EVTOUT7] = 7, - [IRQ_DA8XX_CCINT0] = 7, - [IRQ_DA8XX_CCERRINT] = 7, - [IRQ_DA8XX_TCERRINT0] = 7, - [IRQ_DA8XX_AEMIFINT] = 7, - [IRQ_DA8XX_I2CINT0] = 7, - [IRQ_DA8XX_MMCSDINT0] = 7, - [IRQ_DA8XX_MMCSDINT1] = 7, - [IRQ_DA8XX_ALLINT0] = 7, - [IRQ_DA8XX_RTC] = 7, - [IRQ_DA8XX_SPINT0] = 7, - [IRQ_DA8XX_TINT12_0] = 7, - [IRQ_DA8XX_TINT34_0] = 7, - [IRQ_DA8XX_TINT12_1] = 7, - [IRQ_DA8XX_TINT34_1] = 7, - [IRQ_DA8XX_UARTINT0] = 7, - [IRQ_DA8XX_KEYMGRINT] = 7, - [IRQ_DA830_MPUERR] = 7, - [IRQ_DA8XX_CHIPINT0] = 7, - [IRQ_DA8XX_CHIPINT1] = 7, - [IRQ_DA8XX_CHIPINT2] = 7, - [IRQ_DA8XX_CHIPINT3] = 7, - [IRQ_DA8XX_TCERRINT1] = 7, - [IRQ_DA8XX_C0_RX_THRESH_PULSE] = 7, - [IRQ_DA8XX_C0_RX_PULSE] = 7, - [IRQ_DA8XX_C0_TX_PULSE] = 7, - [IRQ_DA8XX_C0_MISC_PULSE] = 7, - [IRQ_DA8XX_C1_RX_THRESH_PULSE] = 7, - [IRQ_DA8XX_C1_RX_PULSE] = 7, - [IRQ_DA8XX_C1_TX_PULSE] = 7, - [IRQ_DA8XX_C1_MISC_PULSE] = 7, - [IRQ_DA8XX_MEMERR] = 7, - [IRQ_DA8XX_GPIO0] = 7, - [IRQ_DA8XX_GPIO1] = 7, - [IRQ_DA8XX_GPIO2] = 7, - [IRQ_DA8XX_GPIO3] = 7, - [IRQ_DA8XX_GPIO4] = 7, - [IRQ_DA8XX_GPIO5] = 7, - [IRQ_DA8XX_GPIO6] = 7, - [IRQ_DA8XX_GPIO7] = 7, - [IRQ_DA8XX_GPIO8] = 7, - [IRQ_DA8XX_I2CINT1] = 7, - [IRQ_DA8XX_LCDINT] = 7, - [IRQ_DA8XX_UARTINT1] = 7, - [IRQ_DA8XX_MCASPINT] = 7, - [IRQ_DA8XX_ALLINT1] = 7, - [IRQ_DA8XX_SPINT1] = 7, - [IRQ_DA8XX_UHPI_INT1] = 7, - [IRQ_DA8XX_USB_INT] = 7, - [IRQ_DA8XX_IRQN] = 7, - [IRQ_DA8XX_RWAKEUP] = 7, - [IRQ_DA8XX_UARTINT2] = 7, - [IRQ_DA8XX_DFTSSINT] = 7, - [IRQ_DA8XX_EHRPWM0] = 7, - [IRQ_DA8XX_EHRPWM0TZ] = 7, - [IRQ_DA8XX_EHRPWM1] = 7, - [IRQ_DA8XX_EHRPWM1TZ] = 7, - [IRQ_DA830_EHRPWM2] = 7, - [IRQ_DA830_EHRPWM2TZ] = 7, - [IRQ_DA8XX_ECAP0] = 7, - [IRQ_DA8XX_ECAP1] = 7, - [IRQ_DA8XX_ECAP2] = 7, - [IRQ_DA830_EQEP0] = 7, - [IRQ_DA830_EQEP1] = 7, - [IRQ_DA830_T12CMPINT0_0] = 7, - [IRQ_DA830_T12CMPINT1_0] = 7, - [IRQ_DA830_T12CMPINT2_0] = 7, - [IRQ_DA830_T12CMPINT3_0] = 7, - [IRQ_DA830_T12CMPINT4_0] = 7, - [IRQ_DA830_T12CMPINT5_0] = 7, - [IRQ_DA830_T12CMPINT6_0] = 7, - [IRQ_DA830_T12CMPINT7_0] = 7, - [IRQ_DA830_T12CMPINT0_1] = 7, - [IRQ_DA830_T12CMPINT1_1] = 7, - [IRQ_DA830_T12CMPINT2_1] = 7, - [IRQ_DA830_T12CMPINT3_1] = 7, - [IRQ_DA830_T12CMPINT4_1] = 7, - [IRQ_DA830_T12CMPINT5_1] = 7, - [IRQ_DA830_T12CMPINT6_1] = 7, - [IRQ_DA830_T12CMPINT7_1] = 7, - [IRQ_DA8XX_ARMCLKSTOPREQ] = 7, +static u8 da830_cp_intc_prios[] = { + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, }; static struct map_desc da830_io_desc[] = { @@ -807,7 +728,7 @@ static const struct davinci_soc_info davinci_soc_info_da830 = { .pinmux_pins = da830_pins, .pinmux_pins_num = ARRAY_SIZE(da830_pins), .intc_base = DA8XX_CP_INTC_BASE, - .intc_irq_prios = da830_default_priorities, + .intc_irq_prios = da830_cp_intc_prios, .intc_irq_num = DA830_N_CP_INTC_IRQ, .timer_info = &da830_timer_info, .emac_pdata = &da8xx_emac_pdata, diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index e823b89e2b7a..40b90730e847 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -299,108 +299,20 @@ const short da850_vpif_display_pins[] __initconst = { }; /* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */ -static u8 da850_default_priorities[DA850_N_CP_INTC_IRQ] = { - [IRQ_DA8XX_COMMTX] = 7, - [IRQ_DA8XX_COMMRX] = 7, - [IRQ_DA8XX_NINT] = 7, - [IRQ_DA8XX_EVTOUT0] = 7, - [IRQ_DA8XX_EVTOUT1] = 7, - [IRQ_DA8XX_EVTOUT2] = 7, - [IRQ_DA8XX_EVTOUT3] = 7, - [IRQ_DA8XX_EVTOUT4] = 7, - [IRQ_DA8XX_EVTOUT5] = 7, - [IRQ_DA8XX_EVTOUT6] = 7, - [IRQ_DA8XX_EVTOUT7] = 7, - [IRQ_DA8XX_CCINT0] = 7, - [IRQ_DA8XX_CCERRINT] = 7, - [IRQ_DA8XX_TCERRINT0] = 7, - [IRQ_DA8XX_AEMIFINT] = 7, - [IRQ_DA8XX_I2CINT0] = 7, - [IRQ_DA8XX_MMCSDINT0] = 7, - [IRQ_DA8XX_MMCSDINT1] = 7, - [IRQ_DA8XX_ALLINT0] = 7, - [IRQ_DA8XX_RTC] = 7, - [IRQ_DA8XX_SPINT0] = 7, - [IRQ_DA8XX_TINT12_0] = 7, - [IRQ_DA8XX_TINT34_0] = 7, - [IRQ_DA8XX_TINT12_1] = 7, - [IRQ_DA8XX_TINT34_1] = 7, - [IRQ_DA8XX_UARTINT0] = 7, - [IRQ_DA8XX_KEYMGRINT] = 7, - [IRQ_DA850_MPUADDRERR0] = 7, - [IRQ_DA8XX_CHIPINT0] = 7, - [IRQ_DA8XX_CHIPINT1] = 7, - [IRQ_DA8XX_CHIPINT2] = 7, - [IRQ_DA8XX_CHIPINT3] = 7, - [IRQ_DA8XX_TCERRINT1] = 7, - [IRQ_DA8XX_C0_RX_THRESH_PULSE] = 7, - [IRQ_DA8XX_C0_RX_PULSE] = 7, - [IRQ_DA8XX_C0_TX_PULSE] = 7, - [IRQ_DA8XX_C0_MISC_PULSE] = 7, - [IRQ_DA8XX_C1_RX_THRESH_PULSE] = 7, - [IRQ_DA8XX_C1_RX_PULSE] = 7, - [IRQ_DA8XX_C1_TX_PULSE] = 7, - [IRQ_DA8XX_C1_MISC_PULSE] = 7, - [IRQ_DA8XX_MEMERR] = 7, - [IRQ_DA8XX_GPIO0] = 7, - [IRQ_DA8XX_GPIO1] = 7, - [IRQ_DA8XX_GPIO2] = 7, - [IRQ_DA8XX_GPIO3] = 7, - [IRQ_DA8XX_GPIO4] = 7, - [IRQ_DA8XX_GPIO5] = 7, - [IRQ_DA8XX_GPIO6] = 7, - [IRQ_DA8XX_GPIO7] = 7, - [IRQ_DA8XX_GPIO8] = 7, - [IRQ_DA8XX_I2CINT1] = 7, - [IRQ_DA8XX_LCDINT] = 7, - [IRQ_DA8XX_UARTINT1] = 7, - [IRQ_DA8XX_MCASPINT] = 7, - [IRQ_DA8XX_ALLINT1] = 7, - [IRQ_DA8XX_SPINT1] = 7, - [IRQ_DA8XX_UHPI_INT1] = 7, - [IRQ_DA8XX_USB_INT] = 7, - [IRQ_DA8XX_IRQN] = 7, - [IRQ_DA8XX_RWAKEUP] = 7, - [IRQ_DA8XX_UARTINT2] = 7, - [IRQ_DA8XX_DFTSSINT] = 7, - [IRQ_DA8XX_EHRPWM0] = 7, - [IRQ_DA8XX_EHRPWM0TZ] = 7, - [IRQ_DA8XX_EHRPWM1] = 7, - [IRQ_DA8XX_EHRPWM1TZ] = 7, - [IRQ_DA850_SATAINT] = 7, - [IRQ_DA850_TINTALL_2] = 7, - [IRQ_DA8XX_ECAP0] = 7, - [IRQ_DA8XX_ECAP1] = 7, - [IRQ_DA8XX_ECAP2] = 7, - [IRQ_DA850_MMCSDINT0_1] = 7, - [IRQ_DA850_MMCSDINT1_1] = 7, - [IRQ_DA850_T12CMPINT0_2] = 7, - [IRQ_DA850_T12CMPINT1_2] = 7, - [IRQ_DA850_T12CMPINT2_2] = 7, - [IRQ_DA850_T12CMPINT3_2] = 7, - [IRQ_DA850_T12CMPINT4_2] = 7, - [IRQ_DA850_T12CMPINT5_2] = 7, - [IRQ_DA850_T12CMPINT6_2] = 7, - [IRQ_DA850_T12CMPINT7_2] = 7, - [IRQ_DA850_T12CMPINT0_3] = 7, - [IRQ_DA850_T12CMPINT1_3] = 7, - [IRQ_DA850_T12CMPINT2_3] = 7, - [IRQ_DA850_T12CMPINT3_3] = 7, - [IRQ_DA850_T12CMPINT4_3] = 7, - [IRQ_DA850_T12CMPINT5_3] = 7, - [IRQ_DA850_T12CMPINT6_3] = 7, - [IRQ_DA850_T12CMPINT7_3] = 7, - [IRQ_DA850_RPIINT] = 7, - [IRQ_DA850_VPIFINT] = 7, - [IRQ_DA850_CCINT1] = 7, - [IRQ_DA850_CCERRINT1] = 7, - [IRQ_DA850_TCERRINT2] = 7, - [IRQ_DA850_TINTALL_3] = 7, - [IRQ_DA850_MCBSP0RINT] = 7, - [IRQ_DA850_MCBSP0XINT] = 7, - [IRQ_DA850_MCBSP1RINT] = 7, - [IRQ_DA850_MCBSP1XINT] = 7, - [IRQ_DA8XX_ARMCLKSTOPREQ] = 7, +static u8 da850_cp_intc_prios[] = { + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, }; static struct map_desc da850_io_desc[] = { @@ -739,7 +651,7 @@ static const struct davinci_soc_info davinci_soc_info_da850 = { .pinmux_pins = da850_pins, .pinmux_pins_num = ARRAY_SIZE(da850_pins), .intc_base = DA8XX_CP_INTC_BASE, - .intc_irq_prios = da850_default_priorities, + .intc_irq_prios = da850_cp_intc_prios, .intc_irq_num = DA850_N_CP_INTC_IRQ, .timer_info = &da850_timer_info, .emac_pdata = &da8xx_emac_pdata, diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index 03ce5df28d87..a31f56c70d1d 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -154,69 +154,15 @@ MUX_CFG(DM355, VIN_CINH_EN, 0, 8, 3, 3, false) #endif }; -static u8 dm355_default_priorities[DAVINCI_N_AINTC_IRQ] = { - [IRQ_DM355_CCDC_VDINT0] = 2, - [IRQ_DM355_CCDC_VDINT1] = 6, - [IRQ_DM355_CCDC_VDINT2] = 6, - [IRQ_DM355_IPIPE_HST] = 6, - [IRQ_DM355_H3AINT] = 6, - [IRQ_DM355_IPIPE_SDR] = 6, - [IRQ_DM355_IPIPEIFINT] = 6, - [IRQ_DM355_OSDINT] = 7, - [IRQ_DM355_VENCINT] = 6, - [IRQ_ASQINT] = 6, - [IRQ_IMXINT] = 6, - [IRQ_USBINT] = 4, - [IRQ_DM355_RTOINT] = 4, - [IRQ_DM355_UARTINT2] = 7, - [IRQ_DM355_TINT6] = 7, - [IRQ_CCINT0] = 5, /* dma */ - [IRQ_CCERRINT] = 5, /* dma */ - [IRQ_TCERRINT0] = 5, /* dma */ - [IRQ_TCERRINT] = 5, /* dma */ - [IRQ_DM355_SPINT2_1] = 7, - [IRQ_DM355_TINT7] = 4, - [IRQ_DM355_SDIOINT0] = 7, - [IRQ_MBXINT] = 7, - [IRQ_MBRINT] = 7, - [IRQ_MMCINT] = 7, - [IRQ_DM355_MMCINT1] = 7, - [IRQ_DM355_PWMINT3] = 7, - [IRQ_DDRINT] = 7, - [IRQ_AEMIFINT] = 7, - [IRQ_DM355_SDIOINT1] = 4, - [IRQ_TINT0_TINT12] = 2, /* clockevent */ - [IRQ_TINT0_TINT34] = 2, /* clocksource */ - [IRQ_TINT1_TINT12] = 7, /* DSP timer */ - [IRQ_TINT1_TINT34] = 7, /* system tick */ - [IRQ_PWMINT0] = 7, - [IRQ_PWMINT1] = 7, - [IRQ_PWMINT2] = 7, - [IRQ_I2C] = 3, - [IRQ_UARTINT0] = 3, - [IRQ_UARTINT1] = 3, - [IRQ_DM355_SPINT0_0] = 3, - [IRQ_DM355_SPINT0_1] = 3, - [IRQ_DM355_GPIO0] = 3, - [IRQ_DM355_GPIO1] = 7, - [IRQ_DM355_GPIO2] = 4, - [IRQ_DM355_GPIO3] = 4, - [IRQ_DM355_GPIO4] = 7, - [IRQ_DM355_GPIO5] = 7, - [IRQ_DM355_GPIO6] = 7, - [IRQ_DM355_GPIO7] = 7, - [IRQ_DM355_GPIO8] = 7, - [IRQ_DM355_GPIO9] = 7, - [IRQ_DM355_GPIOBNK0] = 7, - [IRQ_DM355_GPIOBNK1] = 7, - [IRQ_DM355_GPIOBNK2] = 7, - [IRQ_DM355_GPIOBNK3] = 7, - [IRQ_DM355_GPIOBNK4] = 7, - [IRQ_DM355_GPIOBNK5] = 7, - [IRQ_DM355_GPIOBNK6] = 7, - [IRQ_COMMTX] = 7, - [IRQ_COMMRX] = 7, - [IRQ_EMUINT] = 7, +static u8 dm355_aintc_prios[] = { + 2, 6, 6, 6, 6, 6, 6, 7, + 6, 6, 6, 4, 4, 7, 7, 5, + 5, 5, 5, 7, 4, 7, 7, 7, + 7, 7, 7, 7, 7, 4, 2, 2, + 7, 7, 7, 7, 7, 3, 3, 3, + 3, 3, 3, 7, 4, 4, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 0, 0, }; /*----------------------------------------------------------------------*/ @@ -705,7 +651,7 @@ static const struct davinci_soc_info davinci_soc_info_dm355 = { .pinmux_pins = dm355_pins, .pinmux_pins_num = ARRAY_SIZE(dm355_pins), .intc_base = DAVINCI_ARM_INTC_BASE, - .intc_irq_prios = dm355_default_priorities, + .intc_irq_prios = dm355_aintc_prios, .intc_irq_num = DAVINCI_N_AINTC_IRQ, .timer_info = &dm355_timer_info, .sram_dma = 0x00010000, diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 3e034f0478d2..42b2012d25cc 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -382,71 +382,15 @@ static struct platform_device dm365_mdio_device = { .resource = dm365_mdio_resources, }; -static u8 dm365_default_priorities[DAVINCI_N_AINTC_IRQ] = { - [IRQ_VDINT0] = 2, - [IRQ_VDINT1] = 6, - [IRQ_VDINT2] = 6, - [IRQ_HISTINT] = 6, - [IRQ_H3AINT] = 6, - [IRQ_PRVUINT] = 6, - [IRQ_RSZINT] = 6, - [IRQ_DM365_INSFINT] = 7, - [IRQ_VENCINT] = 6, - [IRQ_ASQINT] = 6, - [IRQ_IMXINT] = 6, - [IRQ_DM365_IMCOPINT] = 4, - [IRQ_USBINT] = 4, - [IRQ_DM365_RTOINT] = 7, - [IRQ_DM365_TINT5] = 7, - [IRQ_DM365_TINT6] = 5, - [IRQ_CCINT0] = 5, - [IRQ_CCERRINT] = 5, - [IRQ_TCERRINT0] = 5, - [IRQ_TCERRINT] = 7, - [IRQ_PSCIN] = 4, - [IRQ_DM365_SPINT2_1] = 7, - [IRQ_DM365_TINT7] = 7, - [IRQ_DM365_SDIOINT0] = 7, - [IRQ_MBXINT] = 7, - [IRQ_MBRINT] = 7, - [IRQ_MMCINT] = 7, - [IRQ_DM365_MMCINT1] = 7, - [IRQ_DM365_PWMINT3] = 7, - [IRQ_AEMIFINT] = 2, - [IRQ_DM365_SDIOINT1] = 2, - [IRQ_TINT0_TINT12] = 7, - [IRQ_TINT0_TINT34] = 7, - [IRQ_TINT1_TINT12] = 7, - [IRQ_TINT1_TINT34] = 7, - [IRQ_PWMINT0] = 7, - [IRQ_PWMINT1] = 3, - [IRQ_PWMINT2] = 3, - [IRQ_I2C] = 3, - [IRQ_UARTINT0] = 3, - [IRQ_UARTINT1] = 3, - [IRQ_DM365_RTCINT] = 3, - [IRQ_DM365_SPIINT0_0] = 3, - [IRQ_DM365_SPIINT3_0] = 3, - [IRQ_DM365_GPIO0] = 3, - [IRQ_DM365_GPIO1] = 7, - [IRQ_DM365_GPIO2] = 4, - [IRQ_DM365_GPIO3] = 4, - [IRQ_DM365_GPIO4] = 7, - [IRQ_DM365_GPIO5] = 7, - [IRQ_DM365_GPIO6] = 7, - [IRQ_DM365_GPIO7] = 7, - [IRQ_DM365_EMAC_RXTHRESH] = 7, - [IRQ_DM365_EMAC_RXPULSE] = 7, - [IRQ_DM365_EMAC_TXPULSE] = 7, - [IRQ_DM365_EMAC_MISCPULSE] = 7, - [IRQ_DM365_GPIO12] = 7, - [IRQ_DM365_GPIO13] = 7, - [IRQ_DM365_GPIO14] = 7, - [IRQ_DM365_GPIO15] = 7, - [IRQ_DM365_KEYINT] = 7, - [IRQ_DM365_TCERRINT2] = 7, - [IRQ_DM365_TCERRINT3] = 7, - [IRQ_DM365_EMUINT] = 7, +static u8 dm365_aintc_prios[] = { + 2, 6, 6, 6, 6, 6, 6, 7, + 6, 6, 6, 4, 4, 7, 7, 5, + 5, 5, 5, 7, 4, 7, 7, 7, + 7, 7, 7, 7, 7, 2, 2, 7, + 7, 7, 7, 7, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 7, 4, 4, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, }; /* Four Transfer Controllers on DM365 */ @@ -722,7 +666,7 @@ static const struct davinci_soc_info davinci_soc_info_dm365 = { .pinmux_pins = dm365_pins, .pinmux_pins_num = ARRAY_SIZE(dm365_pins), .intc_base = DAVINCI_ARM_INTC_BASE, - .intc_irq_prios = dm365_default_priorities, + .intc_irq_prios = dm365_aintc_prios, .intc_irq_num = DAVINCI_N_AINTC_IRQ, .timer_info = &dm365_timer_info, .emac_pdata = &dm365_emac_pdata, diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 66bab4782c62..bf7ebdcf6c18 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -147,71 +147,15 @@ MUX_CFG(DM644X, LFLDEN, 0, 25, 1, 1, false) }; /* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */ -static u8 dm644x_default_priorities[DAVINCI_N_AINTC_IRQ] = { - [IRQ_VDINT0] = 2, - [IRQ_VDINT1] = 6, - [IRQ_VDINT2] = 6, - [IRQ_HISTINT] = 6, - [IRQ_H3AINT] = 6, - [IRQ_PRVUINT] = 6, - [IRQ_RSZINT] = 6, - [7] = 7, - [IRQ_VENCINT] = 6, - [IRQ_ASQINT] = 6, - [IRQ_IMXINT] = 6, - [IRQ_VLCDINT] = 6, - [IRQ_USBINT] = 4, - [IRQ_EMACINT] = 4, - [14] = 7, - [15] = 7, - [IRQ_CCINT0] = 5, /* dma */ - [IRQ_CCERRINT] = 5, /* dma */ - [IRQ_TCERRINT0] = 5, /* dma */ - [IRQ_TCERRINT] = 5, /* dma */ - [IRQ_PSCIN] = 7, - [21] = 7, - [IRQ_IDE] = 4, - [23] = 7, - [IRQ_MBXINT] = 7, - [IRQ_MBRINT] = 7, - [IRQ_MMCINT] = 7, - [IRQ_SDIOINT] = 7, - [28] = 7, - [IRQ_DDRINT] = 7, - [IRQ_AEMIFINT] = 7, - [IRQ_VLQINT] = 4, - [IRQ_TINT0_TINT12] = 2, /* clockevent */ - [IRQ_TINT0_TINT34] = 2, /* clocksource */ - [IRQ_TINT1_TINT12] = 7, /* DSP timer */ - [IRQ_TINT1_TINT34] = 7, /* system tick */ - [IRQ_PWMINT0] = 7, - [IRQ_PWMINT1] = 7, - [IRQ_PWMINT2] = 7, - [IRQ_I2C] = 3, - [IRQ_UARTINT0] = 3, - [IRQ_UARTINT1] = 3, - [IRQ_UARTINT2] = 3, - [IRQ_SPINT0] = 3, - [IRQ_SPINT1] = 3, - [45] = 7, - [IRQ_DSP2ARM0] = 4, - [IRQ_DSP2ARM1] = 4, - [IRQ_GPIO0] = 7, - [IRQ_GPIO1] = 7, - [IRQ_GPIO2] = 7, - [IRQ_GPIO3] = 7, - [IRQ_GPIO4] = 7, - [IRQ_GPIO5] = 7, - [IRQ_GPIO6] = 7, - [IRQ_GPIO7] = 7, - [IRQ_GPIOBNK0] = 7, - [IRQ_GPIOBNK1] = 7, - [IRQ_GPIOBNK2] = 7, - [IRQ_GPIOBNK3] = 7, - [IRQ_GPIOBNK4] = 7, - [IRQ_COMMTX] = 7, - [IRQ_COMMRX] = 7, - [IRQ_EMUINT] = 7, +static u8 dm644x_aintc_prios[] = { + 2, 6, 6, 6, 6, 6, 6, 7, + 6, 6, 6, 6, 4, 4, 7, 7, + 5, 5, 5, 5, 7, 7, 4, 7, + 7, 7, 7, 7, 7, 7, 7, 4, + 2, 2, 7, 7, 7, 7, 7, 3, + 3, 3, 3, 3, 3, 7, 4, 4, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, }; /*----------------------------------------------------------------------*/ @@ -646,7 +590,7 @@ static const struct davinci_soc_info davinci_soc_info_dm644x = { .pinmux_pins = dm644x_pins, .pinmux_pins_num = ARRAY_SIZE(dm644x_pins), .intc_base = DAVINCI_ARM_INTC_BASE, - .intc_irq_prios = dm644x_default_priorities, + .intc_irq_prios = dm644x_aintc_prios, .intc_irq_num = DAVINCI_N_AINTC_IRQ, .timer_info = &dm644x_timer_info, .emac_pdata = &dm644x_emac_pdata, diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 45efa715a2c1..64b4ae5a4202 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -146,71 +146,15 @@ MUX_CFG(DM646X, PTSIMUX_SERIAL, 0, 16, 3, 3, true) #endif }; -static u8 dm646x_default_priorities[DAVINCI_N_AINTC_IRQ] = { - [IRQ_DM646X_VP_VERTINT0] = 7, - [IRQ_DM646X_VP_VERTINT1] = 7, - [IRQ_DM646X_VP_VERTINT2] = 7, - [IRQ_DM646X_VP_VERTINT3] = 7, - [IRQ_DM646X_VP_ERRINT] = 7, - [IRQ_DM646X_RESERVED_1] = 7, - [IRQ_DM646X_RESERVED_2] = 7, - [IRQ_DM646X_WDINT] = 7, - [IRQ_DM646X_CRGENINT0] = 7, - [IRQ_DM646X_CRGENINT1] = 7, - [IRQ_DM646X_TSIFINT0] = 7, - [IRQ_DM646X_TSIFINT1] = 7, - [IRQ_DM646X_VDCEINT] = 7, - [IRQ_DM646X_USBINT] = 7, - [IRQ_DM646X_USBDMAINT] = 7, - [IRQ_DM646X_PCIINT] = 7, - [IRQ_CCINT0] = 7, /* dma */ - [IRQ_CCERRINT] = 7, /* dma */ - [IRQ_TCERRINT0] = 7, /* dma */ - [IRQ_TCERRINT] = 7, /* dma */ - [IRQ_DM646X_TCERRINT2] = 7, - [IRQ_DM646X_TCERRINT3] = 7, - [IRQ_DM646X_IDE] = 7, - [IRQ_DM646X_HPIINT] = 7, - [IRQ_DM646X_EMACRXTHINT] = 7, - [IRQ_DM646X_EMACRXINT] = 7, - [IRQ_DM646X_EMACTXINT] = 7, - [IRQ_DM646X_EMACMISCINT] = 7, - [IRQ_DM646X_MCASP0TXINT] = 7, - [IRQ_DM646X_MCASP0RXINT] = 7, - [IRQ_DM646X_RESERVED_3] = 7, - [IRQ_DM646X_MCASP1TXINT] = 7, - [IRQ_TINT0_TINT12] = 7, /* clockevent */ - [IRQ_TINT0_TINT34] = 7, /* clocksource */ - [IRQ_TINT1_TINT12] = 7, /* DSP timer */ - [IRQ_TINT1_TINT34] = 7, /* system tick */ - [IRQ_PWMINT0] = 7, - [IRQ_PWMINT1] = 7, - [IRQ_DM646X_VLQINT] = 7, - [IRQ_I2C] = 7, - [IRQ_UARTINT0] = 7, - [IRQ_UARTINT1] = 7, - [IRQ_DM646X_UARTINT2] = 7, - [IRQ_DM646X_SPINT0] = 7, - [IRQ_DM646X_SPINT1] = 7, - [IRQ_DM646X_DSP2ARMINT] = 7, - [IRQ_DM646X_RESERVED_4] = 7, - [IRQ_DM646X_PSCINT] = 7, - [IRQ_DM646X_GPIO0] = 7, - [IRQ_DM646X_GPIO1] = 7, - [IRQ_DM646X_GPIO2] = 7, - [IRQ_DM646X_GPIO3] = 7, - [IRQ_DM646X_GPIO4] = 7, - [IRQ_DM646X_GPIO5] = 7, - [IRQ_DM646X_GPIO6] = 7, - [IRQ_DM646X_GPIO7] = 7, - [IRQ_DM646X_GPIOBNK0] = 7, - [IRQ_DM646X_GPIOBNK1] = 7, - [IRQ_DM646X_GPIOBNK2] = 7, - [IRQ_DM646X_DDRINT] = 7, - [IRQ_DM646X_AEMIFINT] = 7, - [IRQ_COMMTX] = 7, - [IRQ_COMMRX] = 7, - [IRQ_EMUINT] = 7, +static u8 dm646x_aintc_prios[] = { + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, }; /*----------------------------------------------------------------------*/ @@ -586,7 +530,7 @@ static const struct davinci_soc_info davinci_soc_info_dm646x = { .pinmux_pins = dm646x_pins, .pinmux_pins_num = ARRAY_SIZE(dm646x_pins), .intc_base = DAVINCI_ARM_INTC_BASE, - .intc_irq_prios = dm646x_default_priorities, + .intc_irq_prios = dm646x_aintc_prios, .intc_irq_num = DAVINCI_N_AINTC_IRQ, .timer_info = &dm646x_timer_info, .emac_pdata = &dm646x_emac_pdata, From patchwork Thu Jan 31 13:38:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790605 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C980B91E for ; Thu, 31 Jan 2019 13:42:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B859830E62 for ; Thu, 31 Jan 2019 13:42:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ACC3630E68; Thu, 31 Jan 2019 13:42:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UPPERCASE_50_75 autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3B83230E62 for ; Thu, 31 Jan 2019 13:42:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=uWLTBKytoOW9dOEb8J0IvNn10TuaEMG9weN+Ke4+2A4=; b=IX8QMiD9AJOPwS LiY7MivIOWslxIEzIvqBX43/EO9FHMWexZX82iYQ6nAkD+P9qz+cy/XnWkhHZFxC+WfU0KPIT6rRS fT4u6Xj9v4DnnXeKCJ0daM3A3SWbO/yTk/wwtrDmHY5s5sbPz4KPBRL4suYZzNKwY4e9MDuxWQAbM igKmyyIAwSDH5S/EgWzdO6I6eDPZ4gR6lbuZ54S99qN8nl9TPdXwmbZ3vfgE9rLGhxBXf3HQzg4Ik JewolOoYmj5GGRzNBPY8Pdnb+ngRVODzgfPptpZzuGoV8gqLlo62PhWwtv6RUMxdffV4/udKYdv95 b1F3f19l2ex42dbuISVw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCbv-0008Ik-SM; Thu, 31 Jan 2019 13:42:31 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZK-0004bP-N1 for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:19 +0000 Received: by mail-wm1-x344.google.com with SMTP id f188so2566972wmf.5 for ; Thu, 31 Jan 2019 05:39:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FeUZdmMqEulmsWt+CTGGN+WuWiGWBoYv8p5WnxtUkMY=; b=is71jmpf4E7Cgag1DWIc6Q7/suUD4IrcPAKB7qohSrkvOwdtsxeQ9GOiLGyOxAoRWj z3efsOhf3j+nS60KZinWStD8iKC2HUxr+qXsL/gKzzYgJIZQhae5mO2YyifGGYtsEmc2 +5R9HPjXsa1eb3flpxPyU3FKy7+3Cx258sks5NUEgzGAZZEJYbDLGMUoCtjNcw6izEts w9Vfu+EUfhRns+fTUVsjI+Otmwo6vVOEO7xbxwu8sezgVBR6IZWe6rya43VMMF2HeRqs BF8nn5QFZC8E4ndGx0dTLPzai5dk01/DtPujmEZo78nvTUXIIy89Nb9mZDM1dLcKoDcc ewzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FeUZdmMqEulmsWt+CTGGN+WuWiGWBoYv8p5WnxtUkMY=; b=p1IBFb92WzokPfu+86IwFY9h8KM7p+mpI9zFBKbpdIUsNyssXYPCD6Dfa32DYR1Cqc 1h6RcLlGWoy6zVDVF+88QKW3wilT1z/eXN+kvoHTAHBgtSk/QWunDCslzRss/EcSp2cd XpoyzXCLx1moCwqr/ymoF0Sd+7iQjYmW8yM8/F1pjkZCVbbNoZpNUSdFZMZwkswrIn3D PH+ecosVxIuwfn8/x72REb+nm79n5nPNZ1UtLGzp/ZKwCkvdSeMYQWwQTX9ZQX5LmPM2 nk9USv5WXpp99i0CgBeZMSKM+OJUlb03CBfgQVDN3BqFfE6qUVeERt64rEyQzqp7FHFr eLLw== X-Gm-Message-State: AJcUukdQAPjNs6gBn/ajAbkYxgJGXsn55/wFUgf1CLJAKS+4lcuVBC1S w3y86W6F876SCOgfrO66RPvgbQ== X-Google-Smtp-Source: ALg8bN7jtRH8eMgdJm4ttbU25j/eWH4yeXkHXVviv1v3ZdUuHF+9Lx8/WV40YBm8knaWa+fVq+8SZA== X-Received: by 2002:a1c:f613:: with SMTP id w19mr29675233wmc.0.1548941989101; Thu, 31 Jan 2019 05:39:49 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.39.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:39:48 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 06/35] ARM: davinci: wrap interrupt definitions with a macro for SPARSE_IRQ Date: Thu, 31 Jan 2019 14:38:59 +0100 Message-Id: <20190131133928.17985-7-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_053952_025954_EF6F4FFF X-CRM114-Status: GOOD ( 10.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski This is done in preparation for selecting CONFIG_SPARSE_IRQ. The interrupt numbers will then start at the predefined NR_IRQS offset. For now wrap all interrupt numbers with a macro and define DAVINCI_INTC_START to 0. Logically nothing changes for now. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/include/mach/irqs.h | 689 +++++++++++----------- 1 file changed, 346 insertions(+), 343 deletions(-) diff --git a/arch/arm/mach-davinci/include/mach/irqs.h b/arch/arm/mach-davinci/include/mach/irqs.h index 03c446635301..14fa668d4e8d 100644 --- a/arch/arm/mach-davinci/include/mach/irqs.h +++ b/arch/arm/mach-davinci/include/mach/irqs.h @@ -30,371 +30,374 @@ /* Base address */ #define DAVINCI_ARM_INTC_BASE 0x01C48000 +#define DAVINCI_INTC_START 0 +#define DAVINCI_INTC_IRQ(_irqnum) (DAVINCI_INTC_START + (_irqnum)) + /* Interrupt lines */ -#define IRQ_VDINT0 0 -#define IRQ_VDINT1 1 -#define IRQ_VDINT2 2 -#define IRQ_HISTINT 3 -#define IRQ_H3AINT 4 -#define IRQ_PRVUINT 5 -#define IRQ_RSZINT 6 -#define IRQ_VFOCINT 7 -#define IRQ_VENCINT 8 -#define IRQ_ASQINT 9 -#define IRQ_IMXINT 10 -#define IRQ_VLCDINT 11 -#define IRQ_USBINT 12 -#define IRQ_EMACINT 13 +#define IRQ_VDINT0 DAVINCI_INTC_IRQ(0) +#define IRQ_VDINT1 DAVINCI_INTC_IRQ(1) +#define IRQ_VDINT2 DAVINCI_INTC_IRQ(2) +#define IRQ_HISTINT DAVINCI_INTC_IRQ(3) +#define IRQ_H3AINT DAVINCI_INTC_IRQ(4) +#define IRQ_PRVUINT DAVINCI_INTC_IRQ(5) +#define IRQ_RSZINT DAVINCI_INTC_IRQ(6) +#define IRQ_VFOCINT DAVINCI_INTC_IRQ(7) +#define IRQ_VENCINT DAVINCI_INTC_IRQ(8) +#define IRQ_ASQINT DAVINCI_INTC_IRQ(9) +#define IRQ_IMXINT DAVINCI_INTC_IRQ(10) +#define IRQ_VLCDINT DAVINCI_INTC_IRQ(11) +#define IRQ_USBINT DAVINCI_INTC_IRQ(12) +#define IRQ_EMACINT DAVINCI_INTC_IRQ(13) -#define IRQ_CCINT0 16 -#define IRQ_CCERRINT 17 -#define IRQ_TCERRINT0 18 -#define IRQ_TCERRINT 19 -#define IRQ_PSCIN 20 +#define IRQ_CCINT0 DAVINCI_INTC_IRQ(16) +#define IRQ_CCERRINT DAVINCI_INTC_IRQ(17) +#define IRQ_TCERRINT0 DAVINCI_INTC_IRQ(18) +#define IRQ_TCERRINT DAVINCI_INTC_IRQ(19) +#define IRQ_PSCIN DAVINCI_INTC_IRQ(20) -#define IRQ_IDE 22 -#define IRQ_HPIINT 23 -#define IRQ_MBXINT 24 -#define IRQ_MBRINT 25 -#define IRQ_MMCINT 26 -#define IRQ_SDIOINT 27 -#define IRQ_MSINT 28 -#define IRQ_DDRINT 29 -#define IRQ_AEMIFINT 30 -#define IRQ_VLQINT 31 -#define IRQ_TINT0_TINT12 32 -#define IRQ_TINT0_TINT34 33 -#define IRQ_TINT1_TINT12 34 -#define IRQ_TINT1_TINT34 35 -#define IRQ_PWMINT0 36 -#define IRQ_PWMINT1 37 -#define IRQ_PWMINT2 38 -#define IRQ_I2C 39 -#define IRQ_UARTINT0 40 -#define IRQ_UARTINT1 41 -#define IRQ_UARTINT2 42 -#define IRQ_SPINT0 43 -#define IRQ_SPINT1 44 +#define IRQ_IDE DAVINCI_INTC_IRQ(22) +#define IRQ_HPIINT DAVINCI_INTC_IRQ(23) +#define IRQ_MBXINT DAVINCI_INTC_IRQ(24) +#define IRQ_MBRINT DAVINCI_INTC_IRQ(25) +#define IRQ_MMCINT DAVINCI_INTC_IRQ(26) +#define IRQ_SDIOINT DAVINCI_INTC_IRQ(27) +#define IRQ_MSINT DAVINCI_INTC_IRQ(28) +#define IRQ_DDRINT DAVINCI_INTC_IRQ(29) +#define IRQ_AEMIFINT DAVINCI_INTC_IRQ(30) +#define IRQ_VLQINT DAVINCI_INTC_IRQ(31) +#define IRQ_TINT0_TINT12 DAVINCI_INTC_IRQ(32) +#define IRQ_TINT0_TINT34 DAVINCI_INTC_IRQ(33) +#define IRQ_TINT1_TINT12 DAVINCI_INTC_IRQ(34) +#define IRQ_TINT1_TINT34 DAVINCI_INTC_IRQ(35) +#define IRQ_PWMINT0 DAVINCI_INTC_IRQ(36) +#define IRQ_PWMINT1 DAVINCI_INTC_IRQ(37) +#define IRQ_PWMINT2 DAVINCI_INTC_IRQ(38) +#define IRQ_I2C DAVINCI_INTC_IRQ(39) +#define IRQ_UARTINT0 DAVINCI_INTC_IRQ(40) +#define IRQ_UARTINT1 DAVINCI_INTC_IRQ(41) +#define IRQ_UARTINT2 DAVINCI_INTC_IRQ(42) +#define IRQ_SPINT0 DAVINCI_INTC_IRQ(43) +#define IRQ_SPINT1 DAVINCI_INTC_IRQ(44) -#define IRQ_DSP2ARM0 46 -#define IRQ_DSP2ARM1 47 -#define IRQ_GPIO0 48 -#define IRQ_GPIO1 49 -#define IRQ_GPIO2 50 -#define IRQ_GPIO3 51 -#define IRQ_GPIO4 52 -#define IRQ_GPIO5 53 -#define IRQ_GPIO6 54 -#define IRQ_GPIO7 55 -#define IRQ_GPIOBNK0 56 -#define IRQ_GPIOBNK1 57 -#define IRQ_GPIOBNK2 58 -#define IRQ_GPIOBNK3 59 -#define IRQ_GPIOBNK4 60 -#define IRQ_COMMTX 61 -#define IRQ_COMMRX 62 -#define IRQ_EMUINT 63 +#define IRQ_DSP2ARM0 DAVINCI_INTC_IRQ(46) +#define IRQ_DSP2ARM1 DAVINCI_INTC_IRQ(47) +#define IRQ_GPIO0 DAVINCI_INTC_IRQ(48) +#define IRQ_GPIO1 DAVINCI_INTC_IRQ(49) +#define IRQ_GPIO2 DAVINCI_INTC_IRQ(50) +#define IRQ_GPIO3 DAVINCI_INTC_IRQ(51) +#define IRQ_GPIO4 DAVINCI_INTC_IRQ(52) +#define IRQ_GPIO5 DAVINCI_INTC_IRQ(53) +#define IRQ_GPIO6 DAVINCI_INTC_IRQ(54) +#define IRQ_GPIO7 DAVINCI_INTC_IRQ(55) +#define IRQ_GPIOBNK0 DAVINCI_INTC_IRQ(56) +#define IRQ_GPIOBNK1 DAVINCI_INTC_IRQ(57) +#define IRQ_GPIOBNK2 DAVINCI_INTC_IRQ(58) +#define IRQ_GPIOBNK3 DAVINCI_INTC_IRQ(59) +#define IRQ_GPIOBNK4 DAVINCI_INTC_IRQ(60) +#define IRQ_COMMTX DAVINCI_INTC_IRQ(61) +#define IRQ_COMMRX DAVINCI_INTC_IRQ(62) +#define IRQ_EMUINT DAVINCI_INTC_IRQ(63) #define DAVINCI_N_AINTC_IRQ 64 #define ARCH_TIMER_IRQ IRQ_TINT1_TINT34 /* DaVinci DM6467-specific Interrupts */ -#define IRQ_DM646X_VP_VERTINT0 0 -#define IRQ_DM646X_VP_VERTINT1 1 -#define IRQ_DM646X_VP_VERTINT2 2 -#define IRQ_DM646X_VP_VERTINT3 3 -#define IRQ_DM646X_VP_ERRINT 4 -#define IRQ_DM646X_RESERVED_1 5 -#define IRQ_DM646X_RESERVED_2 6 -#define IRQ_DM646X_WDINT 7 -#define IRQ_DM646X_CRGENINT0 8 -#define IRQ_DM646X_CRGENINT1 9 -#define IRQ_DM646X_TSIFINT0 10 -#define IRQ_DM646X_TSIFINT1 11 -#define IRQ_DM646X_VDCEINT 12 -#define IRQ_DM646X_USBINT 13 -#define IRQ_DM646X_USBDMAINT 14 -#define IRQ_DM646X_PCIINT 15 -#define IRQ_DM646X_TCERRINT2 20 -#define IRQ_DM646X_TCERRINT3 21 -#define IRQ_DM646X_IDE 22 -#define IRQ_DM646X_HPIINT 23 -#define IRQ_DM646X_EMACRXTHINT 24 -#define IRQ_DM646X_EMACRXINT 25 -#define IRQ_DM646X_EMACTXINT 26 -#define IRQ_DM646X_EMACMISCINT 27 -#define IRQ_DM646X_MCASP0TXINT 28 -#define IRQ_DM646X_MCASP0RXINT 29 -#define IRQ_DM646X_MCASP1TXINT 30 -#define IRQ_DM646X_RESERVED_3 31 -#define IRQ_DM646X_VLQINT 38 -#define IRQ_DM646X_UARTINT2 42 -#define IRQ_DM646X_SPINT0 43 -#define IRQ_DM646X_SPINT1 44 -#define IRQ_DM646X_DSP2ARMINT 45 -#define IRQ_DM646X_RESERVED_4 46 -#define IRQ_DM646X_PSCINT 47 -#define IRQ_DM646X_GPIO0 48 -#define IRQ_DM646X_GPIO1 49 -#define IRQ_DM646X_GPIO2 50 -#define IRQ_DM646X_GPIO3 51 -#define IRQ_DM646X_GPIO4 52 -#define IRQ_DM646X_GPIO5 53 -#define IRQ_DM646X_GPIO6 54 -#define IRQ_DM646X_GPIO7 55 -#define IRQ_DM646X_GPIOBNK0 56 -#define IRQ_DM646X_GPIOBNK1 57 -#define IRQ_DM646X_GPIOBNK2 58 -#define IRQ_DM646X_DDRINT 59 -#define IRQ_DM646X_AEMIFINT 60 +#define IRQ_DM646X_VP_VERTINT0 DAVINCI_INTC_IRQ(0) +#define IRQ_DM646X_VP_VERTINT1 DAVINCI_INTC_IRQ(1) +#define IRQ_DM646X_VP_VERTINT2 DAVINCI_INTC_IRQ(2) +#define IRQ_DM646X_VP_VERTINT3 DAVINCI_INTC_IRQ(3) +#define IRQ_DM646X_VP_ERRINT DAVINCI_INTC_IRQ(4) +#define IRQ_DM646X_RESERVED_1 DAVINCI_INTC_IRQ(5) +#define IRQ_DM646X_RESERVED_2 DAVINCI_INTC_IRQ(6) +#define IRQ_DM646X_WDINT DAVINCI_INTC_IRQ(7) +#define IRQ_DM646X_CRGENINT0 DAVINCI_INTC_IRQ(8) +#define IRQ_DM646X_CRGENINT1 DAVINCI_INTC_IRQ(9) +#define IRQ_DM646X_TSIFINT0 DAVINCI_INTC_IRQ(10) +#define IRQ_DM646X_TSIFINT1 DAVINCI_INTC_IRQ(11) +#define IRQ_DM646X_VDCEINT DAVINCI_INTC_IRQ(12) +#define IRQ_DM646X_USBINT DAVINCI_INTC_IRQ(13) +#define IRQ_DM646X_USBDMAINT DAVINCI_INTC_IRQ(14) +#define IRQ_DM646X_PCIINT DAVINCI_INTC_IRQ(15) +#define IRQ_DM646X_TCERRINT2 DAVINCI_INTC_IRQ(20) +#define IRQ_DM646X_TCERRINT3 DAVINCI_INTC_IRQ(21) +#define IRQ_DM646X_IDE DAVINCI_INTC_IRQ(22) +#define IRQ_DM646X_HPIINT DAVINCI_INTC_IRQ(23) +#define IRQ_DM646X_EMACRXTHINT DAVINCI_INTC_IRQ(24) +#define IRQ_DM646X_EMACRXINT DAVINCI_INTC_IRQ(25) +#define IRQ_DM646X_EMACTXINT DAVINCI_INTC_IRQ(26) +#define IRQ_DM646X_EMACMISCINT DAVINCI_INTC_IRQ(27) +#define IRQ_DM646X_MCASP0TXINT DAVINCI_INTC_IRQ(28) +#define IRQ_DM646X_MCASP0RXINT DAVINCI_INTC_IRQ(29) +#define IRQ_DM646X_MCASP1TXINT DAVINCI_INTC_IRQ(30) +#define IRQ_DM646X_RESERVED_3 DAVINCI_INTC_IRQ(31) +#define IRQ_DM646X_VLQINT DAVINCI_INTC_IRQ(38) +#define IRQ_DM646X_UARTINT2 DAVINCI_INTC_IRQ(42) +#define IRQ_DM646X_SPINT0 DAVINCI_INTC_IRQ(43) +#define IRQ_DM646X_SPINT1 DAVINCI_INTC_IRQ(44) +#define IRQ_DM646X_DSP2ARMINT DAVINCI_INTC_IRQ(45) +#define IRQ_DM646X_RESERVED_4 DAVINCI_INTC_IRQ(46) +#define IRQ_DM646X_PSCINT DAVINCI_INTC_IRQ(47) +#define IRQ_DM646X_GPIO0 DAVINCI_INTC_IRQ(48) +#define IRQ_DM646X_GPIO1 DAVINCI_INTC_IRQ(49) +#define IRQ_DM646X_GPIO2 DAVINCI_INTC_IRQ(50) +#define IRQ_DM646X_GPIO3 DAVINCI_INTC_IRQ(51) +#define IRQ_DM646X_GPIO4 DAVINCI_INTC_IRQ(52) +#define IRQ_DM646X_GPIO5 DAVINCI_INTC_IRQ(53) +#define IRQ_DM646X_GPIO6 DAVINCI_INTC_IRQ(54) +#define IRQ_DM646X_GPIO7 DAVINCI_INTC_IRQ(55) +#define IRQ_DM646X_GPIOBNK0 DAVINCI_INTC_IRQ(56) +#define IRQ_DM646X_GPIOBNK1 DAVINCI_INTC_IRQ(57) +#define IRQ_DM646X_GPIOBNK2 DAVINCI_INTC_IRQ(58) +#define IRQ_DM646X_DDRINT DAVINCI_INTC_IRQ(59) +#define IRQ_DM646X_AEMIFINT DAVINCI_INTC_IRQ(60) /* DaVinci DM355-specific Interrupts */ -#define IRQ_DM355_CCDC_VDINT0 0 -#define IRQ_DM355_CCDC_VDINT1 1 -#define IRQ_DM355_CCDC_VDINT2 2 -#define IRQ_DM355_IPIPE_HST 3 -#define IRQ_DM355_H3AINT 4 -#define IRQ_DM355_IPIPE_SDR 5 -#define IRQ_DM355_IPIPEIFINT 6 -#define IRQ_DM355_OSDINT 7 -#define IRQ_DM355_VENCINT 8 -#define IRQ_DM355_IMCOPINT 11 -#define IRQ_DM355_RTOINT 13 -#define IRQ_DM355_TINT4 13 -#define IRQ_DM355_TINT2_TINT12 13 -#define IRQ_DM355_UARTINT2 14 -#define IRQ_DM355_TINT5 14 -#define IRQ_DM355_TINT2_TINT34 14 -#define IRQ_DM355_TINT6 15 -#define IRQ_DM355_TINT3_TINT12 15 -#define IRQ_DM355_SPINT1_0 17 -#define IRQ_DM355_SPINT1_1 18 -#define IRQ_DM355_SPINT2_0 19 -#define IRQ_DM355_SPINT2_1 21 -#define IRQ_DM355_TINT7 22 -#define IRQ_DM355_TINT3_TINT34 22 -#define IRQ_DM355_SDIOINT0 23 -#define IRQ_DM355_MMCINT0 26 -#define IRQ_DM355_MSINT 26 -#define IRQ_DM355_MMCINT1 27 -#define IRQ_DM355_PWMINT3 28 -#define IRQ_DM355_SDIOINT1 31 -#define IRQ_DM355_SPINT0_0 42 -#define IRQ_DM355_SPINT0_1 43 -#define IRQ_DM355_GPIO0 44 -#define IRQ_DM355_GPIO1 45 -#define IRQ_DM355_GPIO2 46 -#define IRQ_DM355_GPIO3 47 -#define IRQ_DM355_GPIO4 48 -#define IRQ_DM355_GPIO5 49 -#define IRQ_DM355_GPIO6 50 -#define IRQ_DM355_GPIO7 51 -#define IRQ_DM355_GPIO8 52 -#define IRQ_DM355_GPIO9 53 -#define IRQ_DM355_GPIOBNK0 54 -#define IRQ_DM355_GPIOBNK1 55 -#define IRQ_DM355_GPIOBNK2 56 -#define IRQ_DM355_GPIOBNK3 57 -#define IRQ_DM355_GPIOBNK4 58 -#define IRQ_DM355_GPIOBNK5 59 -#define IRQ_DM355_GPIOBNK6 60 +#define IRQ_DM355_CCDC_VDINT0 DAVINCI_INTC_IRQ(0) +#define IRQ_DM355_CCDC_VDINT1 DAVINCI_INTC_IRQ(1) +#define IRQ_DM355_CCDC_VDINT2 DAVINCI_INTC_IRQ(2) +#define IRQ_DM355_IPIPE_HST DAVINCI_INTC_IRQ(3) +#define IRQ_DM355_H3AINT DAVINCI_INTC_IRQ(4) +#define IRQ_DM355_IPIPE_SDR DAVINCI_INTC_IRQ(5) +#define IRQ_DM355_IPIPEIFINT DAVINCI_INTC_IRQ(6) +#define IRQ_DM355_OSDINT DAVINCI_INTC_IRQ(7) +#define IRQ_DM355_VENCINT DAVINCI_INTC_IRQ(8) +#define IRQ_DM355_IMCOPINT DAVINCI_INTC_IRQ(11) +#define IRQ_DM355_RTOINT DAVINCI_INTC_IRQ(13) +#define IRQ_DM355_TINT4 DAVINCI_INTC_IRQ(13) +#define IRQ_DM355_TINT2_TINT12 DAVINCI_INTC_IRQ(13) +#define IRQ_DM355_UARTINT2 DAVINCI_INTC_IRQ(14) +#define IRQ_DM355_TINT5 DAVINCI_INTC_IRQ(14) +#define IRQ_DM355_TINT2_TINT34 DAVINCI_INTC_IRQ(14) +#define IRQ_DM355_TINT6 DAVINCI_INTC_IRQ(15) +#define IRQ_DM355_TINT3_TINT12 DAVINCI_INTC_IRQ(15) +#define IRQ_DM355_SPINT1_0 DAVINCI_INTC_IRQ(17) +#define IRQ_DM355_SPINT1_1 DAVINCI_INTC_IRQ(18) +#define IRQ_DM355_SPINT2_0 DAVINCI_INTC_IRQ(19) +#define IRQ_DM355_SPINT2_1 DAVINCI_INTC_IRQ(21) +#define IRQ_DM355_TINT7 DAVINCI_INTC_IRQ(22) +#define IRQ_DM355_TINT3_TINT34 DAVINCI_INTC_IRQ(22) +#define IRQ_DM355_SDIOINT0 DAVINCI_INTC_IRQ(23) +#define IRQ_DM355_MMCINT0 DAVINCI_INTC_IRQ(26) +#define IRQ_DM355_MSINT DAVINCI_INTC_IRQ(26) +#define IRQ_DM355_MMCINT1 DAVINCI_INTC_IRQ(27) +#define IRQ_DM355_PWMINT3 DAVINCI_INTC_IRQ(28) +#define IRQ_DM355_SDIOINT1 DAVINCI_INTC_IRQ(31) +#define IRQ_DM355_SPINT0_0 DAVINCI_INTC_IRQ(42) +#define IRQ_DM355_SPINT0_1 DAVINCI_INTC_IRQ(43) +#define IRQ_DM355_GPIO0 DAVINCI_INTC_IRQ(44) +#define IRQ_DM355_GPIO1 DAVINCI_INTC_IRQ(45) +#define IRQ_DM355_GPIO2 DAVINCI_INTC_IRQ(46) +#define IRQ_DM355_GPIO3 DAVINCI_INTC_IRQ(47) +#define IRQ_DM355_GPIO4 DAVINCI_INTC_IRQ(48) +#define IRQ_DM355_GPIO5 DAVINCI_INTC_IRQ(49) +#define IRQ_DM355_GPIO6 DAVINCI_INTC_IRQ(50) +#define IRQ_DM355_GPIO7 DAVINCI_INTC_IRQ(51) +#define IRQ_DM355_GPIO8 DAVINCI_INTC_IRQ(52) +#define IRQ_DM355_GPIO9 DAVINCI_INTC_IRQ(53) +#define IRQ_DM355_GPIOBNK0 DAVINCI_INTC_IRQ(54) +#define IRQ_DM355_GPIOBNK1 DAVINCI_INTC_IRQ(55) +#define IRQ_DM355_GPIOBNK2 DAVINCI_INTC_IRQ(56) +#define IRQ_DM355_GPIOBNK3 DAVINCI_INTC_IRQ(57) +#define IRQ_DM355_GPIOBNK4 DAVINCI_INTC_IRQ(58) +#define IRQ_DM355_GPIOBNK5 DAVINCI_INTC_IRQ(59) +#define IRQ_DM355_GPIOBNK6 DAVINCI_INTC_IRQ(60) /* DaVinci DM365-specific Interrupts */ -#define IRQ_DM365_INSFINT 7 -#define IRQ_DM365_IMXINT1 8 -#define IRQ_DM365_IMXINT0 10 -#define IRQ_DM365_KLD_ARMINT 10 -#define IRQ_DM365_IMCOPINT 11 -#define IRQ_DM365_RTOINT 13 -#define IRQ_DM365_TINT5 14 -#define IRQ_DM365_TINT6 15 -#define IRQ_DM365_SPINT2_1 21 -#define IRQ_DM365_TINT7 22 -#define IRQ_DM365_SDIOINT0 23 -#define IRQ_DM365_MMCINT1 27 -#define IRQ_DM365_PWMINT3 28 -#define IRQ_DM365_RTCINT 29 -#define IRQ_DM365_SDIOINT1 31 -#define IRQ_DM365_SPIINT0_0 42 -#define IRQ_DM365_SPIINT3_0 43 -#define IRQ_DM365_GPIO0 44 -#define IRQ_DM365_GPIO1 45 -#define IRQ_DM365_GPIO2 46 -#define IRQ_DM365_GPIO3 47 -#define IRQ_DM365_GPIO4 48 -#define IRQ_DM365_GPIO5 49 -#define IRQ_DM365_GPIO6 50 -#define IRQ_DM365_GPIO7 51 -#define IRQ_DM365_EMAC_RXTHRESH 52 -#define IRQ_DM365_EMAC_RXPULSE 53 -#define IRQ_DM365_EMAC_TXPULSE 54 -#define IRQ_DM365_EMAC_MISCPULSE 55 -#define IRQ_DM365_GPIO12 56 -#define IRQ_DM365_GPIO13 57 -#define IRQ_DM365_GPIO14 58 -#define IRQ_DM365_GPIO15 59 -#define IRQ_DM365_ADCINT 59 -#define IRQ_DM365_KEYINT 60 -#define IRQ_DM365_TCERRINT2 61 -#define IRQ_DM365_TCERRINT3 62 -#define IRQ_DM365_EMUINT 63 +#define IRQ_DM365_INSFINT DAVINCI_INTC_IRQ(7) +#define IRQ_DM365_IMXINT1 DAVINCI_INTC_IRQ(8) +#define IRQ_DM365_IMXINT0 DAVINCI_INTC_IRQ(10) +#define IRQ_DM365_KLD_ARMINT DAVINCI_INTC_IRQ(10) +#define IRQ_DM365_IMCOPINT DAVINCI_INTC_IRQ(11) +#define IRQ_DM365_RTOINT DAVINCI_INTC_IRQ(13) +#define IRQ_DM365_TINT5 DAVINCI_INTC_IRQ(14) +#define IRQ_DM365_TINT6 DAVINCI_INTC_IRQ(15) +#define IRQ_DM365_SPINT2_1 DAVINCI_INTC_IRQ(21) +#define IRQ_DM365_TINT7 DAVINCI_INTC_IRQ(22) +#define IRQ_DM365_SDIOINT0 DAVINCI_INTC_IRQ(23) +#define IRQ_DM365_MMCINT1 DAVINCI_INTC_IRQ(27) +#define IRQ_DM365_PWMINT3 DAVINCI_INTC_IRQ(28) +#define IRQ_DM365_RTCINT DAVINCI_INTC_IRQ(29) +#define IRQ_DM365_SDIOINT1 DAVINCI_INTC_IRQ(31) +#define IRQ_DM365_SPIINT0_0 DAVINCI_INTC_IRQ(42) +#define IRQ_DM365_SPIINT3_0 DAVINCI_INTC_IRQ(43) +#define IRQ_DM365_GPIO0 DAVINCI_INTC_IRQ(44) +#define IRQ_DM365_GPIO1 DAVINCI_INTC_IRQ(45) +#define IRQ_DM365_GPIO2 DAVINCI_INTC_IRQ(46) +#define IRQ_DM365_GPIO3 DAVINCI_INTC_IRQ(47) +#define IRQ_DM365_GPIO4 DAVINCI_INTC_IRQ(48) +#define IRQ_DM365_GPIO5 DAVINCI_INTC_IRQ(49) +#define IRQ_DM365_GPIO6 DAVINCI_INTC_IRQ(50) +#define IRQ_DM365_GPIO7 DAVINCI_INTC_IRQ(51) +#define IRQ_DM365_EMAC_RXTHRESH DAVINCI_INTC_IRQ(52) +#define IRQ_DM365_EMAC_RXPULSE DAVINCI_INTC_IRQ(53) +#define IRQ_DM365_EMAC_TXPULSE DAVINCI_INTC_IRQ(54) +#define IRQ_DM365_EMAC_MISCPULSE DAVINCI_INTC_IRQ(55) +#define IRQ_DM365_GPIO12 DAVINCI_INTC_IRQ(56) +#define IRQ_DM365_GPIO13 DAVINCI_INTC_IRQ(57) +#define IRQ_DM365_GPIO14 DAVINCI_INTC_IRQ(58) +#define IRQ_DM365_GPIO15 DAVINCI_INTC_IRQ(59) +#define IRQ_DM365_ADCINT DAVINCI_INTC_IRQ(59) +#define IRQ_DM365_KEYINT DAVINCI_INTC_IRQ(60) +#define IRQ_DM365_TCERRINT2 DAVINCI_INTC_IRQ(61) +#define IRQ_DM365_TCERRINT3 DAVINCI_INTC_IRQ(62) +#define IRQ_DM365_EMUINT DAVINCI_INTC_IRQ(63) /* DA8XX interrupts */ -#define IRQ_DA8XX_COMMTX 0 -#define IRQ_DA8XX_COMMRX 1 -#define IRQ_DA8XX_NINT 2 -#define IRQ_DA8XX_EVTOUT0 3 -#define IRQ_DA8XX_EVTOUT1 4 -#define IRQ_DA8XX_EVTOUT2 5 -#define IRQ_DA8XX_EVTOUT3 6 -#define IRQ_DA8XX_EVTOUT4 7 -#define IRQ_DA8XX_EVTOUT5 8 -#define IRQ_DA8XX_EVTOUT6 9 -#define IRQ_DA8XX_EVTOUT7 10 -#define IRQ_DA8XX_CCINT0 11 -#define IRQ_DA8XX_CCERRINT 12 -#define IRQ_DA8XX_TCERRINT0 13 -#define IRQ_DA8XX_AEMIFINT 14 -#define IRQ_DA8XX_I2CINT0 15 -#define IRQ_DA8XX_MMCSDINT0 16 -#define IRQ_DA8XX_MMCSDINT1 17 -#define IRQ_DA8XX_ALLINT0 18 -#define IRQ_DA8XX_RTC 19 -#define IRQ_DA8XX_SPINT0 20 -#define IRQ_DA8XX_TINT12_0 21 -#define IRQ_DA8XX_TINT34_0 22 -#define IRQ_DA8XX_TINT12_1 23 -#define IRQ_DA8XX_TINT34_1 24 -#define IRQ_DA8XX_UARTINT0 25 -#define IRQ_DA8XX_KEYMGRINT 26 -#define IRQ_DA8XX_SECINT 26 -#define IRQ_DA8XX_SECKEYERR 26 -#define IRQ_DA8XX_CHIPINT0 28 -#define IRQ_DA8XX_CHIPINT1 29 -#define IRQ_DA8XX_CHIPINT2 30 -#define IRQ_DA8XX_CHIPINT3 31 -#define IRQ_DA8XX_TCERRINT1 32 -#define IRQ_DA8XX_C0_RX_THRESH_PULSE 33 -#define IRQ_DA8XX_C0_RX_PULSE 34 -#define IRQ_DA8XX_C0_TX_PULSE 35 -#define IRQ_DA8XX_C0_MISC_PULSE 36 -#define IRQ_DA8XX_C1_RX_THRESH_PULSE 37 -#define IRQ_DA8XX_C1_RX_PULSE 38 -#define IRQ_DA8XX_C1_TX_PULSE 39 -#define IRQ_DA8XX_C1_MISC_PULSE 40 -#define IRQ_DA8XX_MEMERR 41 -#define IRQ_DA8XX_GPIO0 42 -#define IRQ_DA8XX_GPIO1 43 -#define IRQ_DA8XX_GPIO2 44 -#define IRQ_DA8XX_GPIO3 45 -#define IRQ_DA8XX_GPIO4 46 -#define IRQ_DA8XX_GPIO5 47 -#define IRQ_DA8XX_GPIO6 48 -#define IRQ_DA8XX_GPIO7 49 -#define IRQ_DA8XX_GPIO8 50 -#define IRQ_DA8XX_I2CINT1 51 -#define IRQ_DA8XX_LCDINT 52 -#define IRQ_DA8XX_UARTINT1 53 -#define IRQ_DA8XX_MCASPINT 54 -#define IRQ_DA8XX_ALLINT1 55 -#define IRQ_DA8XX_SPINT1 56 -#define IRQ_DA8XX_UHPI_INT1 57 -#define IRQ_DA8XX_USB_INT 58 -#define IRQ_DA8XX_IRQN 59 -#define IRQ_DA8XX_RWAKEUP 60 -#define IRQ_DA8XX_UARTINT2 61 -#define IRQ_DA8XX_DFTSSINT 62 -#define IRQ_DA8XX_EHRPWM0 63 -#define IRQ_DA8XX_EHRPWM0TZ 64 -#define IRQ_DA8XX_EHRPWM1 65 -#define IRQ_DA8XX_EHRPWM1TZ 66 -#define IRQ_DA8XX_ECAP0 69 -#define IRQ_DA8XX_ECAP1 70 -#define IRQ_DA8XX_ECAP2 71 -#define IRQ_DA8XX_ARMCLKSTOPREQ 90 +#define IRQ_DA8XX_COMMTX DAVINCI_INTC_IRQ(0) +#define IRQ_DA8XX_COMMRX DAVINCI_INTC_IRQ(1) +#define IRQ_DA8XX_NINT DAVINCI_INTC_IRQ(2) +#define IRQ_DA8XX_EVTOUT0 DAVINCI_INTC_IRQ(3) +#define IRQ_DA8XX_EVTOUT1 DAVINCI_INTC_IRQ(4) +#define IRQ_DA8XX_EVTOUT2 DAVINCI_INTC_IRQ(5) +#define IRQ_DA8XX_EVTOUT3 DAVINCI_INTC_IRQ(6) +#define IRQ_DA8XX_EVTOUT4 DAVINCI_INTC_IRQ(7) +#define IRQ_DA8XX_EVTOUT5 DAVINCI_INTC_IRQ(8) +#define IRQ_DA8XX_EVTOUT6 DAVINCI_INTC_IRQ(9) +#define IRQ_DA8XX_EVTOUT7 DAVINCI_INTC_IRQ(10) +#define IRQ_DA8XX_CCINT0 DAVINCI_INTC_IRQ(11) +#define IRQ_DA8XX_CCERRINT DAVINCI_INTC_IRQ(12) +#define IRQ_DA8XX_TCERRINT0 DAVINCI_INTC_IRQ(13) +#define IRQ_DA8XX_AEMIFINT DAVINCI_INTC_IRQ(14) +#define IRQ_DA8XX_I2CINT0 DAVINCI_INTC_IRQ(15) +#define IRQ_DA8XX_MMCSDINT0 DAVINCI_INTC_IRQ(16) +#define IRQ_DA8XX_MMCSDINT1 DAVINCI_INTC_IRQ(17) +#define IRQ_DA8XX_ALLINT0 DAVINCI_INTC_IRQ(18) +#define IRQ_DA8XX_RTC DAVINCI_INTC_IRQ(19) +#define IRQ_DA8XX_SPINT0 DAVINCI_INTC_IRQ(20) +#define IRQ_DA8XX_TINT12_0 DAVINCI_INTC_IRQ(21) +#define IRQ_DA8XX_TINT34_0 DAVINCI_INTC_IRQ(22) +#define IRQ_DA8XX_TINT12_1 DAVINCI_INTC_IRQ(23) +#define IRQ_DA8XX_TINT34_1 DAVINCI_INTC_IRQ(24) +#define IRQ_DA8XX_UARTINT0 DAVINCI_INTC_IRQ(25) +#define IRQ_DA8XX_KEYMGRINT DAVINCI_INTC_IRQ(26) +#define IRQ_DA8XX_SECINT DAVINCI_INTC_IRQ(26) +#define IRQ_DA8XX_SECKEYERR DAVINCI_INTC_IRQ(26) +#define IRQ_DA8XX_CHIPINT0 DAVINCI_INTC_IRQ(28) +#define IRQ_DA8XX_CHIPINT1 DAVINCI_INTC_IRQ(29) +#define IRQ_DA8XX_CHIPINT2 DAVINCI_INTC_IRQ(30) +#define IRQ_DA8XX_CHIPINT3 DAVINCI_INTC_IRQ(31) +#define IRQ_DA8XX_TCERRINT1 DAVINCI_INTC_IRQ(32) +#define IRQ_DA8XX_C0_RX_THRESH_PULSE DAVINCI_INTC_IRQ(33) +#define IRQ_DA8XX_C0_RX_PULSE DAVINCI_INTC_IRQ(34) +#define IRQ_DA8XX_C0_TX_PULSE DAVINCI_INTC_IRQ(35) +#define IRQ_DA8XX_C0_MISC_PULSE DAVINCI_INTC_IRQ(36) +#define IRQ_DA8XX_C1_RX_THRESH_PULSE DAVINCI_INTC_IRQ(37) +#define IRQ_DA8XX_C1_RX_PULSE DAVINCI_INTC_IRQ(38) +#define IRQ_DA8XX_C1_TX_PULSE DAVINCI_INTC_IRQ(39) +#define IRQ_DA8XX_C1_MISC_PULSE DAVINCI_INTC_IRQ(40) +#define IRQ_DA8XX_MEMERR DAVINCI_INTC_IRQ(41) +#define IRQ_DA8XX_GPIO0 DAVINCI_INTC_IRQ(42) +#define IRQ_DA8XX_GPIO1 DAVINCI_INTC_IRQ(43) +#define IRQ_DA8XX_GPIO2 DAVINCI_INTC_IRQ(44) +#define IRQ_DA8XX_GPIO3 DAVINCI_INTC_IRQ(45) +#define IRQ_DA8XX_GPIO4 DAVINCI_INTC_IRQ(46) +#define IRQ_DA8XX_GPIO5 DAVINCI_INTC_IRQ(47) +#define IRQ_DA8XX_GPIO6 DAVINCI_INTC_IRQ(48) +#define IRQ_DA8XX_GPIO7 DAVINCI_INTC_IRQ(49) +#define IRQ_DA8XX_GPIO8 DAVINCI_INTC_IRQ(50) +#define IRQ_DA8XX_I2CINT1 DAVINCI_INTC_IRQ(51) +#define IRQ_DA8XX_LCDINT DAVINCI_INTC_IRQ(52) +#define IRQ_DA8XX_UARTINT1 DAVINCI_INTC_IRQ(53) +#define IRQ_DA8XX_MCASPINT DAVINCI_INTC_IRQ(54) +#define IRQ_DA8XX_ALLINT1 DAVINCI_INTC_IRQ(55) +#define IRQ_DA8XX_SPINT1 DAVINCI_INTC_IRQ(56) +#define IRQ_DA8XX_UHPI_INT1 DAVINCI_INTC_IRQ(57) +#define IRQ_DA8XX_USB_INT DAVINCI_INTC_IRQ(58) +#define IRQ_DA8XX_IRQN DAVINCI_INTC_IRQ(59) +#define IRQ_DA8XX_RWAKEUP DAVINCI_INTC_IRQ(60) +#define IRQ_DA8XX_UARTINT2 DAVINCI_INTC_IRQ(61) +#define IRQ_DA8XX_DFTSSINT DAVINCI_INTC_IRQ(62) +#define IRQ_DA8XX_EHRPWM0 DAVINCI_INTC_IRQ(63) +#define IRQ_DA8XX_EHRPWM0TZ DAVINCI_INTC_IRQ(64) +#define IRQ_DA8XX_EHRPWM1 DAVINCI_INTC_IRQ(65) +#define IRQ_DA8XX_EHRPWM1TZ DAVINCI_INTC_IRQ(66) +#define IRQ_DA8XX_ECAP0 DAVINCI_INTC_IRQ(69) +#define IRQ_DA8XX_ECAP1 DAVINCI_INTC_IRQ(70) +#define IRQ_DA8XX_ECAP2 DAVINCI_INTC_IRQ(71) +#define IRQ_DA8XX_ARMCLKSTOPREQ DAVINCI_INTC_IRQ(90) /* DA830 specific interrupts */ -#define IRQ_DA830_MPUERR 27 -#define IRQ_DA830_IOPUERR 27 -#define IRQ_DA830_BOOTCFGERR 27 -#define IRQ_DA830_EHRPWM2 67 -#define IRQ_DA830_EHRPWM2TZ 68 -#define IRQ_DA830_EQEP0 72 -#define IRQ_DA830_EQEP1 73 -#define IRQ_DA830_T12CMPINT0_0 74 -#define IRQ_DA830_T12CMPINT1_0 75 -#define IRQ_DA830_T12CMPINT2_0 76 -#define IRQ_DA830_T12CMPINT3_0 77 -#define IRQ_DA830_T12CMPINT4_0 78 -#define IRQ_DA830_T12CMPINT5_0 79 -#define IRQ_DA830_T12CMPINT6_0 80 -#define IRQ_DA830_T12CMPINT7_0 81 -#define IRQ_DA830_T12CMPINT0_1 82 -#define IRQ_DA830_T12CMPINT1_1 83 -#define IRQ_DA830_T12CMPINT2_1 84 -#define IRQ_DA830_T12CMPINT3_1 85 -#define IRQ_DA830_T12CMPINT4_1 86 -#define IRQ_DA830_T12CMPINT5_1 87 -#define IRQ_DA830_T12CMPINT6_1 88 -#define IRQ_DA830_T12CMPINT7_1 89 +#define IRQ_DA830_MPUERR DAVINCI_INTC_IRQ(27) +#define IRQ_DA830_IOPUERR DAVINCI_INTC_IRQ(27) +#define IRQ_DA830_BOOTCFGERR DAVINCI_INTC_IRQ(27) +#define IRQ_DA830_EHRPWM2 DAVINCI_INTC_IRQ(67) +#define IRQ_DA830_EHRPWM2TZ DAVINCI_INTC_IRQ(68) +#define IRQ_DA830_EQEP0 DAVINCI_INTC_IRQ(72) +#define IRQ_DA830_EQEP1 DAVINCI_INTC_IRQ(73) +#define IRQ_DA830_T12CMPINT0_0 DAVINCI_INTC_IRQ(74) +#define IRQ_DA830_T12CMPINT1_0 DAVINCI_INTC_IRQ(75) +#define IRQ_DA830_T12CMPINT2_0 DAVINCI_INTC_IRQ(76) +#define IRQ_DA830_T12CMPINT3_0 DAVINCI_INTC_IRQ(77) +#define IRQ_DA830_T12CMPINT4_0 DAVINCI_INTC_IRQ(78) +#define IRQ_DA830_T12CMPINT5_0 DAVINCI_INTC_IRQ(79) +#define IRQ_DA830_T12CMPINT6_0 DAVINCI_INTC_IRQ(80) +#define IRQ_DA830_T12CMPINT7_0 DAVINCI_INTC_IRQ(81) +#define IRQ_DA830_T12CMPINT0_1 DAVINCI_INTC_IRQ(82) +#define IRQ_DA830_T12CMPINT1_1 DAVINCI_INTC_IRQ(83) +#define IRQ_DA830_T12CMPINT2_1 DAVINCI_INTC_IRQ(84) +#define IRQ_DA830_T12CMPINT3_1 DAVINCI_INTC_IRQ(85) +#define IRQ_DA830_T12CMPINT4_1 DAVINCI_INTC_IRQ(86) +#define IRQ_DA830_T12CMPINT5_1 DAVINCI_INTC_IRQ(87) +#define IRQ_DA830_T12CMPINT6_1 DAVINCI_INTC_IRQ(88) +#define IRQ_DA830_T12CMPINT7_1 DAVINCI_INTC_IRQ(89) #define DA830_N_CP_INTC_IRQ 96 /* DA850 speicific interrupts */ -#define IRQ_DA850_MPUADDRERR0 27 -#define IRQ_DA850_MPUPROTERR0 27 -#define IRQ_DA850_IOPUADDRERR0 27 -#define IRQ_DA850_IOPUPROTERR0 27 -#define IRQ_DA850_IOPUADDRERR1 27 -#define IRQ_DA850_IOPUPROTERR1 27 -#define IRQ_DA850_IOPUADDRERR2 27 -#define IRQ_DA850_IOPUPROTERR2 27 -#define IRQ_DA850_BOOTCFG_ADDR_ERR 27 -#define IRQ_DA850_BOOTCFG_PROT_ERR 27 -#define IRQ_DA850_MPUADDRERR1 27 -#define IRQ_DA850_MPUPROTERR1 27 -#define IRQ_DA850_IOPUADDRERR3 27 -#define IRQ_DA850_IOPUPROTERR3 27 -#define IRQ_DA850_IOPUADDRERR4 27 -#define IRQ_DA850_IOPUPROTERR4 27 -#define IRQ_DA850_IOPUADDRERR5 27 -#define IRQ_DA850_IOPUPROTERR5 27 -#define IRQ_DA850_MIOPU_BOOTCFG_ERR 27 -#define IRQ_DA850_SATAINT 67 -#define IRQ_DA850_TINT12_2 68 -#define IRQ_DA850_TINT34_2 68 -#define IRQ_DA850_TINTALL_2 68 -#define IRQ_DA850_MMCSDINT0_1 72 -#define IRQ_DA850_MMCSDINT1_1 73 -#define IRQ_DA850_T12CMPINT0_2 74 -#define IRQ_DA850_T12CMPINT1_2 75 -#define IRQ_DA850_T12CMPINT2_2 76 -#define IRQ_DA850_T12CMPINT3_2 77 -#define IRQ_DA850_T12CMPINT4_2 78 -#define IRQ_DA850_T12CMPINT5_2 79 -#define IRQ_DA850_T12CMPINT6_2 80 -#define IRQ_DA850_T12CMPINT7_2 81 -#define IRQ_DA850_T12CMPINT0_3 82 -#define IRQ_DA850_T12CMPINT1_3 83 -#define IRQ_DA850_T12CMPINT2_3 84 -#define IRQ_DA850_T12CMPINT3_3 85 -#define IRQ_DA850_T12CMPINT4_3 86 -#define IRQ_DA850_T12CMPINT5_3 87 -#define IRQ_DA850_T12CMPINT6_3 88 -#define IRQ_DA850_T12CMPINT7_3 89 -#define IRQ_DA850_RPIINT 91 -#define IRQ_DA850_VPIFINT 92 -#define IRQ_DA850_CCINT1 93 -#define IRQ_DA850_CCERRINT1 94 -#define IRQ_DA850_TCERRINT2 95 -#define IRQ_DA850_TINT12_3 96 -#define IRQ_DA850_TINT34_3 96 -#define IRQ_DA850_TINTALL_3 96 -#define IRQ_DA850_MCBSP0RINT 97 -#define IRQ_DA850_MCBSP0XINT 98 -#define IRQ_DA850_MCBSP1RINT 99 -#define IRQ_DA850_MCBSP1XINT 100 +#define IRQ_DA850_MPUADDRERR0 DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_MPUPROTERR0 DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_IOPUADDRERR0 DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_IOPUPROTERR0 DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_IOPUADDRERR1 DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_IOPUPROTERR1 DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_IOPUADDRERR2 DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_IOPUPROTERR2 DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_BOOTCFG_ADDR_ERR DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_BOOTCFG_PROT_ERR DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_MPUADDRERR1 DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_MPUPROTERR1 DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_IOPUADDRERR3 DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_IOPUPROTERR3 DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_IOPUADDRERR4 DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_IOPUPROTERR4 DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_IOPUADDRERR5 DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_IOPUPROTERR5 DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_MIOPU_BOOTCFG_ERR DAVINCI_INTC_IRQ(27) +#define IRQ_DA850_SATAINT DAVINCI_INTC_IRQ(67) +#define IRQ_DA850_TINT12_2 DAVINCI_INTC_IRQ(68) +#define IRQ_DA850_TINT34_2 DAVINCI_INTC_IRQ(68) +#define IRQ_DA850_TINTALL_2 DAVINCI_INTC_IRQ(68) +#define IRQ_DA850_MMCSDINT0_1 DAVINCI_INTC_IRQ(72) +#define IRQ_DA850_MMCSDINT1_1 DAVINCI_INTC_IRQ(73) +#define IRQ_DA850_T12CMPINT0_2 DAVINCI_INTC_IRQ(74) +#define IRQ_DA850_T12CMPINT1_2 DAVINCI_INTC_IRQ(75) +#define IRQ_DA850_T12CMPINT2_2 DAVINCI_INTC_IRQ(76) +#define IRQ_DA850_T12CMPINT3_2 DAVINCI_INTC_IRQ(77) +#define IRQ_DA850_T12CMPINT4_2 DAVINCI_INTC_IRQ(78) +#define IRQ_DA850_T12CMPINT5_2 DAVINCI_INTC_IRQ(79) +#define IRQ_DA850_T12CMPINT6_2 DAVINCI_INTC_IRQ(80) +#define IRQ_DA850_T12CMPINT7_2 DAVINCI_INTC_IRQ(81) +#define IRQ_DA850_T12CMPINT0_3 DAVINCI_INTC_IRQ(82) +#define IRQ_DA850_T12CMPINT1_3 DAVINCI_INTC_IRQ(83) +#define IRQ_DA850_T12CMPINT2_3 DAVINCI_INTC_IRQ(84) +#define IRQ_DA850_T12CMPINT3_3 DAVINCI_INTC_IRQ(85) +#define IRQ_DA850_T12CMPINT4_3 DAVINCI_INTC_IRQ(86) +#define IRQ_DA850_T12CMPINT5_3 DAVINCI_INTC_IRQ(87) +#define IRQ_DA850_T12CMPINT6_3 DAVINCI_INTC_IRQ(88) +#define IRQ_DA850_T12CMPINT7_3 DAVINCI_INTC_IRQ(89) +#define IRQ_DA850_RPIINT DAVINCI_INTC_IRQ(91) +#define IRQ_DA850_VPIFINT DAVINCI_INTC_IRQ(92) +#define IRQ_DA850_CCINT1 DAVINCI_INTC_IRQ(93) +#define IRQ_DA850_CCERRINT1 DAVINCI_INTC_IRQ(94) +#define IRQ_DA850_TCERRINT2 DAVINCI_INTC_IRQ(95) +#define IRQ_DA850_TINT12_3 DAVINCI_INTC_IRQ(96) +#define IRQ_DA850_TINT34_3 DAVINCI_INTC_IRQ(96) +#define IRQ_DA850_TINTALL_3 DAVINCI_INTC_IRQ(96) +#define IRQ_DA850_MCBSP0RINT DAVINCI_INTC_IRQ(97) +#define IRQ_DA850_MCBSP0XINT DAVINCI_INTC_IRQ(98) +#define IRQ_DA850_MCBSP1RINT DAVINCI_INTC_IRQ(99) +#define IRQ_DA850_MCBSP1XINT DAVINCI_INTC_IRQ(100) #define DA850_N_CP_INTC_IRQ 101 From patchwork Thu Jan 31 13:39:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790595 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5B2E5922 for ; Thu, 31 Jan 2019 13:41:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4AADD30E4D for ; Thu, 31 Jan 2019 13:41:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3BDC530E50; Thu, 31 Jan 2019 13:41:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CF2BA30E4D for ; Thu, 31 Jan 2019 13:41:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PQivEPx8fL3IzQ25KeHOCzrunkMGRFTiw7buRQlSNNo=; b=RyaeB8rpErc1Cn oPFuzgSIsubG9c3yamCuR2DZiFp3eXiHk/EY2ZBtlXfh0yV2F1S/CtlsJNi7/Y9qsdpy8/R/FrR0D on0bRch6qam5ITV9L7esZ3vgnKRLi6TmjQAwgZVQECKZkj3Wrj+GxTbbutFfCsPybgDJwKXa2KCDZ g4BBYZK/YkW7jpdcb2Vomb5TqcOfetNVbDgqx7P9Drb8X+ggez/uWSgjIt+JnCBME8Lct4QR4069l 4QufVEn2+3HyhNGBmD5A65IFY5fatpBXepG2eatHcPCnhEVRgAF4wC6yGN4CVp7TD/lImhyGR/R/N WyBSkBMfpXKdkV+BlaEQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCaz-0007Hh-5L; Thu, 31 Jan 2019 13:41:33 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZN-0004cd-0r for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:10 +0000 Received: by mail-wm1-x342.google.com with SMTP id m22so2600715wml.3 for ; Thu, 31 Jan 2019 05:39:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=igN5IoKzzGuypW/WHng8Q0d0kyUmZgcX+TCusVRQQ20=; b=FD4eq5Gl8rn+2Ho+toNgwkBbm/TucRqZYioCAgmKXiO7UUsz38dYCUH/imHOkm5wip 8gpPrcHt25ZLVZTnNJPgvK7PBaCpmxyUPSfzRobmLjZZGakbDmEcPx5uzaJLIoJGsRBu 8/kW5H4S2W2Y43PUrP62acbUygyUfUxJ/7LXxuLP4AK8XzTMYef5j7dyND6OsLEtKNja EWV8TqCciGS0RYC6Au/XjFSNhpuihWOQNuW1jSL7dvdwyfAuyCEBbRI/psnVLKE2pWe8 KpaQb2ss3uYMTRWfZWfDOhXXCUtpm8snGo210JOjfwekGnHKArNaoa1m/hQGRFN19sNb Rg8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=igN5IoKzzGuypW/WHng8Q0d0kyUmZgcX+TCusVRQQ20=; b=lKPGqVa+Wy2v+j4+y/lgBT2sx6Qzr/5FyTAmOax/rziDYuzxj/o0NRn4+ZcCCkylaL 6b44W72kOk6wpgNWAXlPB3UR9ccg/gDXw2xDko001rDMcv4uEeWMhr8PmT9qlyl00BF6 quC7VRxNKDVgERgOuaddYanklfiscHSAiZwXjC5JUOzD4kERJ714EbIJCkVtpkOlR+mI XlmXVIUmZFUTOj3ZnM1eHC01LGdBMqi32HDrzDlOSfaR2DOJIw4roKVE0gOF4810qrLq JCiYVPkr/7iXEI38EvW77G8Sy+VF1h/k7+7rD0IV8FtuVTvU7uL/FHjdWsnmjy4RSJRX NE1Q== X-Gm-Message-State: AJcUukcHpI/ElCapfyeTiChi34aJ+75guedNp14wHfVh9kHZ+xMRW+pR jlVPRGFwdz3T9M3oQCdKYJyhqA== X-Google-Smtp-Source: ALg8bN7ip8V2DdRq2xPNVQi9ExZh3zHGlhWg/sL9jclMofTdkXoWeexjS67LXkNy4gbX0cZ7p2t0lw== X-Received: by 2002:a1c:22c5:: with SMTP id i188mr29626344wmi.39.1548941990344; Thu, 31 Jan 2019 05:39:50 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.39.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:39:49 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 07/35] ARM: davinci: aintc: use irq domain Date: Thu, 31 Jan 2019 14:39:00 +0100 Message-Id: <20190131133928.17985-8-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_053953_470972_39B850A2 X-CRM114-Status: GOOD ( 15.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski We need to create an irq domain if we want to select SPARSE_IRQ. The cp-intc driver already supports it, but aintc doesn't. Use the helpers provided by the generic irq chip abstraction. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/irq.c | 38 ++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index e539bc65d4ef..c874ea269411 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -43,6 +44,7 @@ #define IRQ_INTPRI7_REG_OFFSET 0x004C static void __iomem *davinci_intc_base; +static struct irq_domain *davinci_irq_domain; static inline void davinci_irq_writel(unsigned long value, int offset) { @@ -55,17 +57,15 @@ static inline unsigned long davinci_irq_readl(int offset) } static __init void -davinci_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num) +davinci_irq_setup_gc(void __iomem *base, + unsigned int irq_start, unsigned int num) { struct irq_chip_generic *gc; struct irq_chip_type *ct; - gc = irq_alloc_generic_chip("AINTC", 1, irq_start, base, handle_edge_irq); - if (!gc) { - pr_err("%s: irq_alloc_generic_chip for IRQ %u failed\n", - __func__, irq_start); - return; - } + gc = irq_get_domain_generic_chip(davinci_irq_domain, irq_start); + gc->reg_base = base; + gc->irq_base = irq_start; ct = gc->chip_types; ct->chip.irq_ack = irq_gc_ack_set_bit; @@ -82,13 +82,11 @@ static asmlinkage void __exception_irq_entry davinci_handle_irq(struct pt_regs *regs) { int irqnr = davinci_irq_readl(IRQ_IRQENTRY_OFFSET); - struct pt_regs *old_regs = set_irq_regs(regs); irqnr >>= 2; irqnr -= 1; - generic_handle_irq(irqnr); - set_irq_regs(old_regs); + handle_domain_irq(davinci_irq_domain, irqnr, regs); } /* ARM Interrupt Controller Initialization */ @@ -96,6 +94,7 @@ void __init davinci_irq_init(void) { unsigned i, j; const u8 *davinci_def_priorities = davinci_soc_info.intc_irq_prios; + int rv, irq_base; davinci_intc_base = ioremap(davinci_soc_info.intc_base, SZ_4K); if (WARN_ON(!davinci_intc_base)) @@ -131,8 +130,25 @@ void __init davinci_irq_init(void) davinci_irq_writel(pri, i); } + irq_base = irq_alloc_descs(-1, 0, davinci_soc_info.intc_irq_num, 0); + if (WARN_ON(irq_base < 0)) + return; + + davinci_irq_domain = irq_domain_add_legacy(NULL, + davinci_soc_info.intc_irq_num, + irq_base, 0, &irq_domain_simple_ops, + NULL); + if (WARN_ON(!davinci_irq_domain)) + return; + + rv = irq_alloc_domain_generic_chips(davinci_irq_domain, 32, 1, + "AINTC", handle_edge_irq, + IRQ_NOREQUEST | IRQ_NOPROBE, 0, 0); + if (WARN_ON(rv)) + return; + for (i = 0, j = 0; i < davinci_soc_info.intc_irq_num; i += 32, j += 0x04) - davinci_alloc_gc(davinci_intc_base + j, i, 32); + davinci_irq_setup_gc(davinci_intc_base + j, irq_base + i, 32); irq_set_handler(IRQ_TINT1_TINT34, handle_level_irq); set_handle_irq(davinci_handle_irq); From patchwork Thu Jan 31 13:39:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790593 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C4F4F91E for ; Thu, 31 Jan 2019 13:41:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B662330E48 for ; Thu, 31 Jan 2019 13:41:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA9C630E4E; Thu, 31 Jan 2019 13:41:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2070F30E48 for ; Thu, 31 Jan 2019 13:41:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=sE65FvVfrcZXNieuu0mtn71UwjvpH8p+LmJbmFQtxv0=; b=US06iTLMkaHjiA ZyNnUi6Vh/fkaESZUIvQFOI8DL04Q+wTXMGjvzZ4uvcCoc5tIO47BCvwSZDnFA6nV7zLsOJEtMtPM dGqhecpPZUoXQVICB9Xu5I74TNc1DcOUYLZdwV9IQ2QFN9x3rxPIS79AHSCu0RxI/4MSOpKSan1ME l+JabbDJi7RwUICBVAeW6P+8YtTa1I7AzqssHxmW7Zz8ZSMpBYdaQ0QVvW2pKKTGF3x1syLyOfRYa c6Dg+BYPZAo1ftUOuCOceMJynZgEEVUaC9TAcjx2F4tWVTzQy2dYrN5JpVXdMFMpDUt978x0HsPnj ojckdE6DpS58Cm2Sf9Eg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCal-00073R-IB; Thu, 31 Jan 2019 13:41:19 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZM-0004e0-UF for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:00 +0000 Received: by mail-wm1-x344.google.com with SMTP id p6so2603514wmc.1 for ; Thu, 31 Jan 2019 05:39:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SFgXQcpQR4vdt1SMIVPSBQQ8pz6BekA4S3eBHk0UlR8=; b=brWI3BPYpln2UJUSr1verribUHRv2VsT69CGVTL3vUAKKsnGH7XxRz/rQdnaNcLEDF eyk7A6/yCMU8XkK2MWZJWDfYbTb6pZ6wI4sKEP/hxjh7VqPdz6VeCp3k/5G+8xHbR8+i HKOVXI3CNiRNN2iZc2Fd8wu7PbYRu2x4z12eq7CVKESdGdrBur2lKJQQQq9Jqn/h4lfl W2SEcamaEemjeVm7Hqd6owEHwpE62SMczZy49MSG4GU7JBJmLSqq1o8Tdz/CXM0EZToM UEcTnxZu+qlk0arLSDdONSm1QNbuP04E0QJhIhrwURMrcqZQgUOtgbnCle4Pp96Y/BUy THLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SFgXQcpQR4vdt1SMIVPSBQQ8pz6BekA4S3eBHk0UlR8=; b=U68YjTyJyMhOxN21bOJfaaoF1dgRHH3SyKzDot6TEMHTSuEdCi3tBEMpop+HUbAfPU OVNpOwyKvYIA5LOn4wKbeDVwfzmxK56X7iqLhDyuHNG0Qzh69ief5OgqQDn+yU6rDLko phKbvqwvwiTUTM25I1gUlhS1jddESoMltLn/9K4GDU6ZYCf3V605nYNeSN5WVWm3W/o+ zxv6OpG9hyDa/p1Y9w5NEznZSda4vtdpq3NI3xFp5VshYAPpvOAmbeV+1NdB5dqlh1T9 563f+XejWj69htokrZXqOQCa5IcwaRVjh/UM3xbtnpqsQPqaiOXdmYV4AiSOQ3suYM/O x91w== X-Gm-Message-State: AJcUukcWkLc63LCbxQu5Wc237u5glItlWw5nXsvdsuU8HwODpxjPuzHj q1I3z3EEZwHOL4uLbWXAJn0KzQ== X-Google-Smtp-Source: ALg8bN6LWOAFnDr43FzopNmhCHyQIubos78XrOLxOa9Ydu1zfSe/y62SWHS8MD58VWZorZTbFlmmaA== X-Received: by 2002:a1c:a755:: with SMTP id q82mr30630055wme.6.1548941991499; Thu, 31 Jan 2019 05:39:51 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.39.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:39:50 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 08/35] ARM: davinci: select SPARSE_IRQ Date: Thu, 31 Jan 2019 14:39:01 +0100 Message-Id: <20190131133928.17985-9-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_053953_463741_C8563ECB X-CRM114-Status: GOOD ( 13.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Everything is in place now for SPARSE_IRQ. Select it and set DAVINCI_INTC_START to NR_IRQS. We now need to include mach/irqs.h in a couple places as it is no longer indirectly included after selecting SPARSE_IRQ. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/Kconfig | 1 + arch/arm/mach-davinci/board-da830-evm.c | 1 + arch/arm/mach-davinci/board-da850-evm.c | 1 + arch/arm/mach-davinci/board-dm644x-evm.c | 1 + arch/arm/mach-davinci/devices-da8xx.c | 1 + arch/arm/mach-davinci/include/mach/irqs.h | 5 +++-- arch/arm/mach-davinci/irq.c | 1 + 7 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f7770fdcad68..1037f49e050f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -595,6 +595,7 @@ config ARCH_DAVINCI select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS_OF if PM && OF select RESET_CONTROLLER + select SPARSE_IRQ select USE_OF select ZONE_DMA help diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index c4da635ee4ce..41f5a51fee9a 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -36,6 +36,7 @@ #include #include +#include #include "cp_intc.h" #include #include diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 44bca048dfd0..317f48560534 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -46,6 +46,7 @@ #include "cp_intc.h" #include #include +#include #include "sram.h" #include diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index b80c4ee76217..16ffed2525e6 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -36,6 +36,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index cf78da5ab054..65edd2aa9db5 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "asp.h" #include "cpuidle.h" diff --git a/arch/arm/mach-davinci/include/mach/irqs.h b/arch/arm/mach-davinci/include/mach/irqs.h index 14fa668d4e8d..317cbc42e5cd 100644 --- a/arch/arm/mach-davinci/include/mach/irqs.h +++ b/arch/arm/mach-davinci/include/mach/irqs.h @@ -27,10 +27,12 @@ #ifndef __ASM_ARCH_IRQS_H #define __ASM_ARCH_IRQS_H +#include + /* Base address */ #define DAVINCI_ARM_INTC_BASE 0x01C48000 -#define DAVINCI_INTC_START 0 +#define DAVINCI_INTC_START NR_IRQS #define DAVINCI_INTC_IRQ(_irqnum) (DAVINCI_INTC_START + (_irqnum)) /* Interrupt lines */ @@ -404,6 +406,5 @@ /* da850 currently has the most gpio pins (144) */ #define DAVINCI_N_GPIO 144 /* da850 currently has the most irqs so use DA850_N_CP_INTC_IRQ */ -#define NR_IRQS (DA850_N_CP_INTC_IRQ + DAVINCI_N_GPIO) #endif /* __ASM_ARCH_IRQS_H */ diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index c874ea269411..2b8b653aeb98 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include From patchwork Thu Jan 31 13:39:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790599 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 89C95922 for ; Thu, 31 Jan 2019 13:41:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A92030E50 for ; Thu, 31 Jan 2019 13:41:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6ECD730E54; Thu, 31 Jan 2019 13:41:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2304C30E50 for ; Thu, 31 Jan 2019 13:41:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ac//UrHGEAVHP1QSzx7jfBlvpa/QY4JXbM9j0Vzuxr8=; b=L8kcMYDV9zcBdB A8rL/7NkbSZQcAYa7jEchnKbgaxxAE1fRsgvL894WVWulS52ryvqD3kx3KyfNYbnb7SMtPNnX0fN1 3G0V3E4GUOiZmuTjWdkG9QjKxb3L0AeV45NoFw46MenY6XCsAL2GJLWcCBWsRB0k/x3KyCxha6SoI PXpQSShgGWcucjhUWy3CnGZnjmwW5d0ho98lI4n1QhnQgiR4Yb9kIAIIIEXE5detG0D3L/rjnEMjZ fkkaFpT9C66+DJHmRWV0HLVb5VPAM+hMmLnwx0SeswKU54cvkYzRW4wf+9uPBqyhYbCjFalHXbmq0 LdpV/rYHOUk7SCcJjzgA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCbD-0007W7-IK; Thu, 31 Jan 2019 13:41:47 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZO-0004fT-AM for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:11 +0000 Received: by mail-wr1-x442.google.com with SMTP id 96so3370892wrb.2 for ; Thu, 31 Jan 2019 05:39:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C8H9cxuoVpV+o/EPh2jcV/8Q1lf7tmeXG7dsABKpPJQ=; b=O8/RUD7KsWSq63NEF7YF4QVRbxNAAYhzJ9MInh1aFoEeR9KnKjgSNjDsUp2a8jCF3c Mpat2znwaoI8ALGlLxC06g95aRfuPjSupU7kY5wpSyKtJ8Qs7HHu+9ZV6f/Qg/+1QTkD Z0swP/zvqkMEE3Lqx/NA/mwt4PMEvZUdc/FcOl6UJKY6/5KfOs4A/2dI/jfcuVtQ3O1L FOmD1XE8pRQac+zl8ck96qwIni9ju5G0J9C6nWS6hXvm7tKOsFLykK2HCIAYnX4VX0SO 0VYqhM5Hj3UUZLB/j1QoSAn51uzsmYeRLrVUE/4bUPMXpxZ4JeyRMb8x8hUHke46Fvsm ZW5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C8H9cxuoVpV+o/EPh2jcV/8Q1lf7tmeXG7dsABKpPJQ=; b=Lxgxt64HYeyWjxXw2bpEO3ZnFiNYu462G6dACFnHUy7U3c1KyrV3MnP3AJm7CTTTiR 2G/bDsO97D1h/Pqqf1OnJ3XIjpp7MNT+g29qar47oti3qKg9M52LzIGlIXSV4VTqkw81 DaFNZEH2em4Fap2WF/X5m6Akpx4ZcgnisBUIhlnwP+6t3B6ZndZbqbKr+XpW55OEx+fi XtH8eYTgnFj/THLaqdvug4xWgUpZPgGZwAzNI4HP8P3F5i4gWzjvwM1yYyphcda0KFXq ZICqIoi9cXiPGYVuh5uxbLvdOSoC0hXUWG7bacIJgV8yNLUXLiUBAGRFB5UmXyzYkPlb nwsw== X-Gm-Message-State: AJcUukeKw86YnUoHmSGXOjEipZpw2aD5Rx1lhTL2ORXrjFmbESbv9awz eiMnYHIuAPecPjE0ouvtfTX4dw== X-Google-Smtp-Source: ALg8bN5VrZ8UZaJpfQfNa4qk9A8vu/HqtkTiKWAu3qNrzR7nrldhvcUyLZI1TKuQUO8unm5xrsumkg== X-Received: by 2002:a5d:538a:: with SMTP id d10mr33449692wrv.202.1548941992672; Thu, 31 Jan 2019 05:39:52 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.39.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:39:52 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 09/35] ARM: davinci: aintc: drop GPL license boilerplate Date: Thu, 31 Jan 2019 14:39:02 +0100 Message-Id: <20190131133928.17985-10-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_053954_848604_8E877D19 X-CRM114-Status: GOOD ( 12.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Replace the GPLv2 or later license boilerplate with an SPDX identifier. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/irq.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index 2b8b653aeb98..b908b4903b9a 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -1,23 +1,9 @@ -/* - * Interrupt handler for DaVinci boards. - * - * Copyright (C) 2006 Texas Instruments. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ +// SPDX-License-Identifier: GPL-2.0-or-later +// +// Copyright (C) 2006, 2019 Texas Instruments. +// +// Interrupt handler for DaVinci boards. + #include #include #include From patchwork Thu Jan 31 13:39:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790603 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3923D91E for ; Thu, 31 Jan 2019 13:42:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2809330E58 for ; Thu, 31 Jan 2019 13:42:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C9B030E62; Thu, 31 Jan 2019 13:42:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 64C1830E58 for ; Thu, 31 Jan 2019 13:42:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/JII6CrGtxx9AiTfhcDQI2bdkqgj9ZycKUq8jt8dBBE=; b=gdQOd7fEb7PZHp xxyxI5TXglWy+UmR4lqHVrU20ColxEskEp3ugWQDfTS5bY+bGexmHOhSX6F1nnQRhmcYyca7ZShjo HSCsvV50rYRe+t6AvJ9gNjAv3aKRDJuMBT9dVkE8otYCUqpeHEgSQbgHL+kxQrM62Bj+SkYYwWqVQ 8LYeXldF2i+rhC7oyGUUQhbfRTcSiDO1OTwrFpcBr+aeoLFfWN5eK4RpKwGBYsseSd3pOQohhrzcy SbXPM3gBAgeJOhv/BHXnlgh1T/b9p5y2VUnm7TQbcI3dWRsMV2254TqIkuEROtasS6cNHdrH4Z0SJ /FcLBCqa1fUZhDr8dLFg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCbh-00081N-8G; Thu, 31 Jan 2019 13:42:17 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZP-0004h2-B9 for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:19 +0000 Received: by mail-wm1-x341.google.com with SMTP id m22so2600894wml.3 for ; Thu, 31 Jan 2019 05:39:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nfKl1oX5ii0RYJJLqp7zIGe4OVIyZURXgpjZsJl0h8c=; b=FNEezZhLEyujXQxrHyX6JfOwxaB91fFSvIaIRtQON7fmiIhE1uASmQEZfxxdEYcUq9 dlu0IOzBMpnKCD21G9Ugar4o5s3wIJoQbxwbTAXlGaIVHD54UDnXaDOB/ni0X3ZhWLlW J81rxlhPANr0Dkzm39i/ak5F3BTc7QrmI0Owb/Z+tG4zaq2VUKKAhciLBC0RjHmqdZkI BFdHabIfa9YmexqZAgCUQwDGdqELhVgQUjTpD1Di0GeKbTXY3ac+XLAkpqLusqJureBc Q1gWEl/MVtfIlZ1ouZukzfzNq5ZSoV3h/N+GRpwHmSyYYUzLCNwdF0EOB4qN/9HnqtHV QFKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nfKl1oX5ii0RYJJLqp7zIGe4OVIyZURXgpjZsJl0h8c=; b=sAn8QYXPAD/luArzPSkZ1LcKWa2BUJ6Z7VB7monI7WIqr90EiIuU31zKZ4j4E4M7Ww dY+4w1DOIHSmiKoxyo37UUKj5jq4u0ojlZ27yQJ4iYbrTvcrDfWRfrvSLIIGvhgFi2cO im5g8xga6slPmx4JTTzozJb0l2I6A+6lgC60OhpX70y8KzHMRooybiMRTp6fRXViGa6y TqE5euaVE10/rWoKl+px27Dk2Inc5RhoEarkTPndazCntix5B3YgdusjcZnMrgVq3Z5N cosIp5lIpp3N8yo00Y1mfLkgbQl5TdxHSsCuBIE/SVyLicdZqNbvzfrRE2kXN9G4RMga 21Dg== X-Gm-Message-State: AJcUukfP5rfdDLSOX99LPc0BX6eicP45kzOFWVnqPLnN+urkIJxZQfuE nAvY7xLefiU5/ecJ1AtowN6+5Q== X-Google-Smtp-Source: ALg8bN7/sHq7PUuVn5QuL+6e4f/2XuwIbwITVqY7dIndMErhK447Aix9Dgb1XjfYyqxnAKyeSsj4aA== X-Received: by 2002:a7b:c218:: with SMTP id x24mr29381474wmi.58.1548941993875; Thu, 31 Jan 2019 05:39:53 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.39.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:39:53 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 10/35] ARM: davinci: aintc: wrap davinci_irq_init() with a helper Date: Thu, 31 Jan 2019 14:39:03 +0100 Message-Id: <20190131133928.17985-11-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_053956_205396_02C5B9AC X-CRM114-Status: GOOD ( 14.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski We're going to extend the davinci_irq_init() function with a config structure so we can drop the intc-related fields from davinci_soc_info. Once we do it, we won't be able to use this routine directly as the init_irq callback. Wrap the calls in additional helpers that don't take parameters and can be assigned to init_irq. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/board-dm355-evm.c | 2 +- arch/arm/mach-davinci/board-dm355-leopard.c | 2 +- arch/arm/mach-davinci/board-dm365-evm.c | 2 +- arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- arch/arm/mach-davinci/board-dm646x-evm.c | 4 ++-- arch/arm/mach-davinci/board-neuros-osd2.c | 2 +- arch/arm/mach-davinci/board-sffsdr.c | 2 +- arch/arm/mach-davinci/davinci.h | 4 ++++ arch/arm/mach-davinci/dm355.c | 5 +++++ arch/arm/mach-davinci/dm365.c | 5 +++++ arch/arm/mach-davinci/dm644x.c | 5 +++++ arch/arm/mach-davinci/dm646x.c | 5 +++++ 12 files changed, 32 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c index f7fa960c23e3..3d0303fb792f 100644 --- a/arch/arm/mach-davinci/board-dm355-evm.c +++ b/arch/arm/mach-davinci/board-dm355-evm.c @@ -438,7 +438,7 @@ static __init void dm355_evm_init(void) MACHINE_START(DAVINCI_DM355_EVM, "DaVinci DM355 EVM") .atag_offset = 0x100, .map_io = dm355_evm_map_io, - .init_irq = davinci_irq_init, + .init_irq = dm355_init_irqs, .init_time = dm355_init_time, .init_machine = dm355_evm_init, .init_late = davinci_init_late, diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c index 0fdf1d03eb11..91e9772b9399 100644 --- a/arch/arm/mach-davinci/board-dm355-leopard.c +++ b/arch/arm/mach-davinci/board-dm355-leopard.c @@ -273,7 +273,7 @@ static __init void dm355_leopard_init(void) MACHINE_START(DM355_LEOPARD, "DaVinci DM355 leopard") .atag_offset = 0x100, .map_io = dm355_leopard_map_io, - .init_irq = davinci_irq_init, + .init_irq = dm355_init_irqs, .init_time = dm355_init_time, .init_machine = dm355_leopard_init, .init_late = davinci_init_late, diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index e3b0b701e395..be1cfcc412f7 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c @@ -834,7 +834,7 @@ static __init void dm365_evm_init(void) MACHINE_START(DAVINCI_DM365_EVM, "DaVinci DM365 EVM") .atag_offset = 0x100, .map_io = dm365_evm_map_io, - .init_irq = davinci_irq_init, + .init_irq = dm365_init_irqs, .init_time = dm365_init_time, .init_machine = dm365_evm_init, .init_late = davinci_init_late, diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index 16ffed2525e6..f23a29e5116f 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -890,7 +890,7 @@ MACHINE_START(DAVINCI_EVM, "DaVinci DM644x EVM") /* Maintainer: MontaVista Software */ .atag_offset = 0x100, .map_io = davinci_evm_map_io, - .init_irq = davinci_irq_init, + .init_irq = dm644x_init_irqs, .init_time = dm644x_init_time, .init_machine = davinci_evm_init, .init_late = davinci_init_late, diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index 8d5be6dd2019..ebf07d92224e 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -863,7 +863,7 @@ static __init void evm_init(void) MACHINE_START(DAVINCI_DM6467_EVM, "DaVinci DM646x EVM") .atag_offset = 0x100, .map_io = davinci_map_io, - .init_irq = davinci_irq_init, + .init_irq = dm646x_init_irqs, .init_time = dm646x_evm_init_time, .init_machine = evm_init, .init_late = davinci_init_late, @@ -873,7 +873,7 @@ MACHINE_END MACHINE_START(DAVINCI_DM6467TEVM, "DaVinci DM6467T EVM") .atag_offset = 0x100, .map_io = davinci_map_io, - .init_irq = davinci_irq_init, + .init_irq = dm646x_init_irqs, .init_time = dm6467t_evm_init_time, .init_machine = evm_init, .init_late = davinci_init_late, diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c index efdaa27241c5..fb4c5b3ba8f7 100644 --- a/arch/arm/mach-davinci/board-neuros-osd2.c +++ b/arch/arm/mach-davinci/board-neuros-osd2.c @@ -231,7 +231,7 @@ MACHINE_START(NEUROS_OSD2, "Neuros OSD2") /* Maintainer: Neuros Technologies */ .atag_offset = 0x100, .map_io = davinci_ntosd2_map_io, - .init_irq = davinci_irq_init, + .init_irq = dm644x_init_irqs, .init_time = dm644x_init_time, .init_machine = davinci_ntosd2_init, .init_late = davinci_init_late, diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c index 792bb84d5011..2fc6f23285b5 100644 --- a/arch/arm/mach-davinci/board-sffsdr.c +++ b/arch/arm/mach-davinci/board-sffsdr.c @@ -153,7 +153,7 @@ static __init void davinci_sffsdr_init(void) MACHINE_START(SFFSDR, "Lyrtech SFFSDR") .atag_offset = 0x100, .map_io = davinci_sffsdr_map_io, - .init_irq = davinci_irq_init, + .init_irq = dm644x_init_irqs, .init_time = dm644x_init_time, .init_machine = davinci_sffsdr_init, .init_late = davinci_init_late, diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h index db4c95ef4d5c..49958cc161d7 100644 --- a/arch/arm/mach-davinci/davinci.h +++ b/arch/arm/mach-davinci/davinci.h @@ -88,6 +88,7 @@ int davinci_init_wdt(void); /* DM355 function declarations */ void dm355_init(void); void dm355_init_time(void); +void dm355_init_irqs(void); void dm355_register_clocks(void); void dm355_init_spi0(unsigned chipselect_mask, const struct spi_board_info *info, unsigned len); @@ -97,6 +98,7 @@ int dm355_gpio_register(void); /* DM365 function declarations */ void dm365_init(void); +void dm365_init_irqs(void); void dm365_init_time(void); void dm365_register_clocks(void); void dm365_init_asp(void); @@ -110,6 +112,7 @@ int dm365_gpio_register(void); /* DM644x function declarations */ void dm644x_init(void); +void dm644x_init_irqs(void); void dm644x_init_devices(void); void dm644x_init_time(void); void dm644x_register_clocks(void); @@ -119,6 +122,7 @@ int dm644x_gpio_register(void); /* DM646x function declarations */ void dm646x_init(void); +void dm646x_init_irqs(void); void dm646x_init_time(unsigned long ref_clk_rate, unsigned long aux_clkin_rate); void dm646x_register_clocks(void); void dm646x_init_mcasp0(struct snd_platform_data *pdata); diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index a31f56c70d1d..2795b5ee0069 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -738,6 +738,11 @@ int __init dm355_init_video(struct vpfe_config *vpfe_cfg, return 0; } +void __init dm355_init_irqs(void) +{ + davinci_irq_init(); +} + static int __init dm355_init_devices(void) { struct platform_device *edma_pdev; diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 42b2012d25cc..3222873ff9c6 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -995,6 +995,11 @@ int __init dm365_init_video(struct vpfe_config *vpfe_cfg, return 0; } +void __init dm365_init_irqs(void) +{ + davinci_irq_init(); +} + static int __init dm365_init_devices(void) { struct platform_device *edma_pdev; diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index bf7ebdcf6c18..cfc6e2d481d7 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -672,6 +672,11 @@ int __init dm644x_init_video(struct vpfe_config *vpfe_cfg, return 0; } +void __init dm644x_init_irqs(void) +{ + davinci_irq_init(); +} + void __init dm644x_init_devices(void) { struct platform_device *edma_pdev; diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 64b4ae5a4202..5cb087f68efe 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -633,6 +633,11 @@ void __init dm646x_register_clocks(void) platform_device_register(&dm646x_pll2_device); } +void __init dm646x_init_irqs(void) +{ + davinci_irq_init(); +} + static int __init dm646x_init_devices(void) { int ret = 0; From patchwork Thu Jan 31 13:39:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790613 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AD3A291E for ; Thu, 31 Jan 2019 13:43:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99E4A30E79 for ; Thu, 31 Jan 2019 13:43:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 87E5930E7B; Thu, 31 Jan 2019 13:43:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BE21A30E79 for ; Thu, 31 Jan 2019 13:43:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5QiKiMc3UFn9S/zaoiCDOHX3aX7tDeVOGi30TJkywdY=; b=q7HZpGbFUV8D4S 7DwCzECCBtvVJbAX6RTJFT01R6isAEgVHxHB/wbWDFKwvOeKJOijQqrMTdfiYI3cmuD0fT3BZmgmN ku4s2c0D9HKeiLqYOxRT+HP6eqlHgXqRGBHrZ7whjYK3N/YRvM+xvv15sjOV5CUtbEyMGpMeNA5ak fdtFub5v9LiiGWDKl5CMa9OCdTjpQ30bC4PHAVFbshzeajRR62nuWSW7TNnWQDJ30f+gF8TsZSBBa Y3SuNc/BGTKgpmvMg7gX3bu3FCptXPj3T9nj9Rfw4AjpcQsU1i/ATi7DGESqAMA8RJ6yUHE/YDnrv gUfmEDH8sc2UvHDti8MQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCct-0000sq-10; Thu, 31 Jan 2019 13:43:31 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZQ-0004iJ-F7 for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:24 +0000 Received: by mail-wr1-x443.google.com with SMTP id t6so3280974wrr.12 for ; Thu, 31 Jan 2019 05:39:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mWONQ0qDcjtWSVIE/aRPokZRcj03z4Fg2op1S0b4qHw=; b=GmmIYKW3MAumQE+72QsgF0tJKdBlOWHVr34C79/ksplAzKYhZkYIc/BAWRaXnzkkJW u6euD58pKS/if/V6c3c7tCW8X4fQ+UUt29PanoKAWiR/y0BtzxJfw2ktnqd3vf9fnqDO OPwdRBCJEs0uNw0L5WTBW7w8ggfXAjlVK0K1XhSvObEbN/RkBQQ6PVLp2UX2jjeC5pJ0 wcASwB/seMrwate0MpR/EAH/d4G1M/+FvLvFOKTAZ67J6EWYnVcmddheu7sJdAM2NGgR SHUaXfOSgYj0PbCCyd8ATMOXJkKZkYrkbMV76YvL6S2b2e4Ruak+vaqpNFCP6QeoH6mq bIJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mWONQ0qDcjtWSVIE/aRPokZRcj03z4Fg2op1S0b4qHw=; b=Z7FB13ACU348IGkLJULUfuAVGP/zRiYe5FsP89dA6IX2a1zwxuJGytNBRu4qmDCzG1 MjANqFIIubCAALxaIClpC6jryxpeRlHbfeBRxMh1WKDSeexeR6xkLbx1Vgijq+FUIzvA qLAOwlMqoTeGW6ZEqzV54TRKkZ5Z5pE1bNdwgCR2E7HGgZ1mZH2+n8A4J8Tu6mL6u6OQ 573/B+cXdAif5sUDNewSJ+NNFhEtMgS3oRulTNy9xjMN0Nwp456F5i/0LyLLzZCiRn4t iNBDf+UJ4wgZnJ6xQALhVUOKcLErZR/4PXTyBZU8SAcfgwnjtOYZBQKYFX5y/63/8fYO rKCw== X-Gm-Message-State: AJcUukfByyV/KT35VB+Qy0BqUpszJBn2j99xLVQgLbrdzJ0COOfdRFLO ClSSqDuvHQC0hh4tRlEOsMlzxYNgT+M= X-Google-Smtp-Source: ALg8bN4TxDbT9YUI7DpVszT3Xns3HHytpb5YdBwY6cQQtOuTu7vF/AYS9Tfjezqq1rAkvLXz8B+c1Q== X-Received: by 2002:a5d:61c4:: with SMTP id q4mr33107803wrv.308.1548941995065; Thu, 31 Jan 2019 05:39:55 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.39.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:39:54 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 11/35] ARM: davinci: aintc: use a common prefix for symbols in the driver Date: Thu, 31 Jan 2019 14:39:04 +0100 Message-Id: <20190131133928.17985-12-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_053957_300302_51860D18 X-CRM114-Status: GOOD ( 16.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski In preparation for moving the driver to drivers/irqchip do some cleanup: use a common prefix for all symbols. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/dm355.c | 2 +- arch/arm/mach-davinci/dm365.c | 2 +- arch/arm/mach-davinci/dm644x.c | 2 +- arch/arm/mach-davinci/dm646x.c | 2 +- arch/arm/mach-davinci/include/mach/common.h | 2 +- arch/arm/mach-davinci/irq.c | 98 ++++++++++----------- 6 files changed, 54 insertions(+), 54 deletions(-) diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index 2795b5ee0069..cf574956ce1d 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -740,7 +740,7 @@ int __init dm355_init_video(struct vpfe_config *vpfe_cfg, void __init dm355_init_irqs(void) { - davinci_irq_init(); + davinci_aintc_init(); } static int __init dm355_init_devices(void) diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 3222873ff9c6..e63153a6ae41 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -997,7 +997,7 @@ int __init dm365_init_video(struct vpfe_config *vpfe_cfg, void __init dm365_init_irqs(void) { - davinci_irq_init(); + davinci_aintc_init(); } static int __init dm365_init_devices(void) diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index cfc6e2d481d7..0904baa1d008 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -674,7 +674,7 @@ int __init dm644x_init_video(struct vpfe_config *vpfe_cfg, void __init dm644x_init_irqs(void) { - davinci_irq_init(); + davinci_aintc_init(); } void __init dm644x_init_devices(void) diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 5cb087f68efe..27831d6fc5a5 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -635,7 +635,7 @@ void __init dm646x_register_clocks(void) void __init dm646x_init_irqs(void) { - davinci_irq_init(); + davinci_aintc_init(); } static int __init dm646x_init_devices(void) diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index 3d45b73b9a64..9cf3a36a802a 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -19,7 +19,7 @@ void davinci_timer_init(struct clk *clk); -extern void davinci_irq_init(void); +extern void davinci_aintc_init(void); struct davinci_timer_instance { u32 base; diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index b908b4903b9a..c43aee686b78 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -18,39 +18,39 @@ #include #include -#define FIQ_REG0_OFFSET 0x0000 -#define FIQ_REG1_OFFSET 0x0004 -#define IRQ_REG0_OFFSET 0x0008 -#define IRQ_REG1_OFFSET 0x000C -#define IRQ_IRQENTRY_OFFSET 0x0014 -#define IRQ_ENT_REG0_OFFSET 0x0018 -#define IRQ_ENT_REG1_OFFSET 0x001C -#define IRQ_INCTL_REG_OFFSET 0x0020 -#define IRQ_EABASE_REG_OFFSET 0x0024 -#define IRQ_INTPRI0_REG_OFFSET 0x0030 -#define IRQ_INTPRI7_REG_OFFSET 0x004C - -static void __iomem *davinci_intc_base; -static struct irq_domain *davinci_irq_domain; - -static inline void davinci_irq_writel(unsigned long value, int offset) +#define DAVINCI_AINTC_FIQ_REG0 0x0000 +#define DAVINCI_AINTC_FIQ_REG1 0x0004 +#define DAVINCI_AINTC_IRQ_REG0 0x0008 +#define DAVINCI_AINTC_IRQ_REG1 0x000C +#define DAVINCI_AINTC_IRQ_IRQENTRY 0x0014 +#define DAVINCI_AINTC_IRQ_ENT_REG0 0x0018 +#define DAVINCI_AINTC_IRQ_ENT_REG1 0x001C +#define DAVINCI_AINTC_IRQ_INCTL_REG 0x0020 +#define DAVINCI_AINTC_IRQ_EABASE_REG 0x0024 +#define DAVINCI_AINTC_IRQ_INTPRI0_REG 0x0030 +#define DAVINCI_AINTC_IRQ_INTPRI7_REG 0x004C + +static void __iomem *davinci_aintc_base; +static struct irq_domain *davinci_aintc_irq_domain; + +static inline void davinci_aintc_writel(unsigned long value, int offset) { - __raw_writel(value, davinci_intc_base + offset); + __raw_writel(value, davinci_aintc_base + offset); } -static inline unsigned long davinci_irq_readl(int offset) +static inline unsigned long davinci_aintc_readl(int offset) { - return __raw_readl(davinci_intc_base + offset); + return __raw_readl(davinci_aintc_base + offset); } static __init void -davinci_irq_setup_gc(void __iomem *base, - unsigned int irq_start, unsigned int num) +davinci_aintc_setup_gc(void __iomem *base, + unsigned int irq_start, unsigned int num) { struct irq_chip_generic *gc; struct irq_chip_type *ct; - gc = irq_get_domain_generic_chip(davinci_irq_domain, irq_start); + gc = irq_get_domain_generic_chip(davinci_aintc_irq_domain, irq_start); gc->reg_base = base; gc->irq_base = irq_start; @@ -59,84 +59,84 @@ davinci_irq_setup_gc(void __iomem *base, ct->chip.irq_mask = irq_gc_mask_clr_bit; ct->chip.irq_unmask = irq_gc_mask_set_bit; - ct->regs.ack = IRQ_REG0_OFFSET; - ct->regs.mask = IRQ_ENT_REG0_OFFSET; + ct->regs.ack = DAVINCI_AINTC_IRQ_REG0; + ct->regs.mask = DAVINCI_AINTC_IRQ_ENT_REG0; irq_setup_generic_chip(gc, IRQ_MSK(num), IRQ_GC_INIT_MASK_CACHE, IRQ_NOREQUEST | IRQ_NOPROBE, 0); } static asmlinkage void __exception_irq_entry -davinci_handle_irq(struct pt_regs *regs) +davinci_aintc_handle_irq(struct pt_regs *regs) { - int irqnr = davinci_irq_readl(IRQ_IRQENTRY_OFFSET); + int irqnr = davinci_aintc_readl(DAVINCI_AINTC_IRQ_IRQENTRY); irqnr >>= 2; irqnr -= 1; - handle_domain_irq(davinci_irq_domain, irqnr, regs); + handle_domain_irq(davinci_aintc_irq_domain, irqnr, regs); } /* ARM Interrupt Controller Initialization */ -void __init davinci_irq_init(void) +void __init davinci_aintc_init(void) { unsigned i, j; const u8 *davinci_def_priorities = davinci_soc_info.intc_irq_prios; int rv, irq_base; - davinci_intc_base = ioremap(davinci_soc_info.intc_base, SZ_4K); - if (WARN_ON(!davinci_intc_base)) + davinci_aintc_base = ioremap(davinci_soc_info.intc_base, SZ_4K); + if (WARN_ON(!davinci_aintc_base)) return; /* Clear all interrupt requests */ - davinci_irq_writel(~0x0, FIQ_REG0_OFFSET); - davinci_irq_writel(~0x0, FIQ_REG1_OFFSET); - davinci_irq_writel(~0x0, IRQ_REG0_OFFSET); - davinci_irq_writel(~0x0, IRQ_REG1_OFFSET); + davinci_aintc_writel(~0x0, DAVINCI_AINTC_FIQ_REG0); + davinci_aintc_writel(~0x0, DAVINCI_AINTC_FIQ_REG1); + davinci_aintc_writel(~0x0, DAVINCI_AINTC_IRQ_REG0); + davinci_aintc_writel(~0x0, DAVINCI_AINTC_IRQ_REG1); /* Disable all interrupts */ - davinci_irq_writel(0x0, IRQ_ENT_REG0_OFFSET); - davinci_irq_writel(0x0, IRQ_ENT_REG1_OFFSET); + davinci_aintc_writel(0x0, DAVINCI_AINTC_IRQ_ENT_REG0); + davinci_aintc_writel(0x0, DAVINCI_AINTC_IRQ_ENT_REG1); /* Interrupts disabled immediately, IRQ entry reflects all */ - davinci_irq_writel(0x0, IRQ_INCTL_REG_OFFSET); + davinci_aintc_writel(0x0, DAVINCI_AINTC_IRQ_INCTL_REG); /* we don't use the hardware vector table, just its entry addresses */ - davinci_irq_writel(0, IRQ_EABASE_REG_OFFSET); + davinci_aintc_writel(0, DAVINCI_AINTC_IRQ_EABASE_REG); /* Clear all interrupt requests */ - davinci_irq_writel(~0x0, FIQ_REG0_OFFSET); - davinci_irq_writel(~0x0, FIQ_REG1_OFFSET); - davinci_irq_writel(~0x0, IRQ_REG0_OFFSET); - davinci_irq_writel(~0x0, IRQ_REG1_OFFSET); + davinci_aintc_writel(~0x0, DAVINCI_AINTC_FIQ_REG0); + davinci_aintc_writel(~0x0, DAVINCI_AINTC_FIQ_REG1); + davinci_aintc_writel(~0x0, DAVINCI_AINTC_IRQ_REG0); + davinci_aintc_writel(~0x0, DAVINCI_AINTC_IRQ_REG1); - for (i = IRQ_INTPRI0_REG_OFFSET; i <= IRQ_INTPRI7_REG_OFFSET; i += 4) { + for (i = DAVINCI_AINTC_IRQ_INTPRI0_REG; i <= DAVINCI_AINTC_IRQ_INTPRI7_REG; i += 4) { u32 pri; for (j = 0, pri = 0; j < 32; j += 4, davinci_def_priorities++) pri |= (*davinci_def_priorities & 0x07) << j; - davinci_irq_writel(pri, i); + davinci_aintc_writel(pri, i); } irq_base = irq_alloc_descs(-1, 0, davinci_soc_info.intc_irq_num, 0); if (WARN_ON(irq_base < 0)) return; - davinci_irq_domain = irq_domain_add_legacy(NULL, + davinci_aintc_irq_domain = irq_domain_add_legacy(NULL, davinci_soc_info.intc_irq_num, irq_base, 0, &irq_domain_simple_ops, NULL); - if (WARN_ON(!davinci_irq_domain)) + if (WARN_ON(!davinci_aintc_irq_domain)) return; - rv = irq_alloc_domain_generic_chips(davinci_irq_domain, 32, 1, + rv = irq_alloc_domain_generic_chips(davinci_aintc_irq_domain, 32, 1, "AINTC", handle_edge_irq, IRQ_NOREQUEST | IRQ_NOPROBE, 0, 0); if (WARN_ON(rv)) return; for (i = 0, j = 0; i < davinci_soc_info.intc_irq_num; i += 32, j += 0x04) - davinci_irq_setup_gc(davinci_intc_base + j, irq_base + i, 32); + davinci_aintc_setup_gc(davinci_aintc_base + j, irq_base + i, 32); irq_set_handler(IRQ_TINT1_TINT34, handle_level_irq); - set_handle_irq(davinci_handle_irq); + set_handle_irq(davinci_aintc_handle_irq); } From patchwork Thu Jan 31 13:39:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790607 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 36F4713BF for ; Thu, 31 Jan 2019 13:42:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 28C7630E64 for ; Thu, 31 Jan 2019 13:42:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CF1030E77; Thu, 31 Jan 2019 13:42:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BB91630E64 for ; Thu, 31 Jan 2019 13:42:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wNYO5ko1Epu/x3S90fhwp96WcTPl3w4GGMKrmeNH1eY=; b=p3bisofJlA+z3m XjwrZyO0UfCK4Bo9UEeHwWtcJxlvpp8niID65FC+fnSi65CWIsa3eBcgAwB+VZByiIL+dj+eOuio3 X6wqT1FYqL0LwEesvtoQufRviIrq+qnvIhkPUvzCel/pUf7fGdkql0TnryZ+Wg1tWh51NR4RSo7Dn VoL5QN6YlvfdaViwOGnVHq+O7cA+lbgbBiAkgVW1Y594aZhWRnuc8zCqF1DuYokz9qRx2+ZDQKgpn EhmoNneWZPXmVs8AcqecwAlHJf9qxY55k/T14XmnDhC1uAXQkTtVk6cYxBl83I8DzjYQgX9kBgtBe todGzhcXQu1VY86hrdPw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCcB-00008v-JW; Thu, 31 Jan 2019 13:42:47 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZR-0004k6-KI for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:21 +0000 Received: by mail-wr1-x443.google.com with SMTP id t27so3326751wra.6 for ; Thu, 31 Jan 2019 05:39:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QanIhRSlQl6wGHvoamzYhAaZ9CMIQGcX9Hv3iPJ8S+I=; b=RYV5DEzoSKU1PBmHiU+He6LaLOSZF9P8/gPImBjiYXmwPl55MEFXg3Sr2j8Q1gYTib VDlAC0vJdGwISB1akfFzpCza+a7zwLwo4+aPPUGdMmZFcrFyO1f6Qs+VzKhrc6OEOF35 pE4NwzDZ7HCVvy1IHudHxqo2XCLXK8DLjS8+WtpArwly1k/j9Pzs6A8gii2gpDqr/sIz nor04x9qyEbFkjIivz5+6AsF63IcrpONel+9djbvh0lNk+QBT47lZLcLZucvH2S2WKtb qxioHWXWjeVg8ky0kdEGcVqqIn+Adv2oDzgdQ41gfCaNdug3XAD8fmXkUZvXUWaxEPwl vYiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QanIhRSlQl6wGHvoamzYhAaZ9CMIQGcX9Hv3iPJ8S+I=; b=UylVcDiTgG3WEbpcdFwKpRWEZ/LUPSIhsZ4ntRgEm8YqEiCg7eMYHV6PizpTD7vMMV 2EnJJcqXCDfhfx8n/poIYRmt+KEp2eV0Yughrk4vbvTSYyGw/YPbRkKu0rZfGWWU2G1N 0eFpWI2AHY18O39IrM4Oy43EH6QRtSooc1jQL9FgWgXjSKwlwhhp4WdbYh7t1ruRkxdx CznjX6dYHcfymbTjD0aQ24owscm6ftjyZ/f1kQynS9no9C1G6hh5mzTp/tgXHLr3ZF/E qAAcsFmTQZ0kCwSxzy9w69xtf+gh7q07YOHvUmOaycOTVqH20+rklzcDBvcaKPWLyaNc RAMw== X-Gm-Message-State: AHQUAubCzgozbU2fxhiWJzkCBSlFhgwscUfybXmLH3kAOSZp4YRTOhlU lrTvHcIjciXhknE2roA9TzlAKBF8dkg= X-Google-Smtp-Source: AHgI3IZO5qofrDBCfkoDg3bkSTWpbu5tdvIda2Dk0kIwZYe6DPteyHFBgoZzNC5yiSO9+3GFgO/C0A== X-Received: by 2002:adf:fe11:: with SMTP id n17mr7692879wrr.329.1548941996310; Thu, 31 Jan 2019 05:39:56 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.39.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:39:55 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 12/35] ARM: davinci: aintc: drop the 00 prefix from register offsets Date: Thu, 31 Jan 2019 14:39:05 +0100 Message-Id: <20190131133928.17985-13-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_053958_221221_D2F6A4F9 X-CRM114-Status: GOOD ( 10.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Since no offset goes past 0xff - let's drop the 00 prefix for better readability. While we're at it: convert all hex numbers to lower-case. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/irq.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index c43aee686b78..b31821e89a46 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -18,17 +18,17 @@ #include #include -#define DAVINCI_AINTC_FIQ_REG0 0x0000 -#define DAVINCI_AINTC_FIQ_REG1 0x0004 -#define DAVINCI_AINTC_IRQ_REG0 0x0008 -#define DAVINCI_AINTC_IRQ_REG1 0x000C -#define DAVINCI_AINTC_IRQ_IRQENTRY 0x0014 -#define DAVINCI_AINTC_IRQ_ENT_REG0 0x0018 -#define DAVINCI_AINTC_IRQ_ENT_REG1 0x001C -#define DAVINCI_AINTC_IRQ_INCTL_REG 0x0020 -#define DAVINCI_AINTC_IRQ_EABASE_REG 0x0024 -#define DAVINCI_AINTC_IRQ_INTPRI0_REG 0x0030 -#define DAVINCI_AINTC_IRQ_INTPRI7_REG 0x004C +#define DAVINCI_AINTC_FIQ_REG0 0x00 +#define DAVINCI_AINTC_FIQ_REG1 0x04 +#define DAVINCI_AINTC_IRQ_REG0 0x08 +#define DAVINCI_AINTC_IRQ_REG1 0x0c +#define DAVINCI_AINTC_IRQ_IRQENTRY 0x14 +#define DAVINCI_AINTC_IRQ_ENT_REG0 0x18 +#define DAVINCI_AINTC_IRQ_ENT_REG1 0x1c +#define DAVINCI_AINTC_IRQ_INCTL_REG 0x20 +#define DAVINCI_AINTC_IRQ_EABASE_REG 0x24 +#define DAVINCI_AINTC_IRQ_INTPRI0_REG 0x30 +#define DAVINCI_AINTC_IRQ_INTPRI7_REG 0x4c static void __iomem *davinci_aintc_base; static struct irq_domain *davinci_aintc_irq_domain; From patchwork Thu Jan 31 13:39:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790609 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5763891E for ; Thu, 31 Jan 2019 13:43:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 44DB630E64 for ; Thu, 31 Jan 2019 13:43:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 36AF430E76; Thu, 31 Jan 2019 13:43:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E1DAD30E64 for ; Thu, 31 Jan 2019 13:43:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JJul28wQ45JXejE5Cd+fLndVpiI+vbLT3AKHGPNNw88=; b=r2HB0BapvxcsYy 9vD8tw4kISEWP0OBaqj9uQ00zKXPMNiLlfbJLkFYToUrnddnPEfDQukTizKk+MakzmE7T63QsLV82 uIWR6l4yRkdxtg5fdCBnDS502eeuROErueqEX5KINd9ClDw+um6OIDNT/HI2YBzbYut2+FKiirwXx R8KtLu4q4buQuZmDgQY0escVurpSZcbMF50ue5w/58a8u6Pu9/NY8f65YXYxGhTOzLsoGzSR8MP1s xR3mG9JjuYyuTq7nDlMIbSMg8MswJ53FlO5OecoxFgeZXtmR9G4m9RUjr9Ny5zWReFKIo4pqj8Yf+ v+ADUe7d6xB29ey42nRg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCcQ-0000Nc-Tw; Thu, 31 Jan 2019 13:43:02 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZS-0004lY-PP for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:21 +0000 Received: by mail-wr1-x443.google.com with SMTP id p7so3381248wru.0 for ; Thu, 31 Jan 2019 05:39:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/c5hDVe0InyzBLUgsdtqzMSd06Nl7+tp8C6D2lOYhko=; b=QVzASKGeM2ZFTiubzM53pWGi1midPBvfiEoRwa3CAychzozVuwi0MKky/mGeLNmnYE E5UU+snYpAp12nQC/vsaneIYe9jwtiyjwjSZIgkcPF6nCnD4U9w3hxMyuoGFv9APxJbI rkBpsug97GrsEvf/4ak1sXW65tag2xyf9UiqT1DTaWfi7GwRkgcjfWSFPvoz3+xDwm/2 UCEFJ2B/z5usBwM8wDeL7OsfKRWAJfWLIYuHlOVUwC0JKea+FXcGJHcROXfu0J/tHxz7 bUZzfrwGAAMiBOB1QU/oGLIU0RBkggwHwuWgBPGpNcZSrYStWf8A4zFBZQneps8XfWPz ckWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/c5hDVe0InyzBLUgsdtqzMSd06Nl7+tp8C6D2lOYhko=; b=mFeKDEukZ5ddpcQRrLzX8P86M/RRN55y5SpLmWTqjfFDYSZrkhjv4R/rTO98zlnIoE Afh+3bmoZxow+cPGKquHXKsZk7g1Bp9oEkVJ+wmzptooeqKtwsZXzhmFgMuTrEaBlNzr wNs9ummk/2vuxShUQcyvibWwZcd8T6XtNwfLg+VEpbdbDImeiqDXJ+OhbY0grmQcLmp6 ykXte19xWShXx992VhTVC9dAk4pUfECotgAaEOLgrlS5cJR5rR3B3lBvbnCrf6/FSkId xMcNsVeiyoNQZRKe0VlD5Wb6zeNKSrZeTNE1QulDT0/W7olRw6YohK1TXrYdBOSuUKxw XTtg== X-Gm-Message-State: AJcUukf7FgMDkk9R4qYaATyKjX25zZ7+LsxAP5CY5JGqzhcP0/0WD1ME edIGU+eaLGWrmG89uM8D9sIW9g== X-Google-Smtp-Source: ALg8bN4df9GfK9msIhWH5NZz/P0rVnlqXTC1yDU1fQTVRgIetUMUVgVZ40ySMrE9AmG4wkTFSo/5jg== X-Received: by 2002:a5d:6105:: with SMTP id v5mr33635178wrt.63.1548941997359; Thu, 31 Jan 2019 05:39:57 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.39.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:39:56 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 13/35] ARM: davinci: aintc: add a new config structure Date: Thu, 31 Jan 2019 14:39:06 +0100 Message-Id: <20190131133928.17985-14-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_053959_393566_A96AFA5C X-CRM114-Status: GOOD ( 12.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Add a config structure that will be used by aintc-based platforms. It contains the register range resource, number of interrupts and a list of priorities. Signed-off-by: Bartosz Golaszewski --- include/linux/irqchip/irq-davinci-aintc.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 include/linux/irqchip/irq-davinci-aintc.h diff --git a/include/linux/irqchip/irq-davinci-aintc.h b/include/linux/irqchip/irq-davinci-aintc.h new file mode 100644 index 000000000000..d488e798bbef --- /dev/null +++ b/include/linux/irqchip/irq-davinci-aintc.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Texas Instruments + */ + +#ifndef _LINUX_IRQ_DAVINCI_AINTC_ +#define _LINUX_IRQ_DAVINCI_AINTC_ + +#include + +struct davinci_aintc_config { + struct resource reg; + unsigned int num_irqs; + u8 *prios; +}; + +#endif /* _LINUX_IRQ_DAVINCI_AINTC_ */ From patchwork Thu Jan 31 13:39:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790611 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1A297922 for ; Thu, 31 Jan 2019 13:43:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0AFB230E64 for ; Thu, 31 Jan 2019 13:43:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F366B30E76; Thu, 31 Jan 2019 13:43:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8F15F30E64 for ; Thu, 31 Jan 2019 13:43:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dNrd/oZrc7HywTIIUYA106uralFV9pbQw7W9o9ZAZDM=; b=J93ulXaBF2G/ep DdxUg6+vl3BWeWpvJ9aDFXIqunyI0efkjq5OeHnuzBSwfAdHXZ0Gs6+mFQpPs3PXhXOnBYgiASzuh sp+BqOPvwCGLFFtwULnncuNv0VkPXElJfzCYi/+3LbJXy3QmYQZftohKNc8K3V+Ts9rbKIgFNmGME XYpGERDJtVJxo5ERNhSekxl3MPNTIRfz2yGEYuKX/4cDwg1hS2De0XSlZjFfBxNb4rZsxIrZtrlUM b5cuOGuQ8fASLb1Leq63e10PViwYUVkn6cRvAM6eDoKIHx0NJMC7htFkXd/Z4UGCFo00C/b7p5b6P goGBx+8tFJqadMqmLGBg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCcf-0000dx-09; Thu, 31 Jan 2019 13:43:17 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZU-0004my-4B for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:23 +0000 Received: by mail-wr1-x442.google.com with SMTP id z5so3294773wrt.11 for ; Thu, 31 Jan 2019 05:39:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XB8DAnrnVgkm1ZLSZXHvJRftRpL7JEyZD/bNFtysJOk=; b=eostOMYyaHRaga+KnRffQARNh5CgS6967wxV0VVsFcyCF1lfpNbJ5ilYa7QGZUsRzD VIekdUk99tn9omPvZgnU5DnLnv7U7VjYBDw1skPe7ICcaDBg+6Hql2RFnYJRtxTFDn2k LgL0cEy8+tqhcAvo2fuWmbgDNlPzpkH3NKv+lh92smT+eNn6ZQdv5PvKaP3isSxqt1IZ rHzeIkx0dPIYqbm0ukdRdFO1kcPJ1rQe9tiAlLdFX2a/WTsc11ONOKBtgWCBaOJP9n5B cODZJszqH5MQnsCyMECG2eAKBdZywV1drX9xJfl3c05+Wd7HPiIq1ZMCBqe/2rgtDzXv pozA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XB8DAnrnVgkm1ZLSZXHvJRftRpL7JEyZD/bNFtysJOk=; b=jKWUNAaGAwj8I8z1yd/ygXXGq6ddcnurgG1fzNUYRduJ8XkQ6Vy93a1evYKXuRkUfy W8x8koxl2/3bDg8YkPMhKuU3B5ZYsQts3inJ8oq5txLiPO8pYhwdW6oz8lSaoleqEvat IA1TaoOnouH8g+UXKx+OhcDqDz2HivcyINSh/l/jSJCFiEOUSk3GRCS8m4HWY2TI2aOM 6D02wToHnzf9QUo+Qo0Ilb7zCbHqphnUf1YJO6bx+6XqW/pRe5dV3g7QW8C+2vf4NN0v F4d4+cpQN5ndFA55PIJvofEM09xslAs8Rq9fAU7nKIprA5uifVGDs+3EmXJtKWArHdHL AALQ== X-Gm-Message-State: AJcUukf+Wt8AHdUC2i7kAZe10XHDmIQz4BnI9h11da9Z2jmjY4Ag/SmM L4W46DSWRaYMZ2qcFz/g3hXyag== X-Google-Smtp-Source: ALg8bN6GZcbUijMNLIaisJR8PKK8dAjuebBkv/27WuNbbPa0HijHFl0ZhRJ8Co84cYI1dreXIohiDA== X-Received: by 2002:adf:e64d:: with SMTP id b13mr35313826wrn.276.1548941998507; Thu, 31 Jan 2019 05:39:58 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.39.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:39:57 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 14/35] ARM: davinci: aintc: use the new irqchip config structure in dm* SoCs Date: Thu, 31 Jan 2019 14:39:07 +0100 Message-Id: <20190131133928.17985-15-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_054001_158776_D8A0DCC2 X-CRM114-Status: GOOD ( 11.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Add the new-style config structures for dm* SoCs. They will be used once we make the aintc driver stop using davinci_soc_info. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/dm355.c | 11 +++++++++++ arch/arm/mach-davinci/dm365.c | 11 +++++++++++ arch/arm/mach-davinci/dm644x.c | 11 +++++++++++ arch/arm/mach-davinci/dm646x.c | 11 +++++++++++ 4 files changed, 44 insertions(+) diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index cf574956ce1d..0dcfcbec522a 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -738,6 +739,16 @@ int __init dm355_init_video(struct vpfe_config *vpfe_cfg, return 0; } +static const struct davinci_aintc_config dm355_aintc_config = { + .reg = { + .start = DAVINCI_ARM_INTC_BASE, + .end = DAVINCI_ARM_INTC_BASE + SZ_4K, + .flags = IORESOURCE_MEM, + }, + .num_irqs = 64, + .prios = dm355_aintc_prios, +}; + void __init dm355_init_irqs(void) { davinci_aintc_init(); diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index e63153a6ae41..1878c97e5df5 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -995,6 +996,16 @@ int __init dm365_init_video(struct vpfe_config *vpfe_cfg, return 0; } +static const struct davinci_aintc_config dm365_aintc_config = { + .reg = { + .start = DAVINCI_ARM_INTC_BASE, + .end = DAVINCI_ARM_INTC_BASE + SZ_4K, + .flags = IORESOURCE_MEM, + }, + .num_irqs = 64, + .prios = dm365_aintc_prios, +}; + void __init dm365_init_irqs(void) { davinci_aintc_init(); diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 0904baa1d008..5c48a5e4090b 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -672,6 +673,16 @@ int __init dm644x_init_video(struct vpfe_config *vpfe_cfg, return 0; } +static const struct davinci_aintc_config dm644x_aintc_config = { + .reg = { + .start = DAVINCI_ARM_INTC_BASE, + .end = DAVINCI_ARM_INTC_BASE + SZ_4K, + .flags = IORESOURCE_MEM, + }, + .num_irqs = 64, + .prios = dm644x_aintc_prios, +}; + void __init dm644x_init_irqs(void) { davinci_aintc_init(); diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 27831d6fc5a5..e06ea3b61011 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -633,6 +634,16 @@ void __init dm646x_register_clocks(void) platform_device_register(&dm646x_pll2_device); } +static const struct davinci_aintc_config dm646x_aintc_config = { + .reg = { + .start = DAVINCI_ARM_INTC_BASE, + .end = DAVINCI_ARM_INTC_BASE + SZ_4K, + .flags = IORESOURCE_MEM, + }, + .num_irqs = 64, + .prios = dm646x_aintc_prios, +}; + void __init dm646x_init_irqs(void) { davinci_aintc_init(); From patchwork Thu Jan 31 13:39:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790615 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7276F922 for ; Thu, 31 Jan 2019 13:43:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5FF0F30B0E for ; Thu, 31 Jan 2019 13:43:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5172A30B14; Thu, 31 Jan 2019 13:43:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A712E30B14 for ; Thu, 31 Jan 2019 13:43:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WRAfhYmzzy/8tciITwzfcjXKQsD6HzZegh0+C09DpcM=; b=oH9fQFk3HMvxOH S3FOdEqkOiITht9c5T2WCAW4DD21eVoD0o+vnJFUO1FE1wAYlavXF6Z3z/Um1V6dKVaTADR4bG3h4 9X2BRIZSd6kCwphh6Nko9vhLv5j6io4+pgVRPfG50q5v9rNNO4WkPZevMOpolGLqzXql0ijbehXj/ FpHYuEFCYaxdO+1djK0FBiV5Bs6G/sQ1XgG56fPkuuHTTXaVf3KJDs+NcfzAqhGZ/HYaCodqiR/gT IsmBEIyNxawNBkV+VyxCmSp/pCUOyNpCm5xJIoOSJ+IOErBit90YxPknQrO2kclMMywtvqd5fPTqe IUI9DfkRj28rJwpRyDJw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCdG-0001Fg-9y; Thu, 31 Jan 2019 13:43:54 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZV-0004oX-2W for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:24 +0000 Received: by mail-wm1-x342.google.com with SMTP id d15so2545503wmb.3 for ; Thu, 31 Jan 2019 05:40:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=K4gOMPK7JwLenHksVrX0ybAt1GIcZsGbGGGhyJXhtdY=; b=DEfqdyST9YAEVz1EtV/pIdW8aoBrW256e9qVHmBeUZDofeRTYA9P6vaW1Cm/2LzvOy koCL5xjTAw6olPhlaZyfP34LRP0LcUXO65jiHZ+XiPTfzby08xryJi1xl1Kpk2iFROt6 7fB2ZyGa+0j5aZKMQ4BvIARpTo22GoB4OVWLlvaB6sxRl2RI5+HdyQTsNaPOM70gyJNK KDSAe838+rOu9vXhRJuyGtEMl7rp+j4VTPUl5bkcVHuSYHa8MBolPzKAMl1D8DV0uOHx nvNiLQ39EUH/bcpnDQDiNNICA0Da3/BSiJyJveyEfnfn3zjZtD+BQebEOCqLSnMNCBa4 QKVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K4gOMPK7JwLenHksVrX0ybAt1GIcZsGbGGGhyJXhtdY=; b=YMrF4/XS/MC9UpgRDzwozQPPXJez29MMvZF5Jy4ApsvesHl068fxwGhLu1VYQbBYic /xl3unSzqv1K8c63wZJvoQsFSfRFS2IR9ukre/bEb0mH2UyKIVzMGPsqFf7HIsAP4fxB RfThyXWE1FrBycR3BhUya66aGpw0O6s1HaJm46QdVJCWbCI7180j+/sTaujoLPo6KKQj 4wlaj5WV9uSQ3Y8Gy80D2UYIxfk5555quDulLKIEjoRbuVjCRualXuxsPO8rH3oWMo3q vr4iYXaTdLMgxl8IEJAQIPXXaygNMAxF8R/Mwdk44aj2ZOigAPRJeVKGMyyFcvaEimC1 yhvg== X-Gm-Message-State: AJcUukdqjRQpTsx34UFLyMAcmDRNPTIp+amFtmfPwcVCjBxiX8rX95XX Bg0TD4lf73rpcBIYY6mtr9lwnQ== X-Google-Smtp-Source: ALg8bN7Fn0JRQyTqUKqHPKMNVeF06hOd2dDvbVr9wl3LpkcOz0KIAZQhSUn1uvU7rYYYylf82q9EdA== X-Received: by 2002:a1c:a3c3:: with SMTP id m186mr29414917wme.16.1548941999661; Thu, 31 Jan 2019 05:39:59 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.39.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:39:59 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 15/35] ARM: davinci: aintc: use the new config structure Date: Thu, 31 Jan 2019 14:39:08 +0100 Message-Id: <20190131133928.17985-16-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_054003_360949_7B1FEAD3 X-CRM114-Status: GOOD ( 16.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Modify the aintc driver to take all its configuration from the new config structure. Stop referencing davinci_soc_info in any way. Move the declaration for davinci_aintc_init() to irq-davinci-aintc.h and make it take the new config structure as parameter. Convert all users to the new version. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/dm355.c | 2 +- arch/arm/mach-davinci/dm365.c | 2 +- arch/arm/mach-davinci/dm644x.c | 2 +- arch/arm/mach-davinci/dm646x.c | 2 +- arch/arm/mach-davinci/include/mach/common.h | 2 -- arch/arm/mach-davinci/irq.c | 35 ++++++++++++--------- include/linux/irqchip/irq-davinci-aintc.h | 2 ++ 7 files changed, 26 insertions(+), 21 deletions(-) diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index 0dcfcbec522a..a0bfb3602136 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -751,7 +751,7 @@ static const struct davinci_aintc_config dm355_aintc_config = { void __init dm355_init_irqs(void) { - davinci_aintc_init(); + davinci_aintc_init(&dm355_aintc_config); } static int __init dm355_init_devices(void) diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 1878c97e5df5..eab575873255 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -1008,7 +1008,7 @@ static const struct davinci_aintc_config dm365_aintc_config = { void __init dm365_init_irqs(void) { - davinci_aintc_init(); + davinci_aintc_init(&dm365_aintc_config); } static int __init dm365_init_devices(void) diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 5c48a5e4090b..24ad7a09aa15 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -685,7 +685,7 @@ static const struct davinci_aintc_config dm644x_aintc_config = { void __init dm644x_init_irqs(void) { - davinci_aintc_init(); + davinci_aintc_init(&dm644x_aintc_config); } void __init dm644x_init_devices(void) diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index e06ea3b61011..ab02cc93813a 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -646,7 +646,7 @@ static const struct davinci_aintc_config dm646x_aintc_config = { void __init dm646x_init_irqs(void) { - davinci_aintc_init(); + davinci_aintc_init(&dm646x_aintc_config); } static int __init dm646x_init_devices(void) diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index 9cf3a36a802a..9e06974c85bb 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -19,8 +19,6 @@ void davinci_timer_init(struct clk *clk); -extern void davinci_aintc_init(void); - struct davinci_timer_instance { u32 base; u32 bottom_irq; diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index b31821e89a46..d67f443a471d 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -77,13 +78,14 @@ davinci_aintc_handle_irq(struct pt_regs *regs) } /* ARM Interrupt Controller Initialization */ -void __init davinci_aintc_init(void) +void __init davinci_aintc_init(const struct davinci_aintc_config *config) { - unsigned i, j; - const u8 *davinci_def_priorities = davinci_soc_info.intc_irq_prios; + unsigned int irq_off, reg_off, prio, shift; int rv, irq_base; + const u8 *prios; - davinci_aintc_base = ioremap(davinci_soc_info.intc_base, SZ_4K); + davinci_aintc_base = ioremap(config->reg.start, + resource_size(&config->reg)); if (WARN_ON(!davinci_aintc_base)) return; @@ -109,22 +111,22 @@ void __init davinci_aintc_init(void) davinci_aintc_writel(~0x0, DAVINCI_AINTC_IRQ_REG0); davinci_aintc_writel(~0x0, DAVINCI_AINTC_IRQ_REG1); - for (i = DAVINCI_AINTC_IRQ_INTPRI0_REG; i <= DAVINCI_AINTC_IRQ_INTPRI7_REG; i += 4) { - u32 pri; + prios = config->prios; - for (j = 0, pri = 0; j < 32; j += 4, davinci_def_priorities++) - pri |= (*davinci_def_priorities & 0x07) << j; - davinci_aintc_writel(pri, i); + for (reg_off = DAVINCI_AINTC_IRQ_INTPRI0_REG; + reg_off <= DAVINCI_AINTC_IRQ_INTPRI7_REG; reg_off += 4) { + for (shift = 0, prio = 0; shift < 32; shift += 4, prios++) + prio |= (*prios & 0x07) << shift; + davinci_aintc_writel(prio, reg_off); } - irq_base = irq_alloc_descs(-1, 0, davinci_soc_info.intc_irq_num, 0); + irq_base = irq_alloc_descs(-1, 0, config->num_irqs, 0); if (WARN_ON(irq_base < 0)) return; davinci_aintc_irq_domain = irq_domain_add_legacy(NULL, - davinci_soc_info.intc_irq_num, - irq_base, 0, &irq_domain_simple_ops, - NULL); + config->num_irqs, irq_base, 0, + &irq_domain_simple_ops, NULL); if (WARN_ON(!davinci_aintc_irq_domain)) return; @@ -134,8 +136,11 @@ void __init davinci_aintc_init(void) if (WARN_ON(rv)) return; - for (i = 0, j = 0; i < davinci_soc_info.intc_irq_num; i += 32, j += 0x04) - davinci_aintc_setup_gc(davinci_aintc_base + j, irq_base + i, 32); + for (irq_off = 0, reg_off = 0; + irq_off < config->num_irqs; + irq_off += 32, reg_off += 0x04) + davinci_aintc_setup_gc(davinci_aintc_base + reg_off, + irq_base + irq_off, 32); irq_set_handler(IRQ_TINT1_TINT34, handle_level_irq); set_handle_irq(davinci_aintc_handle_irq); diff --git a/include/linux/irqchip/irq-davinci-aintc.h b/include/linux/irqchip/irq-davinci-aintc.h index d488e798bbef..cc851d58f07f 100644 --- a/include/linux/irqchip/irq-davinci-aintc.h +++ b/include/linux/irqchip/irq-davinci-aintc.h @@ -14,4 +14,6 @@ struct davinci_aintc_config { u8 *prios; }; +void davinci_aintc_init(const struct davinci_aintc_config *config); + #endif /* _LINUX_IRQ_DAVINCI_AINTC_ */ From patchwork Thu Jan 31 13:39:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790649 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C0A12746 for ; Thu, 31 Jan 2019 13:56:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B187E30B2B for ; Thu, 31 Jan 2019 13:56:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A59BD30B67; Thu, 31 Jan 2019 13:56:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3D29630B2B for ; Thu, 31 Jan 2019 13:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=uTXqAV1zKld2xv4PhmQLJWczg4uhsjwUc5imCuje/gk=; b=hoeiLvkIhgmuQt bmRDWMy7TYMCoAE8zX+kesBpUuhdUldx4Cx7VJHsZwajF+T/MBdmE+tzHPJUQwCCckI73H+jUjedW k3KKph02dybwdu9MEdLNZHtkSY48fI+43gxOvHgGJ30lC6ueaNjNZCfvIsiA/mlMwpzlbUYTkniZY APmkcLWs1MizKhJ2ABmOovMiXr/NQP75rEZd81fufk3808qHWl942jsLdI2XL9RSCKPu4w9u7s2RJ bKB0udDYOGjW2r2Um46eoAU5sTuDSMxnnX+HRKiPUDs8S3h/7eYw7HGx3ySLCZIZInhyGyBvvRoKk KiWXrrGzqfr3xNqgNXNw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCou-0000lm-9K; Thu, 31 Jan 2019 13:55:56 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZW-0004q7-GA for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:24 +0000 Received: by mail-wr1-x441.google.com with SMTP id l9so3274124wrt.13 for ; Thu, 31 Jan 2019 05:40:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IVtjfjJdrfrUAxYWIg2RkYAV3AoagHAUWgDBm80EJqQ=; b=isRcx9mW+RI31av6Dcbwmiw+5pBDfRY828eYpRmdcfhI5YbEcusJ7sfAhK8Wy0De1O xYgIWwi7+iwOI0Zs5pwhFCys0QSqIHrkl72ohszExQQ3tObbCE76zlremfTzVsl0BB77 8npAmi5DrDEQuFeqJpuiVU1kgsPb1+aUoMbTJ90y+4m+jVRcSyXxUQGKv8HUp9bJmKfg AtelJll4scRpriPZ2Ms14WmPs3fGSojNsXbM7OFL0Hi3uVkfiNJnm5Ut6jPhDzkr41gV /8AtFLRaPh8DJoyLSP+HvIxkvSYPF3epPPMlYF9yHWV7Y/0MRQoHRPD0KnLQSp6vwE/X oxwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IVtjfjJdrfrUAxYWIg2RkYAV3AoagHAUWgDBm80EJqQ=; b=RXW9xpQJdvzEbCdZC96CRSDVdyt2IETRuDf+blKtCvkf1Wz6BYXJ+VVkrMomXyG1Mj jpqqtPMs7bxSA7tvBCPFWZR2wRRCrXg1FSmkJ6KpvGyEPPyGTQ+MLVyEPV0G0Isk6zSj AIfjBmS5qxvsca1DdtJbN0whGn/qGIc+0nk61Mg8XuO5UM64Sk+EZXL265+lTqmVc5dM JuuJ3VuOXrsqDYc+PM67VRdw42eyKa9Rvmnxs5vgehzDyhgdxG59bVzSyPmW+89NvcEw Cr03ALOfrU/yIjLpW1hT5U7GH9bIhpA5OCFJJ0WK3woClxJkZ7MC4Uu1InHqjN7Lo36a FOKw== X-Gm-Message-State: AJcUukeJf3eR9RtSHNSuiZf1YeLqgUF6qHzU8hb74S3+TgGGQKHkw6sD QFZeHq8ENSKdSg5DB+2P6jGl0g== X-Google-Smtp-Source: ALg8bN4WeQvFMwbH2f3ATmmTso+nUUilBM8hLSwpZJ39/4Z3kMtfSSrLXcZQFheaQ8iXZFn3XoCTuw== X-Received: by 2002:a5d:6850:: with SMTP id o16mr35273924wrw.123.1548942000881; Thu, 31 Jan 2019 05:40:00 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.39.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:00 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 16/35] ARM: davinci: aintc: move timer-specific irq_set_handler() out of irq.c Date: Thu, 31 Jan 2019 14:39:09 +0100 Message-Id: <20190131133928.17985-17-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_054004_031490_3337C2D4 X-CRM114-Status: GOOD ( 14.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski I've been unable to figure out exactly why, but it seems that the IRQ_TINT1_TINT34 interrupt for timer 1 needs to be handled as a level irq, not edge like all others. This timer is used by the dsp on dm64* boards only. Let's move the handler setup out of the aintc driver where it's lived since the beginning and into the dm64* SoC-specific files where it belongs. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/dm644x.c | 4 ++++ arch/arm/mach-davinci/dm646x.c | 4 ++++ arch/arm/mach-davinci/irq.c | 1 - 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 24ad7a09aa15..beb97101c881 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -616,6 +617,9 @@ void __init dm644x_init_time(void) void __iomem *pll1, *psc; struct clk *clk; + /* Needed by the dsp. */ + irq_set_handler(IRQ_TINT1_TINT34, handle_level_irq); + clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, DM644X_REF_FREQ); pll1 = ioremap(DAVINCI_PLL1_BASE, SZ_1K); diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index ab02cc93813a..70505c92d5fb 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -599,6 +600,9 @@ void __init dm646x_init_time(unsigned long ref_clk_rate, void __iomem *pll1, *psc; struct clk *clk; + /* Needed by the dsp. */ + irq_set_handler(IRQ_TINT1_TINT34, handle_level_irq); + clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, ref_clk_rate); clk_register_fixed_rate(NULL, "aux_clkin", NULL, 0, aux_clkin_rate); diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index d67f443a471d..2e114ad83adc 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -142,6 +142,5 @@ void __init davinci_aintc_init(const struct davinci_aintc_config *config) davinci_aintc_setup_gc(davinci_aintc_base + reg_off, irq_base + irq_off, 32); - irq_set_handler(IRQ_TINT1_TINT34, handle_level_irq); set_handle_irq(davinci_aintc_handle_irq); } From patchwork Thu Jan 31 13:39:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790617 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 76D4691E for ; Thu, 31 Jan 2019 13:44:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6808530B0E for ; Thu, 31 Jan 2019 13:44:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59DDB30B3E; Thu, 31 Jan 2019 13:44:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F2B3430B0E for ; Thu, 31 Jan 2019 13:44:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vJQozKv20cszLeQJ3wGqJB1hc28ttBTAUg73lYjExHs=; b=p6pYZkJnw5EJBP Q1A+Id7BoYp2ROqk2uzbavvVzgLPtlIOEmMlYnLVb+NblI8VKcrIj18l7a+rEH5iyRGzMCmgVWodM 1musLxXRA3FmN0vllX/uX4PsREsvLIcNa2t5NigmsOx3mGfQHP9G1+H+wa5fHESFLz0fR8Aye6xnp MTsD1LIQ5HSgxEo/l9yqNGs0/KjOoj3nTEETqF2aS/J+9cruiuAw0wL/Wprx2AuzcLY8J8pmq0EeF pYL6RvUbI40n+keh61n1wnIg1hn1goju3xoTXtZPzovj5DF9NIUuheruB9rhxK1xRboNNJiwHXMtE hnCPFjm5Th8hLgUGEwbA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCdZ-0001VQ-3A; Thu, 31 Jan 2019 13:44:13 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZX-0004rP-El for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:25 +0000 Received: by mail-wm1-x344.google.com with SMTP id t200so2634982wmt.0 for ; Thu, 31 Jan 2019 05:40:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cdS11IbVgx3eQtG5n+0kNrZKOYHM3MdE1VC/tnZNKak=; b=w09mFQU/c14b8cwe3r2NIU4j9ZpMcKNn0VdnMKiacsTVAYwUix5OAi4CUmpzns4z7Z KyV1XGsbEm/vyPAkjH0Qj4zDyd46lk89NGVHgR8ui8/2qQc9cQ0BcUdhRKJSsaI2bxCv pxApZlTQcXYh4frKtLnFBUxk0iPbBC6jl3ftnn9kdVMMO0GRkOvpDhA46WOuT7PkUW0i Nf5cM3jb92ZpsbdmSELHsYFVRwUnz0Y+zMYy/dWR2RaHcLz2SBhMCyNn3zK6U4F56HzY WSzsrO2FGaHNl7t6log1dzt8r0d0TWM5O+jwwL2NhN9wfMigR6xXe0dGI/lSWC0tYl90 fodQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cdS11IbVgx3eQtG5n+0kNrZKOYHM3MdE1VC/tnZNKak=; b=EZ1uxJzGrVUj2uAo2WeKZhKO3VbFhiOVjJPHYvBmCmeZYD/bQci7sgg20jT2tkocY6 deKn4FOWjBRL72shz1hAVq1JIuRO3DtomxsG5kBHaz/99M0leuFffTVYvRS/n2QL9Pw3 g/EI1QdG95tq7g0YR0fvIS9lU9T2h99ieCW6Ilu5Tayca+EvYoc8d/jhNo7n0/P177ya VpmO4ep7ZbeZ/VL1XZVygawaMaAIDV9Dv5qqF3+ysG6YfAKNxD8rVjRJhbYyvXhhXhru rQ2jvRZKYyh85udpA8uvDB0ZHGp0XnH/v+rd0fpt5u2/Wix8hg2Maj3YXpulH+koofQ/ 31og== X-Gm-Message-State: AJcUukd8QTTq0gD2ALvvAi4cvI7mNylg1gBxXZcto4VFz81SvY+nMqoE ejmP49F5N8V1J+pnw6VHjfvPxg== X-Google-Smtp-Source: ALg8bN5L9iqGEJX/cb0kOiO+8fhnfMfovehjp1UwzR9NL2cH7gITxMpcgM5vcOjp9rwiYUDWNz70Lw== X-Received: by 2002:a1c:c181:: with SMTP id r123mr29595614wmf.8.1548942001998; Thu, 31 Jan 2019 05:40:01 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:01 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 17/35] ARM: davinci: aintc: remove unnecessary includes Date: Thu, 31 Jan 2019 14:39:10 +0100 Message-Id: <20190131133928.17985-18-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_054004_422793_75C99EFF X-CRM114-Status: UNSURE ( 9.84 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski These includes are no longer required. Remove them. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/irq.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index 2e114ad83adc..ce4625d9cad7 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -12,11 +12,6 @@ #include #include -#include -#include -#include -#include -#include #include #define DAVINCI_AINTC_FIQ_REG0 0x00 From patchwork Thu Jan 31 13:39:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790675 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6FC36746 for ; Thu, 31 Jan 2019 13:59:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F42F309D2 for ; Thu, 31 Jan 2019 13:59:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 52E9030A34; Thu, 31 Jan 2019 13:59:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D3E71309D2 for ; Thu, 31 Jan 2019 13:59:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=93pCb8fcPhz5n7aslB5nxBBWs6qEevfD5WbV+M9i/sI=; b=EDIYrdVI8p75/J SfGAwg9bIxkqgzUl/G75yU++ht5Ux/K/lqt5kYErezxX1s1pPZQ0KQ7/TG366KrpPnvGLFcRtPqes uHiZycDYbehtKQ/5E+5XIhenQzwRbx9eJFkPeA/Y1DHFRc3RZSx8eZpGJJ7oTcF7kcGrfwbkb6xnd WtWIb3IvOR9lxYefKzuaHFKwznWZ/MAiP6MSjXp9BVZkDE3LgB6CAQUJLsXgxOqaQBto1O4xdt/mf RCOllS+fXMFf/b/KIt50iqYIeC8GKuLnaHz6uB88GF34qCGzBLrixzNXO0joGAUvuOhn/KlFejCMZ mtq8JtWoxr5J91ayajgQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCsR-0003Zv-4I; Thu, 31 Jan 2019 13:59:35 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCqv-0002L9-Fn for linux-arm-kernel@bombadil.infradead.org; Thu, 31 Jan 2019 13:58:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=EZWE16C9ZjEItVcQFpDaRLfJ9IzuvKc+mM7HSbjjb18=; b=ZvTF2X/MDbPdrEvpTox/z8uWnx JIMcpcfnwKNw1cXENkzN//QYpPeMBYNHc/5m9EBb+GqsCSRHMRZt6jyIxW051UKO/AFjWF2d0YmyJ pqn/eUb6STiLntH071sBAYbdRjhOS9eSKctU/4wKjKOr2kYdA+oWe5X505JcTcTYoW3EOQXB2laSs Rskg44H/ACHJGo/fICA8WBjvQ/PS7K+0D+ifh8KMcLSF4KLGEi7zluc0KwiJfxH2kuWuTdnGxQ0XY rLP56dHcbEA/YVih5Ke21PP1eAqjcyP00igWe3Ncd5dTUxTa3pMDsJwvPpcKfLsnM5qE3T2fzL771 hxx4Hz5A==; Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZe-000674-KD for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:11 +0000 Received: by mail-wr1-x443.google.com with SMTP id v13so3330425wrw.5 for ; Thu, 31 Jan 2019 05:40:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EZWE16C9ZjEItVcQFpDaRLfJ9IzuvKc+mM7HSbjjb18=; b=xq8rAAuP7npyHn8R0kNkdMt3Sf4drHt66DxX5WT2pL1S4Txtdf87yJF2EfZ/0Xt9BK SNpfOKS/8Y40aQGDMLDIALGZteFlmc9CZTMpAGXVNE6NXMxcKmYw0UqCP5jRlIrLW+HU X6XT61MjiTEEL7cn41ZBoX9DkIkz5rZtfg4uGDHbDb0SkBZiLExNaJcJqlC7GXjxHf7L +BS57iw5LkAurIsFklr0D+S6tg0BtToJTbz79TZbz3jOxVtd2IlzYWS4CKZhZ6UEnWAa UxhGsUVXorlWYYfMW7cYgVRjdqncNtGYH7ZRpN1BW+l8nDcqZXbGEO3+kdqSQU4kVxjq 8mXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EZWE16C9ZjEItVcQFpDaRLfJ9IzuvKc+mM7HSbjjb18=; b=Q5a0VjxS0Di/PBjdQBytUouTncdRYdOkU+hqod9oZrkXoc7gfqQRgjHgVTdutI49FQ Hdvzbh4qIapWeZhpMsE4fzH8XNy9j3/Rg8zKADLDuZ5B3EoC2WWeccZyZJSC7ZtVIJZv rKdQaneE+lEtLJAwSZT6LeAydIZ/a7i5LiNWc9xS/dn8mTKwde1GxzBqomVokizLdLth lblMWp6pfQrP8YCXOh+IoQXlIbpGYAUPqlb/DQAJqyE+3bVWD+ybM1XISEY58vUKSoO/ qPrR5xb2CVxPYBwrQ3tY9ERIl+TZliSe+TvSIETgEsLp+h11SjxctNl+srlky5aX5P7z 6edA== X-Gm-Message-State: AJcUukcrJOIKWIETirDqOliwMrO51I/aZwpNWT2XX1tUm2Pze0vZsiWv hDtb2M8LTK7HgkyBCJw48ye7JDKM3AA= X-Google-Smtp-Source: ALg8bN5MhaTExPvjAOqlg2O5V8JNQzbh0rpvhyT+zq3Mlbz7GzmMXRY90WRUTk/pmZG0TppB36mKsg== X-Received: by 2002:adf:d4c9:: with SMTP id w9mr34463680wrk.119.1548942003051; Thu, 31 Jan 2019 05:40:03 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:02 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 18/35] irqchip: davinci-aintc: move the driver to drivers/irqchip Date: Thu, 31 Jan 2019 14:39:11 +0100 Message-Id: <20190131133928.17985-19-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_084010_674445_EE6DC70D X-CRM114-Status: GOOD ( 13.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski The aintc driver has now been cleaned up. Move it to drivers/irqchip where it belongs. There's no device-tree support for any dm* board so there's no IRQCHIP_OF_DECLARE() - there's only the exported init function called from machine code. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/Kconfig | 11 ++++------- arch/arm/mach-davinci/Makefile | 1 - drivers/irqchip/Kconfig | 5 +++++ drivers/irqchip/Makefile | 1 + .../irq.c => drivers/irqchip/irq-davinci-aintc.c | 0 5 files changed, 10 insertions(+), 8 deletions(-) rename arch/arm/mach-davinci/irq.c => drivers/irqchip/irq-davinci-aintc.c (100%) diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index da8a039d65f9..71a4d875dd39 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -1,9 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 if ARCH_DAVINCI -config AINTC - bool - config CP_INTC bool select IRQ_DOMAIN @@ -17,17 +14,17 @@ comment "DaVinci Core Type" config ARCH_DAVINCI_DM644x bool "DaVinci 644x based system" - select AINTC + select DAVINCI_AINTC select ARCH_DAVINCI_DMx config ARCH_DAVINCI_DM355 bool "DaVinci 355 based system" - select AINTC + select DAVINCI_AINTC select ARCH_DAVINCI_DMx config ARCH_DAVINCI_DM646x bool "DaVinci 646x based system" - select AINTC + select DAVINCI_AINTC select ARCH_DAVINCI_DMx config ARCH_DAVINCI_DA830 @@ -49,7 +46,7 @@ config ARCH_DAVINCI_DA8XX config ARCH_DAVINCI_DM365 bool "DaVinci 365 based system" - select AINTC + select DAVINCI_AINTC select ARCH_DAVINCI_DMx comment "DaVinci Board Type" diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile index 93d271b4d84b..983865a99616 100644 --- a/arch/arm/mach-davinci/Makefile +++ b/arch/arm/mach-davinci/Makefile @@ -18,7 +18,6 @@ obj-$(CONFIG_ARCH_DAVINCI_DM365) += dm365.o devices.o obj-$(CONFIG_ARCH_DAVINCI_DA830) += da830.o devices-da8xx.o usb-da8xx.o obj-$(CONFIG_ARCH_DAVINCI_DA850) += da850.o devices-da8xx.o usb-da8xx.o -obj-$(CONFIG_AINTC) += irq.o obj-$(CONFIG_CP_INTC) += cp_intc.o # Board specific diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 3d1e60779078..ea0eb82bf1d2 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -129,6 +129,11 @@ config BRCMSTB_L2_IRQ select GENERIC_IRQ_CHIP select IRQ_DOMAIN +config DAVINCI_AINTC + bool + select GENERIC_IRQ_CHIP + select IRQ_DOMAIN + config DW_APB_ICTL bool select GENERIC_IRQ_CHIP diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index c93713d24b86..623e0ec5f9d0 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -6,6 +6,7 @@ obj-$(CONFIG_ATH79) += irq-ath79-cpu.o obj-$(CONFIG_ATH79) += irq-ath79-misc.o obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2836.o +obj-$(CONFIG_DAVINCI_AINTC) += irq-davinci-aintc.o obj-$(CONFIG_ARCH_EXYNOS) += exynos-combiner.o obj-$(CONFIG_FARADAY_FTINTC010) += irq-ftintc010.o obj-$(CONFIG_ARCH_HIP04) += irq-hip04.o diff --git a/arch/arm/mach-davinci/irq.c b/drivers/irqchip/irq-davinci-aintc.c similarity index 100% rename from arch/arm/mach-davinci/irq.c rename to drivers/irqchip/irq-davinci-aintc.c From patchwork Thu Jan 31 13:39:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790651 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D207D13A4 for ; Thu, 31 Jan 2019 13:56:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C35982F6C9 for ; Thu, 31 Jan 2019 13:56:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B726530B64; Thu, 31 Jan 2019 13:56:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 22E402F6C9 for ; Thu, 31 Jan 2019 13:56:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dl/bS2ayI8+gIkgkpVZEWoeEfwR9226nEGYnxdhCS/Y=; b=P6LiEWbL2U9lRN WtcN3GsSsOXGjoZhylWohmbgjYXgdjamYeoJdHuP3CmoM0JSLoFjl1SVsqveEnnmVVWA5UT2mgBKF 13Rw3zWEZfTTelSRczD7aVlJ9JYRtyigcu40Yg/sFzYFmy4j2XS1xWoncm2rTR5bH2pjIV6wwxW0G i6EKu5q7I737SOBOH5bDh0iL/idQmfHZ8wyxkXI2O5oY5Iu6K1sez1ollQZ10seMZLRaM42DdRzZx himTfqIL/YD3D0R6bHt/vzvbQhb5BuD8xiJnVKxKSb8DVjv9/voT5SgiDBW7xhj4zdc2QXitn1aC9 piTwkOJbqHTWUyN5qiEA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCpE-00011G-7u; Thu, 31 Jan 2019 13:56:16 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCoi-0000NU-IC for linux-arm-kernel@bombadil.infradead.org; Thu, 31 Jan 2019 13:55:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=WIf2pyuQ702WnMccPZNUgGnsS4Cx8XVFtl5DbW/a/PU=; b=SSKBZYTf6nI8LBlDetYQP6NbQZ psYylXp5f2hH+EEN2+ho2Z+Ein2LtRXvUhB6l5ysZqSE9E50KfOVKD1hbUTc5FFjbYkGi4s0LGAIp 9MTDTQAYD0ItdN5T6OnnfK/KkCX8UtIF0m++cA2bME96phwLscyhnNMXi83XlOq9dc0PX1pj1bg5M QzQqaDazEShBE35BpMB/BqGPG7OAnoMkcU/CgJvqy88eYThSvk6NOfief9MkURQrHPN55ZrvIB8Tg yWncTSqa9i1CivL/QSLULodLkWloCun2noZlIIOTGo6JXq718qyxCKr8vv64V7eEvxk3LaryyQul6 P7kSCI6A==; Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZZ-00058p-Rp for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:17 +0000 Received: by mail-wr1-x443.google.com with SMTP id v13so3330524wrw.5 for ; Thu, 31 Jan 2019 05:40:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WIf2pyuQ702WnMccPZNUgGnsS4Cx8XVFtl5DbW/a/PU=; b=P9lJ0FxCUcgGfuIK3av4VGEFiRIw6MEZD99qrIOY4w/RNXVPRIDTojYqx7IssXiA+d vsUjqBvUSENod7LGfKoGrkF0Qlmc46IKaBhJ/eFSAE/6iyDAs5b9wqsFPQ30PQ1/NmCe H3u3VeDfUrGTziCvOY00WKGs+XwblFGW2JSE2NiY4xqrfU0HO5ljIn20XnvkTwWBWeTu hzrAIs4WJUgUycPmkEMal4I3EoZxwFFIaxz70Jsoe4b1DIuR8vzQeab5zqaeV90QqH6B g8rG05x/j0fT/J1UkoOydT1d9ue/OVcjuZ+DUIBzsaponNcODxOSUuvC/SwSlr13LrrR +4AA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WIf2pyuQ702WnMccPZNUgGnsS4Cx8XVFtl5DbW/a/PU=; b=G6a3NNONaufwtkcY0B2SwelTG1iRR9s8bEQ333ydyFrja/X6bRpUqLswD1WzU/SP1s kMwH1cdYwJgAvuOJO38hB88mhrxWiiV3F+wSa7aEg/S9qbPXVkWumFkXYkvo5iNacMbi 0KoxKHi7QXXKbjLoGJDUA8goyK4y/SHfn3Qy8nhZRkubAxcUU/j+Iwum1y03H43eCje6 gNwkypNUiA/rrYAd2JnuYpW+L2f1dt5b0h9o4pVOXzNDPbgoaryd+kXNdC2c4IYXatr8 hhZIcPU/rAC9xX4eYIf2dQJeHrV4QZEoQI4fhBeFIeeVOjvh6B3RsgViKAVN/B7LIEzX NtLA== X-Gm-Message-State: AJcUukfi35LPjMEOZT7Gpa1FLrpFMs0eOhcVZMvF3cq6XVIimz5qCZ+5 TvPO7zB/q14VkYBsc4U+OU9ieg== X-Google-Smtp-Source: ALg8bN5cAGW/e+JYB7m74gtG1TI9eXhNDzFMbFSN7gxU2VTiEg4F7922+Qi0olC8umKnjmLpsiqqTA== X-Received: by 2002:a5d:538a:: with SMTP id d10mr33450410wrv.202.1548942004288; Thu, 31 Jan 2019 05:40:04 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:03 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 19/35] ARM: davinci: cp-intc: remove cp_intc.h Date: Thu, 31 Jan 2019 14:39:12 +0100 Message-Id: <20190131133928.17985-20-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_134005_930338_92F7DC58 X-CRM114-Status: GOOD ( 20.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski There's no need to have a local header for cp-intc. Move the only declaration for a public function to common.h. Move all register offsets into the driver source file and drop all unused defines. Make cp_intc_of_init() static. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/board-da830-evm.c | 1 - arch/arm/mach-davinci/board-da850-evm.c | 1 - arch/arm/mach-davinci/board-mityomapl138.c | 1 - arch/arm/mach-davinci/board-omapl138-hawk.c | 1 - arch/arm/mach-davinci/cp_intc.c | 20 +++++++- arch/arm/mach-davinci/cp_intc.h | 57 --------------------- arch/arm/mach-davinci/include/mach/common.h | 1 + 7 files changed, 19 insertions(+), 63 deletions(-) delete mode 100644 arch/arm/mach-davinci/cp_intc.h diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index 41f5a51fee9a..4c1836fa654e 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -37,7 +37,6 @@ #include #include -#include "cp_intc.h" #include #include diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 317f48560534..548a3c351c02 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -43,7 +43,6 @@ #include #include -#include "cp_intc.h" #include #include #include diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c index 8df16e81b69e..eb6a9465f229 100644 --- a/arch/arm/mach-davinci/board-mityomapl138.c +++ b/arch/arm/mach-davinci/board-mityomapl138.c @@ -27,7 +27,6 @@ #include #include #include -#include "cp_intc.h" #include #include #include diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 94c4f126ef86..7f852722ff08 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -27,7 +27,6 @@ #include #include -#include "cp_intc.h" #include #include diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 384b72fbefca..817b7616753c 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -21,7 +21,22 @@ #include #include -#include "cp_intc.h" + +#define CP_INTC_CTRL 0x04 +#define CP_INTC_HOST_CTRL 0x0C +#define CP_INTC_GLOBAL_ENABLE 0x10 +#define CP_INTC_SYS_STAT_IDX_CLR 0x24 +#define CP_INTC_SYS_ENABLE_IDX_SET 0x28 +#define CP_INTC_SYS_ENABLE_IDX_CLR 0x2C +#define CP_INTC_HOST_ENABLE_IDX_SET 0x34 +#define CP_INTC_HOST_ENABLE_IDX_CLR 0x38 +#define CP_INTC_PRIO_IDX 0x80 +#define CP_INTC_SYS_STAT_CLR(n) (0x0280 + (n << 2)) +#define CP_INTC_SYS_ENABLE_CLR(n) (0x0380 + (n << 2)) +#define CP_INTC_CHAN_MAP(n) (0x0400 + (n << 2)) +#define CP_INTC_SYS_POLARITY(n) (0x0D00 + (n << 2)) +#define CP_INTC_SYS_TYPE(n) (0x0D80 + (n << 2)) +#define CP_INTC_HOST_ENABLE(n) (0x1500 + (n << 2)) static void __iomem *davinci_intc_base; @@ -126,7 +141,8 @@ static const struct irq_domain_ops cp_intc_host_ops = { .xlate = irq_domain_xlate_onetwocell, }; -int __init cp_intc_of_init(struct device_node *node, struct device_node *parent) +static int __init cp_intc_of_init(struct device_node *node, + struct device_node *parent) { u32 num_irq = davinci_soc_info.intc_irq_num; u8 *irq_prio = davinci_soc_info.intc_irq_prios; diff --git a/arch/arm/mach-davinci/cp_intc.h b/arch/arm/mach-davinci/cp_intc.h deleted file mode 100644 index 827bbe9baed4..000000000000 --- a/arch/arm/mach-davinci/cp_intc.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * TI Common Platform Interrupt Controller (cp_intc) definitions - * - * Author: Steve Chen - * Copyright (C) 2008-2009, MontaVista Software, Inc. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. - */ -#ifndef __ASM_HARDWARE_CP_INTC_H -#define __ASM_HARDWARE_CP_INTC_H - -#define CP_INTC_REV 0x00 -#define CP_INTC_CTRL 0x04 -#define CP_INTC_HOST_CTRL 0x0C -#define CP_INTC_GLOBAL_ENABLE 0x10 -#define CP_INTC_GLOBAL_NESTING_LEVEL 0x1C -#define CP_INTC_SYS_STAT_IDX_SET 0x20 -#define CP_INTC_SYS_STAT_IDX_CLR 0x24 -#define CP_INTC_SYS_ENABLE_IDX_SET 0x28 -#define CP_INTC_SYS_ENABLE_IDX_CLR 0x2C -#define CP_INTC_GLOBAL_WAKEUP_ENABLE 0x30 -#define CP_INTC_HOST_ENABLE_IDX_SET 0x34 -#define CP_INTC_HOST_ENABLE_IDX_CLR 0x38 -#define CP_INTC_PACING_PRESCALE 0x40 -#define CP_INTC_VECTOR_BASE 0x50 -#define CP_INTC_VECTOR_SIZE 0x54 -#define CP_INTC_VECTOR_NULL 0x58 -#define CP_INTC_PRIO_IDX 0x80 -#define CP_INTC_PRIO_VECTOR 0x84 -#define CP_INTC_SECURE_ENABLE 0x90 -#define CP_INTC_SECURE_PRIO_IDX 0x94 -#define CP_INTC_PACING_PARAM(n) (0x0100 + (n << 4)) -#define CP_INTC_PACING_DEC(n) (0x0104 + (n << 4)) -#define CP_INTC_PACING_MAP(n) (0x0108 + (n << 4)) -#define CP_INTC_SYS_RAW_STAT(n) (0x0200 + (n << 2)) -#define CP_INTC_SYS_STAT_CLR(n) (0x0280 + (n << 2)) -#define CP_INTC_SYS_ENABLE_SET(n) (0x0300 + (n << 2)) -#define CP_INTC_SYS_ENABLE_CLR(n) (0x0380 + (n << 2)) -#define CP_INTC_CHAN_MAP(n) (0x0400 + (n << 2)) -#define CP_INTC_HOST_MAP(n) (0x0800 + (n << 2)) -#define CP_INTC_HOST_PRIO_IDX(n) (0x0900 + (n << 2)) -#define CP_INTC_SYS_POLARITY(n) (0x0D00 + (n << 2)) -#define CP_INTC_SYS_TYPE(n) (0x0D80 + (n << 2)) -#define CP_INTC_WAKEUP_ENABLE(n) (0x0E00 + (n << 2)) -#define CP_INTC_DEBUG_SELECT(n) (0x0F00 + (n << 2)) -#define CP_INTC_SYS_SECURE_ENABLE(n) (0x1000 + (n << 2)) -#define CP_INTC_HOST_NESTING_LEVEL(n) (0x1100 + (n << 2)) -#define CP_INTC_HOST_ENABLE(n) (0x1500 + (n << 2)) -#define CP_INTC_HOST_PRIO_VECTOR(n) (0x1600 + (n << 2)) -#define CP_INTC_VECTOR_ADDR(n) (0x2000 + (n << 2)) - -void cp_intc_init(void); -int cp_intc_of_init(struct device_node *, struct device_node *); - -#endif /* __ASM_HARDWARE_CP_INTC_H */ diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index 9e06974c85bb..4177a71db64c 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -17,6 +17,7 @@ #include #include +void cp_intc_init(void); void davinci_timer_init(struct clk *clk); struct davinci_timer_instance { From patchwork Thu Jan 31 13:39:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790659 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6A31C746 for ; Thu, 31 Jan 2019 13:57:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59E3A2F6C9 for ; Thu, 31 Jan 2019 13:57:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D91E30B64; Thu, 31 Jan 2019 13:57:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CBC382F6C9 for ; Thu, 31 Jan 2019 13:57:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tT2RGpzx0SP4kw/6xLkKak2rPvr9Scj4fj823BBrLNg=; b=uiJa33pONockHi f+SHPruoFB9t5UXOW3GWUg5xkak4ge13IhS0r6RhHZKK7CI9hgCEMBXUX5MCYc0kQU6el9ZP4forK KVUB7E3mDn8ah3MDxbmhqWWoTKeKtcthOyeIKwuGEl6Ka7gu1z21U1SaQ1nzsZTHOAZZ7UH0dNVzd 6GKDAiadg0qLrXhlKQaB5BCxvJubH7Q7CAJBY+4U+5NoT+XFMnTQA7Jy8tY2/emTLSIFG9KLeVCSN bbm0FUNNbFa2gqZnHUWIOyt0xkD/wyNEEfjQOTA88fnqPIDnWtT8vgxW98Qq/ckRIiKKX0hdOHkdQ j3IaChn5S3oCLhVqWVMQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCqG-0001wr-Jb; Thu, 31 Jan 2019 13:57:20 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCoj-0000NU-Ql for linux-arm-kernel@bombadil.infradead.org; Thu, 31 Jan 2019 13:55:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=K5vMBO4aqrhzgeSw21nioDJfMcdmFayCNuqBHxzCinc=; b=KxJQkw1PoZNgaxy1bLi2ZthW+i kuz/4pySxy8vcxQ8kt0C23eW2J0zps9QwejrhV1fJciuncCmSpGUUZ8qFIhv2Q3r7e00+HLx9pUv/ Kwq4vVvkpElXcE7Rqj3iUGOin2L6qyXc469yghNX05u7cwJQtTY2ILUn7/H6iJmqzmiad7VW0Ihsu YRsoJRtQuAUwzU9pLz7YH6dRbLThQtLzfRWDtpupGMTMVFUxZwhKgwemRDP3PzJ7rVGeL+CjZ88O/ RhibFj6F9593MTtXI6FuSYMAoWxSQh+GE4leZ2R9nmgW2BW8zWw9OPFvzZmG8R2q37uIQs9R/MTgh C8mAvo8A==; Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZa-000595-I9 for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:13 +0000 Received: by mail-wr1-x441.google.com with SMTP id s12so3342130wrt.4 for ; Thu, 31 Jan 2019 05:40:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=K5vMBO4aqrhzgeSw21nioDJfMcdmFayCNuqBHxzCinc=; b=t4Dhfll4FUhhKqT5NS/ho9aZ106LH3gvp2RZ4l+k/jeHbcR2XkT2RUutoBUP/kuntp 0csrkM6Ll5qka5MJ64qDlFk7BBR75rEoxN8+ZscVTPdvNLov0XF3V5RFCXtsnBF/Y1HZ popx0r0k/zssRDtMemaSIE6t4EV89UF3LMMUjMo9mJsJqtKKe47NO9ojGRZ209n69HtY mxJKYITNrObAVYY8C7Os7GwdEBJziWjatG2ofjnMpveHD1BAag+VTirjYFYnVsLSK0AQ 2EMb37vU66DtliZY7i6OpjXnbol2AJKSIwMxfQYnoHaHQ7t6/O9LxeVPtIBqzW8LASYY KCMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K5vMBO4aqrhzgeSw21nioDJfMcdmFayCNuqBHxzCinc=; b=sLgaiH+Jdb+6lu4vuT+qTgoQuYo9HhT6gUqi+LlimKDER8CKUBq73SzaegGdOXo5/n 91xCepR0VhDCe3fKQah/37DDGEAns7j2EcxHbN0fyRNxegf3SYzVjTzi8FsZWtWSAHxJ dshx6i6qsb4FjmHw3Ez0Lcy6prC2ua5BEwoDxxZBGkCodPPcrGPTntUevuZrFG7qjuJ3 bxi5pDVnC1eNIAT1ChskbR1uOPMh5Q3F7rjpJulXAqdixY9wEE12q0Sb7dU1JP++43oW k05fXF4ntgZoTMkRecrWEXUNo95X4455x6x33AZ0y3TNptRTQOTtmJpDDas2o/BFL+fA khHg== X-Gm-Message-State: AJcUukfIQWTd6LhiHDM0YcADXRQhWSVbZKnALmiGZpynAsRup1QmCioQ 12yuBRQ8upLvoqTqBzH3XPLhSw== X-Google-Smtp-Source: ALg8bN5hUwCJjr1gj4uhLw8ONv9cOqoXimEo8PzFjEShjsowbkc8ULqWmH+L/oRnF//7MOLQ8eP9Kw== X-Received: by 2002:a5d:61c4:: with SMTP id q4mr33108437wrv.308.1548942005475; Thu, 31 Jan 2019 05:40:05 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:04 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 20/35] ARM: davinci: cp-intc: add a wrapper around cp_intc_init() Date: Thu, 31 Jan 2019 14:39:13 +0100 Message-Id: <20190131133928.17985-21-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_134006_706078_CFD6F43C X-CRM114-Status: GOOD ( 16.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski We're going to extend the cp_intc_init() function with a config structure so we can drop the intc-related fields from davinci_soc_info. Once we do it, we won't be able to use this routine directly as the init_irq callback. Wrap the calls in additional helpers that don't take parameters and can be assigned to init_irq. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/board-da830-evm.c | 2 +- arch/arm/mach-davinci/board-da850-evm.c | 2 +- arch/arm/mach-davinci/board-mityomapl138.c | 2 +- arch/arm/mach-davinci/board-omapl138-hawk.c | 2 +- arch/arm/mach-davinci/da830.c | 5 +++++ arch/arm/mach-davinci/da850.c | 5 +++++ arch/arm/mach-davinci/include/mach/da8xx.h | 2 ++ 7 files changed, 16 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index 4c1836fa654e..b3a0148f7f1a 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -693,7 +693,7 @@ static void __init da830_evm_map_io(void) MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137/AM17x EVM") .atag_offset = 0x100, .map_io = da830_evm_map_io, - .init_irq = cp_intc_init, + .init_irq = da830_init_irqs, .init_time = da830_init_time, .init_machine = da830_evm_init, .init_late = davinci_init_late, diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 548a3c351c02..efc9a33da6e1 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -1521,7 +1521,7 @@ static void __init da850_evm_map_io(void) MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM") .atag_offset = 0x100, .map_io = da850_evm_map_io, - .init_irq = cp_intc_init, + .init_irq = da850_init_irqs, .init_time = da850_init_time, .init_machine = da850_evm_init, .init_late = davinci_init_late, diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c index eb6a9465f229..59a6f5db4222 100644 --- a/arch/arm/mach-davinci/board-mityomapl138.c +++ b/arch/arm/mach-davinci/board-mityomapl138.c @@ -623,7 +623,7 @@ static void __init mityomapl138_map_io(void) MACHINE_START(MITYOMAPL138, "MityDSP-L138/MityARM-1808") .atag_offset = 0x100, .map_io = mityomapl138_map_io, - .init_irq = cp_intc_init, + .init_irq = da850_init_irqs, .init_time = da850_init_time, .init_machine = mityomapl138_init, .init_late = davinci_init_late, diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 7f852722ff08..af6580ce71eb 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -461,7 +461,7 @@ static void __init omapl138_hawk_map_io(void) MACHINE_START(OMAPL138_HAWKBOARD, "AM18x/OMAP-L138 Hawkboard") .atag_offset = 0x100, .map_io = omapl138_hawk_map_io, - .init_irq = cp_intc_init, + .init_irq = da850_init_irqs, .init_time = da850_init_time, .init_machine = omapl138_hawk_init, .init_late = davinci_init_late, diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index f1e7b6c644e5..8b9220badef5 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -742,6 +742,11 @@ void __init da830_init(void) WARN(!da8xx_syscfg0_base, "Unable to map syscfg0 module"); } +void __init da830_init_irqs(void) +{ + cp_intc_init(); +} + void __init da830_init_time(void) { void __iomem *pll; diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 40b90730e847..9f48e1ac61fb 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -671,6 +671,11 @@ void __init da850_init(void) WARN(!da8xx_syscfg1_base, "Unable to map syscfg1 module"); } +void __init da850_init_irqs(void) +{ + cp_intc_init(); +} + void __init da850_init_time(void) { void __iomem *pll0; diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h index ab4a57f433f4..a5b4b1b964fd 100644 --- a/arch/arm/mach-davinci/include/mach/da8xx.h +++ b/arch/arm/mach-davinci/include/mach/da8xx.h @@ -88,10 +88,12 @@ extern unsigned int da850_max_speed; #define DA8XX_ARM_RAM_BASE 0xffff0000 void da830_init(void); +void da830_init_irqs(void); void da830_init_time(void); void da830_register_clocks(void); void da850_init(void); +void da850_init_irqs(void); void da850_init_time(void); void da850_register_clocks(void); From patchwork Thu Jan 31 13:39:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790673 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9CE85746 for ; Thu, 31 Jan 2019 13:59:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8315730976 for ; Thu, 31 Jan 2019 13:59:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6EDAF30978; Thu, 31 Jan 2019 13:59:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 13E4430940 for ; Thu, 31 Jan 2019 13:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=r18lC/spfIxHruEEUt1jHEa5O/hKo4P1JrehNoKZcO8=; b=Mqu8sfMBcVAH9K 8Ay9wV13TziANYXSIEZUd5X+iQPNxjDXyzcmY9BjASZ6TVYYDS9maCl51lPpLTrY54xPnifv8/iYd dmuPwhgK/kxUccufWHCDfNcOL0ilb74nVE3YKLPXHUWS6xGacuX01rhIZ3m7wa0RbpVsRjR24pg1S /VNnKq0VTroR0FHiXRFaDQMuYJb1/tNmnhxjoGLLbSkbw5dfV99pK269sTUlBEMjGDx5PG8/olFK6 Ht/ppCNwTKDZoy4g7FnLjry6L+pf/zdjmCttjHT+u5P3K54UwvRvFMNWPozOnWO0wJ/oPrEXmWtmc enkTtKUa5uULBBVG4joA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCsC-0003Kn-6C; Thu, 31 Jan 2019 13:59:20 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCqu-0002L9-2J for linux-arm-kernel@bombadil.infradead.org; Thu, 31 Jan 2019 13:58:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=rYTaet1Bgd+3TjusLrnLJTwwFR4I7lsLwRcAysaeRos=; b=JcruZhx5CrwKGDusc33kHojLch PAPHOPnC+OOELnYUPXoeFnu6seQRsVLmVfb6KJz6l/gWmoYVhpsXd5qs3easDI2r6FyJ6QiNGom8u Fs5Wdzjt7w32q8O/H+ZhllGN73d2qogAD7pCeb/edoc9PNyttsAi1WEUOnswuBXD97RYIXNxOXT2u za6SLB0arB3b/1MbI9ya+sUwU2SC9+q3Gzn+enU5WX/cpO4QJE8kpi3PgkaivvnYKfmUV7fvgUc7R GkQPkAPxoaHFTRKh2djH6LPHb4b4SHC1D2ZSIxBngJlEvWlYQr9m5bDy2r3modWvmjmjq5JY0uLiQ t7Qpb1Ww==; Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZe-000678-QF for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:11 +0000 Received: by mail-wm1-x343.google.com with SMTP id p6so2604233wmc.1 for ; Thu, 31 Jan 2019 05:40:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rYTaet1Bgd+3TjusLrnLJTwwFR4I7lsLwRcAysaeRos=; b=ZGCCYjokBLcG5+KDM3mpQsBIIl1KK0uLF3aZDEa40VBxsh7Wg1y3Nj9MV3VJyEbulz 4Utd1wYLRAhicO1NU8j6De7dOoG7f00tKpmAAx0fmE4BePp6IO0n4YMs1w+/OrtKQHQN efVendyAQfiJFg0cdvLQPsSGw6wC+C7T/hvpMd7jhf8dmDgwyaQqMTCKbLfeuNxRoaZc fJh8fQ0B2tQsereO+uRmwNXO49LbNZHC6DHpIgPtn7zzcUywJ4OSO92+yazh/UpNbf/n 2cG2BKvuhjhQ3fh0/wIEoeWJqNMx70iDsW5rEd0AKx9DWAtLh7ySLwL7BuNN40SREWpp gLeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rYTaet1Bgd+3TjusLrnLJTwwFR4I7lsLwRcAysaeRos=; b=TFupalBpCWQlj+50BpOZuzPijEsJPBp+Ft5cxCBHa0Y8okXfCWrjnVRVmHVbWb/hsi SC6n81g3uuQNoJp3RJZrP4nY+Izogl6HW6T2wlFoB2sNtY3HQQLtb4KeVJ0rDedTFsn5 W6qFJs4MIjXS2DnjIMfHgsu2zqpvGjbtUFAfwxJfLZUrUJyAdLYpxKUlx8nL4rSqLC7N cdDu6FwiBsZwzU3pRBzY52yN84swD24RjYksKa78HJrtCDMRz65DHKTQC0rgE7tV1V6U rn9ESYEvRmC7AOjwDkf+T5IQcrOVtJjS5OErarGIHZlxW571N7FOhO0kpmZonbgKn+uy lJig== X-Gm-Message-State: AJcUukc+qceaFbdaQypWlENTKent0J0T4WEeBhymLYoqfdSx8yeopBwj H9AqoADN21QFhUtvjy56LMCjJw== X-Google-Smtp-Source: ALg8bN4LVGdrNflpToPu7R9czul7RQOtNw9JpZEVkxbcEEd1feqZh6dBdnAJ+ilPRgPQUdhEiEUylw== X-Received: by 2002:a1c:f613:: with SMTP id w19mr29676094wmc.0.1548942006556; Thu, 31 Jan 2019 05:40:06 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:05 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 21/35] ARM: davinci: cp-intc: add a new config structure Date: Thu, 31 Jan 2019 14:39:14 +0100 Message-Id: <20190131133928.17985-22-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_084010_873175_BB76D35E X-CRM114-Status: GOOD ( 14.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Add a config structure that will be used by cp-intc-based platforms. It contains the register range resource and the number of interrupts. Signed-off-by: Bartosz Golaszewski --- include/linux/irqchip/irq-davinci-cp-intc.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 include/linux/irqchip/irq-davinci-cp-intc.h diff --git a/include/linux/irqchip/irq-davinci-cp-intc.h b/include/linux/irqchip/irq-davinci-cp-intc.h new file mode 100644 index 000000000000..9b0c7d6189eb --- /dev/null +++ b/include/linux/irqchip/irq-davinci-cp-intc.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Texas Instruments + */ + +#ifndef _LINUX_IRQ_DAVINCI_CP_INTC_ +#define _LINUX_IRQ_DAVINCI_CP_INTC_ + +#include + +struct davinci_cp_intc_config { + struct resource reg; + unsigned int num_irqs; +}; + +#endif /* _LINUX_IRQ_DAVINCI_CP_INTC_ */ From patchwork Thu Jan 31 13:39:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790655 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1983D746 for ; Thu, 31 Jan 2019 13:56:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B4242F6C9 for ; Thu, 31 Jan 2019 13:56:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F3AE530B64; Thu, 31 Jan 2019 13:56:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5CE342F6C9 for ; Thu, 31 Jan 2019 13:56:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=C1ILc6qtNO5EKVsv/MzifgZqHnoGVnPW6f+vBmec9XI=; b=bJJaUSDXIlxENv bVnu4n+j4mGvyTtbNtxNMV+asCSIiuQk2eq00mmxYBY56E7hymcpy3m8LuAYVqph/hztGe4kh9uT0 /n/nAA65pSFAkDbJqHF+KeSTLqyvvRQu54dimiFgxdbJQ/yqCj7keElQo33cIU3UT9e/nCwpy9/22 DuZ2F07iRyePOrbTwsNfhy8sQYCT+qmhx+I4lH5HRJFxCJ+NmXEsJOQVLCtFr80dFjreWvghfbQeO k61//H4+5nyJ07Prl/vVIUmbwFyl9ABeHbGU27yRKsKtcCMWtuj29L+UqGxc/3ioK7WCRCXKFiwZq cipVn8Ej3YQkNP4zb9Dg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCpj-0001Qt-47; Thu, 31 Jan 2019 13:56:47 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCoj-0000Gm-Lz for linux-arm-kernel@bombadil.infradead.org; Thu, 31 Jan 2019 13:55:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=kiBWtlRU9Lv1TNlAe7u938RwMGut2xvtFe1CB/XYr9Q=; b=uiN/J1s2Ejph2bXtCmqjJV21mK l3/dgxy8eOqn4hRzQiBqM11UIYofGd2cnk6jDZ1aJFSY8m6pPwoxf+r43S8au+K7NWvLs9LoIISli pkYmlxnLeYJbLQiToMIJN8ot9MVaaxOZq9clwvH6xi+J3PQlYXHdgXjsGIUlMCc3GX1l5KD7Rvwt3 R+889p3eaG201yESOIufttrUrwm+dvfikTLJNbTegVJD81kp3gxu+k9TN3iGLywP9jEtx3v4qB976 n+nG+eAcaqTcd0b2fC2s0B0UiaOrRgntZ4G3Yv3q0iVCEbrxXfP3IxwnClICGnKI/mbC3dVKZEGa5 XuGC+NIw==; Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZd-00059O-0m for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:15 +0000 Received: by mail-wm1-x343.google.com with SMTP id y8so2573298wmi.4 for ; Thu, 31 Jan 2019 05:40:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kiBWtlRU9Lv1TNlAe7u938RwMGut2xvtFe1CB/XYr9Q=; b=KZZFIKFEnSpOLEmJzYc0d52J4r/ZzyuTbfMa1Kcz2exMYS8V9pyI9UEBEZfvBFJYzJ 4m9+9afl487V6Re4yxadzf1qPs8x6gR/5o+CznxMRj97t7yDvitgjQWEU8SBFSaSGrhS kGVGDfZX/fVl1iJ6VJtMVV2s9vlwOWvX+Ufa6Ks8DZXCzIOevECzL5VyshoAyZ4QU1of D2Q4/Dt/so9Db6r3jd92EuIMuKHGVokkW2/hUl8KSHyh5z/TkeBZEIHZtIohgG/afSc2 Yx75FP8jQYj2R6t1PzIkzykCwHpcAX8+Ak7BJxzYtVMX8VMiw6dNaeZ0OQQXkyk25hU4 d9GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kiBWtlRU9Lv1TNlAe7u938RwMGut2xvtFe1CB/XYr9Q=; b=GL1EiUgVj0MtJhi6YJjQcbvN8pSDUeukKa57D5P58ch4beGJZgTXxL0bG5n6u8jL2M +F9LhzrjzD8kUjjzYbBrjubWNdRqd5VpQHSjZjClwS9BthYbV1VgakS2w3wcaDwj/+cG hctMzMJsowAjM73qeQdtMeqerdAO/BOHjECC9G3AMyaYboNkZzOItFA85C4BwqmO+3nq ZzqVrvnGLoSRdIVdhT1/W5AZHoO48e8MQdUPIYsW7ytvNJGgNAchjsNIGiMq/LmnmF8I fa4LfP3Q2ai1WgplzNYfyMeDGx2JkJVc4I+y+kGNghi5HQr2+LdABvcYQMUw2xUgE9Ms +Izw== X-Gm-Message-State: AHQUAubp1sdJSimE2OTbE/CfWIuE/B8LxcLJGYHWfCt9lh2Ax4hKSAzu 7TZ3lWUICkPa7p5alp81Xx9yCg== X-Google-Smtp-Source: AHgI3IaeU4wPRnVdskTvnoa4D5Bwf2OoIri7AYedrJchwcgCmtIN2YFR8d/+LqFdp8FRIUQRkSQMKA== X-Received: by 2002:a1c:c64e:: with SMTP id w75mr3830698wmf.46.1548942007705; Thu, 31 Jan 2019 05:40:07 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:07 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 22/35] ARM: davinci: cp-intc: add the new config structures for da8xx SoCs Date: Thu, 31 Jan 2019 14:39:15 +0100 Message-Id: <20190131133928.17985-23-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_134009_070501_B15DD54A X-CRM114-Status: GOOD ( 13.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Add the new-style config structures for dm* SoCs. They will be used once we make the cp-intc driver stop using davinci_soc_info. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/da830.c | 10 ++++++++++ arch/arm/mach-davinci/da850.c | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 8b9220badef5..6d3da4364f7a 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -742,6 +743,15 @@ void __init da830_init(void) WARN(!da8xx_syscfg0_base, "Unable to map syscfg0 module"); } +static const struct davinci_cp_intc_config da830_cp_intc_config = { + .reg = { + .start = DA8XX_CP_INTC_BASE, + .end = DA8XX_CP_INTC_BASE + SZ_8K, + .flags = IORESOURCE_MEM, + }, + .num_irqs = DA830_N_CP_INTC_IRQ, +}; + void __init da830_init_irqs(void) { cp_intc_init(); diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 9f48e1ac61fb..5e7f2c962abf 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -671,6 +672,15 @@ void __init da850_init(void) WARN(!da8xx_syscfg1_base, "Unable to map syscfg1 module"); } +static const struct davinci_cp_intc_config da850_cp_intc_config = { + .reg = { + .start = DA8XX_CP_INTC_BASE, + .end = DA8XX_CP_INTC_BASE + SZ_8K, + .flags = IORESOURCE_MEM, + }, + .num_irqs = DA850_N_CP_INTC_IRQ, +}; + void __init da850_init_irqs(void) { cp_intc_init(); From patchwork Thu Jan 31 13:39:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790657 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2991B13A4 for ; Thu, 31 Jan 2019 13:57:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A68F2F6C9 for ; Thu, 31 Jan 2019 13:57:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0E83830B64; Thu, 31 Jan 2019 13:57:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 447672F6C9 for ; Thu, 31 Jan 2019 13:57:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=FkgTHVeCc4GcpEyY/UruvkrbsVgMSFukD2ezvKUbROI=; b=PTorXv3cIEVenr WhE0+vHa1maugQgGsERbhlSHMiRUZEz2FYZLi3f+TtKkdYL8eG99Op0D94M7ixYvy5KXGz/t7UGlk Ea/QQVteEAGxtOHMsNlUS5xolqz/fr5IDJcHNpfkYps4gt88LKSq9l/OrND2IXGoA1+AGJre2rsxN Fbn8MR9wr8uKOBn+mgXGtrIQw+35hyF6Iax60rhkSSAm/1+3LzwVDqvsfuVFAQqOl4yNYuBg4OmU6 BxAaivXRVF3av+qEJZJVMXIzLgd9DD89nZ6gO5tWZF309m4l/dUIsX9hlaB19ZBs9XoPbRm5eDB9N SZshiffv1iySVeaWFhhQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCpy-0001gX-Rq; Thu, 31 Jan 2019 13:57:02 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCoj-0000IY-Ht for linux-arm-kernel@bombadil.infradead.org; Thu, 31 Jan 2019 13:55:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=BHL4Uhtkze2JGBppAQPrwDtmt/ymE8HF1WarxVJlURw=; b=rO4Z28Ed2fMlI5lUA18xfnFv4M YA8a7NyfHc7TY2OWQDDlndpsfA/BIqTJTfPQaOzXGH9GnbYFzv1w3NtRBQOqWs+v79/m5ovTz1MQR +kmT/eboSkliiUT/ihbXrtOgTCzFZXkRz6AGToXvB/uem0WZZwmz0Nc+MuCUXDOTUq+ITZrEJP5kl +8gU6791HvPlAR1LO53ExEydJd2CHF1CwRAbR4AM2bYJvoPhZa1OBpWnpU+s3WP7dATWRdmd2JXRa NpukvGoy9QoUbBh+llKbaHpH94ThHhvqOhWEB7/CWPJqv2GGh4zhpHZkvJj3CSl5MrpUNfO5CRGV8 wg2f9oeg==; Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZe-00059h-4v for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:15 +0000 Received: by mail-wr1-x442.google.com with SMTP id s12so3342423wrt.4 for ; Thu, 31 Jan 2019 05:40:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BHL4Uhtkze2JGBppAQPrwDtmt/ymE8HF1WarxVJlURw=; b=iSslnfxdkPW1P9OZRz9bFQNfaCCC40Y6tbQvm40Xmag/lr8BaeCSTL0j77tHquWit4 wyJFpBZhD7ZJiKCvS6qzXg6xhrw6Ob1WZZFrsFBgh5RuCSC8m/Yjswan+43igSjSZMs1 +gNs9arRZevISnNuzZAieFIlcaxBtscdRuDXr7yPwZcX2BuNBX44hBcHC4iaSV/ME6yA F3sBxQGAVV+k97SoSKahPEQpTrCco9pmWRdJd25Z2voRRGAU51h8hJ8QcEyecRHtFG/b 7Y69NfM3ISnL15MHrpJ+e/7tGV/GcMIsssHZU2GZFAKgBm00CErVWf9+TKKinsLIpQHn VM9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BHL4Uhtkze2JGBppAQPrwDtmt/ymE8HF1WarxVJlURw=; b=BCKVjRLOieWNZ+y6bNqSeWKYcd1XilXcaZPTcXygYjlln0AmgxVrbD6BgkRYOv73l6 aoYsjbh8G8KRkGfDG9TnGViq7s44s2qjDM3fHbO2JvjAeooViWlOa643nOpouSVoqVTc H8c6Sy79oliTrSHrQylY47GoSvO7ItdAWZwl5/bUgW2OfdSUb/957g1V/kML3BhUzUW2 NnI0unAblVLzVjLbB6onmYLqnbE+GXpHczOExzNJFiMxS+Uzf6XC7G4ZbYVvAm3EG7dj b8jpwsCd3CAvCQDCQ1nP2FWMHFgUcLM7YmEDJM/xrmmmoRs7sGByb2HAX3PtIbA+nnyQ tkpg== X-Gm-Message-State: AJcUukdLf0OmG+abSfn5Hr8QU9VM9DotOudmxK6kzpOQ5KDjPj6pLClk L2jahRYMtAEw4pLCLPye/kaCzQ== X-Google-Smtp-Source: ALg8bN5m/tFjRweFqgH5e8mOGIysxTj+mf5Qni9MRMisqhKIY5tLI1gnl1ZnLMwTF8oYdb6GSoH2IA== X-Received: by 2002:a05:6000:120a:: with SMTP id e10mr34772093wrx.85.1548942008953; Thu, 31 Jan 2019 05:40:08 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:08 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 23/35] ARM: davinci: cp-intc: use a common prefix for all symbols Date: Thu, 31 Jan 2019 14:39:16 +0100 Message-Id: <20190131133928.17985-24-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_134010_231650_A8FB91A3 X-CRM114-Status: GOOD ( 26.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski In preparation for moving the driver to drivers/irqchip do some cleanup: use a common prefix for all symbols. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/cp_intc.c | 143 ++++++++++---------- arch/arm/mach-davinci/da830.c | 2 +- arch/arm/mach-davinci/da850.c | 2 +- arch/arm/mach-davinci/include/mach/common.h | 2 +- 4 files changed, 77 insertions(+), 72 deletions(-) diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 817b7616753c..3a99a3146d8e 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -22,60 +22,65 @@ #include #include -#define CP_INTC_CTRL 0x04 -#define CP_INTC_HOST_CTRL 0x0C -#define CP_INTC_GLOBAL_ENABLE 0x10 -#define CP_INTC_SYS_STAT_IDX_CLR 0x24 -#define CP_INTC_SYS_ENABLE_IDX_SET 0x28 -#define CP_INTC_SYS_ENABLE_IDX_CLR 0x2C -#define CP_INTC_HOST_ENABLE_IDX_SET 0x34 -#define CP_INTC_HOST_ENABLE_IDX_CLR 0x38 -#define CP_INTC_PRIO_IDX 0x80 -#define CP_INTC_SYS_STAT_CLR(n) (0x0280 + (n << 2)) -#define CP_INTC_SYS_ENABLE_CLR(n) (0x0380 + (n << 2)) -#define CP_INTC_CHAN_MAP(n) (0x0400 + (n << 2)) -#define CP_INTC_SYS_POLARITY(n) (0x0D00 + (n << 2)) -#define CP_INTC_SYS_TYPE(n) (0x0D80 + (n << 2)) -#define CP_INTC_HOST_ENABLE(n) (0x1500 + (n << 2)) - -static void __iomem *davinci_intc_base; - -static inline unsigned int cp_intc_read(unsigned offset) +#define DAVINCI_CP_INTC_CTRL 0x04 +#define DAVINCI_CP_INTC_HOST_CTRL 0x0C +#define DAVINCI_CP_INTC_GLOBAL_ENABLE 0x10 +#define DAVINCI_CP_INTC_SYS_STAT_IDX_CLR 0x24 +#define DAVINCI_CP_INTC_SYS_ENABLE_IDX_SET 0x28 +#define DAVINCI_CP_INTC_SYS_ENABLE_IDX_CLR 0x2C +#define DAVINCI_CP_INTC_HOST_ENABLE_IDX_SET 0x34 +#define DAVINCI_CP_INTC_HOST_ENABLE_IDX_CLR 0x38 +#define DAVINCI_CP_INTC_PRIO_IDX 0x80 +#define DAVINCI_CP_INTC_SYS_STAT_CLR(n) (0x0280 + (n << 2)) +#define DAVINCI_CP_INTC_SYS_ENABLE_CLR(n) (0x0380 + (n << 2)) +#define DAVINCI_CP_INTC_CHAN_MAP(n) (0x0400 + (n << 2)) +#define DAVINCI_CP_INTC_SYS_POLARITY(n) (0x0D00 + (n << 2)) +#define DAVINCI_CP_INTC_SYS_TYPE(n) (0x0D80 + (n << 2)) +#define DAVINCI_CP_INTC_HOST_ENABLE(n) (0x1500 + (n << 2)) + +static void __iomem *davinci_cp_intc_base; +static struct irq_domain *davinci_cp_intc_irq_domain; + +static inline unsigned int davinci_cp_intc_read(unsigned int offset) { - return __raw_readl(davinci_intc_base + offset); + return __raw_readl(davinci_cp_intc_base + offset); } -static inline void cp_intc_write(unsigned long value, unsigned offset) +static inline void davinci_cp_intc_write(unsigned long value, + unsigned int offset) { - __raw_writel(value, davinci_intc_base + offset); + __raw_writel(value, davinci_cp_intc_base + offset); } -static void cp_intc_ack_irq(struct irq_data *d) +static void davinci_cp_intc_ack_irq(struct irq_data *d) { - cp_intc_write(d->hwirq, CP_INTC_SYS_STAT_IDX_CLR); + davinci_cp_intc_write(d->hwirq, DAVINCI_CP_INTC_SYS_STAT_IDX_CLR); } /* Disable interrupt */ -static void cp_intc_mask_irq(struct irq_data *d) +static void davinci_cp_intc_mask_irq(struct irq_data *d) { /* XXX don't know why we need to disable nIRQ here... */ - cp_intc_write(1, CP_INTC_HOST_ENABLE_IDX_CLR); - cp_intc_write(d->hwirq, CP_INTC_SYS_ENABLE_IDX_CLR); - cp_intc_write(1, CP_INTC_HOST_ENABLE_IDX_SET); + davinci_cp_intc_write(1, DAVINCI_CP_INTC_HOST_ENABLE_IDX_CLR); + davinci_cp_intc_write(d->hwirq, DAVINCI_CP_INTC_SYS_ENABLE_IDX_CLR); + davinci_cp_intc_write(1, DAVINCI_CP_INTC_HOST_ENABLE_IDX_SET); } /* Enable interrupt */ static void cp_intc_unmask_irq(struct irq_data *d) { - cp_intc_write(d->hwirq, CP_INTC_SYS_ENABLE_IDX_SET); + davinci_cp_intc_write(d->hwirq, DAVINCI_CP_INTC_SYS_ENABLE_IDX_SET); } -static int cp_intc_set_irq_type(struct irq_data *d, unsigned int flow_type) +static int davinci_cp_intc_set_irq_type(struct irq_data *d, + unsigned int flow_type) { unsigned reg = BIT_WORD(d->hwirq); unsigned mask = BIT_MASK(d->hwirq); - unsigned polarity = cp_intc_read(CP_INTC_SYS_POLARITY(reg)); - unsigned type = cp_intc_read(CP_INTC_SYS_TYPE(reg)); + unsigned polarity = davinci_cp_intc_read( + DAVINCI_CP_INTC_SYS_POLARITY(reg)); + unsigned type = davinci_cp_intc_read( + DAVINCI_CP_INTC_SYS_TYPE(reg)); switch (flow_type) { case IRQ_TYPE_EDGE_RISING: @@ -98,51 +103,49 @@ static int cp_intc_set_irq_type(struct irq_data *d, unsigned int flow_type) return -EINVAL; } - cp_intc_write(polarity, CP_INTC_SYS_POLARITY(reg)); - cp_intc_write(type, CP_INTC_SYS_TYPE(reg)); + davinci_cp_intc_write(polarity, DAVINCI_CP_INTC_SYS_POLARITY(reg)); + davinci_cp_intc_write(type, DAVINCI_CP_INTC_SYS_TYPE(reg)); return 0; } -static struct irq_chip cp_intc_irq_chip = { +static struct irq_chip davinci_cp_intc_irq_chip = { .name = "cp_intc", - .irq_ack = cp_intc_ack_irq, - .irq_mask = cp_intc_mask_irq, + .irq_ack = davinci_cp_intc_ack_irq, + .irq_mask = davinci_cp_intc_mask_irq, .irq_unmask = cp_intc_unmask_irq, - .irq_set_type = cp_intc_set_irq_type, + .irq_set_type = davinci_cp_intc_set_irq_type, .flags = IRQCHIP_SKIP_SET_WAKE, }; -static struct irq_domain *cp_intc_domain; - static asmlinkage void __exception_irq_entry -cp_intc_handle_irq(struct pt_regs *regs) +davinci_cp_intc_handle_irq(struct pt_regs *regs) { - int irqnr = cp_intc_read(CP_INTC_PRIO_IDX); + int irqnr = davinci_cp_intc_read(DAVINCI_CP_INTC_PRIO_IDX); irqnr &= 0xff; - handle_domain_irq(cp_intc_domain, irqnr, regs); + handle_domain_irq(davinci_cp_intc_irq_domain, irqnr, regs); } -static int cp_intc_host_map(struct irq_domain *h, unsigned int virq, +static int davinci_cp_intc_host_map(struct irq_domain *h, unsigned int virq, irq_hw_number_t hw) { pr_debug("cp_intc_host_map(%d, 0x%lx)\n", virq, hw); - irq_set_chip(virq, &cp_intc_irq_chip); + irq_set_chip(virq, &davinci_cp_intc_irq_chip); irq_set_probe(virq); irq_set_handler(virq, handle_edge_irq); return 0; } -static const struct irq_domain_ops cp_intc_host_ops = { - .map = cp_intc_host_map, +static const struct irq_domain_ops davinci_cp_intc_irq_domain_ops = { + .map = davinci_cp_intc_host_map, .xlate = irq_domain_xlate_onetwocell, }; -static int __init cp_intc_of_init(struct device_node *node, - struct device_node *parent) +static int __init davinci_cp_intc_of_init(struct device_node *node, + struct device_node *parent) { u32 num_irq = davinci_soc_info.intc_irq_num; u8 *irq_prio = davinci_soc_info.intc_irq_prios; @@ -150,35 +153,35 @@ static int __init cp_intc_of_init(struct device_node *node, int i, irq_base; if (node) { - davinci_intc_base = of_iomap(node, 0); + davinci_cp_intc_base = of_iomap(node, 0); if (of_property_read_u32(node, "ti,intc-size", &num_irq)) pr_warn("unable to get intc-size, default to %d\n", num_irq); } else { - davinci_intc_base = ioremap(davinci_soc_info.intc_base, SZ_8K); + davinci_cp_intc_base = ioremap(davinci_soc_info.intc_base, SZ_8K); } - if (WARN_ON(!davinci_intc_base)) + if (WARN_ON(!davinci_cp_intc_base)) return -EINVAL; - cp_intc_write(0, CP_INTC_GLOBAL_ENABLE); + davinci_cp_intc_write(0, DAVINCI_CP_INTC_GLOBAL_ENABLE); /* Disable all host interrupts */ - cp_intc_write(0, CP_INTC_HOST_ENABLE(0)); + davinci_cp_intc_write(0, DAVINCI_CP_INTC_HOST_ENABLE(0)); /* Disable system interrupts */ for (i = 0; i < num_reg; i++) - cp_intc_write(~0, CP_INTC_SYS_ENABLE_CLR(i)); + davinci_cp_intc_write(~0, DAVINCI_CP_INTC_SYS_ENABLE_CLR(i)); /* Set to normal mode, no nesting, no priority hold */ - cp_intc_write(0, CP_INTC_CTRL); - cp_intc_write(0, CP_INTC_HOST_CTRL); + davinci_cp_intc_write(0, DAVINCI_CP_INTC_CTRL); + davinci_cp_intc_write(0, DAVINCI_CP_INTC_HOST_CTRL); /* Clear system interrupt status */ for (i = 0; i < num_reg; i++) - cp_intc_write(~0, CP_INTC_SYS_STAT_CLR(i)); + davinci_cp_intc_write(~0, DAVINCI_CP_INTC_SYS_STAT_CLR(i)); /* Enable nIRQ (what about nFIQ?) */ - cp_intc_write(1, CP_INTC_HOST_ENABLE_IDX_SET); + davinci_cp_intc_write(1, DAVINCI_CP_INTC_HOST_ENABLE_IDX_SET); /* * Priority is determined by host channel: lower channel number has @@ -197,7 +200,7 @@ static int __init cp_intc_of_init(struct device_node *node, val |= irq_prio[k] << 24; } - cp_intc_write(val, CP_INTC_CHAN_MAP(i)); + davinci_cp_intc_write(val, DAVINCI_CP_INTC_CHAN_MAP(i)); } } else { /* @@ -206,7 +209,8 @@ static int __init cp_intc_of_init(struct device_node *node, * are mapped to nIRQ. */ for (i = 0; i < num_reg; i++) - cp_intc_write(0x0f0f0f0f, CP_INTC_CHAN_MAP(i)); + davinci_cp_intc_write(0x0f0f0f0f, + DAVINCI_CP_INTC_CHAN_MAP(i)); } irq_base = irq_alloc_descs(-1, 0, num_irq, 0); @@ -216,25 +220,26 @@ static int __init cp_intc_of_init(struct device_node *node, } /* create a legacy host */ - cp_intc_domain = irq_domain_add_legacy(node, num_irq, - irq_base, 0, &cp_intc_host_ops, NULL); + davinci_cp_intc_irq_domain = irq_domain_add_legacy( + node, num_irq, irq_base, 0, + &davinci_cp_intc_irq_domain_ops, NULL); - if (!cp_intc_domain) { + if (!davinci_cp_intc_irq_domain) { pr_err("cp_intc: failed to allocate irq host!\n"); return -EINVAL; } - set_handle_irq(cp_intc_handle_irq); + set_handle_irq(davinci_cp_intc_handle_irq); /* Enable global interrupt */ - cp_intc_write(1, CP_INTC_GLOBAL_ENABLE); + davinci_cp_intc_write(1, DAVINCI_CP_INTC_GLOBAL_ENABLE); return 0; } -void __init cp_intc_init(void) +void __init davinci_cp_intc_init(void) { - cp_intc_of_init(NULL, NULL); + davinci_cp_intc_of_init(NULL, NULL); } -IRQCHIP_DECLARE(cp_intc, "ti,cp-intc", cp_intc_of_init); +IRQCHIP_DECLARE(cp_intc, "ti,cp-intc", davinci_cp_intc_of_init); diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 6d3da4364f7a..565c306e5252 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -754,7 +754,7 @@ static const struct davinci_cp_intc_config da830_cp_intc_config = { void __init da830_init_irqs(void) { - cp_intc_init(); + davinci_cp_intc_init(); } void __init da830_init_time(void) diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 5e7f2c962abf..794ddbe78534 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -683,7 +683,7 @@ static const struct davinci_cp_intc_config da850_cp_intc_config = { void __init da850_init_irqs(void) { - cp_intc_init(); + davinci_cp_intc_init(); } void __init da850_init_time(void) diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index 4177a71db64c..0a6607ea4560 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -17,7 +17,7 @@ #include #include -void cp_intc_init(void); +void davinci_cp_intc_init(void); void davinci_timer_init(struct clk *clk); struct davinci_timer_instance { From patchwork Thu Jan 31 13:39:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790669 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E1ED3746 for ; Thu, 31 Jan 2019 13:58:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 567272856A for ; Thu, 31 Jan 2019 13:58:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 48FA030B65; Thu, 31 Jan 2019 13:58:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E20DB30B22 for ; Thu, 31 Jan 2019 13:58:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UmZBHkg/hsmX/xxsK1TLFUQ5agrmRp1eNNAGSlcSdBY=; b=qmQ/e+m/8NC9nu lJLuZ8l2mQE+wn6SGCieJNsISMK0ppqv7ty11qrMi7rxv+DcyXa8aFMIVp+UA18/Dk8n2Ma1YYHn8 cdqzia3JJwWhko+scwrrZXyydgYcGRdCoXvBd7k2rH6kIz5iKQlk14aTbqYJlrI8S+xPjmI63yQnA m1mTFfmmUaNP1rAvCEL2+hmc8+m5V9iv3BmLrhZh30yrDGs7v0tiwjZkYXmbs48zRj519DchQqMcQ 1rSpCn53y8Tw/Vnu8hHkZ28j83drt28Ewe5HsuqUpaLjinuh2XFLCUSZn5hRFfa2hv/E7jM1fn9Ye K54LPZTli5p3/mWwt4MA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCrf-0002qV-6R; Thu, 31 Jan 2019 13:58:47 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCqr-0002L9-79 for linux-arm-kernel@bombadil.infradead.org; Thu, 31 Jan 2019 13:57:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=tQ080XSy9CragrnXr938L/pI+v5aJ06V54Jlzfpdd30=; b=dPkNV0+FjCkSifxJcmPnUrkTnB VtWPd9A5XEwMtwYFcH8DQsNvio5xum2kbMXs9LsFIt4IDR7GiDGfpYvlIx1cpbwLCbSg/LX0bEs7U uzk+iEsKVvcmd47UlPhad9UIv9kzkxwPRPlFFX60BZxns0QEqFmYfsqRXPS4Zb70z7C8wSHSZaMVP x2uNbgGWDah1HAuDp26C2dgprxZwgEvloC7C/VNTbADkFp2bKdOdya9yOu1EGwslziWDn9Xct047w 2uQ43s3JdSFyrChrw5YrIF85VH0miCjwq83/JC8CJuMYTQiPVTJFoYdN1YjtrSBAhU3f2EJ8zcZ/8 jx5BrVwg==; Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZh-00067s-MG for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:19 +0000 Received: by mail-wr1-x441.google.com with SMTP id p7so3382200wru.0 for ; Thu, 31 Jan 2019 05:40:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tQ080XSy9CragrnXr938L/pI+v5aJ06V54Jlzfpdd30=; b=hmdqpeYcpj+SLDsDzt/8vR5qdul/8gSSFcb/1wzDH9OetGMQltUKBb9OV8Qiz8OJwK 6s8/AXuYShhh4K6bAtU8JQ4+LSOP70jsLF805U7aNpE88RQAuDRYVpRs1EkOHL98In1d vTwq/yf0tCLrgpC3NvRMe0HfU17YC1ExyTueq7V8y/nOor940hP0zAA37YgcwNo0G39E qe9U+Q66olaL3XVYe16/Dr7pfo1DbeDilXPJ9g+I7p76NCJBdfBeevweRbTcnR6DAHVL cXdPd4hd3SSO1foATQYlfeYt88lVR1CKi0egxob6TF69DtTJ1en+VEXb0Fhf1+jLO7Vp +9Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tQ080XSy9CragrnXr938L/pI+v5aJ06V54Jlzfpdd30=; b=TJpJaKkPKavjQL9mwykrNJpW1G1MWhDgoY6fgi8zeoPHyyJ0+Uc5Qd51KjUSryLLgb wvnymBvsVapUxIoHt9IDWg0mpSCv7KjrKEnhzA+Fl/+ks/NCQD3i2U1D7o/8FLphfJgH ujELmg7ES2H0Yb4vVidwy7mUDc67HkXQDRLmrw878zxZMMxAwdK1z3waxcVREPJAD0Oy h4eXhWggNIwi1iNKtjCclBkJqZu5ncMUoB8BxWZWWsVRG1gm79f2jdArFQo3a4L4STcJ v5nGMgZTOTOvs3OIQIlKb2D4tKkd2TPxtNHfDmPRLRv46YLkOQSR8kIsTtt3HXJQedQw X66A== X-Gm-Message-State: AJcUukcHcuUX/04O13GbuOSVsXjY0cVoDhTMn3fRQdrgPEErNdMViDQL kGzQWg6t0tETcSUM61fJ/3mT6Q== X-Google-Smtp-Source: ALg8bN4qJy8KXPn1XXnN39DTI3SKbStCMBYqfVP9ZHSUPOBZXWwqKyeDtXVo9Y+MOG1/Ita1e5xTmg== X-Received: by 2002:a5d:6105:: with SMTP id v5mr33635986wrt.63.1548942010166; Thu, 31 Jan 2019 05:40:10 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:09 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 24/35] ARM: davinci: cp-intc: convert all hex numbers to lowercase Date: Thu, 31 Jan 2019 14:39:17 +0100 Message-Id: <20190131133928.17985-25-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_084013_736389_D783C1DC X-CRM114-Status: GOOD ( 11.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Use lowercase letters in hexadecimal numbers as is done in most of the kernel code base. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/cp_intc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 3a99a3146d8e..1f55d68672db 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -23,19 +23,19 @@ #include #define DAVINCI_CP_INTC_CTRL 0x04 -#define DAVINCI_CP_INTC_HOST_CTRL 0x0C +#define DAVINCI_CP_INTC_HOST_CTRL 0x0c #define DAVINCI_CP_INTC_GLOBAL_ENABLE 0x10 #define DAVINCI_CP_INTC_SYS_STAT_IDX_CLR 0x24 #define DAVINCI_CP_INTC_SYS_ENABLE_IDX_SET 0x28 -#define DAVINCI_CP_INTC_SYS_ENABLE_IDX_CLR 0x2C +#define DAVINCI_CP_INTC_SYS_ENABLE_IDX_CLR 0x2c #define DAVINCI_CP_INTC_HOST_ENABLE_IDX_SET 0x34 #define DAVINCI_CP_INTC_HOST_ENABLE_IDX_CLR 0x38 #define DAVINCI_CP_INTC_PRIO_IDX 0x80 #define DAVINCI_CP_INTC_SYS_STAT_CLR(n) (0x0280 + (n << 2)) #define DAVINCI_CP_INTC_SYS_ENABLE_CLR(n) (0x0380 + (n << 2)) #define DAVINCI_CP_INTC_CHAN_MAP(n) (0x0400 + (n << 2)) -#define DAVINCI_CP_INTC_SYS_POLARITY(n) (0x0D00 + (n << 2)) -#define DAVINCI_CP_INTC_SYS_TYPE(n) (0x0D80 + (n << 2)) +#define DAVINCI_CP_INTC_SYS_POLARITY(n) (0x0d00 + (n << 2)) +#define DAVINCI_CP_INTC_SYS_TYPE(n) (0x0d80 + (n << 2)) #define DAVINCI_CP_INTC_HOST_ENABLE(n) (0x1500 + (n << 2)) static void __iomem *davinci_cp_intc_base; From patchwork Thu Jan 31 13:39:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790619 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A408491E for ; Thu, 31 Jan 2019 13:44:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5732430B71 for ; Thu, 31 Jan 2019 13:44:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B58C30E4E; Thu, 31 Jan 2019 13:44:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9F13130B71 for ; Thu, 31 Jan 2019 13:44:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=55640GKZ93E1NELZh/w96GF+yOmqBnu9nbEM3y1UlyI=; b=ejhwCk2MFFRa1B 1BM/nZ2gQGi/e1Gr3BiX0DbRUEAxVxyjS/A5oDH2LmzV4eWkXBzbQw7/eRgHL/b5ikqIFmg6GD1OP DMGIamJNYYwDWTFZ7qC07VFUU2+yD2Y6Sbugfe1e6tvfmRW9exQ0fWnEAnfU7TiM/fMvP8512fcSR Nz9TgEbd1HXUYukr1Ho5dBrqrLw8ZVv34lp0c19pKyuiwn4zLhIQaeZeDyYDXZEhSXymPbb5nTifl 3Fe3r86X1vUhhgCowdoDIQgPPg3teJ1+tDv2kYzWWB9RSeFPXjmHG4OBuqFUdBm8FsfF6EQHAVxNV YV1KY146sRvPGc1b1uOg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCdm-0001go-N2; Thu, 31 Jan 2019 13:44:26 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZh-0005LW-49 for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:29 +0000 Received: by mail-wr1-x444.google.com with SMTP id t6so3282147wrr.12 for ; Thu, 31 Jan 2019 05:40:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ys1Qmvh0LDODbKSEj2pf4iStmeI+PYiuCBLDhUYc/3E=; b=EiDA7RsYM7Hf3oBcp7uXOdxan633bxYkrbCqhbu4nq7hNTpYXt+nKDVVqFR5a7h1eE LzLWOM3sESUpBhUi5Yo02jZjDNkI31IqIhS8q64YSf8ltbuBH8J5Kk3m42EMF225A1YB Q66PXs9l7YAI7CJ8j0YTId3K0mdMVDoDLz70/yA83WijPNYREadQ0vhynnkExEQE4T1A WDHkC1fd1L4540TwwWWaBgsVaO+mhovznoaaAoJ1e9M7MikeEe6AOxU4QW0hWC6ETYpZ BGmtBs45RfLpeoY8cDKO/dulaYSPo6Y+srdWldI/83ZcTuRNdzSbQrnjKlWaMgSSh8ac 4fBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ys1Qmvh0LDODbKSEj2pf4iStmeI+PYiuCBLDhUYc/3E=; b=dAg8jQTzH9KEoG75ApuzHaM9nkbpzfnMMm8k2FBDq0kTI2z59aalpMq7kZR+93JR9U T3p0iqNVE2WORVbFPUiZMpZO5dVWuvPCJevF5ndr+ySfMk+xge212tdIUB9VH7fv72i+ xIf5ku7bGvGH9meV9O+oFNLlrfe1KaynsTJNE9oMssnuN/3pahw72xIFoFS9X+yympIZ 30bOSXIBToD3he+Xsjq8GEQpomfhPf1Uhosz97U4GUg7hHVMANzlM+zMkvtov4ZKykVT hfxv+O1Mpkaq9gV95NDp3TAegZvcua6qzCA9sm5i9OVLljuijrlegztAzSc9UePhSdFs eQDg== X-Gm-Message-State: AJcUukfjMb64WKtRY+2wx2+A7E0mkDGuZhPJFLywSSdGA2aIDYEYW0AV 49q7UJQsDljAGJJDHYWcT6mQNA== X-Google-Smtp-Source: ALg8bN7cNp94ZetUb/cEUh1dkubZybHAloO89Ni1u6WTftgTo+9FzEhr12LRDMiZiwm36/b/q8G8OQ== X-Received: by 2002:adf:e64d:: with SMTP id b13mr35314651wrn.276.1548942011290; Thu, 31 Jan 2019 05:40:11 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:10 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 25/35] ARM: davinci: cp-intc: use the new-style config structure Date: Thu, 31 Jan 2019 14:39:18 +0100 Message-Id: <20190131133928.17985-26-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_054013_880337_78AE951A X-CRM114-Status: GOOD ( 21.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Modify the cp-intc driver to take all its configuration from the new config structure. Stop referencing davinci_soc_info in any way. Move the declaration for davinci_cp_intc_init() to irq-davinci-cp-intc.h and make it take the new config structure as parameter. Convert all users to the new version. Also: since the two da8xx SoCs default all irq priorities to 7, just drop the priority configuration at all and hardcode the channels to 7. It will simplify the driver code and make our lives easier when it comes to device-tree support. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/cp_intc.c | 92 +++++++++------------ arch/arm/mach-davinci/da830.c | 2 +- arch/arm/mach-davinci/da850.c | 2 +- arch/arm/mach-davinci/include/mach/common.h | 1 - include/linux/irqchip/irq-davinci-cp-intc.h | 2 + 5 files changed, 44 insertions(+), 55 deletions(-) diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 1f55d68672db..2ce0b7653c88 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -144,22 +145,15 @@ static const struct irq_domain_ops davinci_cp_intc_irq_domain_ops = { .xlate = irq_domain_xlate_onetwocell, }; -static int __init davinci_cp_intc_of_init(struct device_node *node, - struct device_node *parent) +static int __init +davinci_cp_intc_do_init(const struct davinci_cp_intc_config *config, + struct device_node *node) { - u32 num_irq = davinci_soc_info.intc_irq_num; - u8 *irq_prio = davinci_soc_info.intc_irq_prios; - unsigned num_reg = BITS_TO_LONGS(num_irq); - int i, irq_base; - - if (node) { - davinci_cp_intc_base = of_iomap(node, 0); - if (of_property_read_u32(node, "ti,intc-size", &num_irq)) - pr_warn("unable to get intc-size, default to %d\n", - num_irq); - } else { - davinci_cp_intc_base = ioremap(davinci_soc_info.intc_base, SZ_8K); - } + unsigned int num_regs = BITS_TO_LONGS(config->num_irqs); + int offset, irq_base; + + davinci_cp_intc_base = ioremap(config->reg.start, + resource_size(&config->reg)); if (WARN_ON(!davinci_cp_intc_base)) return -EINVAL; @@ -169,51 +163,29 @@ static int __init davinci_cp_intc_of_init(struct device_node *node, davinci_cp_intc_write(0, DAVINCI_CP_INTC_HOST_ENABLE(0)); /* Disable system interrupts */ - for (i = 0; i < num_reg; i++) - davinci_cp_intc_write(~0, DAVINCI_CP_INTC_SYS_ENABLE_CLR(i)); + for (offset = 0; offset < num_regs; offset++) + davinci_cp_intc_write(~0, + DAVINCI_CP_INTC_SYS_ENABLE_CLR(offset)); /* Set to normal mode, no nesting, no priority hold */ davinci_cp_intc_write(0, DAVINCI_CP_INTC_CTRL); davinci_cp_intc_write(0, DAVINCI_CP_INTC_HOST_CTRL); /* Clear system interrupt status */ - for (i = 0; i < num_reg; i++) - davinci_cp_intc_write(~0, DAVINCI_CP_INTC_SYS_STAT_CLR(i)); + for (offset = 0; offset < num_regs; offset++) + davinci_cp_intc_write(~0, + DAVINCI_CP_INTC_SYS_STAT_CLR(offset)); /* Enable nIRQ (what about nFIQ?) */ davinci_cp_intc_write(1, DAVINCI_CP_INTC_HOST_ENABLE_IDX_SET); - /* - * Priority is determined by host channel: lower channel number has - * higher priority i.e. channel 0 has highest priority and channel 31 - * had the lowest priority. - */ - num_reg = (num_irq + 3) >> 2; /* 4 channels per register */ - if (irq_prio) { - unsigned j, k; - u32 val; - - for (k = i = 0; i < num_reg; i++) { - for (val = j = 0; j < 4; j++, k++) { - val >>= 8; - if (k < num_irq) - val |= irq_prio[k] << 24; - } - - davinci_cp_intc_write(val, DAVINCI_CP_INTC_CHAN_MAP(i)); - } - } else { - /* - * Default everything to channel 15 if priority not specified. - * Note that channel 0-1 are mapped to nFIQ and channels 2-31 - * are mapped to nIRQ. - */ - for (i = 0; i < num_reg; i++) - davinci_cp_intc_write(0x0f0f0f0f, - DAVINCI_CP_INTC_CHAN_MAP(i)); - } + /* Default all priorities to channel 7. */ + num_regs = (config->num_irqs + 3) >> 2; /* 4 channels per register */ + for (offset = 0; offset < num_regs; offset++) + davinci_cp_intc_write(0x07070707, + DAVINCI_CP_INTC_CHAN_MAP(offset)); - irq_base = irq_alloc_descs(-1, 0, num_irq, 0); + irq_base = irq_alloc_descs(-1, 0, config->num_irqs, 0); if (irq_base < 0) { pr_warn("Couldn't allocate IRQ numbers\n"); irq_base = 0; @@ -221,7 +193,7 @@ static int __init davinci_cp_intc_of_init(struct device_node *node, /* create a legacy host */ davinci_cp_intc_irq_domain = irq_domain_add_legacy( - node, num_irq, irq_base, 0, + node, config->num_irqs, irq_base, 0, &davinci_cp_intc_irq_domain_ops, NULL); if (!davinci_cp_intc_irq_domain) { @@ -237,9 +209,25 @@ static int __init davinci_cp_intc_of_init(struct device_node *node, return 0; } -void __init davinci_cp_intc_init(void) +int __init davinci_cp_intc_init(const struct davinci_cp_intc_config *config) { - davinci_cp_intc_of_init(NULL, NULL); + return davinci_cp_intc_do_init(config, NULL); } +static int __init davinci_cp_intc_of_init(struct device_node *node, + struct device_node *parent) +{ + struct davinci_cp_intc_config config = { }; + int rv; + + rv = of_address_to_resource(node, 0, &config.reg); + if (WARN_ON(rv)) + return rv; + + rv = of_property_read_u32(node, "ti,intc-size", &config.num_irqs); + if (WARN_ON(rv)) + return rv; + + return davinci_cp_intc_do_init(&config, node); +} IRQCHIP_DECLARE(cp_intc, "ti,cp-intc", davinci_cp_intc_of_init); diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 565c306e5252..bdbd66ffd2ea 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -754,7 +754,7 @@ static const struct davinci_cp_intc_config da830_cp_intc_config = { void __init da830_init_irqs(void) { - davinci_cp_intc_init(); + davinci_cp_intc_init(&da830_cp_intc_config); } void __init da830_init_time(void) diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 794ddbe78534..fe370e85aeb1 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -683,7 +683,7 @@ static const struct davinci_cp_intc_config da850_cp_intc_config = { void __init da850_init_irqs(void) { - davinci_cp_intc_init(); + davinci_cp_intc_init(&da850_cp_intc_config); } void __init da850_init_time(void) diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index 0a6607ea4560..9e06974c85bb 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -17,7 +17,6 @@ #include #include -void davinci_cp_intc_init(void); void davinci_timer_init(struct clk *clk); struct davinci_timer_instance { diff --git a/include/linux/irqchip/irq-davinci-cp-intc.h b/include/linux/irqchip/irq-davinci-cp-intc.h index 9b0c7d6189eb..596145c2f3d1 100644 --- a/include/linux/irqchip/irq-davinci-cp-intc.h +++ b/include/linux/irqchip/irq-davinci-cp-intc.h @@ -13,4 +13,6 @@ struct davinci_cp_intc_config { unsigned int num_irqs; }; +int davinci_cp_intc_init(const struct davinci_cp_intc_config *config); + #endif /* _LINUX_IRQ_DAVINCI_CP_INTC_ */ From patchwork Thu Jan 31 13:39:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790671 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8C765746 for ; Thu, 31 Jan 2019 13:59:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 786012EBF0 for ; Thu, 31 Jan 2019 13:59:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 69A102F75B; Thu, 31 Jan 2019 13:59:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 59B1E2EBF0 for ; Thu, 31 Jan 2019 13:59:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=zY7WnUox9yz03mWa4IjDJAH47PuQMAurBIUAr7zyZuk=; b=AsMvHAhJuMCPvR 3PbNBDVDjxFEJ93bv40I69gk81zq0901M/PeE4j0xM5yVfLLpTUssTO6Xyk+FzHBG7Z6QFhKNDhdx 7M+h4h7I1HdYNrUQOMEWcgCZw0fRuXv6mDh2Q83G/CLOw/mRjemo9BUCKowXsTtV8TJB4mljWz8wn VNa9Wcko/Lz6j7FW/NlPjyk1iyQu47nHahWA11OKp/ocT0Lb/CQ8WAHIQhWLqVhOBYxQzMaph2/az XrAemX/B+FLfsPMMP1GChfittVTvomqg7ucJAuYo1GcV9hpMQuo3iEeUxhg3NbexM7waLxL8Lh5li 9bnFPrlGsq0fBla2M24A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCrw-00035z-EI; Thu, 31 Jan 2019 13:59:04 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCqs-0002L9-L9 for linux-arm-kernel@bombadil.infradead.org; Thu, 31 Jan 2019 13:57:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=k1HTTn1zj1MT4j+ZQRh8biG0PnZ1oRBNNapN+dBPCQc=; b=EFPNVUfjzGHcj58RQRP3jULZoj nlbpYOpFLcqP3IOVdcodCso1xmvvD28nWnjLvWZnxCPFQ2nbkH/G60H56uccN5VbWHHdToZdX/0iq 3pSLGNRnzLf8Pfgj/JqtPyqu8MEn57E+NjQb+3RYgT3HuVUe1z4JoVKn7EhSveOeHOvfha+xT9F4K 2FYm5b0oRXib3ux1tWTdUSKsKHRGbVY9U6ISc30Ftd4GZ8/+EUh51yViBVRaLfNDfQfj4IR27SeAu 8oiqaDLimwm9LPWlrBlJirNTQjzqDu9fNHarrna4EYGgznC++RqZA6GcFncAXrGk2sqKWF2UwgWBM Ra77W1tg==; Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZi-000687-Ic for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:16 +0000 Received: by mail-wm1-x342.google.com with SMTP id r24so2157211wmh.0 for ; Thu, 31 Jan 2019 05:40:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k1HTTn1zj1MT4j+ZQRh8biG0PnZ1oRBNNapN+dBPCQc=; b=yXsqvJsgY0gXnH7Bhgddj++HS6M1/Mg/ntCKI/aXRWNdAEdnbki//I/WxKRK+J1W7s +xyKHgCe4FgJkPTgve5sxnI9ebBjgsRPR6qxic3g97nQ9J3ZhflMuop4CMqqB2kR5ZwE byqrOtHObAyNu38zWDaUfuGrSUaJ/ErrWnyFfJSpBj1sWI1/ITjec3IqRvP9uQfiY47V lJH9kqFEr5hhFw3gUej2hAL19d7saNoAVft4PEKt5ZqF/iFdCUwB7a0y+v1zOhfEmaVB Tn5g2gVzoWH4RkQlA3mXX5Ll8FFGYkXn+/kh6wTLpe3vscW33fHqxjYF6G4dEdNsdCYb UjqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k1HTTn1zj1MT4j+ZQRh8biG0PnZ1oRBNNapN+dBPCQc=; b=YMPkVuQI8IlWccCM4FVksFhzEqSqmR8E0lwNvYDXwJKZ5+/J6/3+p6Z2wFhU8BXQXM kUWQmuJLR6b/UMpiNVgctBpOWvD67EdMl8uRXkv4fTKEPskLHacgW1HlfZU+czcOe67C AKPqmLK0Ywmz0PgrwKHSu5Y9IrBi3rEzxplHUOXwrm+vp9OrWdpTuZXArFz8cBua1F+B YGULUnkMIYUWiu5pn+LNsJUbZ/oypDsNLh17f7dPZOT3Bg0ULZ30Ig+C9lD5d8+KKg53 wK739HneRadS8ZQrVpT7RhcPIsUbv872Vbvgh9EqBF8TcKRn5qwdkft1ihzkUefHh9t7 JjEQ== X-Gm-Message-State: AJcUukd565xi0zx6tNXMFbbjqZ8PKRVQrCS21Ab/Om5/+iahgS/n8Uc3 q43KmLX9c39yN4CcVbwToNMT1A== X-Google-Smtp-Source: ALg8bN4fZmcsLxh6VIkBDvi3YojOuyTp7UWE4fZ6I6gO0T9djSicgcYPZ9ew+621Hws57Xi9IezELA== X-Received: by 2002:a7b:c218:: with SMTP id x24mr29382352wmi.58.1548942012453; Thu, 31 Jan 2019 05:40:12 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:11 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 26/35] ARM: davinci: cp-intc: improve coding style Date: Thu, 31 Jan 2019 14:39:19 +0100 Message-Id: <20190131133928.17985-27-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_084014_654991_9A8DD10F X-CRM114-Status: GOOD ( 12.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Drop tabs from variable initialization. Arrange variables in reverse christmas-tree order. Add a newline before a return. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/cp_intc.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 2ce0b7653c88..4cd515b507f4 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -76,12 +76,12 @@ static void cp_intc_unmask_irq(struct irq_data *d) static int davinci_cp_intc_set_irq_type(struct irq_data *d, unsigned int flow_type) { - unsigned reg = BIT_WORD(d->hwirq); - unsigned mask = BIT_MASK(d->hwirq); - unsigned polarity = davinci_cp_intc_read( - DAVINCI_CP_INTC_SYS_POLARITY(reg)); - unsigned type = davinci_cp_intc_read( - DAVINCI_CP_INTC_SYS_TYPE(reg)); + unsigned int reg, mask, polarity, type; + + reg = BIT_WORD(d->hwirq); + mask = BIT_MASK(d->hwirq); + polarity = davinci_cp_intc_read(DAVINCI_CP_INTC_SYS_POLARITY(reg)); + type = davinci_cp_intc_read(DAVINCI_CP_INTC_SYS_TYPE(reg)); switch (flow_type) { case IRQ_TYPE_EDGE_RISING: @@ -137,6 +137,7 @@ static int davinci_cp_intc_host_map(struct irq_domain *h, unsigned int virq, irq_set_chip(virq, &davinci_cp_intc_irq_chip); irq_set_probe(virq); irq_set_handler(virq, handle_edge_irq); + return 0; } From patchwork Thu Jan 31 13:39:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790653 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0AED113A4 for ; Thu, 31 Jan 2019 13:56:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED23D2F6C9 for ; Thu, 31 Jan 2019 13:56:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD52530B64; Thu, 31 Jan 2019 13:56:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5245E2F6C9 for ; Thu, 31 Jan 2019 13:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=outWGmDj6HHJZ7B076WpOpZF2wf74/hfp9ApGIYz3A4=; b=RzfFaQlZ3vhmMv /hDa9xZXNeeuavjwXLzPlAtY9rtyvskJr4Ov4u3KSuzSwsRwa7zW7oNo45GzpqBuURmmM8ci/TnT+ 9g69IayT96I5nmsACdxRltav72ogHNCRmXRV19AD2klU2d0Q3lHjmybzEQOYsdLhjSerggyD5JmLg mXoITQOtASwVzOrd2OpO1FnaRzVrwWhRr3KqCnn9heEPR6Ju6ceJ92zjVWb6UE/b6a8amDkCV2/Ma qbCTELoQMazAaYRV8RB49VzzZEMZinVDhBA5Wj2eLT0OSxGT8Te3B7i+tHGp3fJlSUKjATaHq9fmm NRvLh77nZ/3PmusCNUOA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCpS-0001Cy-QE; Thu, 31 Jan 2019 13:56:30 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCoj-0000Gv-2Q for linux-arm-kernel@bombadil.infradead.org; Thu, 31 Jan 2019 13:55:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=vxfm0fKbkuL8SE9c4CrhCSFAKt2dnHDzKJRVV3w+UdE=; b=TS2TIl7fBm/AQaRe2AAF0yt0cR PPT4oQoGbDXCz0n58rK1C7W4gt8pvofw2GZC14F+M6zgKfXNIVKfGI1bvAlD/UhNpJVe3wyqaVkKb MfbITSBWV6XsR8CmKjS3IGPoRbyOeqn+u584kmyrGDevA3jc2+ldzvt7/va5wELZB2nBYo0gWxxRT KYHiU3hUt1Uqk/oAOJp00NI55sJVsccv6+EBhfcHt1ubCqyXCCunM73pTonuuVRziKj9JkVtKsoFj Su4qbklsFNFz38ztsmnpIK+igGZkx60bp4c6+HwU6ztH2zZLhWi9asTDQapT2bIZNPacWUcIlj4A6 XzmPOAsA==; Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZi-0005Aw-OI for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:17 +0000 Received: by mail-wm1-x343.google.com with SMTP id y139so2510956wmc.5 for ; Thu, 31 Jan 2019 05:40:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vxfm0fKbkuL8SE9c4CrhCSFAKt2dnHDzKJRVV3w+UdE=; b=Oi5dsV1IH5FhJX8S3ZuGU/CN53LrP0QqDD+FHNkMaT8NdpywplaK4XK29ZsbTcf30N NPHpXD4GACwqZ0XycIeop3T1/yvW0AshHTXnLy45JKjS+cV9V7ORtLHtYMxBEJ4/ZBXQ LASQpuFU48Mqfh0dxqq9+NMoxgPOwoklOGYjd7t+BBqeqUs8gqFCjR/HU8eaCCV5TZ96 4fTNGdBCGy00uFZ9U4NJigu6JvMWdjGUqu8U26XmSdXAL7WIrtaRPc6a0serPHoGdy0E 1uIcXs8Rm0Lh1EFK/rttuZ8EuOQjU7HCcGx4w34EJhMrGBBSFdfWZAW64tn3MYRYAv7S 1+IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vxfm0fKbkuL8SE9c4CrhCSFAKt2dnHDzKJRVV3w+UdE=; b=o6OrEkHD5mU1Xt5hmPNMQN75uAed8IlCR41BR+I2PbcKayO9KuQ7wnZfDHeZeJ5jlO xl9F2QThc6EcYVWsMxWZJO7mNQJT4PY4pTHcip7HmxBzquG4DP+xXLQKxeS0f/NxFzHj i0/auFIXfvTbM8fBW4RDdB/h5oTKStTWJPmoNYwQa0G8wGWmqXzwFEKRl8aZVZB7LYQn NFjYneoB5ye4CU53rXPqBu+RaLvD2cUftBknzkcY5xO8JizDhAqbttxOTPFRKVLYiaF/ T4FGNAW5d3IistQQTB494HDzOAwd4ZsGCA+4GI5GEraN+y+7NVlHgZwe5+orhk9JPyzJ ohew== X-Gm-Message-State: AHQUAubSCFx9VFJzmaL765yQOglQx68R5urg2MTS2ix+csuRSatWqMJe 8X74QuCCgbHg1ajmaaMpeZZ13Q== X-Google-Smtp-Source: AHgI3IbYvqW8nVCYDm7z4NeIwu8NZvfbdpzPIBEZ+pvo2Wymz8BGH4jH+TEFaNz4jnVpLHlMQrVVww== X-Received: by 2002:a7b:c1d7:: with SMTP id a23mr1297394wmj.48.1548942013583; Thu, 31 Jan 2019 05:40:13 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:12 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 27/35] ARM: davinci: cp-intc: unify error handling Date: Thu, 31 Jan 2019 14:39:20 +0100 Message-Id: <20190131133928.17985-28-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_134014_826670_B8AA3741 X-CRM114-Status: GOOD ( 13.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Use WARN_ON() on eny error in cp-intc initialization and drop all custom error messages. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/cp_intc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 4cd515b507f4..8d751318682d 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -187,20 +187,16 @@ davinci_cp_intc_do_init(const struct davinci_cp_intc_config *config, DAVINCI_CP_INTC_CHAN_MAP(offset)); irq_base = irq_alloc_descs(-1, 0, config->num_irqs, 0); - if (irq_base < 0) { - pr_warn("Couldn't allocate IRQ numbers\n"); - irq_base = 0; - } + if (WARN_ON(irq_base < 0)) + return irq_base; /* create a legacy host */ davinci_cp_intc_irq_domain = irq_domain_add_legacy( node, config->num_irqs, irq_base, 0, &davinci_cp_intc_irq_domain_ops, NULL); - if (!davinci_cp_intc_irq_domain) { - pr_err("cp_intc: failed to allocate irq host!\n"); + if (WARN_ON(!davinci_cp_intc_irq_domain)) return -EINVAL; - } set_handle_irq(davinci_cp_intc_handle_irq); From patchwork Thu Jan 31 13:39:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790647 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1E0E013A4 for ; Thu, 31 Jan 2019 13:55:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DF6130B2B for ; Thu, 31 Jan 2019 13:55:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0161330B65; Thu, 31 Jan 2019 13:55:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 991A130B2B for ; Thu, 31 Jan 2019 13:55:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=sLVI9F/RKf8aFySizYEQo4ATL+LgATKAePg7L7ay/QI=; b=TYM1ndHEXePBRw cv5HW06Um4eNjaRl1oRv+FY0k5CbFGE9zg1FLUske1jDHLdpHB3PFIg/4UtHvwmWVFWhjTG3Npulf La693I/57V/bpfUMLLT65zxOqDXjv1M4oLTZ6GpQT4JYFWMV/hANzq9IdAhj5Onv+AW2bctFNNr/y r4l7btDl3W+Q9sz5viW8z+aXHxdmz4ZhO6iXisMpSSVxJumWAz/I1V9UP5VY15sKw1xKEWOvFEHI6 i4BuV7xIBNStbfC68iD9PtQuinkKMJKRtTnp2B/GOyuG2Vpg1LkWhLy7VXzXNzjK0MgyTpgzEvIpm W0z+Qd8TkoMSTdac1Q8g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCoj-0000ah-Hn; Thu, 31 Jan 2019 13:55:45 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCoi-0000Gv-23 for linux-arm-kernel@bombadil.infradead.org; Thu, 31 Jan 2019 13:55:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=suo+S/p01f0fXm68K0wOuLuMu8DfXRVmkAo382MDz8Y=; b=J7GCg0tU5U/4WgU+nPBo9SSJnZ ybToFb3d8UaFR2yu/z0UMpXac6c9AOhmwXiYDe6tEdkrJZXF9zVZtIYX3yNH4lUqkJOrUQyKtOZHL cSAe4Ri5NzYN5F+PYcEC3sAS57s1jQvIiqxzM4IY86sLKQ8eiVxsKApx8fMYAZsYdiRGqAc2DaKQL I61PoedZci5a3+1EBZSbeNOhiscY9hvVOncImhr1jVUJgGuYCnwzRbni9oWxQ/zM+JFnLiSpGB0n2 d7a1lD0ypxjJkJTexb3DduGTL1KAAQW6sVIPg7FR2oX4q920Zwhe05znm1GW6XRb6w3rOeW+Ucyxd 6aZpXBvA==; Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZj-0005BS-LX for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:19 +0000 Received: by mail-wm1-x343.google.com with SMTP id m22so2601897wml.3 for ; Thu, 31 Jan 2019 05:40:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=suo+S/p01f0fXm68K0wOuLuMu8DfXRVmkAo382MDz8Y=; b=zjPDnWnrJ0x0vcVq1AmXMJevGmQre2lZ664/pYI8oeykVs+FDnxvnDoADtP9ZGikC6 6jwJHE+mfl478Mqoz7HRGNaxTGDXBZ3y7Ob+hX1/NNQEPlsySViLj6y0ZlldKb3tqRSC rr4aO5yG7Ip8KM6uwYwW0ic/W5Ax+GkpzN0el+pKvntLUAnUEYDHkW1RHlYMQTqsDvXr WwF3L79lFQ0lk9QeWk0uup+lIsAP5WifAjT+0z6GQAdNWfEvQKuK2UdHuU6H4z01ufQn azqkhV4kLHCiDTcg9bTk7H+HcgRi2duP+usNovrJJcexc2M87aKNqUrKejMXfrl87jeW eTAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=suo+S/p01f0fXm68K0wOuLuMu8DfXRVmkAo382MDz8Y=; b=tFGkioSe43MHDSt+1vKNAmHR4wZvwo5KF9GkKrB8PIc4O8II+CI5h2ora1O5t7h9qd I79AZSOepam/pV5aDGSpKggc4gGS54JeUMDZpakU0ldjTh6mxzsvpb8QJV4lh6VihIK3 YJ9m+dZ2g3UfKRm0HDf6TpV79Ol6/hfovDeHbN6kCgRTalKQuDXz/+E8VYj/PsOZB41Q qnft5P/nsU0n/Xz95u4FMHGFbQFAeZzLLceYk/o1QinSRpeyzTPrLGAxGR2sJ7nbqumh PHfxfymNskIAFwCPZBanPtC8xyDex1a3FVhk3nBj/AhkvFqdp/vKN2tj7lxl7id+TvM3 wPwg== X-Gm-Message-State: AJcUukc+EzDwKa6Wy102MMSeCVeWVFom9jrYLT9ggmbqqgfhl9PSH+2x 79AxLijQeQY4SsHKDOkxHI2lBw== X-Google-Smtp-Source: ALg8bN5ibLPcQXfxZ3bmH/xGPIH5HpgxF7ioO9Rlv/z5DLFwKXEH5IROXVDMEZIWbH7yAbnQP/qJOQ== X-Received: by 2002:a7b:c7c7:: with SMTP id z7mr31531297wmk.74.1548942014638; Thu, 31 Jan 2019 05:40:14 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:14 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 28/35] ARM: davinci: cp-intc: remove unneeded include Date: Thu, 31 Jan 2019 14:39:21 +0100 Message-Id: <20190131133928.17985-29-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_134015_768497_C8048BBA X-CRM114-Status: GOOD ( 11.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski This header is no longer needed. Remove it. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/cp_intc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 8d751318682d..812e49fcaa8b 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -21,7 +21,6 @@ #include #include -#include #define DAVINCI_CP_INTC_CTRL 0x04 #define DAVINCI_CP_INTC_HOST_CTRL 0x0c From patchwork Thu Jan 31 13:39:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790621 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 72D89139A for ; Thu, 31 Jan 2019 13:45:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0621730B71 for ; Thu, 31 Jan 2019 13:44:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE96130E4E; Thu, 31 Jan 2019 13:44:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9A43630B71 for ; Thu, 31 Jan 2019 13:44:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Qry1KbX8nKlRUk2svea9xJrPXylcubyIJY7NpVCZ4ZY=; b=iEhfhl/h6nx/1f 5f1YuQ88A0Gbi04UGDbFFfMJF2H691GFhjXv55LBPumz3XXUtGFW3MYm45FXn2PLFE3JcTiWXpcG0 ynqw8NcMo30TeMFNR2/9cIwB9uc2ntZW6pGX1L9niDB1A2bzDa/tUDPvMov0NehuJoAohlQaiWjHO vdlLpBP8Cyq+IgXbT1JsheuOIYV3T9PfI5Jd0Iq5zfr7u+YrTE7WAIHadCHegcvXjT4i7hNxptfK/ L2EFIxley9Ex0zGf79KgobLbhJ/Mg3LwWFjE+K/3iqdPnmtp0g5Xy3T9C/NrxoXJe4/kN9bnTB5aZ cQ5pk4bzrcvl/Bdvautw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCe2-0001vw-00; Thu, 31 Jan 2019 13:44:42 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZl-0005eR-6T for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:30 +0000 Received: by mail-wr1-x441.google.com with SMTP id x10so3322363wrs.8 for ; Thu, 31 Jan 2019 05:40:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=w2Xh/bADBzCrm3hKxGT4g5SPR6uE8yywQw4yqUJgRK0=; b=LDQuT2ptEwh9NF1JFEiGkKxl7h2tRCIljF+tOMhMiKr2Fb16f/N1+bb0JNGMVFX70T hrMgSazv1p25WG6lo9thtuBjBPYV2/n6ixKUiL5Dgvwh0rT6orexRJOmNel3dh+BzpD7 jurEFlxuK7vKUAZihSUt/l9oN5WQWHc9boQC1b5pkI2fxD2dUQZHbGyv15NHB5oHCuNi a1GrJPmy3SMd1dSOvu+IAspEk8wRU1J08XyLbaJluKhwWCAQr00M4MhvhTIRL6IbJPev 3+2kTrgRsXxvdWQ5xof/gpQ07DFY2aLMRlxzNfmY8vuWONTJqfioHQkonY0+kMA3E0le Y9XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=w2Xh/bADBzCrm3hKxGT4g5SPR6uE8yywQw4yqUJgRK0=; b=DY1hChksONA3zVvoUrAYrbyQGHk5YL4OweevQNGt4fxAnM0SwRADFXRWFJtAe67/Vh QGqblj/ZTA/6luthF5hSL86VlWaX+EEY5iUsU7VVmE5XiF9OlJNHlsKbpKHAU+QEhGLz nfEvcf7IfI6krdG8cTDSW8nPm8zxj0ETMhtf5jVS9KcDhlZ5c2/o507OZI9T7UJ6suVg KKOtXurHJV1KdpmdPOI2eCpNkcevQUHxNsr9cnnakVR3c53LVkRJVVgL5TiJeadpgb65 L2TPaDkWTeano99s5fR7dTb2Oq+g9rj+PqP6JBMwYVjS8Iw1TXucIwmCqgsW4Iro1qKs dzJw== X-Gm-Message-State: AJcUukdnwmnhXa/8NONfgacpReVpqXSCGPK3mvsZg2BHn3YWl8e1tD1G yf+TmicXXruzGXNiGoqAxFk7CQ== X-Google-Smtp-Source: ALg8bN5h64yQsKQBbQ0yLFAe7JMo8Th/nncaNStYFuEj0CyTQd40wFF+daLlnxbSRiE94SMeJfoR+A== X-Received: by 2002:a5d:6850:: with SMTP id o16mr35274858wrw.123.1548942015818; Thu, 31 Jan 2019 05:40:15 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:15 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 29/35] ARM: davinci: cp-intc: drop GPL license boilerplate Date: Thu, 31 Jan 2019 14:39:22 +0100 Message-Id: <20190131133928.17985-30-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_054017_613301_898882B2 X-CRM114-Status: GOOD ( 10.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Replace the GPLv2 license boilerplate with an SPDX identifier. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/cp_intc.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 812e49fcaa8b..780b3f57aa59 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -1,13 +1,11 @@ -/* - * TI Common Platform Interrupt Controller (cp_intc) driver - * - * Author: Steve Chen - * Copyright (C) 2008-2009, MontaVista Software, Inc. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. - */ +// SPDX-License-Identifier: GPL-2.0 +// +// Author: Steve Chen +// Copyright (C) 2008-2009, MontaVista Software, Inc. +// Author: Bartosz Golaszewski +// Copyright (C) 2019, Texas Instruments +// +// TI Common Platform Interrupt Controller (cp_intc) driver #include #include From patchwork Thu Jan 31 13:39:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790623 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8DFB991E for ; Thu, 31 Jan 2019 13:45:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6091B30E19 for ; Thu, 31 Jan 2019 13:45:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 505DC30E7A; Thu, 31 Jan 2019 13:45:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2DDD730E19 for ; Thu, 31 Jan 2019 13:45:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bvgdyU2lf6DSBaRtbmMsz8A3UGST7nQBJ9IPTXsZvWg=; b=HeFOKJ76EIjRd1 2vl1lR403cMNVDSokksXNniOvlhnzT/30Hcf9Y6D8OE4L0SccyAH39IByWBMBt88mWfhcaLgzQlRJ etU7AInBj1L0FIqQmjgbnp4qwAzrogM5ekfJrE1nVWHISz/UJVwlqp7w29XVSd9Yw6nxVxLrKDgjG 16eW7aO3DDK36hLNFcm/2G2vrC4R8uMBSMyezRXJlSdnOGv1e8KtdXGmJRniqzIVGnzIdLLISxLp2 trwQ5s/yZUIj+/x12f2ownOumlxJRjZsZVRzzNSf4qxgHpja2qp8x4y0DHWxv0dw6EPCItSc6XCEY LnexdQgKKGC9pXNWuNlg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCeK-0002DV-JH; Thu, 31 Jan 2019 13:45:00 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZm-0005ja-JI for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:31 +0000 Received: by mail-wm1-x343.google.com with SMTP id y8so2573724wmi.4 for ; Thu, 31 Jan 2019 05:40:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RXeq39eWmFtFqzceOwGnZ9UFM2CvQxzUwG5lxEDQOVo=; b=I2UR00xSc5Qy4Gmfvcls86a1esPplq06/kGKZbZ15CTISczcRut/ms/OsfFKJ5wBLi BioURh9bB3pFUFwFBDMSo2/YbpnYqatXt/4Shk97uO1lFVHBd3yY+uhNNUaQH18RJjh5 Wf9UGSBgFclG+YFAgxdG5EMbErVImUosa/ck5n9NtYT4GojlBtx292WaB8z2ulA6kkrC b9LDGIqSFIaNemKqMQ0qesBZEFnHVlwdcd5gHG4zF2nGM756rDcHAEzrcHAkgir0VDJU ogN+CaFnxjvJHkZMhgFxpGHtD7fyEAsOK/VvKk56J9X1crLpoEvKFyVl7W9b89ThdUSO MkVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RXeq39eWmFtFqzceOwGnZ9UFM2CvQxzUwG5lxEDQOVo=; b=Kzoq40Rtd2y0lFqtcD2RnlKw6eK1LGQ64O5nHnHRnGqc2F4wx8BdmnOSeArWfw5bLW oe863xARhOi8nuYjNfpkbNozFaZRgJ2I1kGkTakI1Eq6loACK6neW2gu3gk1GU0u3J97 Ljc6s9XNTT45TfOd82R6lLfHbtOFX5NKWjoyLMhvd+XkkYSwukMJPq+aZdk5hEhP7FwD bQqfgL6I2a6gdJ0jnslMnmcQOIdCV+oniMoicw5q0CPZn7EPIYR8UgRLD2luBGIgoMNa I6RD41SlpTNKAN4ICh432fYtYjRVk6Q3wHcLHlBac/Vw+IpmLgVLlOws5+g4B3OAoMlU 5SDQ== X-Gm-Message-State: AJcUukfuCsKrMPjD2S+sWCJhvvCBIJT6RzWLUQm+nXVaqdhBofk61pwu WaFDj912CpUc4rgS03spr81TZA== X-Google-Smtp-Source: ALg8bN6geK0rY7RKjGKVNo7k31uHEbHPv9XscohM1HlHWkdrFIaOhltZrp4yMJeUiV0ocffkVTIMGw== X-Received: by 2002:a7b:cb86:: with SMTP id m6mr29516105wmi.61.1548942016910; Thu, 31 Jan 2019 05:40:16 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:16 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 30/35] ARM: davinci: cp-intc: remove redundant comments Date: Thu, 31 Jan 2019 14:39:23 +0100 Message-Id: <20190131133928.17985-31-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_054018_863446_7A9F635C X-CRM114-Status: GOOD ( 10.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski We don't need comments explaining what functions with obvious names do. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/cp_intc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 780b3f57aa59..b5ace86c419f 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -55,7 +55,6 @@ static void davinci_cp_intc_ack_irq(struct irq_data *d) davinci_cp_intc_write(d->hwirq, DAVINCI_CP_INTC_SYS_STAT_IDX_CLR); } -/* Disable interrupt */ static void davinci_cp_intc_mask_irq(struct irq_data *d) { /* XXX don't know why we need to disable nIRQ here... */ @@ -64,7 +63,6 @@ static void davinci_cp_intc_mask_irq(struct irq_data *d) davinci_cp_intc_write(1, DAVINCI_CP_INTC_HOST_ENABLE_IDX_SET); } -/* Enable interrupt */ static void cp_intc_unmask_irq(struct irq_data *d) { davinci_cp_intc_write(d->hwirq, DAVINCI_CP_INTC_SYS_ENABLE_IDX_SET); @@ -187,7 +185,6 @@ davinci_cp_intc_do_init(const struct davinci_cp_intc_config *config, if (WARN_ON(irq_base < 0)) return irq_base; - /* create a legacy host */ davinci_cp_intc_irq_domain = irq_domain_add_legacy( node, config->num_irqs, irq_base, 0, &davinci_cp_intc_irq_domain_ops, NULL); From patchwork Thu Jan 31 13:39:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790667 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 99037746 for ; Thu, 31 Jan 2019 13:58:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8AB2730B22 for ; Thu, 31 Jan 2019 13:58:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E8E630B65; Thu, 31 Jan 2019 13:58:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1774C30B22 for ; Thu, 31 Jan 2019 13:58:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5hXuLR9Uq4mO35R2Xvofa/MAawmGjaeB5HZ24YrNb3I=; b=KSWnisFDwN7PVt 00Io4oRWn6mbizq2jo53bJ9zo/G/4J6yMnCDgROFhlO4FluWF0wzx4J4EFj9fVNIRYXonrfYDSINA u+89moRTmQNXIBfVk+UPcfmcsj+/7Sc4aVFTdAC7fPAza/1AoMdEWnfiJ6kQF8MTXrf4Lcq6S5YGu UpPud23ZakTpz+v/7Dck+vfWbwWvjPGeIZ82xeAa7t3iGdaPrVkau1/0zt85cKXbcEpVOWQ7NrWSZ 0O1lU9SbFII5hyvR+rPZHuFm6HSiOIGqjJuX6bU4xodP9kjJGvqTFKBQYnPVgeRNlv16UvPAQgfxI MxsleZW49aOSH3UefAdw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCrM-0002Xi-QM; Thu, 31 Jan 2019 13:58:28 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCqp-0002L9-JC for linux-arm-kernel@bombadil.infradead.org; Thu, 31 Jan 2019 13:57:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=L9qT/L4DhuaGAJ7qBZnKhfl1j2KQKPFuYoKVi0aeXEM=; b=gQGoqtZCjtTyYSwp3AQEqoW2w0 o/0gbkAFpuWqWAuL3KXbDAXEoSvXi+qL9Nh20UprVOxyJfTSfX06SA41TmV4/GUUP1vm9Bxo9XHEp LOINFn9uDIl+8JDCpVGkUff4zSrWqA/BWSGvc4sC4Hw991DCuLOoMbye+yshkSar08dBIuL4/ItIn cwjlp95x437op4kTV/Yol2wkkZ3HkzmVYbxF4VvRZGN1n/BQM/sspfYh4gH/9jzpwI5hVgkVHuaty fXwqrYzf91jRBsBBePhkRdsX8/SnlBOV6jz2UAZDvO2i2dv5En3k+U/ezH88q7KPrsEbeFFJaLq3k 8y9xIUOg==; Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZo-00068r-4A for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:20 +0000 Received: by mail-wm1-x341.google.com with SMTP id m1so2540720wml.2 for ; Thu, 31 Jan 2019 05:40:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L9qT/L4DhuaGAJ7qBZnKhfl1j2KQKPFuYoKVi0aeXEM=; b=e5Au1lXKcMGVzf2HCIvrba3ow8dKukNk0vS7q8EPeRZlOXYibXPRR8GyJFQ70Gu6lM lu/NLS2Fu2isd5eDGxxIyLAHxqO/06hjPzC78tZf8A4OhalyXNOPaLnWfuELdvZ8pTn+ /R6HMy75h18WyYUVqV7C6u1ZoXJNZqbEf/NFFb4io7pQn+yYSkHnGUi++ehdoD70/omb 32R2h+3EMsC+ShUL5/8rq6jGjgIYmuxmR4DXUP3k31KNL87D9eLOZe95K06TIHkfNcFT nFlg6l42ORyroswzDycKVr++DEE1bX12Z2TWrjN8A1+DJFT7wvxeDP+jdjlANCnhCQmT uaTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L9qT/L4DhuaGAJ7qBZnKhfl1j2KQKPFuYoKVi0aeXEM=; b=GTAw1v+8oPbV37BIz+af2Fn5gDhb056TzysLlZNm8DdJp9nY4cfwqkzE81bJj44+vF tjGAimFC4Vfuh7G4PXLMiuuOyuWu3hTNCVMMJLvqZl3zaN8P76j+4q/uhoyoSEJhrdS5 GdimOrQH1wVOwtbbq48WwrgAm/r6IAXikGyIwoO+V5VN9vcd3eFPZTRkrcj4OMqTEA6M E+wpZBvDj6lU5MRevHOf4YE7GMftSAoPcuj3fbNdDUF+C+7iYB71B0CymqCWT1rxwUHI iseu6h3GCr8Sw/WNhsegIYq1C+3rDUdyrI9eYHYvvfRzbJx1fKNyxCBQmRv4l9crWlCr Jlzg== X-Gm-Message-State: AJcUuke1jbUhAKyc+z00YUJ2AnAUM17H8ZOq+Pq5iIKpChWiZ8XjmHXj 2KxfZdwGjV7a+w0c0iJrK29dlQ== X-Google-Smtp-Source: ALg8bN5ugTtKbDvNIkD3NnnntM+dInMSRDxKmxkYXU3KGu0I7hpyCIDQ+W242HUk2m4I14x0y1G/qg== X-Received: by 2002:a1c:23cb:: with SMTP id j194mr27851527wmj.91.1548942017998; Thu, 31 Jan 2019 05:40:17 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:17 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 31/35] irqchip: davinci-cp-intc: move the driver to drivers/irqchip Date: Thu, 31 Jan 2019 14:39:24 +0100 Message-Id: <20190131133928.17985-32-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_084020_176274_0E460F02 X-CRM114-Status: GOOD ( 12.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski The cp-intc driver has now been cleaned up. Move it to drivers/irqchip where it belongs. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/Kconfig | 8 ++------ arch/arm/mach-davinci/Makefile | 2 -- drivers/irqchip/Kconfig | 5 +++++ drivers/irqchip/Makefile | 1 + .../cp_intc.c => drivers/irqchip/irq-davinci-cp-intc.c | 0 5 files changed, 8 insertions(+), 8 deletions(-) rename arch/arm/mach-davinci/cp_intc.c => drivers/irqchip/irq-davinci-cp-intc.c (100%) diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 71a4d875dd39..5a59cebc7d0a 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -1,10 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 if ARCH_DAVINCI -config CP_INTC - bool - select IRQ_DOMAIN - config ARCH_DAVINCI_DMx bool @@ -33,13 +29,13 @@ config ARCH_DAVINCI_DA830 select ARCH_DAVINCI_DA8XX # needed on silicon revs 1.0, 1.1: select CPU_DCACHE_WRITETHROUGH if !CPU_DCACHE_DISABLE - select CP_INTC + select DAVINCI_CP_INTC config ARCH_DAVINCI_DA850 bool "DA850/OMAP-L138/AM18x based system" depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT) select ARCH_DAVINCI_DA8XX - select CP_INTC + select DAVINCI_CP_INTC config ARCH_DAVINCI_DA8XX bool diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile index 983865a99616..f76a8482784f 100644 --- a/arch/arm/mach-davinci/Makefile +++ b/arch/arm/mach-davinci/Makefile @@ -18,8 +18,6 @@ obj-$(CONFIG_ARCH_DAVINCI_DM365) += dm365.o devices.o obj-$(CONFIG_ARCH_DAVINCI_DA830) += da830.o devices-da8xx.o usb-da8xx.o obj-$(CONFIG_ARCH_DAVINCI_DA850) += da850.o devices-da8xx.o usb-da8xx.o -obj-$(CONFIG_CP_INTC) += cp_intc.o - # Board specific obj-$(CONFIG_MACH_DA8XX_DT) += da8xx-dt.o pdata-quirks.o obj-$(CONFIG_MACH_DAVINCI_EVM) += board-dm644x-evm.o diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index ea0eb82bf1d2..48fc5024c073 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -134,6 +134,11 @@ config DAVINCI_AINTC select GENERIC_IRQ_CHIP select IRQ_DOMAIN +config DAVINCI_CP_INTC + bool + select GENERIC_IRQ_CHIP + select IRQ_DOMAIN + config DW_APB_ICTL bool select GENERIC_IRQ_CHIP diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 623e0ec5f9d0..e6cd0c98eff2 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -7,6 +7,7 @@ obj-$(CONFIG_ATH79) += irq-ath79-misc.o obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2836.o obj-$(CONFIG_DAVINCI_AINTC) += irq-davinci-aintc.o +obj-$(CONFIG_DAVINCI_CP_INTC) += irq-davinci-cp-intc.o obj-$(CONFIG_ARCH_EXYNOS) += exynos-combiner.o obj-$(CONFIG_FARADAY_FTINTC010) += irq-ftintc010.o obj-$(CONFIG_ARCH_HIP04) += irq-hip04.o diff --git a/arch/arm/mach-davinci/cp_intc.c b/drivers/irqchip/irq-davinci-cp-intc.c similarity index 100% rename from arch/arm/mach-davinci/cp_intc.c rename to drivers/irqchip/irq-davinci-cp-intc.c From patchwork Thu Jan 31 13:39:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790627 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 39B81139A for ; Thu, 31 Jan 2019 13:47:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 266E930E81 for ; Thu, 31 Jan 2019 13:47:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 19BC330E84; Thu, 31 Jan 2019 13:47:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 253D830E81 for ; Thu, 31 Jan 2019 13:47:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=M9OwwoPJ791Y8zvrn2FQyDo+gMNo/B49/9ptA8s6RUI=; b=HFeh25JoedHBwO 8Ev4PsTejepvutx/Pje5CyltdudcsLRcG8+nPKbDiBopL+I+xKFu7cVe4Y4+xwuQ1rBgTf1Jwjhz+ QyxYlQnLtAwVJyvt37nc6trNdnfLsGHWB0d8YwI4NP+udmzuRY8Iob5N4luW4Ak0ghoTSvYLGP/No jlFlC8MxJpEqJu6nI76aU0+3Oz0hd+8frrrIgkaF48EyQFlItgSPVkwAWV75erGE9Y7Vk1jF0rMFe liU7ZJUDC13SptMcxdXfxzasTdgL5BMnP8HAEjww4d1KWKOqnP2Itroq8nnJZbN0TWd4NQBkWrih3 aQ+u2FxX+RnnDI8pmxnA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCgN-0003wW-FE; Thu, 31 Jan 2019 13:47:07 +0000 Received: from mail-wr1-f65.google.com ([209.85.221.65]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZo-0005vQ-Vn for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:31 +0000 Received: by mail-wr1-f65.google.com with SMTP id x10so3322603wrs.8 for ; Thu, 31 Jan 2019 05:40:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=We2WlkoJ1lTjORWt1TBXuNoYiOgoaziyvmKKctGjQOg=; b=U1+qrDL1hKiJD95zrgp5kctoBSKJnzQuxYzATy98FMDtxrBxDlEsIZIqpNSB3Yito8 /D4waT9v8hZEJVT0WC9RjTc4VowuB1m8+sU0HRbvwcdB+gBZCB6lE/OymwsJhZ//u5Bl umdcnRW3cqr3EfVX4OZrpNvxFslPNEl2i0AFXtLiXuk3AizJIEXDVGY8i+haR5qJSBbx V190OHH8rKABE7AS2eHoLHhIlNpjJiEty2xfaVIhecPKSUK2Cpkiks82YNRDivm5lzw/ zP9hyAEDHeGk1A+L7aO3HruX9kxpsveLQUdy4E5rLMZDo5+uMeLUHEzWXHyyQy9QhQ1H Mgyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=We2WlkoJ1lTjORWt1TBXuNoYiOgoaziyvmKKctGjQOg=; b=iFHAPbNrU2wZReBbEXs93t5i/F3uCNmZPENwZ8nyQkKbF3ofw08Hb1zj++Lc2p5dlh YZuLHwQ4n1oN19glc8rkVBL0WyZ5vjR6w78fE1dYNd3opEBlPnl45I4w1ZlmBIxc/ALk LCUCDgxN390D+mZ6f/a4fglXWJFMzWUiflndpUk/Gd0w/48Rn6nU0o3iEWxD9eObLvkq eUVS2USTZqquPRvODqSDFPRjHcT9cshC2pRDOxyYzPFSTe+9wDC6BtyxbDuYZSLTz9D9 ++EDpoUO/+dMTvRZxHK1qLiZMqHIbjYO42V1ZcHe4jkBhuZXAkfF/hLkh9GxHzc8okh8 2o7A== X-Gm-Message-State: AHQUAuahTdq4KBB2vRe0pAfomvjEpRhdR08tAnoVL6N9dABw0I2sJzVF 74/NRITsRCik1+EwVr/yRZgrzg== X-Google-Smtp-Source: AHgI3IaJaNxLdLCLlO5UsDg7/jCPCCJbBa5eq5GrkHIjm+VHASnM8QiRabB7OiyD6WPN8apUEF7Juw== X-Received: by 2002:adf:8421:: with SMTP id 30mr178924wrf.153.1548942019070; Thu, 31 Jan 2019 05:40:19 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:18 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 32/35] ARM: davinci: remove intc related fields from davinci_soc_info Date: Thu, 31 Jan 2019 14:39:25 +0100 Message-Id: <20190131133928.17985-33-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_054021_133897_5D29EEDE X-CRM114-Status: GOOD ( 11.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski These are no longer used. Remove them. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/da830.c | 19 ------------------- arch/arm/mach-davinci/da850.c | 20 -------------------- arch/arm/mach-davinci/dm355.c | 3 --- arch/arm/mach-davinci/dm365.c | 3 --- arch/arm/mach-davinci/dm644x.c | 3 --- arch/arm/mach-davinci/dm646x.c | 3 --- arch/arm/mach-davinci/include/mach/common.h | 3 --- 7 files changed, 54 deletions(-) diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index bdbd66ffd2ea..9cf9b090efeb 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -624,22 +624,6 @@ const short da830_eqep1_pins[] __initconst = { -1 }; -/* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */ -static u8 da830_cp_intc_prios[] = { - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, -}; - static struct map_desc da830_io_desc[] = { { .virtual = IO_VIRT, @@ -728,9 +712,6 @@ static const struct davinci_soc_info davinci_soc_info_da830 = { .pinmux_base = DA8XX_SYSCFG0_BASE + 0x120, .pinmux_pins = da830_pins, .pinmux_pins_num = ARRAY_SIZE(da830_pins), - .intc_base = DA8XX_CP_INTC_BASE, - .intc_irq_prios = da830_cp_intc_prios, - .intc_irq_num = DA830_N_CP_INTC_IRQ, .timer_info = &da830_timer_info, .emac_pdata = &da8xx_emac_pdata, }; diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index fe370e85aeb1..b9ebdcde68eb 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -299,23 +299,6 @@ const short da850_vpif_display_pins[] __initconst = { -1 }; -/* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */ -static u8 da850_cp_intc_prios[] = { - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, -}; - static struct map_desc da850_io_desc[] = { { .virtual = IO_VIRT, @@ -651,9 +634,6 @@ static const struct davinci_soc_info davinci_soc_info_da850 = { .pinmux_base = DA8XX_SYSCFG0_BASE + 0x120, .pinmux_pins = da850_pins, .pinmux_pins_num = ARRAY_SIZE(da850_pins), - .intc_base = DA8XX_CP_INTC_BASE, - .intc_irq_prios = da850_cp_intc_prios, - .intc_irq_num = DA850_N_CP_INTC_IRQ, .timer_info = &da850_timer_info, .emac_pdata = &da8xx_emac_pdata, .sram_dma = DA8XX_SHARED_RAM_BASE, diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index a0bfb3602136..5573f53b47f9 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -651,9 +651,6 @@ static const struct davinci_soc_info davinci_soc_info_dm355 = { .pinmux_base = DAVINCI_SYSTEM_MODULE_BASE, .pinmux_pins = dm355_pins, .pinmux_pins_num = ARRAY_SIZE(dm355_pins), - .intc_base = DAVINCI_ARM_INTC_BASE, - .intc_irq_prios = dm355_aintc_prios, - .intc_irq_num = DAVINCI_N_AINTC_IRQ, .timer_info = &dm355_timer_info, .sram_dma = 0x00010000, .sram_len = SZ_32K, diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index eab575873255..6d9bf292f4c6 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -666,9 +666,6 @@ static const struct davinci_soc_info davinci_soc_info_dm365 = { .pinmux_base = DAVINCI_SYSTEM_MODULE_BASE, .pinmux_pins = dm365_pins, .pinmux_pins_num = ARRAY_SIZE(dm365_pins), - .intc_base = DAVINCI_ARM_INTC_BASE, - .intc_irq_prios = dm365_aintc_prios, - .intc_irq_num = DAVINCI_N_AINTC_IRQ, .timer_info = &dm365_timer_info, .emac_pdata = &dm365_emac_pdata, .sram_dma = 0x00010000, diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index beb97101c881..2f181b4149c1 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -591,9 +591,6 @@ static const struct davinci_soc_info davinci_soc_info_dm644x = { .pinmux_base = DAVINCI_SYSTEM_MODULE_BASE, .pinmux_pins = dm644x_pins, .pinmux_pins_num = ARRAY_SIZE(dm644x_pins), - .intc_base = DAVINCI_ARM_INTC_BASE, - .intc_irq_prios = dm644x_aintc_prios, - .intc_irq_num = DAVINCI_N_AINTC_IRQ, .timer_info = &dm644x_timer_info, .emac_pdata = &dm644x_emac_pdata, .sram_dma = 0x00008000, diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 70505c92d5fb..4ce2c8c6b945 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -531,9 +531,6 @@ static const struct davinci_soc_info davinci_soc_info_dm646x = { .pinmux_base = DAVINCI_SYSTEM_MODULE_BASE, .pinmux_pins = dm646x_pins, .pinmux_pins_num = ARRAY_SIZE(dm646x_pins), - .intc_base = DAVINCI_ARM_INTC_BASE, - .intc_irq_prios = dm646x_aintc_prios, - .intc_irq_num = DAVINCI_N_AINTC_IRQ, .timer_info = &dm646x_timer_info, .emac_pdata = &dm646x_emac_pdata, .sram_dma = 0x10010000, diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index 9e06974c85bb..2b986d32049f 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -53,9 +53,6 @@ struct davinci_soc_info { u32 pinmux_base; const struct mux_config *pinmux_pins; unsigned long pinmux_pins_num; - u32 intc_base; - u8 *intc_irq_prios; - unsigned long intc_irq_num; struct davinci_timer_info *timer_info; int gpio_type; u32 gpio_base; From patchwork Thu Jan 31 13:39:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790625 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 54EB791E for ; Thu, 31 Jan 2019 13:47:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4379230E81 for ; Thu, 31 Jan 2019 13:47:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 379E330E84; Thu, 31 Jan 2019 13:47:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9FA4630E81 for ; Thu, 31 Jan 2019 13:47:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=9k3PQbwuLWEOE52PShsgaQZvfeBydq3B5KjlzJMRWu8=; b=errkCxKfCtB0ir gPq8EI64W6VKfnGibQs9x510qf9f/1uXw7kEtPRrglAd9WwOeuIPF77xnbOGWNorvVKcOPEqeCEpv B4tLwpog6en6+44Hy9Vk/uPVeqhyQsPCYtDhid4ezaIVuQkNw+M1xs0FMA/jhGzVIbHNXwRgXwikD ok5TfFxen1obdNcn38IAiGCa48NkpJG3VNgPC6B33jHmy4xZiOKfZAclgdZRz0Iy596cv6CCskHEV 8tuJBdZ50mEWhEuzpwKkMrJYPKryPXX2BMrHbhcDzdMECTkfFWOxVwAlLp7gE9FbOEpsxBqKNgr1k RzbViWzy4+88VkCkbkOg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCgD-0003nD-NK; Thu, 31 Jan 2019 13:46:57 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZp-0005zm-NU for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:32 +0000 Received: by mail-wr1-x442.google.com with SMTP id 96so3372872wrb.2 for ; Thu, 31 Jan 2019 05:40:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=padNTKocuwwxGO42WDui/BONzRUERCjnTaS+UDD+SrU=; b=EtoOyzTwbuKA+RAbm57od7nekqOmEc6K+qso18grAMS7Via6T2XpJ0Dypz4V9ijr+g rJ9Mp0J8Zlu8/M/HrnKOUL2gn+ptW/n7Zofc795yllmcCdGvpLQxVb9g6vWp1yuoCss/ 0Ru82S3/E90ktmt+dIjw47WKkApQCcquz4xMkHTSBL/tr2r5VU7Y4Bmay/K012/NTZP9 iG74NWD6rDMDUchkVM4ajXSHVayaD8xIX05SzDd/y+Ut9h50kQUM78g7mPU9juyTRYDC FEB7N8h+HZN3GGH7GdxIJCX6TLXgQ2rT5h7AMstq1rNKVteDc77FJtzFZ6l+TLlRvv3i uspQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=padNTKocuwwxGO42WDui/BONzRUERCjnTaS+UDD+SrU=; b=iDSXh/e3DbGRVpcL2/dGjC+OBGOhvyOyPdNR8fYZKpfz22Kej/rxMnQVZvm2QI/d/C 3z8yAoWmruw8Ulbfee5ZMVKYqW63dDthmYkjmQ/18GuBGRcCk3locroiPCG5j2E7RJeB vyWHK55+CaDxwoTPNj+YLB8AQLlQ0BIWaQ4pGeWfid2bHDBnXcANT1RcqMnmESA4tmeh eIXdVdQXkMxTcdV1sJ6VWeKJF1bF5/9KqRr1ene91l0JANINIqVJF9K4pGolk4Xw+W4X KgK4lz5CfPNRkpoJo5LwKwOCQam/Qy7HmvR3cv9TzKfQFGQsGPACFmjxtd+N8ozx7xGK P5uA== X-Gm-Message-State: AJcUukfS4coO/23u17COkZiaW93bewdJnaksOgE53Q+KSjWiZt+TZhue ROnvi4f4E4dbezQqS68+An5IEw== X-Google-Smtp-Source: ALg8bN7wgaBd0tavK1f4G8lbe1qLagkKsMfMhZ3uqdKElNKY/4c9GZQ/FY70qUsxMtqJHeXeVlmbXg== X-Received: by 2002:a5d:68c3:: with SMTP id p3mr35334018wrw.34.1548942020343; Thu, 31 Jan 2019 05:40:20 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:19 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 33/35] ARM: davinci: prepare to remove mach/irqs.h Date: Thu, 31 Jan 2019 14:39:26 +0100 Message-Id: <20190131133928.17985-34-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_054021_905564_8AAFC443 X-CRM114-Status: GOOD ( 16.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Since we now select SPARSE_IRQ in davinci, the mach/irqs.h header is no longer included from asm/irq.h. All interrupt numbers for devices should be defined as platform device resources. Let's prepare for the removal of mach/irqs.h by moving all defines that we want to keep to relevant headers (davinci.h, common.h) and replacing others with simple literals. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/board-da830-evm.c | 2 +- arch/arm/mach-davinci/board-da850-evm.c | 4 ++-- arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- arch/arm/mach-davinci/board-dm646x-evm.c | 2 +- arch/arm/mach-davinci/da830.c | 2 +- arch/arm/mach-davinci/da850.c | 2 +- arch/arm/mach-davinci/davinci.h | 2 ++ arch/arm/mach-davinci/include/mach/common.h | 5 +++++ arch/arm/mach-davinci/include/mach/irqs.h | 18 ------------------ 9 files changed, 14 insertions(+), 25 deletions(-) diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index b3a0148f7f1a..950e98e4eda5 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -488,7 +488,7 @@ static int da830_evm_ui_expander_teardown(struct i2c_client *client, int gpio, } static struct pcf857x_platform_data __initdata da830_evm_ui_expander_info = { - .gpio_base = DAVINCI_N_GPIO, + .gpio_base = 144, .setup = da830_evm_ui_expander_setup, .teardown = da830_evm_ui_expander_teardown, }; diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index efc9a33da6e1..27acba6fe5f8 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -562,7 +562,7 @@ static int da850_evm_ui_expander_teardown(struct i2c_client *client, /* assign the baseboard expander's GPIOs after the UI board's */ #define DA850_UI_EXPANDER_N_GPIOS ARRAY_SIZE(da850_evm_ui_exp) -#define DA850_BB_EXPANDER_GPIO_BASE (DAVINCI_N_GPIO + DA850_UI_EXPANDER_N_GPIOS) +#define DA850_BB_EXPANDER_GPIO_BASE (144 + DA850_UI_EXPANDER_N_GPIOS) enum da850_evm_bb_exp_pins { DA850_EVM_BB_EXP_DEEP_SLEEP_EN = 0, @@ -735,7 +735,7 @@ static int da850_evm_bb_expander_teardown(struct i2c_client *client, } static struct pca953x_platform_data da850_evm_ui_expander_info = { - .gpio_base = DAVINCI_N_GPIO, + .gpio_base = 144, .setup = da850_evm_ui_expander_setup, .teardown = da850_evm_ui_expander_teardown, .names = da850_evm_ui_exp, diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index f23a29e5116f..d04ce0c206b6 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -310,7 +310,7 @@ static struct platform_device rtc_dev = { * I2C GPIO expanders */ -#define PCF_Uxx_BASE(x) (DAVINCI_N_GPIO + ((x) * 8)) +#define PCF_Uxx_BASE(x) (144 + ((x) * 8)) /* U2 -- LEDs */ diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index ebf07d92224e..2ddc03a95acd 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -333,7 +333,7 @@ static int evm_pcf_teardown(struct i2c_client *client, int gpio, } static struct pcf857x_platform_data pcf_data = { - .gpio_base = DAVINCI_N_GPIO+1, + .gpio_base = 145, .setup = evm_pcf_setup, .teardown = evm_pcf_teardown, }; diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 9cf9b090efeb..74cbab153e59 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -730,7 +730,7 @@ static const struct davinci_cp_intc_config da830_cp_intc_config = { .end = DA8XX_CP_INTC_BASE + SZ_8K, .flags = IORESOURCE_MEM, }, - .num_irqs = DA830_N_CP_INTC_IRQ, + .num_irqs = 96, }; void __init da830_init_irqs(void) diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index b9ebdcde68eb..644f4eec8d5c 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -658,7 +658,7 @@ static const struct davinci_cp_intc_config da850_cp_intc_config = { .end = DA8XX_CP_INTC_BASE + SZ_8K, .flags = IORESOURCE_MEM, }, - .num_irqs = DA850_N_CP_INTC_IRQ, + .num_irqs = 101, }; void __init da850_init_irqs(void) diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h index 49958cc161d7..d5bffd3751f9 100644 --- a/arch/arm/mach-davinci/davinci.h +++ b/arch/arm/mach-davinci/davinci.h @@ -39,6 +39,8 @@ #define DAVINCI_PLL2_BASE 0x01c40c00 #define DAVINCI_PWR_SLEEP_CNTRL_BASE 0x01c41000 +#define DAVINCI_ARM_INTC_BASE 0x01c48000 + #define DAVINCI_SYSTEM_MODULE_BASE 0x01c40000 #define SYSMOD_VDAC_CONFIG 0x2c #define SYSMOD_VIDCLKCTL 0x38 diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index 2b986d32049f..9526e5da0d33 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -17,6 +17,11 @@ #include #include +#include + +#define DAVINCI_INTC_START NR_IRQS +#define DAVINCI_INTC_IRQ(_irqnum) (DAVINCI_INTC_START + (_irqnum)) + void davinci_timer_init(struct clk *clk); struct davinci_timer_instance { diff --git a/arch/arm/mach-davinci/include/mach/irqs.h b/arch/arm/mach-davinci/include/mach/irqs.h index 317cbc42e5cd..27c9f89f2a7f 100644 --- a/arch/arm/mach-davinci/include/mach/irqs.h +++ b/arch/arm/mach-davinci/include/mach/irqs.h @@ -29,12 +29,6 @@ #include -/* Base address */ -#define DAVINCI_ARM_INTC_BASE 0x01C48000 - -#define DAVINCI_INTC_START NR_IRQS -#define DAVINCI_INTC_IRQ(_irqnum) (DAVINCI_INTC_START + (_irqnum)) - /* Interrupt lines */ #define IRQ_VDINT0 DAVINCI_INTC_IRQ(0) #define IRQ_VDINT1 DAVINCI_INTC_IRQ(1) @@ -100,10 +94,6 @@ #define IRQ_COMMRX DAVINCI_INTC_IRQ(62) #define IRQ_EMUINT DAVINCI_INTC_IRQ(63) -#define DAVINCI_N_AINTC_IRQ 64 - -#define ARCH_TIMER_IRQ IRQ_TINT1_TINT34 - /* DaVinci DM6467-specific Interrupts */ #define IRQ_DM646X_VP_VERTINT0 DAVINCI_INTC_IRQ(0) #define IRQ_DM646X_VP_VERTINT1 DAVINCI_INTC_IRQ(1) @@ -344,8 +334,6 @@ #define IRQ_DA830_T12CMPINT6_1 DAVINCI_INTC_IRQ(88) #define IRQ_DA830_T12CMPINT7_1 DAVINCI_INTC_IRQ(89) -#define DA830_N_CP_INTC_IRQ 96 - /* DA850 speicific interrupts */ #define IRQ_DA850_MPUADDRERR0 DAVINCI_INTC_IRQ(27) #define IRQ_DA850_MPUPROTERR0 DAVINCI_INTC_IRQ(27) @@ -401,10 +389,4 @@ #define IRQ_DA850_MCBSP1RINT DAVINCI_INTC_IRQ(99) #define IRQ_DA850_MCBSP1XINT DAVINCI_INTC_IRQ(100) -#define DA850_N_CP_INTC_IRQ 101 - -/* da850 currently has the most gpio pins (144) */ -#define DAVINCI_N_GPIO 144 -/* da850 currently has the most irqs so use DA850_N_CP_INTC_IRQ */ - #endif /* __ASM_ARCH_IRQS_H */ From patchwork Thu Jan 31 13:39:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790631 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6AB4B91E for ; Thu, 31 Jan 2019 13:47:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5537730EA9 for ; Thu, 31 Jan 2019 13:47:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 493C230EB0; Thu, 31 Jan 2019 13:47:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6552930EB0 for ; Thu, 31 Jan 2019 13:47:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7nUzt4DEekFcoBE4pHC/HnlYVC41SjGQTxEf7EAsPmE=; b=rGTrVhkjGVMEYQ Xolypt/Ln4PmE2NhVqsGoLwmWf8PjoK412k0Jrqs+VSDNXM2fB4CIrTbufeDWVsYmPYHhksQIHHyD EQLdnN7b6/83dbD8jDWJCrG345gtVyFdd88BgdiUgPhbEF2/crs0BO5OVFo/nsiWaWGEdVlmvuzDn ar600NF6nX6oAJ5SDMmWY98qxCaxWahi365oAD2nI6it10JaAdpgkUUivTPF3fl+p4OwSAVD5aZGX RyrZlmx69aT20Zy94x0r5Ije06RWkwYJCd61td/fh6yrn/IJHC4B1X90N69fUaeLGbwqwCeM5ivkJ BYMvGhxYTr27n3BkqvBw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCgs-0004R5-Sd; Thu, 31 Jan 2019 13:47:39 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZr-000685-GB for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:36 +0000 Received: by mail-wr1-x443.google.com with SMTP id l9so3275698wrt.13 for ; Thu, 31 Jan 2019 05:40:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1JE167iruojMcj//oSVyp9MKJElJ70DgO5ByMSFKSYQ=; b=tN93PNXp/QTYofd973QlJFrFsCGVCi50IMz2JMdsPvg7W7sHwry1FdIY8eb1MFhNIw D7ZDj9xxdXB2u2g0WjxGa1L789+ARc3vGGletCc8KCmV0a5HKVvTOtd0/rkAuAFliOd+ nUZoKTivjyOcWgw4xLMUU3hp4/ra2zX0Ypa0Fhp/+itf8BZV0MmvSzna6ZfS4jCKPqp7 37k+sGg6yUNFSuukhcAzud8Z2SXH2rZKqDvtCoOujEScF9VXVWkpv7+LyNJr8d5+Mses /I/jfwhbxtAWh3wOFx1TY4EJdRmTRe0+LKkK69maoDZqR/Hz6gV+AKcyynBcFQ6gRXcR Lo9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1JE167iruojMcj//oSVyp9MKJElJ70DgO5ByMSFKSYQ=; b=MbAqrejBSzHy5aP2djGufR7VNMh1zLccPlxGpv3dsC7sfSu0PhMgJkKGqqLywLBnDV T66eLR8VT0TNO6jsOnNoXJtMH5S/bRuUM/9Gnid/rsAFPUONFZdtkKxS9Y4srC2oMujK i2xS+4sCK1TVigsAtEkVV3/LlXZY6vPtPHH3FgRdNvvT5fP+jPBAfHDGcQYWyikZw1QG tAwai652kdSg/dXrJjrrpIcl19Bgzv89FgPd85/Sko3WO8CZBqyQ6HRIyL6N1aJ/cbF8 D5gXcRXRe+IrDPR7adQ8MQGMh02Ua02R/5cw8mh8Vwmz50yTOOrLjnDyzOeJzA9xYWZs XK/A== X-Gm-Message-State: AJcUukcv1ZvJrJMk7BZHeblY/RJ3A5T7Ytgxco/hv9EKonY+ZBx6aD8I x8c4+JaoBS0ivsZEmgyzJWbomA== X-Google-Smtp-Source: ALg8bN6h0pHK8LZrFqLpj2J1uz/uVQcicyBSnw8UYz9QgsehumDKmCnIAfIEOp/yRWUqLFFORU37Ow== X-Received: by 2002:adf:9d85:: with SMTP id p5mr33052861wre.41.1548942021598; Thu, 31 Jan 2019 05:40:21 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:20 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 34/35] ARM: davinci: stop using defines from mach/irqs.h Date: Thu, 31 Jan 2019 14:39:27 +0100 Message-Id: <20190131133928.17985-35-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_054023_792190_15D87F2C X-CRM114-Status: GOOD ( 13.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski As the second step in preparation for mach/irqs.h removal - replace all constants defined there with the DAVINCI_INTC_IRQ() macro which takes the NR_IRQS offset into account. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/asp.h | 8 +- arch/arm/mach-davinci/da830.c | 12 +-- arch/arm/mach-davinci/da850.c | 28 ++--- arch/arm/mach-davinci/devices-da8xx.c | 146 +++++++++++++------------- arch/arm/mach-davinci/devices.c | 30 +++--- arch/arm/mach-davinci/dm355.c | 56 +++++----- arch/arm/mach-davinci/dm365.c | 80 +++++++------- arch/arm/mach-davinci/dm644x.c | 48 ++++----- arch/arm/mach-davinci/dm646x.c | 62 +++++------ arch/arm/mach-davinci/usb-da8xx.c | 6 +- arch/arm/mach-davinci/usb.c | 6 +- 11 files changed, 241 insertions(+), 241 deletions(-) diff --git a/arch/arm/mach-davinci/asp.h b/arch/arm/mach-davinci/asp.h index 495aa6907cbc..17013e27152e 100644 --- a/arch/arm/mach-davinci/asp.h +++ b/arch/arm/mach-davinci/asp.h @@ -49,9 +49,9 @@ #define DAVINCI_DA830_DMA_MCASP2_AXEVT 5 /* Interrupts */ -#define DAVINCI_ASP0_RX_INT IRQ_MBRINT -#define DAVINCI_ASP0_TX_INT IRQ_MBXINT -#define DAVINCI_ASP1_RX_INT IRQ_MBRINT -#define DAVINCI_ASP1_TX_INT IRQ_MBXINT +#define DAVINCI_ASP0_RX_INT DAVINCI_INTC_IRQ(25) +#define DAVINCI_ASP0_TX_INT DAVINCI_INTC_IRQ(24) +#define DAVINCI_ASP1_RX_INT DAVINCI_INTC_IRQ(25) +#define DAVINCI_ASP1_TX_INT DAVINCI_INTC_IRQ(24) #endif /* __ASM_ARCH_DAVINCI_ASP_H */ diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 74cbab153e59..a8407c1d1a68 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -678,17 +678,17 @@ int __init da830_register_gpio(void) static struct davinci_timer_instance da830_timer_instance[2] = { { .base = DA8XX_TIMER64P0_BASE, - .bottom_irq = IRQ_DA8XX_TINT12_0, - .top_irq = IRQ_DA8XX_TINT34_0, + .bottom_irq = DAVINCI_INTC_IRQ(21), + .top_irq = DAVINCI_INTC_IRQ(22), .cmp_off = DA830_CMP12_0, - .cmp_irq = IRQ_DA830_T12CMPINT0_0, + .cmp_irq = DAVINCI_INTC_IRQ(74), }, { .base = DA8XX_TIMER64P1_BASE, - .bottom_irq = IRQ_DA8XX_TINT12_1, - .top_irq = IRQ_DA8XX_TINT34_1, + .bottom_irq = DAVINCI_INTC_IRQ(23), + .top_irq = DAVINCI_INTC_IRQ(24), .cmp_off = DA830_CMP12_0, - .cmp_irq = IRQ_DA830_T12CMPINT0_1, + .cmp_irq = DAVINCI_INTC_IRQ(82), }, }; diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 644f4eec8d5c..84b30c70ddf1 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -335,23 +335,23 @@ static struct davinci_id da850_ids[] = { static struct davinci_timer_instance da850_timer_instance[4] = { { .base = DA8XX_TIMER64P0_BASE, - .bottom_irq = IRQ_DA8XX_TINT12_0, - .top_irq = IRQ_DA8XX_TINT34_0, + .bottom_irq = DAVINCI_INTC_IRQ(21), + .top_irq = DAVINCI_INTC_IRQ(22), }, { .base = DA8XX_TIMER64P1_BASE, - .bottom_irq = IRQ_DA8XX_TINT12_1, - .top_irq = IRQ_DA8XX_TINT34_1, + .bottom_irq = DAVINCI_INTC_IRQ(23), + .top_irq = DAVINCI_INTC_IRQ(24), }, { .base = DA850_TIMER64P2_BASE, - .bottom_irq = IRQ_DA850_TINT12_2, - .top_irq = IRQ_DA850_TINT34_2, + .bottom_irq = DAVINCI_INTC_IRQ(68), + .top_irq = DAVINCI_INTC_IRQ(68), }, { .base = DA850_TIMER64P3_BASE, - .bottom_irq = IRQ_DA850_TINT12_3, - .top_irq = IRQ_DA850_TINT34_3, + .bottom_irq = DAVINCI_INTC_IRQ(96), + .top_irq = DAVINCI_INTC_IRQ(96), }, }; @@ -554,8 +554,8 @@ static struct platform_device da850_vpif_dev = { static struct resource da850_vpif_display_resource[] = { { - .start = IRQ_DA850_VPIFINT, - .end = IRQ_DA850_VPIFINT, + .start = DAVINCI_INTC_IRQ(92), + .end = DAVINCI_INTC_IRQ(92), .flags = IORESOURCE_IRQ, }, }; @@ -573,13 +573,13 @@ static struct platform_device da850_vpif_display_dev = { static struct resource da850_vpif_capture_resource[] = { { - .start = IRQ_DA850_VPIFINT, - .end = IRQ_DA850_VPIFINT, + .start = DAVINCI_INTC_IRQ(92), + .end = DAVINCI_INTC_IRQ(92), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA850_VPIFINT, - .end = IRQ_DA850_VPIFINT, + .start = DAVINCI_INTC_IRQ(92), + .end = DAVINCI_INTC_IRQ(92), .flags = IORESOURCE_IRQ, }, }; diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index 65edd2aa9db5..fda6d35c415c 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -65,7 +65,7 @@ void __iomem *da8xx_syscfg1_base; static struct plat_serial8250_port da8xx_serial0_pdata[] = { { .mapbase = DA8XX_UART0_BASE, - .irq = IRQ_DA8XX_UARTINT0, + .irq = DAVINCI_INTC_IRQ(25), .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP, .iotype = UPIO_MEM, @@ -78,7 +78,7 @@ static struct plat_serial8250_port da8xx_serial0_pdata[] = { static struct plat_serial8250_port da8xx_serial1_pdata[] = { { .mapbase = DA8XX_UART1_BASE, - .irq = IRQ_DA8XX_UARTINT1, + .irq = DAVINCI_INTC_IRQ(53), .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP, .iotype = UPIO_MEM, @@ -91,7 +91,7 @@ static struct plat_serial8250_port da8xx_serial1_pdata[] = { static struct plat_serial8250_port da8xx_serial2_pdata[] = { { .mapbase = DA8XX_UART2_BASE, - .irq = IRQ_DA8XX_UARTINT2, + .irq = DAVINCI_INTC_IRQ(61), .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP, .iotype = UPIO_MEM, @@ -172,12 +172,12 @@ static struct resource da8xx_edma0_resources[] = { }, { .name = "edma3_ccint", - .start = IRQ_DA8XX_CCINT0, + .start = DAVINCI_INTC_IRQ(11), .flags = IORESOURCE_IRQ, }, { .name = "edma3_ccerrint", - .start = IRQ_DA8XX_CCERRINT, + .start = DAVINCI_INTC_IRQ(12), .flags = IORESOURCE_IRQ, }, }; @@ -197,12 +197,12 @@ static struct resource da850_edma1_resources[] = { }, { .name = "edma3_ccint", - .start = IRQ_DA850_CCINT1, + .start = DAVINCI_INTC_IRQ(93), .flags = IORESOURCE_IRQ, }, { .name = "edma3_ccerrint", - .start = IRQ_DA850_CCERRINT1, + .start = DAVINCI_INTC_IRQ(94), .flags = IORESOURCE_IRQ, }, }; @@ -307,8 +307,8 @@ static struct resource da8xx_i2c_resources0[] = { .flags = IORESOURCE_MEM, }, { - .start = IRQ_DA8XX_I2CINT0, - .end = IRQ_DA8XX_I2CINT0, + .start = DAVINCI_INTC_IRQ(15), + .end = DAVINCI_INTC_IRQ(15), .flags = IORESOURCE_IRQ, }, }; @@ -327,8 +327,8 @@ static struct resource da8xx_i2c_resources1[] = { .flags = IORESOURCE_MEM, }, { - .start = IRQ_DA8XX_I2CINT1, - .end = IRQ_DA8XX_I2CINT1, + .start = DAVINCI_INTC_IRQ(51), + .end = DAVINCI_INTC_IRQ(51), .flags = IORESOURCE_IRQ, }, }; @@ -383,23 +383,23 @@ static struct resource da8xx_emac_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = IRQ_DA8XX_C0_RX_THRESH_PULSE, - .end = IRQ_DA8XX_C0_RX_THRESH_PULSE, + .start = DAVINCI_INTC_IRQ(33), + .end = DAVINCI_INTC_IRQ(33), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_C0_RX_PULSE, - .end = IRQ_DA8XX_C0_RX_PULSE, + .start = DAVINCI_INTC_IRQ(34), + .end = DAVINCI_INTC_IRQ(34), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_C0_TX_PULSE, - .end = IRQ_DA8XX_C0_TX_PULSE, + .start = DAVINCI_INTC_IRQ(35), + .end = DAVINCI_INTC_IRQ(35), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_C0_MISC_PULSE, - .end = IRQ_DA8XX_C0_MISC_PULSE, + .start = DAVINCI_INTC_IRQ(36), + .end = DAVINCI_INTC_IRQ(36), .flags = IORESOURCE_IRQ, }, }; @@ -471,7 +471,7 @@ static struct resource da830_mcasp1_resources[] = { }, { .name = "common", - .start = IRQ_DA8XX_MCASPINT, + .start = DAVINCI_INTC_IRQ(54), .flags = IORESOURCE_IRQ, }, }; @@ -506,7 +506,7 @@ static struct resource da830_mcasp2_resources[] = { }, { .name = "common", - .start = IRQ_DA8XX_MCASPINT, + .start = DAVINCI_INTC_IRQ(54), .flags = IORESOURCE_IRQ, }, }; @@ -541,7 +541,7 @@ static struct resource da850_mcasp_resources[] = { }, { .name = "common", - .start = IRQ_DA8XX_MCASPINT, + .start = DAVINCI_INTC_IRQ(54), .flags = IORESOURCE_IRQ, }, }; @@ -589,43 +589,43 @@ static struct resource da8xx_pruss_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = IRQ_DA8XX_EVTOUT0, - .end = IRQ_DA8XX_EVTOUT0, + .start = DAVINCI_INTC_IRQ(3), + .end = DAVINCI_INTC_IRQ(3), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_EVTOUT1, - .end = IRQ_DA8XX_EVTOUT1, + .start = DAVINCI_INTC_IRQ(4), + .end = DAVINCI_INTC_IRQ(4), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_EVTOUT2, - .end = IRQ_DA8XX_EVTOUT2, + .start = DAVINCI_INTC_IRQ(5), + .end = DAVINCI_INTC_IRQ(5), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_EVTOUT3, - .end = IRQ_DA8XX_EVTOUT3, + .start = DAVINCI_INTC_IRQ(6), + .end = DAVINCI_INTC_IRQ(6), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_EVTOUT4, - .end = IRQ_DA8XX_EVTOUT4, + .start = DAVINCI_INTC_IRQ(7), + .end = DAVINCI_INTC_IRQ(7), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_EVTOUT5, - .end = IRQ_DA8XX_EVTOUT5, + .start = DAVINCI_INTC_IRQ(8), + .end = DAVINCI_INTC_IRQ(8), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_EVTOUT6, - .end = IRQ_DA8XX_EVTOUT6, + .start = DAVINCI_INTC_IRQ(9), + .end = DAVINCI_INTC_IRQ(9), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_EVTOUT7, - .end = IRQ_DA8XX_EVTOUT7, + .start = DAVINCI_INTC_IRQ(10), + .end = DAVINCI_INTC_IRQ(10), .flags = IORESOURCE_IRQ, }, }; @@ -675,8 +675,8 @@ static struct resource da8xx_lcdc_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { /* interrupt */ - .start = IRQ_DA8XX_LCDINT, - .end = IRQ_DA8XX_LCDINT, + .start = DAVINCI_INTC_IRQ(52), + .end = DAVINCI_INTC_IRQ(52), .flags = IORESOURCE_IRQ, }, }; @@ -701,48 +701,48 @@ static struct resource da8xx_gpio_resources[] = { .flags = IORESOURCE_MEM, }, { /* interrupt */ - .start = IRQ_DA8XX_GPIO0, - .end = IRQ_DA8XX_GPIO0, + .start = DAVINCI_INTC_IRQ(42), + .end = DAVINCI_INTC_IRQ(42), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_GPIO1, - .end = IRQ_DA8XX_GPIO1, + .start = DAVINCI_INTC_IRQ(43), + .end = DAVINCI_INTC_IRQ(43), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_GPIO2, - .end = IRQ_DA8XX_GPIO2, + .start = DAVINCI_INTC_IRQ(44), + .end = DAVINCI_INTC_IRQ(44), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_GPIO3, - .end = IRQ_DA8XX_GPIO3, + .start = DAVINCI_INTC_IRQ(45), + .end = DAVINCI_INTC_IRQ(45), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_GPIO4, - .end = IRQ_DA8XX_GPIO4, + .start = DAVINCI_INTC_IRQ(46), + .end = DAVINCI_INTC_IRQ(46), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_GPIO5, - .end = IRQ_DA8XX_GPIO5, + .start = DAVINCI_INTC_IRQ(47), + .end = DAVINCI_INTC_IRQ(47), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_GPIO6, - .end = IRQ_DA8XX_GPIO6, + .start = DAVINCI_INTC_IRQ(48), + .end = DAVINCI_INTC_IRQ(48), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_GPIO7, - .end = IRQ_DA8XX_GPIO7, + .start = DAVINCI_INTC_IRQ(49), + .end = DAVINCI_INTC_IRQ(49), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DA8XX_GPIO8, - .end = IRQ_DA8XX_GPIO8, + .start = DAVINCI_INTC_IRQ(50), + .end = DAVINCI_INTC_IRQ(50), .flags = IORESOURCE_IRQ, }, }; @@ -767,8 +767,8 @@ static struct resource da8xx_mmcsd0_resources[] = { .flags = IORESOURCE_MEM, }, { /* interrupt */ - .start = IRQ_DA8XX_MMCSDINT0, - .end = IRQ_DA8XX_MMCSDINT0, + .start = DAVINCI_INTC_IRQ(16), + .end = DAVINCI_INTC_IRQ(16), .flags = IORESOURCE_IRQ, }, }; @@ -794,8 +794,8 @@ static struct resource da850_mmcsd1_resources[] = { .flags = IORESOURCE_MEM, }, { /* interrupt */ - .start = IRQ_DA850_MMCSDINT0_1, - .end = IRQ_DA850_MMCSDINT0_1, + .start = DAVINCI_INTC_IRQ(72), + .end = DAVINCI_INTC_IRQ(72), .flags = IORESOURCE_IRQ, }, }; @@ -846,8 +846,8 @@ static struct resource da8xx_rproc_resources[] = { .flags = IORESOURCE_MEM, }, { /* dsp irq */ - .start = IRQ_DA8XX_CHIPINT0, - .end = IRQ_DA8XX_CHIPINT0, + .start = DAVINCI_INTC_IRQ(28), + .end = DAVINCI_INTC_IRQ(28), .flags = IORESOURCE_IRQ, }, }; @@ -937,13 +937,13 @@ static struct resource da8xx_rtc_resources[] = { .flags = IORESOURCE_MEM, }, { /* timer irq */ - .start = IRQ_DA8XX_RTC, - .end = IRQ_DA8XX_RTC, + .start = DAVINCI_INTC_IRQ(19), + .end = DAVINCI_INTC_IRQ(19), .flags = IORESOURCE_IRQ, }, { /* alarm irq */ - .start = IRQ_DA8XX_RTC, - .end = IRQ_DA8XX_RTC, + .start = DAVINCI_INTC_IRQ(19), + .end = DAVINCI_INTC_IRQ(19), .flags = IORESOURCE_IRQ, }, }; @@ -1010,8 +1010,8 @@ static struct resource da8xx_spi0_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = IRQ_DA8XX_SPINT0, - .end = IRQ_DA8XX_SPINT0, + .start = DAVINCI_INTC_IRQ(20), + .end = DAVINCI_INTC_IRQ(20), .flags = IORESOURCE_IRQ, }, }; @@ -1023,8 +1023,8 @@ static struct resource da8xx_spi1_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = IRQ_DA8XX_SPINT1, - .end = IRQ_DA8XX_SPINT1, + .start = DAVINCI_INTC_IRQ(56), + .end = DAVINCI_INTC_IRQ(56), .flags = IORESOURCE_IRQ, }, }; @@ -1104,7 +1104,7 @@ static struct resource da850_sata_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = IRQ_DA850_SATAINT, + .start = DAVINCI_INTC_IRQ(67), .flags = IORESOURCE_IRQ, }, }; diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c index e8dbbb7479ab..b8e5c5998872 100644 --- a/arch/arm/mach-davinci/devices.c +++ b/arch/arm/mach-davinci/devices.c @@ -56,7 +56,7 @@ static struct resource i2c_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = IRQ_I2C, + .start = DAVINCI_INTC_IRQ(39), .flags = IORESOURCE_IRQ, }, }; @@ -84,8 +84,8 @@ static struct resource ide_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = IRQ_IDE, - .end = IRQ_IDE, + .start = DAVINCI_INTC_IRQ(22), + .end = DAVINCI_INTC_IRQ(22), .flags = IORESOURCE_IRQ, }, }; @@ -110,7 +110,7 @@ void __init davinci_init_ide(void) davinci_cfg_reg(DM644X_ATAEN); davinci_cfg_reg(DM644X_HDIREN); } else if (cpu_is_davinci_dm646x()) { - /* IRQ_DM646X_IDE is the same as IRQ_IDE */ + /* DAVINCI_INTC_IRQ(22) is the same as DAVINCI_INTC_IRQ(22) */ davinci_cfg_reg(DM646X_ATAEN); } else { WARN_ON(1); @@ -133,11 +133,11 @@ static struct resource mmcsd0_resources[] = { }, /* IRQs: MMC/SD, then SDIO */ { - .start = IRQ_MMCINT, + .start = DAVINCI_INTC_IRQ(26), .flags = IORESOURCE_IRQ, }, { /* different on dm355 */ - .start = IRQ_SDIOINT, + .start = DAVINCI_INTC_IRQ(27), .flags = IORESOURCE_IRQ, }, }; @@ -163,10 +163,10 @@ static struct resource mmcsd1_resources[] = { }, /* IRQs: MMC/SD, then SDIO */ { - .start = IRQ_DM355_MMCINT1, + .start = DAVINCI_INTC_IRQ(27), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM355_SDIOINT1, + .start = DAVINCI_INTC_IRQ(31), .flags = IORESOURCE_IRQ, }, }; @@ -219,7 +219,7 @@ void __init davinci_setup_mmc(int module, struct davinci_mmc_config *config) mmcsd1_resources[0].start = DM365_MMCSD1_BASE; mmcsd1_resources[0].end = DM365_MMCSD1_BASE + SZ_4K - 1; - mmcsd1_resources[2].start = IRQ_DM365_SDIOINT1; + mmcsd1_resources[2].start = DAVINCI_INTC_IRQ(31); davinci_mmcsd1_device.name = "da830-mmc"; } else break; @@ -230,7 +230,7 @@ void __init davinci_setup_mmc(int module, struct davinci_mmc_config *config) if (cpu_is_davinci_dm355()) { mmcsd0_resources[0].start = DM355_MMCSD0_BASE; mmcsd0_resources[0].end = DM355_MMCSD0_BASE + SZ_4K - 1; - mmcsd0_resources[2].start = IRQ_DM355_SDIOINT0; + mmcsd0_resources[2].start = DAVINCI_INTC_IRQ(23); /* expose all 6 MMC0 signals: CLK, CMD, DATA[0..3] */ davinci_cfg_reg(DM355_MMCSD0); @@ -241,7 +241,7 @@ void __init davinci_setup_mmc(int module, struct davinci_mmc_config *config) mmcsd0_resources[0].start = DM365_MMCSD0_BASE; mmcsd0_resources[0].end = DM365_MMCSD0_BASE + SZ_4K - 1; - mmcsd0_resources[2].start = IRQ_DM365_SDIOINT0; + mmcsd0_resources[2].start = DAVINCI_INTC_IRQ(23); davinci_mmcsd0_device.name = "da830-mmc"; } else if (cpu_is_davinci_dm644x()) { /* REVISIT: should this be in board-init code? */ @@ -313,13 +313,13 @@ int davinci_gpio_register(struct resource *res, int size, void *pdata) struct davinci_timer_instance davinci_timer_instance[2] = { { .base = DAVINCI_TIMER0_BASE, - .bottom_irq = IRQ_TINT0_TINT12, - .top_irq = IRQ_TINT0_TINT34, + .bottom_irq = DAVINCI_INTC_IRQ(32), + .top_irq = DAVINCI_INTC_IRQ(33), }, { .base = DAVINCI_TIMER1_BASE, - .bottom_irq = IRQ_TINT1_TINT12, - .top_irq = IRQ_TINT1_TINT34, + .bottom_irq = DAVINCI_INTC_IRQ(34), + .top_irq = DAVINCI_INTC_IRQ(35), }, }; diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index 5573f53b47f9..8d53d0c0a4a2 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -54,7 +54,7 @@ static struct resource dm355_spi0_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = IRQ_DM355_SPINT0_0, + .start = DAVINCI_INTC_IRQ(42), .flags = IORESOURCE_IRQ, }, }; @@ -220,12 +220,12 @@ static struct resource edma_resources[] = { }, { .name = "edma3_ccint", - .start = IRQ_CCINT0, + .start = DAVINCI_INTC_IRQ(16), .flags = IORESOURCE_IRQ, }, { .name = "edma3_ccerrint", - .start = IRQ_CCERRINT, + .start = DAVINCI_INTC_IRQ(17), .flags = IORESOURCE_IRQ, }, /* not using (or muxing) TC*_ERR */ @@ -305,13 +305,13 @@ static struct platform_device dm355_vpss_device = { static struct resource vpfe_resources[] = { { - .start = IRQ_VDINT0, - .end = IRQ_VDINT0, + .start = DAVINCI_INTC_IRQ(0), + .end = DAVINCI_INTC_IRQ(0), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_VDINT1, - .end = IRQ_VDINT1, + .start = DAVINCI_INTC_IRQ(1), + .end = DAVINCI_INTC_IRQ(1), .flags = IORESOURCE_IRQ, }, }; @@ -369,8 +369,8 @@ static struct platform_device dm355_osd_dev = { static struct resource dm355_venc_resources[] = { { - .start = IRQ_VENCINT, - .end = IRQ_VENCINT, + .start = DAVINCI_INTC_IRQ(8), + .end = DAVINCI_INTC_IRQ(8), .flags = IORESOURCE_IRQ, }, /* venc registers io space */ @@ -389,8 +389,8 @@ static struct resource dm355_venc_resources[] = { static struct resource dm355_v4l2_disp_resources[] = { { - .start = IRQ_VENCINT, - .end = IRQ_VENCINT, + .start = DAVINCI_INTC_IRQ(8), + .end = DAVINCI_INTC_IRQ(8), .flags = IORESOURCE_IRQ, }, /* venc registers io space */ @@ -494,38 +494,38 @@ static struct resource dm355_gpio_resources[] = { .flags = IORESOURCE_MEM, }, { /* interrupt */ - .start = IRQ_DM355_GPIOBNK0, - .end = IRQ_DM355_GPIOBNK0, + .start = DAVINCI_INTC_IRQ(54), + .end = DAVINCI_INTC_IRQ(54), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM355_GPIOBNK1, - .end = IRQ_DM355_GPIOBNK1, + .start = DAVINCI_INTC_IRQ(55), + .end = DAVINCI_INTC_IRQ(55), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM355_GPIOBNK2, - .end = IRQ_DM355_GPIOBNK2, + .start = DAVINCI_INTC_IRQ(56), + .end = DAVINCI_INTC_IRQ(56), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM355_GPIOBNK3, - .end = IRQ_DM355_GPIOBNK3, + .start = DAVINCI_INTC_IRQ(57), + .end = DAVINCI_INTC_IRQ(57), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM355_GPIOBNK4, - .end = IRQ_DM355_GPIOBNK4, + .start = DAVINCI_INTC_IRQ(58), + .end = DAVINCI_INTC_IRQ(58), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM355_GPIOBNK5, - .end = IRQ_DM355_GPIOBNK5, + .start = DAVINCI_INTC_IRQ(59), + .end = DAVINCI_INTC_IRQ(59), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM355_GPIOBNK6, - .end = IRQ_DM355_GPIOBNK6, + .start = DAVINCI_INTC_IRQ(60), + .end = DAVINCI_INTC_IRQ(60), .flags = IORESOURCE_IRQ, }, }; @@ -579,7 +579,7 @@ static struct davinci_timer_info dm355_timer_info = { static struct plat_serial8250_port dm355_serial0_platform_data[] = { { .mapbase = DAVINCI_UART0_BASE, - .irq = IRQ_UARTINT0, + .irq = DAVINCI_INTC_IRQ(40), .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP, .iotype = UPIO_MEM, @@ -592,7 +592,7 @@ static struct plat_serial8250_port dm355_serial0_platform_data[] = { static struct plat_serial8250_port dm355_serial1_platform_data[] = { { .mapbase = DAVINCI_UART1_BASE, - .irq = IRQ_UARTINT1, + .irq = DAVINCI_INTC_IRQ(41), .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP, .iotype = UPIO_MEM, @@ -605,7 +605,7 @@ static struct plat_serial8250_port dm355_serial1_platform_data[] = { static struct plat_serial8250_port dm355_serial2_platform_data[] = { { .mapbase = DM355_UART2_BASE, - .irq = IRQ_DM355_UARTINT2, + .irq = DAVINCI_INTC_IRQ(14), .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP, .iotype = UPIO_MEM, diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 6d9bf292f4c6..00d90cf81e7f 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -225,7 +225,7 @@ static struct resource dm365_spi0_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = IRQ_DM365_SPIINT0_0, + .start = DAVINCI_INTC_IRQ(42), .flags = IORESOURCE_IRQ, }, }; @@ -267,43 +267,43 @@ static struct resource dm365_gpio_resources[] = { .flags = IORESOURCE_MEM, }, { /* interrupt */ - .start = IRQ_DM365_GPIO0, - .end = IRQ_DM365_GPIO0, + .start = DAVINCI_INTC_IRQ(44), + .end = DAVINCI_INTC_IRQ(44), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM365_GPIO1, - .end = IRQ_DM365_GPIO1, + .start = DAVINCI_INTC_IRQ(45), + .end = DAVINCI_INTC_IRQ(45), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM365_GPIO2, - .end = IRQ_DM365_GPIO2, + .start = DAVINCI_INTC_IRQ(46), + .end = DAVINCI_INTC_IRQ(46), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM365_GPIO3, - .end = IRQ_DM365_GPIO3, + .start = DAVINCI_INTC_IRQ(47), + .end = DAVINCI_INTC_IRQ(47), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM365_GPIO4, - .end = IRQ_DM365_GPIO4, + .start = DAVINCI_INTC_IRQ(48), + .end = DAVINCI_INTC_IRQ(48), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM365_GPIO5, - .end = IRQ_DM365_GPIO5, + .start = DAVINCI_INTC_IRQ(49), + .end = DAVINCI_INTC_IRQ(49), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM365_GPIO6, - .end = IRQ_DM365_GPIO6, + .start = DAVINCI_INTC_IRQ(50), + .end = DAVINCI_INTC_IRQ(50), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM365_GPIO7, - .end = IRQ_DM365_GPIO7, + .start = DAVINCI_INTC_IRQ(51), + .end = DAVINCI_INTC_IRQ(51), .flags = IORESOURCE_IRQ, }, }; @@ -337,23 +337,23 @@ static struct resource dm365_emac_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = IRQ_DM365_EMAC_RXTHRESH, - .end = IRQ_DM365_EMAC_RXTHRESH, + .start = DAVINCI_INTC_IRQ(52), + .end = DAVINCI_INTC_IRQ(52), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM365_EMAC_RXPULSE, - .end = IRQ_DM365_EMAC_RXPULSE, + .start = DAVINCI_INTC_IRQ(53), + .end = DAVINCI_INTC_IRQ(53), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM365_EMAC_TXPULSE, - .end = IRQ_DM365_EMAC_TXPULSE, + .start = DAVINCI_INTC_IRQ(54), + .end = DAVINCI_INTC_IRQ(54), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM365_EMAC_MISCPULSE, - .end = IRQ_DM365_EMAC_MISCPULSE, + .start = DAVINCI_INTC_IRQ(55), + .end = DAVINCI_INTC_IRQ(55), .flags = IORESOURCE_IRQ, }, }; @@ -463,12 +463,12 @@ static struct resource edma_resources[] = { }, { .name = "edma3_ccint", - .start = IRQ_CCINT0, + .start = DAVINCI_INTC_IRQ(16), .flags = IORESOURCE_IRQ, }, { .name = "edma3_ccerrint", - .start = IRQ_CCERRINT, + .start = DAVINCI_INTC_IRQ(17), .flags = IORESOURCE_IRQ, }, /* not using TC*_ERR */ @@ -542,7 +542,7 @@ static struct resource dm365_rtc_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = IRQ_DM365_RTCINT, + .start = DAVINCI_INTC_IRQ(29), .flags = IORESOURCE_IRQ, }, }; @@ -572,8 +572,8 @@ static struct resource dm365_ks_resources[] = { }, { /* interrupt */ - .start = IRQ_DM365_KEYINT, - .end = IRQ_DM365_KEYINT, + .start = DAVINCI_INTC_IRQ(60), + .end = DAVINCI_INTC_IRQ(60), .flags = IORESOURCE_IRQ, }, }; @@ -614,7 +614,7 @@ static struct davinci_timer_info dm365_timer_info = { static struct plat_serial8250_port dm365_serial0_platform_data[] = { { .mapbase = DAVINCI_UART0_BASE, - .irq = IRQ_UARTINT0, + .irq = DAVINCI_INTC_IRQ(40), .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP, .iotype = UPIO_MEM, @@ -627,7 +627,7 @@ static struct plat_serial8250_port dm365_serial0_platform_data[] = { static struct plat_serial8250_port dm365_serial1_platform_data[] = { { .mapbase = DM365_UART1_BASE, - .irq = IRQ_UARTINT1, + .irq = DAVINCI_INTC_IRQ(41), .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP, .iotype = UPIO_MEM, @@ -763,13 +763,13 @@ static struct platform_device dm365_vpss_device = { static struct resource vpfe_resources[] = { { - .start = IRQ_VDINT0, - .end = IRQ_VDINT0, + .start = DAVINCI_INTC_IRQ(0), + .end = DAVINCI_INTC_IRQ(0), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_VDINT1, - .end = IRQ_VDINT1, + .start = DAVINCI_INTC_IRQ(1), + .end = DAVINCI_INTC_IRQ(1), .flags = IORESOURCE_IRQ, }, }; @@ -850,8 +850,8 @@ static struct platform_device dm365_osd_dev = { static struct resource dm365_venc_resources[] = { { - .start = IRQ_VENCINT, - .end = IRQ_VENCINT, + .start = DAVINCI_INTC_IRQ(8), + .end = DAVINCI_INTC_IRQ(8), .flags = IORESOURCE_IRQ, }, /* venc registers io space */ @@ -870,8 +870,8 @@ static struct resource dm365_venc_resources[] = { static struct resource dm365_v4l2_disp_resources[] = { { - .start = IRQ_VENCINT, - .end = IRQ_VENCINT, + .start = DAVINCI_INTC_IRQ(8), + .end = DAVINCI_INTC_IRQ(8), .flags = IORESOURCE_IRQ, }, /* venc registers io space */ diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 2f181b4149c1..a17ae9d66c53 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -61,8 +61,8 @@ static struct resource dm644x_emac_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = IRQ_EMACINT, - .end = IRQ_EMACINT, + .start = DAVINCI_INTC_IRQ(13), + .end = DAVINCI_INTC_IRQ(13), .flags = IORESOURCE_IRQ, }, }; @@ -206,12 +206,12 @@ static struct resource edma_resources[] = { }, { .name = "edma3_ccint", - .start = IRQ_CCINT0, + .start = DAVINCI_INTC_IRQ(16), .flags = IORESOURCE_IRQ, }, { .name = "edma3_ccerrint", - .start = IRQ_CCERRINT, + .start = DAVINCI_INTC_IRQ(17), .flags = IORESOURCE_IRQ, }, /* not using TC*_ERR */ @@ -276,13 +276,13 @@ static struct platform_device dm644x_vpss_device = { static struct resource dm644x_vpfe_resources[] = { { - .start = IRQ_VDINT0, - .end = IRQ_VDINT0, + .start = DAVINCI_INTC_IRQ(0), + .end = DAVINCI_INTC_IRQ(0), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_VDINT1, - .end = IRQ_VDINT1, + .start = DAVINCI_INTC_IRQ(1), + .end = DAVINCI_INTC_IRQ(1), .flags = IORESOURCE_IRQ, }, }; @@ -388,8 +388,8 @@ static int dm644x_venc_setup_clock(enum vpbe_enc_timings_type type, static struct resource dm644x_v4l2_disp_resources[] = { { - .start = IRQ_VENCINT, - .end = IRQ_VENCINT, + .start = DAVINCI_INTC_IRQ(8), + .end = DAVINCI_INTC_IRQ(8), .flags = IORESOURCE_IRQ, }, }; @@ -437,28 +437,28 @@ static struct resource dm644_gpio_resources[] = { .flags = IORESOURCE_MEM, }, { /* interrupt */ - .start = IRQ_GPIOBNK0, - .end = IRQ_GPIOBNK0, + .start = DAVINCI_INTC_IRQ(56), + .end = DAVINCI_INTC_IRQ(56), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_GPIOBNK1, - .end = IRQ_GPIOBNK1, + .start = DAVINCI_INTC_IRQ(57), + .end = DAVINCI_INTC_IRQ(57), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_GPIOBNK2, - .end = IRQ_GPIOBNK2, + .start = DAVINCI_INTC_IRQ(58), + .end = DAVINCI_INTC_IRQ(58), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_GPIOBNK3, - .end = IRQ_GPIOBNK3, + .start = DAVINCI_INTC_IRQ(59), + .end = DAVINCI_INTC_IRQ(59), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_GPIOBNK4, - .end = IRQ_GPIOBNK4, + .start = DAVINCI_INTC_IRQ(60), + .end = DAVINCI_INTC_IRQ(60), .flags = IORESOURCE_IRQ, }, }; @@ -519,7 +519,7 @@ static struct davinci_timer_info dm644x_timer_info = { static struct plat_serial8250_port dm644x_serial0_platform_data[] = { { .mapbase = DAVINCI_UART0_BASE, - .irq = IRQ_UARTINT0, + .irq = DAVINCI_INTC_IRQ(40), .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP, .iotype = UPIO_MEM, @@ -532,7 +532,7 @@ static struct plat_serial8250_port dm644x_serial0_platform_data[] = { static struct plat_serial8250_port dm644x_serial1_platform_data[] = { { .mapbase = DAVINCI_UART1_BASE, - .irq = IRQ_UARTINT1, + .irq = DAVINCI_INTC_IRQ(41), .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP, .iotype = UPIO_MEM, @@ -545,7 +545,7 @@ static struct plat_serial8250_port dm644x_serial1_platform_data[] = { static struct plat_serial8250_port dm644x_serial2_platform_data[] = { { .mapbase = DAVINCI_UART2_BASE, - .irq = IRQ_UARTINT2, + .irq = DAVINCI_INTC_IRQ(42), .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP, .iotype = UPIO_MEM, @@ -615,7 +615,7 @@ void __init dm644x_init_time(void) struct clk *clk; /* Needed by the dsp. */ - irq_set_handler(IRQ_TINT1_TINT34, handle_level_irq); + irq_set_handler(DAVINCI_INTC_IRQ(35), handle_level_irq); clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, DM644X_REF_FREQ); diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 4ce2c8c6b945..f5506216321e 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -64,23 +64,23 @@ static struct resource dm646x_emac_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = IRQ_DM646X_EMACRXTHINT, - .end = IRQ_DM646X_EMACRXTHINT, + .start = DAVINCI_INTC_IRQ(24), + .end = DAVINCI_INTC_IRQ(24), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM646X_EMACRXINT, - .end = IRQ_DM646X_EMACRXINT, + .start = DAVINCI_INTC_IRQ(25), + .end = DAVINCI_INTC_IRQ(25), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM646X_EMACTXINT, - .end = IRQ_DM646X_EMACTXINT, + .start = DAVINCI_INTC_IRQ(26), + .end = DAVINCI_INTC_IRQ(26), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM646X_EMACMISCINT, - .end = IRQ_DM646X_EMACMISCINT, + .start = DAVINCI_INTC_IRQ(27), + .end = DAVINCI_INTC_IRQ(27), .flags = IORESOURCE_IRQ, }, }; @@ -219,12 +219,12 @@ static struct resource edma_resources[] = { }, { .name = "edma3_ccint", - .start = IRQ_CCINT0, + .start = DAVINCI_INTC_IRQ(16), .flags = IORESOURCE_IRQ, }, { .name = "edma3_ccerrint", - .start = IRQ_CCERRINT, + .start = DAVINCI_INTC_IRQ(17), .flags = IORESOURCE_IRQ, }, /* not using TC*_ERR */ @@ -261,12 +261,12 @@ static struct resource dm646x_mcasp0_resources[] = { }, { .name = "tx", - .start = IRQ_DM646X_MCASP0TXINT, + .start = DAVINCI_INTC_IRQ(28), .flags = IORESOURCE_IRQ, }, { .name = "rx", - .start = IRQ_DM646X_MCASP0RXINT, + .start = DAVINCI_INTC_IRQ(29), .flags = IORESOURCE_IRQ, }, }; @@ -287,7 +287,7 @@ static struct resource dm646x_mcasp1_resources[] = { }, { .name = "tx", - .start = IRQ_DM646X_MCASP1TXINT, + .start = DAVINCI_INTC_IRQ(30), .flags = IORESOURCE_IRQ, }, }; @@ -334,13 +334,13 @@ static struct platform_device vpif_dev = { static struct resource vpif_display_resource[] = { { - .start = IRQ_DM646X_VP_VERTINT2, - .end = IRQ_DM646X_VP_VERTINT2, + .start = DAVINCI_INTC_IRQ(2), + .end = DAVINCI_INTC_IRQ(2), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM646X_VP_VERTINT3, - .end = IRQ_DM646X_VP_VERTINT3, + .start = DAVINCI_INTC_IRQ(3), + .end = DAVINCI_INTC_IRQ(3), .flags = IORESOURCE_IRQ, }, }; @@ -358,13 +358,13 @@ static struct platform_device vpif_display_dev = { static struct resource vpif_capture_resource[] = { { - .start = IRQ_DM646X_VP_VERTINT0, - .end = IRQ_DM646X_VP_VERTINT0, + .start = DAVINCI_INTC_IRQ(0), + .end = DAVINCI_INTC_IRQ(0), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM646X_VP_VERTINT1, - .end = IRQ_DM646X_VP_VERTINT1, + .start = DAVINCI_INTC_IRQ(1), + .end = DAVINCI_INTC_IRQ(1), .flags = IORESOURCE_IRQ, }, }; @@ -387,18 +387,18 @@ static struct resource dm646x_gpio_resources[] = { .flags = IORESOURCE_MEM, }, { /* interrupt */ - .start = IRQ_DM646X_GPIOBNK0, - .end = IRQ_DM646X_GPIOBNK0, + .start = DAVINCI_INTC_IRQ(56), + .end = DAVINCI_INTC_IRQ(56), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM646X_GPIOBNK1, - .end = IRQ_DM646X_GPIOBNK1, + .start = DAVINCI_INTC_IRQ(57), + .end = DAVINCI_INTC_IRQ(57), .flags = IORESOURCE_IRQ, }, { - .start = IRQ_DM646X_GPIOBNK2, - .end = IRQ_DM646X_GPIOBNK2, + .start = DAVINCI_INTC_IRQ(58), + .end = DAVINCI_INTC_IRQ(58), .flags = IORESOURCE_IRQ, }, }; @@ -459,7 +459,7 @@ static struct davinci_timer_info dm646x_timer_info = { static struct plat_serial8250_port dm646x_serial0_platform_data[] = { { .mapbase = DAVINCI_UART0_BASE, - .irq = IRQ_UARTINT0, + .irq = DAVINCI_INTC_IRQ(40), .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP, .iotype = UPIO_MEM32, @@ -472,7 +472,7 @@ static struct plat_serial8250_port dm646x_serial0_platform_data[] = { static struct plat_serial8250_port dm646x_serial1_platform_data[] = { { .mapbase = DAVINCI_UART1_BASE, - .irq = IRQ_UARTINT1, + .irq = DAVINCI_INTC_IRQ(41), .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP, .iotype = UPIO_MEM32, @@ -485,7 +485,7 @@ static struct plat_serial8250_port dm646x_serial1_platform_data[] = { static struct plat_serial8250_port dm646x_serial2_platform_data[] = { { .mapbase = DAVINCI_UART2_BASE, - .irq = IRQ_DM646X_UARTINT2, + .irq = DAVINCI_INTC_IRQ(42), .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP, .iotype = UPIO_MEM32, @@ -598,7 +598,7 @@ void __init dm646x_init_time(unsigned long ref_clk_rate, struct clk *clk; /* Needed by the dsp. */ - irq_set_handler(IRQ_TINT1_TINT34, handle_level_irq); + irq_set_handler(DAVINCI_INTC_IRQ(35), handle_level_irq); clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, ref_clk_rate); clk_register_fixed_rate(NULL, "aux_clkin", NULL, 0, aux_clkin_rate); diff --git a/arch/arm/mach-davinci/usb-da8xx.c b/arch/arm/mach-davinci/usb-da8xx.c index c17ce66a3d95..fdfe03669d9f 100644 --- a/arch/arm/mach-davinci/usb-da8xx.c +++ b/arch/arm/mach-davinci/usb-da8xx.c @@ -70,7 +70,7 @@ static struct resource da8xx_usb20_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = IRQ_DA8XX_USB_INT, + .start = DAVINCI_INTC_IRQ(58), .flags = IORESOURCE_IRQ, .name = "mc", }, @@ -105,8 +105,8 @@ static struct resource da8xx_usb11_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = IRQ_DA8XX_IRQN, - .end = IRQ_DA8XX_IRQN, + .start = DAVINCI_INTC_IRQ(59), + .end = DAVINCI_INTC_IRQ(59), .flags = IORESOURCE_IRQ, }, }; diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c index 31ed7aa47227..feb300670f43 100644 --- a/arch/arm/mach-davinci/usb.c +++ b/arch/arm/mach-davinci/usb.c @@ -38,7 +38,7 @@ static struct resource usb_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = IRQ_USBINT, + .start = DAVINCI_INTC_IRQ(12), .flags = IORESOURCE_IRQ, .name = "mc" }, @@ -70,8 +70,8 @@ void __init davinci_setup_usb(unsigned mA, unsigned potpgt_ms) if (cpu_is_davinci_dm646x()) { /* Override the defaults as DM6467 uses different IRQs. */ - usb_dev.resource[1].start = IRQ_DM646X_USBINT; - usb_dev.resource[2].start = IRQ_DM646X_USBDMAINT; + usb_dev.resource[1].start = DAVINCI_INTC_IRQ(13); + usb_dev.resource[2].start = DAVINCI_INTC_IRQ(14); } else /* other devices don't have dedicated CPPI IRQ */ usb_dev.num_resources = 2; From patchwork Thu Jan 31 13:39:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790629 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D88F491E for ; Thu, 31 Jan 2019 13:47:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7A1730E82 for ; Thu, 31 Jan 2019 13:47:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BBF7730EA5; Thu, 31 Jan 2019 13:47:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UPPERCASE_50_75 autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4BD3C30E82 for ; Thu, 31 Jan 2019 13:47:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=iC/QMe/vhogRGoCamHcOdv2arYk9hHm2sZ8E8RGkkYY=; b=PVzM4kAdGC6jUM auMelhcROCIJbgiU+nCHy2KJpQnQkos2w8NcSEvcwIz1bFT9QzXy6owDnbG8i1S7zR6mMKuZKP/L1 rchv3Xuspck50PpPMUPbLjCiI9aIR7mHa0k98sodmWcj9jdISrHaP0eJruvofgyqAVvcVUbjO4I8M Dv7v4c/V/4uHKYAGpHLfxS8I2pBokRjEpQnyEQ9M7TerBCzR29zgBFF0hvnXcax3wKfsNqzyhsUtn 0FAm5rYModAwAq6CiO8rzuOomKFpifn+2BnTKdGQxlHkRYCbxzANz/ggTNUUfHBx3fTCXqIJLSeQp Q/Ex/H7i2GTwJ1ZhaGnQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCgd-0004Ct-2M; Thu, 31 Jan 2019 13:47:23 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZs-0006FC-RS for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:35 +0000 Received: by mail-wr1-x443.google.com with SMTP id v13so3331840wrw.5 for ; Thu, 31 Jan 2019 05:40:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d8zirslUFbMuRJ2+Uv/jUm1rRBXue3Kxa80gKIwXI0g=; b=KDpyOegR9UttHZU7A3OCdPN8nGCLlEmA+QEwWFr+4BhyVtk9HKAAmip+wEIevIhI4R 3GFgCFQlEfXZx3UNS0iLxz5iPHhkN0JaKfF/zBCtikFNMxeD8CwMcB2OMpOwxWW2MH/r syMvcdGqFNZO4H2fX2DFrIrPEea0Onr6aXjmCcRNcJ1T5GUc7l4+neyKQOucviSD6SSX 4RKAOLJ9Yw7QGwToKIY7QOCCmPesSBniVQrxE8kGRZUnalhKcYeGQMbn9gFjDDyrTbWJ dpNPfMqcAvDRus89z9P4liqgnOj4MBBtoMH2bCWuoiKQnUNHYvSv0odPa/pvd7mZzxUF JN3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d8zirslUFbMuRJ2+Uv/jUm1rRBXue3Kxa80gKIwXI0g=; b=hGvw/CjIh2JS5pGaKi8UurDOqkcyT9KJGyMkjWaGKg4xFHk8+1Twntw1Ct4UYrcjMe yRJojDQUOQjex8QKjbWC1Ok4XL4bpxth4nKCbcEBfqnPfXOOZAaFpyOHCNloP2xhR5Ql yrNnlwuudTVC5RxEb/eEuzU2xxxTsnJ7jzjW0sjBpPsKocZ/x+SMdJsqPj1ZqFHdBvMz 065QuoF7b6IkxyUMdKh0SHGmP/pfGZRk0AX41QAEyclpQ4HVdq8RFghU/DSDhEFlWjqU E3Yc3dFiWdP0/z+b2OKN8rfsUhfKswRKKN6OQzcoITzVPv3roHzkaPUP07Yj8D1I6EMP qiJg== X-Gm-Message-State: AJcUukcGnJeiJ/IQn8j7vwLr72OjfyzCRLWb+XKwSbmoTsmXldQpQwg4 +2uZnHu4O0PQ55OBMxzEKLsuGQ== X-Google-Smtp-Source: ALg8bN4Mu6BWH+2DGxJU3AKBv6lRfxAr4ZximVaWWNvHWifnDhcvxp6Qc2HOoDqCqB7FFjLvmeldSg== X-Received: by 2002:adf:c846:: with SMTP id e6mr33257588wrh.243.1548942023243; Thu, 31 Jan 2019 05:40:23 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.40.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:40:22 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 35/35] ARM: davinci: remove mach/irqs.h Date: Thu, 31 Jan 2019 14:39:28 +0100 Message-Id: <20190131133928.17985-36-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_054025_206079_3EF72A01 X-CRM114-Status: GOOD ( 15.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski We can now remove mach/irqs.h as there are no more users. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/board-da830-evm.c | 1 - arch/arm/mach-davinci/board-da850-evm.c | 1 - arch/arm/mach-davinci/board-dm644x-evm.c | 1 - arch/arm/mach-davinci/board-dm646x-evm.c | 1 - arch/arm/mach-davinci/da830.c | 1 - arch/arm/mach-davinci/da850.c | 1 - arch/arm/mach-davinci/devices-da8xx.c | 1 - arch/arm/mach-davinci/devices.c | 1 - arch/arm/mach-davinci/dm355.c | 1 - arch/arm/mach-davinci/dm365.c | 1 - arch/arm/mach-davinci/dm644x.c | 1 - arch/arm/mach-davinci/dm646x.c | 1 - arch/arm/mach-davinci/include/mach/irqs.h | 392 ---------------------- arch/arm/mach-davinci/usb-da8xx.c | 1 - arch/arm/mach-davinci/usb.c | 1 - 15 files changed, 406 deletions(-) delete mode 100644 arch/arm/mach-davinci/include/mach/irqs.h diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index 950e98e4eda5..123b424058e2 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -36,7 +36,6 @@ #include #include -#include #include #include diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 27acba6fe5f8..1da3d79f2757 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -45,7 +45,6 @@ #include #include #include -#include #include "sram.h" #include diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index d04ce0c206b6..dac5ad9ff91c 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -36,7 +36,6 @@ #include #include -#include #include #include #include diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index 2ddc03a95acd..b8c7c50212bc 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -44,7 +44,6 @@ #include #include -#include #include #include "davinci.h" diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index a8407c1d1a68..e4d781a36aa1 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include "mux.h" diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 84b30c70ddf1..3872eedb0b23 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index fda6d35c415c..262dcd0a3528 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -25,7 +25,6 @@ #include #include #include -#include #include "asp.h" #include "cpuidle.h" diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c index b8e5c5998872..1337630868f0 100644 --- a/arch/arm/mach-davinci/devices.c +++ b/arch/arm/mach-davinci/devices.c @@ -17,7 +17,6 @@ #include #include -#include #include #include #include diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index 8d53d0c0a4a2..a653defd6418 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -27,7 +27,6 @@ #include #include -#include #include #include #include diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 00d90cf81e7f..35e547a145a9 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -32,7 +32,6 @@ #include #include -#include #include #include #include diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index a17ae9d66c53..a86b20ff2966 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -25,7 +25,6 @@ #include #include -#include #include #include #include diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index f5506216321e..80193b8bd92a 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -26,7 +26,6 @@ #include #include -#include #include #include #include diff --git a/arch/arm/mach-davinci/include/mach/irqs.h b/arch/arm/mach-davinci/include/mach/irqs.h deleted file mode 100644 index 27c9f89f2a7f..000000000000 --- a/arch/arm/mach-davinci/include/mach/irqs.h +++ /dev/null @@ -1,392 +0,0 @@ -/* - * DaVinci interrupt controller definitions - * - * Copyright (C) 2006 Texas Instruments. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ -#ifndef __ASM_ARCH_IRQS_H -#define __ASM_ARCH_IRQS_H - -#include - -/* Interrupt lines */ -#define IRQ_VDINT0 DAVINCI_INTC_IRQ(0) -#define IRQ_VDINT1 DAVINCI_INTC_IRQ(1) -#define IRQ_VDINT2 DAVINCI_INTC_IRQ(2) -#define IRQ_HISTINT DAVINCI_INTC_IRQ(3) -#define IRQ_H3AINT DAVINCI_INTC_IRQ(4) -#define IRQ_PRVUINT DAVINCI_INTC_IRQ(5) -#define IRQ_RSZINT DAVINCI_INTC_IRQ(6) -#define IRQ_VFOCINT DAVINCI_INTC_IRQ(7) -#define IRQ_VENCINT DAVINCI_INTC_IRQ(8) -#define IRQ_ASQINT DAVINCI_INTC_IRQ(9) -#define IRQ_IMXINT DAVINCI_INTC_IRQ(10) -#define IRQ_VLCDINT DAVINCI_INTC_IRQ(11) -#define IRQ_USBINT DAVINCI_INTC_IRQ(12) -#define IRQ_EMACINT DAVINCI_INTC_IRQ(13) - -#define IRQ_CCINT0 DAVINCI_INTC_IRQ(16) -#define IRQ_CCERRINT DAVINCI_INTC_IRQ(17) -#define IRQ_TCERRINT0 DAVINCI_INTC_IRQ(18) -#define IRQ_TCERRINT DAVINCI_INTC_IRQ(19) -#define IRQ_PSCIN DAVINCI_INTC_IRQ(20) - -#define IRQ_IDE DAVINCI_INTC_IRQ(22) -#define IRQ_HPIINT DAVINCI_INTC_IRQ(23) -#define IRQ_MBXINT DAVINCI_INTC_IRQ(24) -#define IRQ_MBRINT DAVINCI_INTC_IRQ(25) -#define IRQ_MMCINT DAVINCI_INTC_IRQ(26) -#define IRQ_SDIOINT DAVINCI_INTC_IRQ(27) -#define IRQ_MSINT DAVINCI_INTC_IRQ(28) -#define IRQ_DDRINT DAVINCI_INTC_IRQ(29) -#define IRQ_AEMIFINT DAVINCI_INTC_IRQ(30) -#define IRQ_VLQINT DAVINCI_INTC_IRQ(31) -#define IRQ_TINT0_TINT12 DAVINCI_INTC_IRQ(32) -#define IRQ_TINT0_TINT34 DAVINCI_INTC_IRQ(33) -#define IRQ_TINT1_TINT12 DAVINCI_INTC_IRQ(34) -#define IRQ_TINT1_TINT34 DAVINCI_INTC_IRQ(35) -#define IRQ_PWMINT0 DAVINCI_INTC_IRQ(36) -#define IRQ_PWMINT1 DAVINCI_INTC_IRQ(37) -#define IRQ_PWMINT2 DAVINCI_INTC_IRQ(38) -#define IRQ_I2C DAVINCI_INTC_IRQ(39) -#define IRQ_UARTINT0 DAVINCI_INTC_IRQ(40) -#define IRQ_UARTINT1 DAVINCI_INTC_IRQ(41) -#define IRQ_UARTINT2 DAVINCI_INTC_IRQ(42) -#define IRQ_SPINT0 DAVINCI_INTC_IRQ(43) -#define IRQ_SPINT1 DAVINCI_INTC_IRQ(44) - -#define IRQ_DSP2ARM0 DAVINCI_INTC_IRQ(46) -#define IRQ_DSP2ARM1 DAVINCI_INTC_IRQ(47) -#define IRQ_GPIO0 DAVINCI_INTC_IRQ(48) -#define IRQ_GPIO1 DAVINCI_INTC_IRQ(49) -#define IRQ_GPIO2 DAVINCI_INTC_IRQ(50) -#define IRQ_GPIO3 DAVINCI_INTC_IRQ(51) -#define IRQ_GPIO4 DAVINCI_INTC_IRQ(52) -#define IRQ_GPIO5 DAVINCI_INTC_IRQ(53) -#define IRQ_GPIO6 DAVINCI_INTC_IRQ(54) -#define IRQ_GPIO7 DAVINCI_INTC_IRQ(55) -#define IRQ_GPIOBNK0 DAVINCI_INTC_IRQ(56) -#define IRQ_GPIOBNK1 DAVINCI_INTC_IRQ(57) -#define IRQ_GPIOBNK2 DAVINCI_INTC_IRQ(58) -#define IRQ_GPIOBNK3 DAVINCI_INTC_IRQ(59) -#define IRQ_GPIOBNK4 DAVINCI_INTC_IRQ(60) -#define IRQ_COMMTX DAVINCI_INTC_IRQ(61) -#define IRQ_COMMRX DAVINCI_INTC_IRQ(62) -#define IRQ_EMUINT DAVINCI_INTC_IRQ(63) - -/* DaVinci DM6467-specific Interrupts */ -#define IRQ_DM646X_VP_VERTINT0 DAVINCI_INTC_IRQ(0) -#define IRQ_DM646X_VP_VERTINT1 DAVINCI_INTC_IRQ(1) -#define IRQ_DM646X_VP_VERTINT2 DAVINCI_INTC_IRQ(2) -#define IRQ_DM646X_VP_VERTINT3 DAVINCI_INTC_IRQ(3) -#define IRQ_DM646X_VP_ERRINT DAVINCI_INTC_IRQ(4) -#define IRQ_DM646X_RESERVED_1 DAVINCI_INTC_IRQ(5) -#define IRQ_DM646X_RESERVED_2 DAVINCI_INTC_IRQ(6) -#define IRQ_DM646X_WDINT DAVINCI_INTC_IRQ(7) -#define IRQ_DM646X_CRGENINT0 DAVINCI_INTC_IRQ(8) -#define IRQ_DM646X_CRGENINT1 DAVINCI_INTC_IRQ(9) -#define IRQ_DM646X_TSIFINT0 DAVINCI_INTC_IRQ(10) -#define IRQ_DM646X_TSIFINT1 DAVINCI_INTC_IRQ(11) -#define IRQ_DM646X_VDCEINT DAVINCI_INTC_IRQ(12) -#define IRQ_DM646X_USBINT DAVINCI_INTC_IRQ(13) -#define IRQ_DM646X_USBDMAINT DAVINCI_INTC_IRQ(14) -#define IRQ_DM646X_PCIINT DAVINCI_INTC_IRQ(15) -#define IRQ_DM646X_TCERRINT2 DAVINCI_INTC_IRQ(20) -#define IRQ_DM646X_TCERRINT3 DAVINCI_INTC_IRQ(21) -#define IRQ_DM646X_IDE DAVINCI_INTC_IRQ(22) -#define IRQ_DM646X_HPIINT DAVINCI_INTC_IRQ(23) -#define IRQ_DM646X_EMACRXTHINT DAVINCI_INTC_IRQ(24) -#define IRQ_DM646X_EMACRXINT DAVINCI_INTC_IRQ(25) -#define IRQ_DM646X_EMACTXINT DAVINCI_INTC_IRQ(26) -#define IRQ_DM646X_EMACMISCINT DAVINCI_INTC_IRQ(27) -#define IRQ_DM646X_MCASP0TXINT DAVINCI_INTC_IRQ(28) -#define IRQ_DM646X_MCASP0RXINT DAVINCI_INTC_IRQ(29) -#define IRQ_DM646X_MCASP1TXINT DAVINCI_INTC_IRQ(30) -#define IRQ_DM646X_RESERVED_3 DAVINCI_INTC_IRQ(31) -#define IRQ_DM646X_VLQINT DAVINCI_INTC_IRQ(38) -#define IRQ_DM646X_UARTINT2 DAVINCI_INTC_IRQ(42) -#define IRQ_DM646X_SPINT0 DAVINCI_INTC_IRQ(43) -#define IRQ_DM646X_SPINT1 DAVINCI_INTC_IRQ(44) -#define IRQ_DM646X_DSP2ARMINT DAVINCI_INTC_IRQ(45) -#define IRQ_DM646X_RESERVED_4 DAVINCI_INTC_IRQ(46) -#define IRQ_DM646X_PSCINT DAVINCI_INTC_IRQ(47) -#define IRQ_DM646X_GPIO0 DAVINCI_INTC_IRQ(48) -#define IRQ_DM646X_GPIO1 DAVINCI_INTC_IRQ(49) -#define IRQ_DM646X_GPIO2 DAVINCI_INTC_IRQ(50) -#define IRQ_DM646X_GPIO3 DAVINCI_INTC_IRQ(51) -#define IRQ_DM646X_GPIO4 DAVINCI_INTC_IRQ(52) -#define IRQ_DM646X_GPIO5 DAVINCI_INTC_IRQ(53) -#define IRQ_DM646X_GPIO6 DAVINCI_INTC_IRQ(54) -#define IRQ_DM646X_GPIO7 DAVINCI_INTC_IRQ(55) -#define IRQ_DM646X_GPIOBNK0 DAVINCI_INTC_IRQ(56) -#define IRQ_DM646X_GPIOBNK1 DAVINCI_INTC_IRQ(57) -#define IRQ_DM646X_GPIOBNK2 DAVINCI_INTC_IRQ(58) -#define IRQ_DM646X_DDRINT DAVINCI_INTC_IRQ(59) -#define IRQ_DM646X_AEMIFINT DAVINCI_INTC_IRQ(60) - -/* DaVinci DM355-specific Interrupts */ -#define IRQ_DM355_CCDC_VDINT0 DAVINCI_INTC_IRQ(0) -#define IRQ_DM355_CCDC_VDINT1 DAVINCI_INTC_IRQ(1) -#define IRQ_DM355_CCDC_VDINT2 DAVINCI_INTC_IRQ(2) -#define IRQ_DM355_IPIPE_HST DAVINCI_INTC_IRQ(3) -#define IRQ_DM355_H3AINT DAVINCI_INTC_IRQ(4) -#define IRQ_DM355_IPIPE_SDR DAVINCI_INTC_IRQ(5) -#define IRQ_DM355_IPIPEIFINT DAVINCI_INTC_IRQ(6) -#define IRQ_DM355_OSDINT DAVINCI_INTC_IRQ(7) -#define IRQ_DM355_VENCINT DAVINCI_INTC_IRQ(8) -#define IRQ_DM355_IMCOPINT DAVINCI_INTC_IRQ(11) -#define IRQ_DM355_RTOINT DAVINCI_INTC_IRQ(13) -#define IRQ_DM355_TINT4 DAVINCI_INTC_IRQ(13) -#define IRQ_DM355_TINT2_TINT12 DAVINCI_INTC_IRQ(13) -#define IRQ_DM355_UARTINT2 DAVINCI_INTC_IRQ(14) -#define IRQ_DM355_TINT5 DAVINCI_INTC_IRQ(14) -#define IRQ_DM355_TINT2_TINT34 DAVINCI_INTC_IRQ(14) -#define IRQ_DM355_TINT6 DAVINCI_INTC_IRQ(15) -#define IRQ_DM355_TINT3_TINT12 DAVINCI_INTC_IRQ(15) -#define IRQ_DM355_SPINT1_0 DAVINCI_INTC_IRQ(17) -#define IRQ_DM355_SPINT1_1 DAVINCI_INTC_IRQ(18) -#define IRQ_DM355_SPINT2_0 DAVINCI_INTC_IRQ(19) -#define IRQ_DM355_SPINT2_1 DAVINCI_INTC_IRQ(21) -#define IRQ_DM355_TINT7 DAVINCI_INTC_IRQ(22) -#define IRQ_DM355_TINT3_TINT34 DAVINCI_INTC_IRQ(22) -#define IRQ_DM355_SDIOINT0 DAVINCI_INTC_IRQ(23) -#define IRQ_DM355_MMCINT0 DAVINCI_INTC_IRQ(26) -#define IRQ_DM355_MSINT DAVINCI_INTC_IRQ(26) -#define IRQ_DM355_MMCINT1 DAVINCI_INTC_IRQ(27) -#define IRQ_DM355_PWMINT3 DAVINCI_INTC_IRQ(28) -#define IRQ_DM355_SDIOINT1 DAVINCI_INTC_IRQ(31) -#define IRQ_DM355_SPINT0_0 DAVINCI_INTC_IRQ(42) -#define IRQ_DM355_SPINT0_1 DAVINCI_INTC_IRQ(43) -#define IRQ_DM355_GPIO0 DAVINCI_INTC_IRQ(44) -#define IRQ_DM355_GPIO1 DAVINCI_INTC_IRQ(45) -#define IRQ_DM355_GPIO2 DAVINCI_INTC_IRQ(46) -#define IRQ_DM355_GPIO3 DAVINCI_INTC_IRQ(47) -#define IRQ_DM355_GPIO4 DAVINCI_INTC_IRQ(48) -#define IRQ_DM355_GPIO5 DAVINCI_INTC_IRQ(49) -#define IRQ_DM355_GPIO6 DAVINCI_INTC_IRQ(50) -#define IRQ_DM355_GPIO7 DAVINCI_INTC_IRQ(51) -#define IRQ_DM355_GPIO8 DAVINCI_INTC_IRQ(52) -#define IRQ_DM355_GPIO9 DAVINCI_INTC_IRQ(53) -#define IRQ_DM355_GPIOBNK0 DAVINCI_INTC_IRQ(54) -#define IRQ_DM355_GPIOBNK1 DAVINCI_INTC_IRQ(55) -#define IRQ_DM355_GPIOBNK2 DAVINCI_INTC_IRQ(56) -#define IRQ_DM355_GPIOBNK3 DAVINCI_INTC_IRQ(57) -#define IRQ_DM355_GPIOBNK4 DAVINCI_INTC_IRQ(58) -#define IRQ_DM355_GPIOBNK5 DAVINCI_INTC_IRQ(59) -#define IRQ_DM355_GPIOBNK6 DAVINCI_INTC_IRQ(60) - -/* DaVinci DM365-specific Interrupts */ -#define IRQ_DM365_INSFINT DAVINCI_INTC_IRQ(7) -#define IRQ_DM365_IMXINT1 DAVINCI_INTC_IRQ(8) -#define IRQ_DM365_IMXINT0 DAVINCI_INTC_IRQ(10) -#define IRQ_DM365_KLD_ARMINT DAVINCI_INTC_IRQ(10) -#define IRQ_DM365_IMCOPINT DAVINCI_INTC_IRQ(11) -#define IRQ_DM365_RTOINT DAVINCI_INTC_IRQ(13) -#define IRQ_DM365_TINT5 DAVINCI_INTC_IRQ(14) -#define IRQ_DM365_TINT6 DAVINCI_INTC_IRQ(15) -#define IRQ_DM365_SPINT2_1 DAVINCI_INTC_IRQ(21) -#define IRQ_DM365_TINT7 DAVINCI_INTC_IRQ(22) -#define IRQ_DM365_SDIOINT0 DAVINCI_INTC_IRQ(23) -#define IRQ_DM365_MMCINT1 DAVINCI_INTC_IRQ(27) -#define IRQ_DM365_PWMINT3 DAVINCI_INTC_IRQ(28) -#define IRQ_DM365_RTCINT DAVINCI_INTC_IRQ(29) -#define IRQ_DM365_SDIOINT1 DAVINCI_INTC_IRQ(31) -#define IRQ_DM365_SPIINT0_0 DAVINCI_INTC_IRQ(42) -#define IRQ_DM365_SPIINT3_0 DAVINCI_INTC_IRQ(43) -#define IRQ_DM365_GPIO0 DAVINCI_INTC_IRQ(44) -#define IRQ_DM365_GPIO1 DAVINCI_INTC_IRQ(45) -#define IRQ_DM365_GPIO2 DAVINCI_INTC_IRQ(46) -#define IRQ_DM365_GPIO3 DAVINCI_INTC_IRQ(47) -#define IRQ_DM365_GPIO4 DAVINCI_INTC_IRQ(48) -#define IRQ_DM365_GPIO5 DAVINCI_INTC_IRQ(49) -#define IRQ_DM365_GPIO6 DAVINCI_INTC_IRQ(50) -#define IRQ_DM365_GPIO7 DAVINCI_INTC_IRQ(51) -#define IRQ_DM365_EMAC_RXTHRESH DAVINCI_INTC_IRQ(52) -#define IRQ_DM365_EMAC_RXPULSE DAVINCI_INTC_IRQ(53) -#define IRQ_DM365_EMAC_TXPULSE DAVINCI_INTC_IRQ(54) -#define IRQ_DM365_EMAC_MISCPULSE DAVINCI_INTC_IRQ(55) -#define IRQ_DM365_GPIO12 DAVINCI_INTC_IRQ(56) -#define IRQ_DM365_GPIO13 DAVINCI_INTC_IRQ(57) -#define IRQ_DM365_GPIO14 DAVINCI_INTC_IRQ(58) -#define IRQ_DM365_GPIO15 DAVINCI_INTC_IRQ(59) -#define IRQ_DM365_ADCINT DAVINCI_INTC_IRQ(59) -#define IRQ_DM365_KEYINT DAVINCI_INTC_IRQ(60) -#define IRQ_DM365_TCERRINT2 DAVINCI_INTC_IRQ(61) -#define IRQ_DM365_TCERRINT3 DAVINCI_INTC_IRQ(62) -#define IRQ_DM365_EMUINT DAVINCI_INTC_IRQ(63) - -/* DA8XX interrupts */ -#define IRQ_DA8XX_COMMTX DAVINCI_INTC_IRQ(0) -#define IRQ_DA8XX_COMMRX DAVINCI_INTC_IRQ(1) -#define IRQ_DA8XX_NINT DAVINCI_INTC_IRQ(2) -#define IRQ_DA8XX_EVTOUT0 DAVINCI_INTC_IRQ(3) -#define IRQ_DA8XX_EVTOUT1 DAVINCI_INTC_IRQ(4) -#define IRQ_DA8XX_EVTOUT2 DAVINCI_INTC_IRQ(5) -#define IRQ_DA8XX_EVTOUT3 DAVINCI_INTC_IRQ(6) -#define IRQ_DA8XX_EVTOUT4 DAVINCI_INTC_IRQ(7) -#define IRQ_DA8XX_EVTOUT5 DAVINCI_INTC_IRQ(8) -#define IRQ_DA8XX_EVTOUT6 DAVINCI_INTC_IRQ(9) -#define IRQ_DA8XX_EVTOUT7 DAVINCI_INTC_IRQ(10) -#define IRQ_DA8XX_CCINT0 DAVINCI_INTC_IRQ(11) -#define IRQ_DA8XX_CCERRINT DAVINCI_INTC_IRQ(12) -#define IRQ_DA8XX_TCERRINT0 DAVINCI_INTC_IRQ(13) -#define IRQ_DA8XX_AEMIFINT DAVINCI_INTC_IRQ(14) -#define IRQ_DA8XX_I2CINT0 DAVINCI_INTC_IRQ(15) -#define IRQ_DA8XX_MMCSDINT0 DAVINCI_INTC_IRQ(16) -#define IRQ_DA8XX_MMCSDINT1 DAVINCI_INTC_IRQ(17) -#define IRQ_DA8XX_ALLINT0 DAVINCI_INTC_IRQ(18) -#define IRQ_DA8XX_RTC DAVINCI_INTC_IRQ(19) -#define IRQ_DA8XX_SPINT0 DAVINCI_INTC_IRQ(20) -#define IRQ_DA8XX_TINT12_0 DAVINCI_INTC_IRQ(21) -#define IRQ_DA8XX_TINT34_0 DAVINCI_INTC_IRQ(22) -#define IRQ_DA8XX_TINT12_1 DAVINCI_INTC_IRQ(23) -#define IRQ_DA8XX_TINT34_1 DAVINCI_INTC_IRQ(24) -#define IRQ_DA8XX_UARTINT0 DAVINCI_INTC_IRQ(25) -#define IRQ_DA8XX_KEYMGRINT DAVINCI_INTC_IRQ(26) -#define IRQ_DA8XX_SECINT DAVINCI_INTC_IRQ(26) -#define IRQ_DA8XX_SECKEYERR DAVINCI_INTC_IRQ(26) -#define IRQ_DA8XX_CHIPINT0 DAVINCI_INTC_IRQ(28) -#define IRQ_DA8XX_CHIPINT1 DAVINCI_INTC_IRQ(29) -#define IRQ_DA8XX_CHIPINT2 DAVINCI_INTC_IRQ(30) -#define IRQ_DA8XX_CHIPINT3 DAVINCI_INTC_IRQ(31) -#define IRQ_DA8XX_TCERRINT1 DAVINCI_INTC_IRQ(32) -#define IRQ_DA8XX_C0_RX_THRESH_PULSE DAVINCI_INTC_IRQ(33) -#define IRQ_DA8XX_C0_RX_PULSE DAVINCI_INTC_IRQ(34) -#define IRQ_DA8XX_C0_TX_PULSE DAVINCI_INTC_IRQ(35) -#define IRQ_DA8XX_C0_MISC_PULSE DAVINCI_INTC_IRQ(36) -#define IRQ_DA8XX_C1_RX_THRESH_PULSE DAVINCI_INTC_IRQ(37) -#define IRQ_DA8XX_C1_RX_PULSE DAVINCI_INTC_IRQ(38) -#define IRQ_DA8XX_C1_TX_PULSE DAVINCI_INTC_IRQ(39) -#define IRQ_DA8XX_C1_MISC_PULSE DAVINCI_INTC_IRQ(40) -#define IRQ_DA8XX_MEMERR DAVINCI_INTC_IRQ(41) -#define IRQ_DA8XX_GPIO0 DAVINCI_INTC_IRQ(42) -#define IRQ_DA8XX_GPIO1 DAVINCI_INTC_IRQ(43) -#define IRQ_DA8XX_GPIO2 DAVINCI_INTC_IRQ(44) -#define IRQ_DA8XX_GPIO3 DAVINCI_INTC_IRQ(45) -#define IRQ_DA8XX_GPIO4 DAVINCI_INTC_IRQ(46) -#define IRQ_DA8XX_GPIO5 DAVINCI_INTC_IRQ(47) -#define IRQ_DA8XX_GPIO6 DAVINCI_INTC_IRQ(48) -#define IRQ_DA8XX_GPIO7 DAVINCI_INTC_IRQ(49) -#define IRQ_DA8XX_GPIO8 DAVINCI_INTC_IRQ(50) -#define IRQ_DA8XX_I2CINT1 DAVINCI_INTC_IRQ(51) -#define IRQ_DA8XX_LCDINT DAVINCI_INTC_IRQ(52) -#define IRQ_DA8XX_UARTINT1 DAVINCI_INTC_IRQ(53) -#define IRQ_DA8XX_MCASPINT DAVINCI_INTC_IRQ(54) -#define IRQ_DA8XX_ALLINT1 DAVINCI_INTC_IRQ(55) -#define IRQ_DA8XX_SPINT1 DAVINCI_INTC_IRQ(56) -#define IRQ_DA8XX_UHPI_INT1 DAVINCI_INTC_IRQ(57) -#define IRQ_DA8XX_USB_INT DAVINCI_INTC_IRQ(58) -#define IRQ_DA8XX_IRQN DAVINCI_INTC_IRQ(59) -#define IRQ_DA8XX_RWAKEUP DAVINCI_INTC_IRQ(60) -#define IRQ_DA8XX_UARTINT2 DAVINCI_INTC_IRQ(61) -#define IRQ_DA8XX_DFTSSINT DAVINCI_INTC_IRQ(62) -#define IRQ_DA8XX_EHRPWM0 DAVINCI_INTC_IRQ(63) -#define IRQ_DA8XX_EHRPWM0TZ DAVINCI_INTC_IRQ(64) -#define IRQ_DA8XX_EHRPWM1 DAVINCI_INTC_IRQ(65) -#define IRQ_DA8XX_EHRPWM1TZ DAVINCI_INTC_IRQ(66) -#define IRQ_DA8XX_ECAP0 DAVINCI_INTC_IRQ(69) -#define IRQ_DA8XX_ECAP1 DAVINCI_INTC_IRQ(70) -#define IRQ_DA8XX_ECAP2 DAVINCI_INTC_IRQ(71) -#define IRQ_DA8XX_ARMCLKSTOPREQ DAVINCI_INTC_IRQ(90) - -/* DA830 specific interrupts */ -#define IRQ_DA830_MPUERR DAVINCI_INTC_IRQ(27) -#define IRQ_DA830_IOPUERR DAVINCI_INTC_IRQ(27) -#define IRQ_DA830_BOOTCFGERR DAVINCI_INTC_IRQ(27) -#define IRQ_DA830_EHRPWM2 DAVINCI_INTC_IRQ(67) -#define IRQ_DA830_EHRPWM2TZ DAVINCI_INTC_IRQ(68) -#define IRQ_DA830_EQEP0 DAVINCI_INTC_IRQ(72) -#define IRQ_DA830_EQEP1 DAVINCI_INTC_IRQ(73) -#define IRQ_DA830_T12CMPINT0_0 DAVINCI_INTC_IRQ(74) -#define IRQ_DA830_T12CMPINT1_0 DAVINCI_INTC_IRQ(75) -#define IRQ_DA830_T12CMPINT2_0 DAVINCI_INTC_IRQ(76) -#define IRQ_DA830_T12CMPINT3_0 DAVINCI_INTC_IRQ(77) -#define IRQ_DA830_T12CMPINT4_0 DAVINCI_INTC_IRQ(78) -#define IRQ_DA830_T12CMPINT5_0 DAVINCI_INTC_IRQ(79) -#define IRQ_DA830_T12CMPINT6_0 DAVINCI_INTC_IRQ(80) -#define IRQ_DA830_T12CMPINT7_0 DAVINCI_INTC_IRQ(81) -#define IRQ_DA830_T12CMPINT0_1 DAVINCI_INTC_IRQ(82) -#define IRQ_DA830_T12CMPINT1_1 DAVINCI_INTC_IRQ(83) -#define IRQ_DA830_T12CMPINT2_1 DAVINCI_INTC_IRQ(84) -#define IRQ_DA830_T12CMPINT3_1 DAVINCI_INTC_IRQ(85) -#define IRQ_DA830_T12CMPINT4_1 DAVINCI_INTC_IRQ(86) -#define IRQ_DA830_T12CMPINT5_1 DAVINCI_INTC_IRQ(87) -#define IRQ_DA830_T12CMPINT6_1 DAVINCI_INTC_IRQ(88) -#define IRQ_DA830_T12CMPINT7_1 DAVINCI_INTC_IRQ(89) - -/* DA850 speicific interrupts */ -#define IRQ_DA850_MPUADDRERR0 DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_MPUPROTERR0 DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_IOPUADDRERR0 DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_IOPUPROTERR0 DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_IOPUADDRERR1 DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_IOPUPROTERR1 DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_IOPUADDRERR2 DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_IOPUPROTERR2 DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_BOOTCFG_ADDR_ERR DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_BOOTCFG_PROT_ERR DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_MPUADDRERR1 DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_MPUPROTERR1 DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_IOPUADDRERR3 DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_IOPUPROTERR3 DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_IOPUADDRERR4 DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_IOPUPROTERR4 DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_IOPUADDRERR5 DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_IOPUPROTERR5 DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_MIOPU_BOOTCFG_ERR DAVINCI_INTC_IRQ(27) -#define IRQ_DA850_SATAINT DAVINCI_INTC_IRQ(67) -#define IRQ_DA850_TINT12_2 DAVINCI_INTC_IRQ(68) -#define IRQ_DA850_TINT34_2 DAVINCI_INTC_IRQ(68) -#define IRQ_DA850_TINTALL_2 DAVINCI_INTC_IRQ(68) -#define IRQ_DA850_MMCSDINT0_1 DAVINCI_INTC_IRQ(72) -#define IRQ_DA850_MMCSDINT1_1 DAVINCI_INTC_IRQ(73) -#define IRQ_DA850_T12CMPINT0_2 DAVINCI_INTC_IRQ(74) -#define IRQ_DA850_T12CMPINT1_2 DAVINCI_INTC_IRQ(75) -#define IRQ_DA850_T12CMPINT2_2 DAVINCI_INTC_IRQ(76) -#define IRQ_DA850_T12CMPINT3_2 DAVINCI_INTC_IRQ(77) -#define IRQ_DA850_T12CMPINT4_2 DAVINCI_INTC_IRQ(78) -#define IRQ_DA850_T12CMPINT5_2 DAVINCI_INTC_IRQ(79) -#define IRQ_DA850_T12CMPINT6_2 DAVINCI_INTC_IRQ(80) -#define IRQ_DA850_T12CMPINT7_2 DAVINCI_INTC_IRQ(81) -#define IRQ_DA850_T12CMPINT0_3 DAVINCI_INTC_IRQ(82) -#define IRQ_DA850_T12CMPINT1_3 DAVINCI_INTC_IRQ(83) -#define IRQ_DA850_T12CMPINT2_3 DAVINCI_INTC_IRQ(84) -#define IRQ_DA850_T12CMPINT3_3 DAVINCI_INTC_IRQ(85) -#define IRQ_DA850_T12CMPINT4_3 DAVINCI_INTC_IRQ(86) -#define IRQ_DA850_T12CMPINT5_3 DAVINCI_INTC_IRQ(87) -#define IRQ_DA850_T12CMPINT6_3 DAVINCI_INTC_IRQ(88) -#define IRQ_DA850_T12CMPINT7_3 DAVINCI_INTC_IRQ(89) -#define IRQ_DA850_RPIINT DAVINCI_INTC_IRQ(91) -#define IRQ_DA850_VPIFINT DAVINCI_INTC_IRQ(92) -#define IRQ_DA850_CCINT1 DAVINCI_INTC_IRQ(93) -#define IRQ_DA850_CCERRINT1 DAVINCI_INTC_IRQ(94) -#define IRQ_DA850_TCERRINT2 DAVINCI_INTC_IRQ(95) -#define IRQ_DA850_TINT12_3 DAVINCI_INTC_IRQ(96) -#define IRQ_DA850_TINT34_3 DAVINCI_INTC_IRQ(96) -#define IRQ_DA850_TINTALL_3 DAVINCI_INTC_IRQ(96) -#define IRQ_DA850_MCBSP0RINT DAVINCI_INTC_IRQ(97) -#define IRQ_DA850_MCBSP0XINT DAVINCI_INTC_IRQ(98) -#define IRQ_DA850_MCBSP1RINT DAVINCI_INTC_IRQ(99) -#define IRQ_DA850_MCBSP1XINT DAVINCI_INTC_IRQ(100) - -#endif /* __ASM_ARCH_IRQS_H */ diff --git a/arch/arm/mach-davinci/usb-da8xx.c b/arch/arm/mach-davinci/usb-da8xx.c index fdfe03669d9f..eec6a14d034a 100644 --- a/arch/arm/mach-davinci/usb-da8xx.c +++ b/arch/arm/mach-davinci/usb-da8xx.c @@ -18,7 +18,6 @@ #include #include #include -#include #define DA8XX_USB0_BASE 0x01e00000 #define DA8XX_USB1_BASE 0x01e25000 diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c index feb300670f43..42ffc6c7e5d8 100644 --- a/arch/arm/mach-davinci/usb.c +++ b/arch/arm/mach-davinci/usb.c @@ -9,7 +9,6 @@ #include #include -#include #include #include