From patchwork Thu Oct 18 17:19:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12354 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D6C9F241AD for ; Thu, 18 Oct 2012 17:19:41 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 8A192A18752 for ; Thu, 18 Oct 2012 17:19:41 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so13636175iej.11 for ; Thu, 18 Oct 2012 10:19:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=bxs0Vx/WqCcrhEvY6JILGB9bJzDq5FbIogW44o4nH7M=; b=F7Jdkidp7cKsv4vZ4W1CGttGmCLWMaa1GweZIw41he4MhfYmPa76p622ZMtziSji61 g6UXGiyM2WHF6ThbVQ8jHL6XUkjyUtV8DrBAvuU+EUDWOGgSqn8uTMPjjt812GXbSbBN MtKqeFgFWqbQ6MR8xHf9UWMeguzYq/HONzcmks43yvYK2BB8Y546ePUyei+whKpZ6kz8 S48cdkMuacP4q8g0C2IapBhZOvhfBB0hwpl8iboLkcd1UVdGpf6By904bY7dA1GwJr/L CJ2t0XMxPNk8EusaJz0rmC4NMPSAG8tPDXfVyvzGSr9WmYMJTm1IjOsE+LWBb1imd6OT 3KIg== Received: by 10.50.168.37 with SMTP id zt5mr5613210igb.57.1350580781346; Thu, 18 Oct 2012 10:19:41 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp1109770igt; Thu, 18 Oct 2012 10:19:40 -0700 (PDT) Received: by 10.14.223.4 with SMTP id u4mr32538961eep.19.1350580779873; Thu, 18 Oct 2012 10:19:39 -0700 (PDT) Received: from eu1sys200aog101.obsmtp.com (eu1sys200aog101.obsmtp.com [207.126.144.111]) by mx.google.com with SMTP id f44si16649665eep.131.2012.10.18.10.19.37 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 10:19:39 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.111 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.111; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.111 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob101.postini.com ([207.126.147.11]) with SMTP ID DSNKUIA6J/ABUjQDf0VDZx8cTX3Bl7qGUOqB@postini.com; Thu, 18 Oct 2012 17:19:39 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id 83DC250; Thu, 18 Oct 2012 17:19:02 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id B088F65; Thu, 18 Oct 2012 12:52:01 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 8B02B24C2C0; Thu, 18 Oct 2012 19:19:24 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Thu, 18 Oct 2012 19:19:32 +0200 From: Linus Walleij To: , Cc: Anmar Oueja , Linus Walleij Subject: [PATCH 8/8] ARM: plat-nomadik: convert platforms to SPARSE_IRQ Date: Thu, 18 Oct 2012 19:19:30 +0200 Message-ID: <1350580770-8586-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnkzFCX0880+EMaMvaTNLcILu7q5LXbjxxZC1wPYtgY9TttWPgGL0Aj+c891bawzolynqMA From: Linus Walleij This converts the Nomadik and Ux500 platforms to use SPARSE_IRQ. Signed-off-by: Linus Walleij --- arch/arm/Kconfig | 2 ++ arch/arm/mach-nomadik/include/mach/irqs.h | 2 +- arch/arm/mach-ux500/board-mop500.c | 1 - arch/arm/mach-ux500/cpu-db8500.c | 1 + arch/arm/mach-ux500/devices-common.c | 1 + arch/arm/mach-ux500/devices-db8500.c | 1 + arch/arm/mach-ux500/devices-db8500.h | 1 + arch/arm/mach-ux500/include/mach/irqs.h | 2 +- drivers/pinctrl/pinctrl-nomadik.c | 3 +-- 9 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c5f2c18..8d7fcd3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -885,6 +885,7 @@ config ARCH_U8500 select GENERIC_CLOCKEVENTS select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 + select SPARSE_IRQ help Support for ST-Ericsson's Ux500 architecture @@ -899,6 +900,7 @@ config ARCH_NOMADIK select MIGHT_HAVE_CACHE_L2X0 select PINCTRL select PINCTRL_STN8815 + select SPARSE_IRQ help Support for the Nomadik platform by ST-Ericsson diff --git a/arch/arm/mach-nomadik/include/mach/irqs.h b/arch/arm/mach-nomadik/include/mach/irqs.h index a118e61..b549d05 100644 --- a/arch/arm/mach-nomadik/include/mach/irqs.h +++ b/arch/arm/mach-nomadik/include/mach/irqs.h @@ -72,7 +72,7 @@ #define NOMADIK_NR_GPIO 128 /* last 4 not wired to pins */ #define NOMADIK_GPIO_TO_IRQ(gpio) ((gpio) + NOMADIK_GPIO_OFFSET) #define NOMADIK_IRQ_TO_GPIO(irq) ((irq) - NOMADIK_GPIO_OFFSET) -#define NR_IRQS NOMADIK_GPIO_TO_IRQ(NOMADIK_NR_GPIO) +#define NOMADIK_NR_IRQS NOMADIK_GPIO_TO_IRQ(NOMADIK_NR_GPIO) /* Following two are used by entry_macro.S, to access our dual-vic */ #define VIC_REG_IRQSR0 0 diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 0213e89..9268056 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -1,4 +1,3 @@ - /* * Copyright (C) 2008-2009 ST-Ericsson * diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 87a8f9f..8bff078 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "devices-db8500.h" #include "ste-dma40-db8500.h" diff --git a/arch/arm/mach-ux500/devices-common.c b/arch/arm/mach-ux500/devices-common.c index 692a77a..16b5f71 100644 --- a/arch/arm/mach-ux500/devices-common.c +++ b/arch/arm/mach-ux500/devices-common.c @@ -14,6 +14,7 @@ #include #include +#include #include "devices-common.h" diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index bdc963c..318d490 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c @@ -16,6 +16,7 @@ #include #include +#include #include "ste-dma40-db8500.h" diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h index 3c8010f..4b24c99 100644 --- a/arch/arm/mach-ux500/devices-db8500.h +++ b/arch/arm/mach-ux500/devices-db8500.h @@ -8,6 +8,7 @@ #ifndef __DEVICES_DB8500_H #define __DEVICES_DB8500_H +#include #include "devices-common.h" struct ske_keypad_platform_data; diff --git a/arch/arm/mach-ux500/include/mach/irqs.h b/arch/arm/mach-ux500/include/mach/irqs.h index e892854..fc77b42 100644 --- a/arch/arm/mach-ux500/include/mach/irqs.h +++ b/arch/arm/mach-ux500/include/mach/irqs.h @@ -46,6 +46,6 @@ #include #endif -#define NR_IRQS IRQ_BOARD_END +#define UX500_NR_IRQS IRQ_BOARD_END #endif /* ASM_ARCH_IRQS_H */ diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index 0a712c2..abf9dea 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c @@ -32,9 +32,8 @@ #include #include #include - #include - +#include #include "pinctrl-nomadik.h" /*