diff options
| author | Piotr Wilczek <p.wilczek@samsung.com> | 2013-05-21 15:39:04 +0200 | 
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2013-08-23 10:25:57 +0900 | 
| commit | 0abb0aeeead1058fa750b35d68dc4e4f63c8f0a7 (patch) | |
| tree | 3ed2eaf8f1f8941152b31490ce6a716f4ff45623 | |
| parent | 9ed887caecb9ecb0c68773a1870d143b9f28d3da (diff) | |
| download | olio-uboot-2014.01-0abb0aeeead1058fa750b35d68dc4e4f63c8f0a7.tar.xz olio-uboot-2014.01-0abb0aeeead1058fa750b35d68dc4e4f63c8f0a7.zip | |
arm:exynos:gpio: fix s5p_gpio_part_max for exynos4x12
This patch fix wrong value returned by 's5p_gpio_part_max' function
for Exynos4412.
Signed-off-by: Piotr Wilczek <p.wilczek@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| -rw-r--r-- | arch/arm/include/asm/arch-exynos/gpio.h | 17 | 
1 files changed, 13 insertions, 4 deletions
| diff --git a/arch/arm/include/asm/arch-exynos/gpio.h b/arch/arm/include/asm/arch-exynos/gpio.h index e95581126..a1a74393d 100644 --- a/arch/arm/include/asm/arch-exynos/gpio.h +++ b/arch/arm/include/asm/arch-exynos/gpio.h @@ -290,10 +290,19 @@ static inline unsigned int s5p_gpio_part_max(int nr)  			return EXYNOS5_GPIO_PART2_MAX;  	} else if (cpu_is_exynos4()) { -		if (nr < EXYNOS4_GPIO_PART1_MAX) -			return 0; -		else -			return EXYNOS4_GPIO_PART1_MAX; +		if (proid_is_exynos4412()) { +			if (nr < EXYNOS4X12_GPIO_PART1_MAX) +				return 0; +			else if (nr < EXYNOS4X12_GPIO_PART2_MAX) +				return EXYNOS4X12_GPIO_PART1_MAX; +			else +				return EXYNOS4X12_GPIO_PART2_MAX; +		} else { +			if (nr < EXYNOS4_GPIO_PART1_MAX) +				return 0; +			else +				return EXYNOS4_GPIO_PART1_MAX; +		}  	}  	return 0; |