Patchwork [U-Boot] arm:exynos:gpio: fix s5p_gpio_part_max for exynos4x12

login
register
mail settings
Submitter Piotr Wilczek
Date May 21, 2013, 1:39 p.m.
Message ID <1369143544-29213-1-git-send-email-p.wilczek@samsung.com>
Download mbox | patch
Permalink /patch/245311/
State Accepted
Delegated to: Minkyu Kang
Headers show

Comments

Piotr Wilczek - May 21, 2013, 1:39 p.m.
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>
CC: Minkyu Kang <mk7.kang@samsung.com>
---
 arch/arm/include/asm/arch-exynos/gpio.h |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)
Piotr Wilczek - July 18, 2013, 2:10 p.m.
Dear Minkyu Kang,

Could you please review this patch?

Best regards,
Piotr Wilczek

--
Samsung R&D Institute Poland
Samsung Electronics

On 05/21/2013 03:39 PM, Piotr Wilczek wrote:
> 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>
> CC: Minkyu Kang <mk7.kang@samsung.com>
> ---
>   arch/arm/include/asm/arch-exynos/gpio.h |   17 +++++++++++++----
>   1 file 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 cfe1024..20a4e3f 100644
> --- a/arch/arm/include/asm/arch-exynos/gpio.h
> +++ b/arch/arm/include/asm/arch-exynos/gpio.h
> @@ -303,10 +303,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;
>
Minkyu Kang - July 19, 2013, 5:43 a.m.
On 18/07/13 23:10, Piotr Wilczek wrote:
> Dear Minkyu Kang,
> 
> Could you please review this patch?

Please don't top posting.
And your patches  will be merged after release.

> 
> Best regards,
> Piotr Wilczek
> 
> -- 
> Samsung R&D Institute Poland
> Samsung Electronics
> 

Thanks,
Minkyu Kang.
Minkyu Kang - Aug. 6, 2013, 11:24 a.m.
On 21/05/13 22:39, Piotr Wilczek wrote:
> 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>
> CC: Minkyu Kang <mk7.kang@samsung.com>
> ---
>  arch/arm/include/asm/arch-exynos/gpio.h |   17 +++++++++++++----
>  1 file 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 cfe1024..20a4e3f 100644
> --- a/arch/arm/include/asm/arch-exynos/gpio.h
> +++ b/arch/arm/include/asm/arch-exynos/gpio.h
> @@ -303,10 +303,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;
> 

applied to u-boot-samsung.

Thanks,
Minkyu Kang.

Patch

diff --git a/arch/arm/include/asm/arch-exynos/gpio.h b/arch/arm/include/asm/arch-exynos/gpio.h
index cfe1024..20a4e3f 100644
--- a/arch/arm/include/asm/arch-exynos/gpio.h
+++ b/arch/arm/include/asm/arch-exynos/gpio.h
@@ -303,10 +303,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;