From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E7EEC43381 for ; Thu, 14 Feb 2019 14:52:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8E99222D9 for ; Thu, 14 Feb 2019 14:52:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="D35ls8L/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439516AbfBNOw5 (ORCPT ); Thu, 14 Feb 2019 09:52:57 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:36683 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2439502AbfBNOwz (ORCPT ); Thu, 14 Feb 2019 09:52:55 -0500 Received: by mail-wm1-f66.google.com with SMTP id j125so6395775wmj.1 for ; Thu, 14 Feb 2019 06:52:53 -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=9eYjYNduzPZNy43v8Fvj91hRMMSatkg8sxxgZqtJcIw=; b=D35ls8L/Iq6Fzg7hpEo0hLRu2+RJ1OaeR0MqRZLXTFda32un/4nuipp8M6RtWGDjVo AdOgy0ynmCrBzUbbDFm2KN8ijWDbXvLd3VADVf6XkT/GommgnERiCY46Vk+mpTwp2m2T jLB3VIAZmYfb6RXqA0ypxEQmkgoB/2h3DX16nt0grW7w8iOyYi15uJuXIEvZxoKaI7OH tTJ9G9/h42mYyDnZE0r7oggMj7y/xOylopq0xhzFMad6IFQWZZQUzDmN1OJSADB0uqeu 7qNDq31hVT4hxr+n/u+akww33kBWMl/BFh0qzKvw1WflhLWQfrNMkrQQxfPRPxwcOZ/e WojA== 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=9eYjYNduzPZNy43v8Fvj91hRMMSatkg8sxxgZqtJcIw=; b=FnCOkUjMRp0Tew6TWJ0LkTqsjPNEGZK9QUFrrfj/CRuEgdYy780feqG27pxDcAmtkX jwgbCrIHptFcwuhtyeGtQ+8Ap6SMSMWh4Q7jsEOKN5Np+1gyXyk2bSsK0v+5RZPkm24e HAjajj/vier4Fk4CcHq9PgEoGKhFahS4wTOQPCl4oWKDPaWIrUIrnDx2+VbLuF6GBf38 mdlySzZJScompsUeQIDE2C0mba4Gjxi7Mwwi0f5QwLGp5JJh14ZG3MjSiRs+l11e5peR kkGTNzrWUdj1IKhkXm9b5wg2SfiWupcNr7eb0m4u5oNRkVD8bKn7H7J4yPvJ1cYrK70A EDUg== X-Gm-Message-State: AHQUAubMqZYlCwvZvDW8t2nZnZwinCylSk5+FCCdWTMtZsnzV8lPqBbr igL7j269ZUsLE0JkfKEc9mPPTA== X-Google-Smtp-Source: AHgI3IZRb7SAoA2fsBvli6Ec+7My/OnxCG6DfTkXqFZfBti2EM05PoAiTYJ9Ky22qRJ8xRR9WCXCMA== X-Received: by 2002:a7b:cf3a:: with SMTP id m26mr997357wmg.144.1550155972349; Thu, 14 Feb 2019 06:52:52 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id y20sm4181005wra.51.2019.02.14.06.52.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 06:52:51 -0800 (PST) From: Bartosz Golaszewski To: Dmitry Torokhov , Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier , David Lechner Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v4 08/37] ARM: davinci: select SPARSE_IRQ Date: Thu, 14 Feb 2019 15:52:02 +0100 Message-Id: <20190214145231.8750-9-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190214145231.8750-1-brgl@bgdev.pl> References: <20190214145231.8750-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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/common.h | 4 +++- arch/arm/mach-davinci/include/mach/irqs.h | 1 - arch/arm/mach-davinci/irq.c | 1 + 8 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 298165095d31..3104a3eb2ddf 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/common.h b/arch/arm/mach-davinci/include/mach/common.h index d840023eaaac..1ceed0345988 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -17,7 +17,9 @@ #include #include -#define DAVINCI_INTC_START 0 +#include + +#define DAVINCI_INTC_START NR_IRQS #define DAVINCI_INTC_IRQ(_irqnum) (DAVINCI_INTC_START + (_irqnum)) void davinci_timer_init(struct clk *clk); diff --git a/arch/arm/mach-davinci/include/mach/irqs.h b/arch/arm/mach-davinci/include/mach/irqs.h index 03c446635301..8f9fc7a56ce8 100644 --- a/arch/arm/mach-davinci/include/mach/irqs.h +++ b/arch/arm/mach-davinci/include/mach/irqs.h @@ -401,6 +401,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 80bf99c8fa55..34b0eec4de4e 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 -- 2.20.1