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

Commit 4b25408f authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: Move gpio.h to include/linux/platform_data 



This way we can remove includes of plat/gpio.h which won't work
with the single zImage support.

Note that we also remove the cpu_class_is_omap2() check
in gpio-omap.c as the drivers should not call it as we need to
make it local to arch/arm/mach-omap2 for single zImage support.

While at it, arrange the related includes in the standard way.

Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: linux-mtd@lists.infradead.org
Cc: alsa-devel@alsa-project.org
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a940d9a1

arch/arm/mach-omap1/board-ams-delta.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/export.h>

#include <linux/omapfb.h>

#include <linux/io.h>

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



#include <media/soc_camera.h>

arch/arm/mach-omap1/board-osk.c

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#include <linux/i2c/tps65010.h>

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

#include <linux/platform_data/omap1_bl.h>



#include <asm/mach-types.h>

arch/arm/mach-omap1/gpio15xx.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 */



#include <linux/gpio.h>

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



#define OMAP1_MPUIO_VBASE		OMAP1_MPUIO_BASE

#define OMAP1510_GPIO_BASE		0xFFFCE000

arch/arm/mach-omap1/gpio16xx.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 */



#include <linux/gpio.h>

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



#define OMAP1610_GPIO1_BASE		0xfffbe400

#define OMAP1610_GPIO2_BASE		0xfffbec00

arch/arm/mach-omap1/gpio7xx.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 */



#include <linux/gpio.h>

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



#define OMAP7XX_GPIO1_BASE		0xfffbc000

#define OMAP7XX_GPIO2_BASE		0xfffbc800