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

Commit 26683316 authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Tony Lindgren
Browse files

ARM: OMAP1: ams-delta-fiq: Use <linux/platform_data/gpio-omap.h> 



Instead of defining symbols already defined in
linux/platform_data/gpio-omap.h, use that header file.

Since we include the header into an assembler code, prevent C only bits
from being read in.

Signed-off-by: default avatarJanusz Krzysztofik <jmkrzyszt@gmail.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent d3e952ad

arch/arm/mach-omap1/ams-delta-fiq-handler.S

+3 −9
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <linux/linkage.h>

#include <linux/platform_data/ams-delta-fiq.h>

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



#include <asm/assembler.h>

#include <mach/board-ams-delta.h>
@@ -24,17 +25,10 @@ 
#include "soc.h"



/*

 * GPIO related definitions, copied from arch/arm/plat-omap/gpio.c.

 * Unfortunately, those were not placed in a separate header file.

 * OMAP1510 GPIO related symbol copied from arch/arm/mach-omap1/gpio15xx.c.

 * Unfortunately, it was not placed in a separate header file.

 */

#define OMAP1510_GPIO_BASE		0xFFFCE000

#define OMAP1510_GPIO_DATA_INPUT	0x00

#define OMAP1510_GPIO_DATA_OUTPUT	0x04

#define OMAP1510_GPIO_DIR_CONTROL	0x08

#define OMAP1510_GPIO_INT_CONTROL	0x0c

#define OMAP1510_GPIO_INT_MASK		0x10

#define OMAP1510_GPIO_INT_STATUS	0x14

#define OMAP1510_GPIO_PIN_CONTROL	0x18



/* GPIO register bitmasks */

#define KEYBRD_DATA_MASK		(0x1 << AMS_DELTA_GPIO_PIN_KEYBRD_DATA)

include/linux/platform_data/gpio-omap.h

+4 −0
Original line number Diff line number Diff line
@@ -24,8 +24,10 @@ 
#ifndef __ASM_ARCH_OMAP_GPIO_H

#define __ASM_ARCH_OMAP_GPIO_H



#ifndef __ASSEMBLER__

#include <linux/io.h>

#include <linux/platform_device.h>

#endif



#define OMAP1_MPUIO_BASE			0xfffb5000
@@ -157,6 +159,7 @@ 
#define OMAP_MPUIO(nr)		(OMAP_MAX_GPIO_LINES + (nr))

#define OMAP_GPIO_IS_MPUIO(nr)	((nr) >= OMAP_MAX_GPIO_LINES)



#ifndef __ASSEMBLER__

struct omap_gpio_reg_offs {

	u16 revision;

	u16 direction;
@@ -215,5 +218,6 @@ static inline void omap2_gpio_resume_after_idle(void) 
{

}

#endif

#endif /* __ASSEMBLER__ */



#endif