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

Commit f10590c9 authored by Sangsu Park's avatar Sangsu Park Committed by Kukjin Kim
Browse files

ARM: EXYNOS: add GPC4 bank instance 



Add GPC4 bank instance which is included in rev1 of EXYNOS5.

Signed-off-by: default avatarSangsu Park <sangsu4u.park@samsung.com>
Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent eeed66e3

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

+6 −3
Original line number Diff line number Diff line
@@ -153,10 +153,11 @@ enum exynos4_gpio_number { 
#define EXYNOS5_GPIO_B2_NR	(4)

#define EXYNOS5_GPIO_B3_NR	(4)

#define EXYNOS5_GPIO_C0_NR	(7)

#define EXYNOS5_GPIO_C1_NR	(7)

#define EXYNOS5_GPIO_C1_NR	(4)

#define EXYNOS5_GPIO_C2_NR	(7)

#define EXYNOS5_GPIO_C3_NR	(7)

#define EXYNOS5_GPIO_D0_NR	(8)

#define EXYNOS5_GPIO_C4_NR	(7)

#define EXYNOS5_GPIO_D0_NR	(4)

#define EXYNOS5_GPIO_D1_NR	(8)

#define EXYNOS5_GPIO_Y0_NR	(6)

#define EXYNOS5_GPIO_Y1_NR	(4)
@@ -199,7 +200,8 @@ enum exynos5_gpio_number { 
	EXYNOS5_GPIO_C1_START		= EXYNOS_GPIO_NEXT(EXYNOS5_GPIO_C0),

	EXYNOS5_GPIO_C2_START		= EXYNOS_GPIO_NEXT(EXYNOS5_GPIO_C1),

	EXYNOS5_GPIO_C3_START		= EXYNOS_GPIO_NEXT(EXYNOS5_GPIO_C2),

	EXYNOS5_GPIO_D0_START		= EXYNOS_GPIO_NEXT(EXYNOS5_GPIO_C3),

	EXYNOS5_GPIO_C4_START		= EXYNOS_GPIO_NEXT(EXYNOS5_GPIO_C3),

	EXYNOS5_GPIO_D0_START		= EXYNOS_GPIO_NEXT(EXYNOS5_GPIO_C4),

	EXYNOS5_GPIO_D1_START		= EXYNOS_GPIO_NEXT(EXYNOS5_GPIO_D0),

	EXYNOS5_GPIO_Y0_START		= EXYNOS_GPIO_NEXT(EXYNOS5_GPIO_D1),

	EXYNOS5_GPIO_Y1_START		= EXYNOS_GPIO_NEXT(EXYNOS5_GPIO_Y0),
@@ -242,6 +244,7 @@ enum exynos5_gpio_number { 
#define EXYNOS5_GPC1(_nr)	(EXYNOS5_GPIO_C1_START + (_nr))

#define EXYNOS5_GPC2(_nr)	(EXYNOS5_GPIO_C2_START + (_nr))

#define EXYNOS5_GPC3(_nr)	(EXYNOS5_GPIO_C3_START + (_nr))

#define EXYNOS5_GPC4(_nr)	(EXYNOS5_GPIO_C4_START + (_nr))

#define EXYNOS5_GPD0(_nr)	(EXYNOS5_GPIO_D0_START + (_nr))

#define EXYNOS5_GPD1(_nr)	(EXYNOS5_GPIO_D1_START + (_nr))

#define EXYNOS5_GPY0(_nr)	(EXYNOS5_GPIO_Y0_START + (_nr))

arch/arm/mach-exynos/include/mach/irqs.h

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ 


#define EXYNOS5_MAX_COMBINER_NR		32



#define EXYNOS5_IRQ_GPIO1_NR_GROUPS	13

#define EXYNOS5_IRQ_GPIO1_NR_GROUPS	14

#define EXYNOS5_IRQ_GPIO2_NR_GROUPS	9

#define EXYNOS5_IRQ_GPIO3_NR_GROUPS	5

#define EXYNOS5_IRQ_GPIO4_NR_GROUPS	1

drivers/gpio/gpio-samsung.c

+10 −1
Original line number Diff line number Diff line
@@ -2452,6 +2452,12 @@ static struct samsung_gpio_chip exynos5_gpios_1[] = { 
			.ngpio	= EXYNOS5_GPIO_C3_NR,

			.label	= "GPC3",

		},

	}, {

		.chip	= {

			.base	= EXYNOS5_GPC4(0),

			.ngpio	= EXYNOS5_GPIO_C4_NR,

			.label	= "GPC4",

		},

	}, {

		.chip	= {

			.base	= EXYNOS5_GPD0(0),
@@ -2878,8 +2884,11 @@ static __init int samsung_gpiolib_init(void) 
			goto err_ioremap1;

		}



		/* need to set base address for gpc4 */

		exynos5_gpios_1[11].base = gpio_base1 + 0x2E0;



		/* need to set base address for gpx */

		chip = &exynos5_gpios_1[20];

		chip = &exynos5_gpios_1[21];

		gpx_base = gpio_base1 + 0xC00;

		for (i = 0; i < 4; i++, chip++, gpx_base += 0x20)

			chip->base = gpx_base;