diff options
| author | Tom Rini <trini@ti.com> | 2013-09-12 09:08:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-09-12 09:08:24 -0400 |
| commit | 7bcee5f7eef740c506117e6da1226bc8ec7f466a (patch) | |
| tree | 4af76300afef92ddd284ca75f4f242354d7a1484 /arch/arm/include/asm/arch-exynos/gpio.h | |
| parent | 985a71d15b8bd9cfbeae1ac1b08a5319abfd246c (diff) | |
| parent | 5480ac32171ab0e38c48c9f585fa650c7867f6a1 (diff) | |
| download | olio-uboot-2014.01-7bcee5f7eef740c506117e6da1226bc8ec7f466a.tar.xz olio-uboot-2014.01-7bcee5f7eef740c506117e6da1226bc8ec7f466a.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/include/asm/arch-exynos/gpio.h')
| -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; |