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

Commit d67d1127 authored by Rabin Vincent's avatar Rabin Vincent Committed by Russell King
Browse files

ARM: 6081/1: ux500: move gpio macros to common header 



Move GPIO macros to a common header, and allow them to use the correct
macros for the appropriate SoC, and be named accordingly.

Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Acked-by: default avatarSrinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 178980f9

arch/arm/mach-ux500/cpu-u8500.c

+0 −30
Original line number Diff line number Diff line
@@ -23,36 +23,6 @@ 
#include <mach/hardware.h>

#include <mach/setup.h>



#define GPIO_RESOURCE(block)						\

	{								\

		.start	= U8500_GPIOBANK##block##_BASE,			\

		.end	= U8500_GPIOBANK##block##_BASE + 127,		\

		.flags	= IORESOURCE_MEM,				\

	},								\

	{								\

		.start	= IRQ_GPIO##block,				\

		.end	= IRQ_GPIO##block,				\

		.flags	= IORESOURCE_IRQ,				\

	}



#define GPIO_DEVICE(block)						\

	{								\

		.name 		= "gpio",				\

		.id		= block,				\

		.num_resources 	= 2,					\

		.resource	= &u8500_gpio_resources[block * 2],	\

		.dev = {						\

			.platform_data = &u8500_gpio_data[block],	\

		},							\

	}



#define GPIO_DATA(_name, first)						\

	{								\

		.name 		= _name,				\

		.first_gpio 	= first,				\

		.first_irq 	= NOMADIK_GPIO_TO_IRQ(first),		\

	}



static struct nmk_gpio_platform_data u8500_gpio_data[] = {

	GPIO_DATA("GPIO-0-31", 0),

	GPIO_DATA("GPIO-32-63", 32), /* 37..63 not routed to pin */

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

+38 −0
Original line number Diff line number Diff line
@@ -9,4 +9,42 @@ 


#include <plat/gpio.h>



#define __GPIO_RESOURCE(soc, block)					\

	{								\

		.start	= soc##_GPIOBANK##block##_BASE,			\

		.end	= soc##_GPIOBANK##block##_BASE + 127,		\

		.flags	= IORESOURCE_MEM,				\

	},								\

	{								\

		.start	= IRQ_GPIO##block,				\

		.end	= IRQ_GPIO##block,				\

		.flags	= IORESOURCE_IRQ,				\

	}



#define __GPIO_DEVICE(soc, block)					\

	{								\

		.name		= "gpio",				\

		.id		= block,				\

		.num_resources	= 2,					\

		.resource	= &soc##_gpio_resources[block * 2],	\

		.dev = {						\

			.platform_data = &soc##_gpio_data[block],	\

		},							\

	}



#define GPIO_DATA(_name, first)						\

	{								\

		.name		= _name,				\

		.first_gpio	= first,				\

		.first_irq	= NOMADIK_GPIO_TO_IRQ(first),		\

	}



#ifdef CONFIG_UX500_SOC_DB8500

#define GPIO_RESOURCE(block)	__GPIO_RESOURCE(U8500, block)

#define GPIO_DEVICE(block)	__GPIO_DEVICE(u8500, block)

#elif defined(CONFIG_UX500_SOC_DB5500)

#define GPIO_RESOURCE(block)	__GPIO_RESOURCE(U5500, block)

#define GPIO_DEVICE(block)	__GPIO_DEVICE(u5500, block)

#endif



#endif /* __ASM_ARCH_GPIO_H */