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

Commit 873e6980 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: Remove NEED_MACH_GPIO_H 



Omap no longer needs this option, mach/gpio.h is
empty.

Also remove mach/irqs.h from gpio-omap.h and
include it directly from the related omap1
gpio init files.

Otherwise omap2+ build fails for MULTI_PLATFORM.

Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Jarkko Nikula <jarkko.nikula@bitmer.com>
Cc: Liam Girdwood <lrg@ti.com>
Cc: alsa-devel@alsa-project.org
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 7136f8d8

arch/arm/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -937,7 +937,6 @@ config ARCH_OMAP 
	select CLKSRC_MMIO

	select CLKSRC_MMIO

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select HAVE_CLK

	select NEED_MACH_GPIO_H

	help

	help

	  Support for TI's OMAP platform (OMAP1/2/3/4).

	  Support for TI's OMAP platform (OMAP1/2/3/4).

arch/arm/mach-omap1/gpio15xx.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/platform_data/gpio-omap.h>

#include <linux/platform_data/gpio-omap.h>





#include <mach/irqs.h>



#define OMAP1_MPUIO_VBASE		OMAP1_MPUIO_BASE

#define OMAP1_MPUIO_VBASE		OMAP1_MPUIO_BASE

#define OMAP1510_GPIO_BASE		0xFFFCE000

#define OMAP1510_GPIO_BASE		0xFFFCE000

arch/arm/mach-omap1/gpio16xx.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/platform_data/gpio-omap.h>

#include <linux/platform_data/gpio-omap.h>





#include <mach/irqs.h>



#define OMAP1610_GPIO1_BASE		0xfffbe400

#define OMAP1610_GPIO1_BASE		0xfffbe400

#define OMAP1610_GPIO2_BASE		0xfffbec00

#define OMAP1610_GPIO2_BASE		0xfffbec00

#define OMAP1610_GPIO3_BASE		0xfffbb400

#define OMAP1610_GPIO3_BASE		0xfffbb400

arch/arm/mach-omap1/gpio7xx.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/platform_data/gpio-omap.h>

#include <linux/platform_data/gpio-omap.h>





#include <mach/irqs.h>



#define OMAP7XX_GPIO1_BASE		0xfffbc000

#define OMAP7XX_GPIO1_BASE		0xfffbc000

#define OMAP7XX_GPIO2_BASE		0xfffbc800

#define OMAP7XX_GPIO2_BASE		0xfffbc800

#define OMAP7XX_GPIO3_BASE		0xfffbd000

#define OMAP7XX_GPIO3_BASE		0xfffbd000

arch/arm/mach-omap1/include/mach/gpio.h

deleted100644 → 0
+0 −3
Original line number Original line Diff line number Diff line 
/*

 * arch/arm/mach-omap1/include/mach/gpio.h

 */