Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mach-pxa/include/mach/balloon3.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -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,

arch/arm/mach-pxa/include/mach/corgi.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -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

arch/arm/mach-pxa/include/mach/csb726.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -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

arch/arm/mach-pxa/include/mach/gumstix.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -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

arch/arm/mach-pxa/include/mach/idp.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -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)