Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: plat-nomadik: convert platforms to SPARSE_IRQ

Browse source 
This converts the Nomadik and Ux500 platforms to use SPARSE_IRQ.

Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2012-10-18 11:08:05 +02:00
parent a7238e4325
commit c3b9d1db23
9 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/Kconfig
View file

@ -885,6 +885,7 @@ config ARCH_U8500
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select HAVE_SMP select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_CACHE_L2X0
select SPARSE_IRQ
help help
Support for ST-Ericsson's Ux500 architecture Support for ST-Ericsson's Ux500 architecture
@ -899,6 +900,7 @@ config ARCH_NOMADIK
select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_CACHE_L2X0
select PINCTRL select PINCTRL
select PINCTRL_STN8815 select PINCTRL_STN8815
select SPARSE_IRQ
help help
Support for the Nomadik platform by ST-Ericsson Support for the Nomadik platform by ST-Ericsson

2
arch/arm/mach-nomadik/include/mach/irqs.h
View file

@ -72,7 +72,7 @@
#define NOMADIK_NR_GPIO 128 /* last 4 not wired to pins */ #define NOMADIK_NR_GPIO 128 /* last 4 not wired to pins */
#define NOMADIK_GPIO_TO_IRQ(gpio) ((gpio) + NOMADIK_GPIO_OFFSET) #define NOMADIK_GPIO_TO_IRQ(gpio) ((gpio) + NOMADIK_GPIO_OFFSET)
#define NOMADIK_IRQ_TO_GPIO(irq) ((irq) - 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 */ /* Following two are used by entry_macro.S, to access our dual-vic */
#define VIC_REG_IRQSR0 0 #define VIC_REG_IRQSR0 0

1
arch/arm/mach-ux500/board-mop500.c
View file

@ -1,4 +1,3 @@
/* /*
* Copyright (C) 2008-2009 ST-Ericsson * Copyright (C) 2008-2009 ST-Ericsson
* *

1
arch/arm/mach-ux500/cpu-db8500.c
View file

@ -26,6 +26,7 @@
#include <mach/setup.h> #include <mach/setup.h>
#include <mach/devices.h> #include <mach/devices.h>
#include <mach/db8500-regs.h> #include <mach/db8500-regs.h>
#include <mach/irqs.h>
#include "devices-db8500.h" #include "devices-db8500.h"
#include "ste-dma40-db8500.h" #include "ste-dma40-db8500.h"

1
arch/arm/mach-ux500/devices-common.c
View file

@ -14,6 +14,7 @@
#include <linux/platform_data/pinctrl-nomadik.h> #include <linux/platform_data/pinctrl-nomadik.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/irqs.h>
#include "devices-common.h" #include "devices-common.h"

1
arch/arm/mach-ux500/devices-db8500.c
View file

@ -16,6 +16,7 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/setup.h> #include <mach/setup.h>
#include <mach/irqs.h>
#include "ste-dma40-db8500.h" #include "ste-dma40-db8500.h"

1
arch/arm/mach-ux500/devices-db8500.h
View file

@ -8,6 +8,7 @@
#ifndef __DEVICES_DB8500_H #ifndef __DEVICES_DB8500_H
#define __DEVICES_DB8500_H #define __DEVICES_DB8500_H
#include <mach/irqs.h>
#include "devices-common.h" #include "devices-common.h"
struct ske_keypad_platform_data; struct ske_keypad_platform_data;

2
arch/arm/mach-ux500/include/mach/irqs.h
View file

@ -46,6 +46,6 @@
#include <mach/irqs-board-mop500.h> #include <mach/irqs-board-mop500.h>
#endif #endif
#define NR_IRQS IRQ_BOARD_END #define UX500_NR_IRQS IRQ_BOARD_END
#endif /* ASM_ARCH_IRQS_H */ #endif /* ASM_ARCH_IRQS_H */

3
drivers/pinctrl/pinctrl-nomadik.c
View file

@ -45,9 +45,8 @@ static inline void prcmu_write(unsigned int reg, u32 value) {}
static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value) {} static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value) {}
#endif #endif
#include <linux/platform_data/pinctrl-nomadik.h> #include <linux/platform_data/pinctrl-nomadik.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <mach/irqs.h>
#include "pinctrl-nomadik.h" #include "pinctrl-nomadik.h"
/* /*