Commit 9705e746 authored by Linus Walleij's avatar Linus Walleij Committed by Kevin Hilman

ARM: pxa: fix various compilation problems

Due to commit 88f718e3
"ARM: pxa: delete the custom GPIO header" some drivers fail
compilation, for example like this:

In file included from sound/soc/pxa/spitz.c:28:0:
sound/soc/pxa/spitz.c: In function ‘spitz_ext_control’:
arch/arm/mach-pxa/include/mach/spitz.h:111:30: error:
‘PXA_NR_BUILTIN_GPIO’ undeclared (first use in this function)
 #define SPITZ_SCP_GPIO_BASE (PXA_NR_BUILTIN_GPIO)
(etc.)

This is caused by implicit inclusion of <mach/irqs.h> from
various board-specific headers under <mach/*> in the PXA
platform. So we take a sweep over these, and for every such
header that uses PXA_NR_BUILTIN_GPIO or PXA_GPIO_TO_IRQ()
we explicitly #include "irqs.h" so that we satisfy the
dependency in the board include file alone.
Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: stable@vger.kernel.org # v3.13+
Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parent 29ffa48f
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
#ifndef ASM_ARCH_BALLOON3_H #ifndef ASM_ARCH_BALLOON3_H
#define ASM_ARCH_BALLOON3_H #define ASM_ARCH_BALLOON3_H
#include "irqs.h" /* PXA_NR_BUILTIN_GPIO */
enum balloon3_features { enum balloon3_features {
BALLOON3_FEATURE_OHCI, BALLOON3_FEATURE_OHCI,
BALLOON3_FEATURE_MMC, BALLOON3_FEATURE_MMC,
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#ifndef __ASM_ARCH_CORGI_H #ifndef __ASM_ARCH_CORGI_H
#define __ASM_ARCH_CORGI_H 1 #define __ASM_ARCH_CORGI_H 1
#include "irqs.h" /* PXA_NR_BUILTIN_GPIO */
/* /*
* Corgi (Non Standard) GPIO Definitions * Corgi (Non Standard) GPIO Definitions
......
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
#ifndef CSB726_H #ifndef CSB726_H
#define CSB726_H #define CSB726_H
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
#define CSB726_GPIO_IRQ_LAN 52 #define CSB726_GPIO_IRQ_LAN 52
#define CSB726_GPIO_IRQ_SM501 53 #define CSB726_GPIO_IRQ_SM501 53
#define CSB726_GPIO_MMC_DETECT 100 #define CSB726_GPIO_MMC_DETECT 100
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/* BTRESET - Reset line to Bluetooth module, active low signal. */ /* BTRESET - Reset line to Bluetooth module, active low signal. */
#define GPIO_GUMSTIX_BTRESET 7 #define GPIO_GUMSTIX_BTRESET 7
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
* IDP hardware. * IDP hardware.
*/ */
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
#define IDP_FLASH_PHYS (PXA_CS0_PHYS) #define IDP_FLASH_PHYS (PXA_CS0_PHYS)
#define IDP_ALT_FLASH_PHYS (PXA_CS1_PHYS) #define IDP_ALT_FLASH_PHYS (PXA_CS1_PHYS)
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#ifndef _INCLUDE_PALMLD_H_ #ifndef _INCLUDE_PALMLD_H_
#define _INCLUDE_PALMLD_H_ #define _INCLUDE_PALMLD_H_
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/** HERE ARE GPIOs **/ /** HERE ARE GPIOs **/
/* GPIOs */ /* GPIOs */
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
#ifndef _INCLUDE_PALMT5_H_ #ifndef _INCLUDE_PALMT5_H_
#define _INCLUDE_PALMT5_H_ #define _INCLUDE_PALMT5_H_
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/** HERE ARE GPIOs **/ /** HERE ARE GPIOs **/
/* GPIOs */ /* GPIOs */
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
#ifndef _INCLUDE_PALMTC_H_ #ifndef _INCLUDE_PALMTC_H_
#define _INCLUDE_PALMTC_H_ #define _INCLUDE_PALMTC_H_
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/** HERE ARE GPIOs **/ /** HERE ARE GPIOs **/
/* GPIOs */ /* GPIOs */
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
#ifndef _INCLUDE_PALMTX_H_ #ifndef _INCLUDE_PALMTX_H_
#define _INCLUDE_PALMTX_H_ #define _INCLUDE_PALMTX_H_
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/** HERE ARE GPIOs **/ /** HERE ARE GPIOs **/
/* GPIOs */ /* GPIOs */
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* Definitions of CPU card resources only * Definitions of CPU card resources only
*/ */
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/* phyCORE-PXA270 (PCM027) Interrupts */ /* phyCORE-PXA270 (PCM027) Interrupts */
#define PCM027_IRQ(x) (IRQ_BOARD_START + (x)) #define PCM027_IRQ(x) (IRQ_BOARD_START + (x))
#define PCM027_BTDET_IRQ PCM027_IRQ(0) #define PCM027_BTDET_IRQ PCM027_IRQ(0)
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
*/ */
#include <mach/pcm027.h> #include <mach/pcm027.h>
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/* /*
* definitions relevant only when the PCM-990 * definitions relevant only when the PCM-990
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
#ifndef __ASM_ARCH_POODLE_H #ifndef __ASM_ARCH_POODLE_H
#define __ASM_ARCH_POODLE_H 1 #define __ASM_ARCH_POODLE_H 1
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/* /*
* GPIOs * GPIOs
*/ */
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
#define __ASM_ARCH_SPITZ_H 1 #define __ASM_ARCH_SPITZ_H 1
#endif #endif
#include "irqs.h" /* PXA_NR_BUILTIN_GPIO, PXA_GPIO_TO_IRQ */
#include <linux/fb.h> #include <linux/fb.h>
#include <linux/gpio.h>
/* Spitz/Akita GPIOs */ /* Spitz/Akita GPIOs */
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#ifndef _ASM_ARCH_TOSA_H_ #ifndef _ASM_ARCH_TOSA_H_
#define _ASM_ARCH_TOSA_H_ 1 #define _ASM_ARCH_TOSA_H_ 1
#include "irqs.h" /* PXA_NR_BUILTIN_GPIO */
/* TOSA Chip selects */ /* TOSA Chip selects */
#define TOSA_LCDC_PHYS PXA_CS4_PHYS #define TOSA_LCDC_PHYS PXA_CS4_PHYS
/* Internel Scoop */ /* Internel Scoop */
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#ifndef _TRIPEPS4_H_ #ifndef _TRIPEPS4_H_
#define _TRIPEPS4_H_ #define _TRIPEPS4_H_
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/* physical memory regions */ /* physical memory regions */
#define TRIZEPS4_FLASH_PHYS (PXA_CS0_PHYS) /* Flash region */ #define TRIZEPS4_FLASH_PHYS (PXA_CS0_PHYS) /* Flash region */
#define TRIZEPS4_DISK_PHYS (PXA_CS1_PHYS) /* Disk On Chip region */ #define TRIZEPS4_DISK_PHYS (PXA_CS1_PHYS) /* Disk On Chip region */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment