[PATCH 0/3] ARM: S3C24XX: s3c2416 build fixes

[PATCH 0/3] ARM: S3C24XX: s3c2416 build fixes

[Heiko Stübner]

While testing Tomasz' timer series I came accross some small build problems
in the new code for pinctrl and dt support on s3c24xx.

All 3 patches fix problems in the samsung tree, so should also go thru there.

Heiko Stuebner (3):
  gpio: samsung: add PINCTRL_S3C24XX to exclude options
  pinctrl: s3c24xx: use correct header for chained_irq functions
  ARM: S3C24XX: update uart addresses in s3c2416-dt auxdata

 arch/arm/mach-s3c24xx/mach-s3c2416-dt.c |    8 ++++----
 drivers/gpio/gpio-samsung.c             |    3 ++-
 drivers/pinctrl/pinctrl-s3c24xx.c       |    3 +--
 3 files changed, 7 insertions(+), 7 deletions(-)

-- 
1.7.10.4

[PATCH 1/3] gpio: samsung: add PINCTRL_S3C24XX to exclude options

[Heiko Stübner]

When a pinctrl driver is loaded legacy gpio support has to be disabled.
The code checking for the pinctrl presence is contained in an #ifdef
checking for the presence of a valid samsung pinctrl driver.

There the new PINCTRL_S3C24XX was missing resulting in the check never
being run and the gpio being enabled breaking the pinctrl driver.

Fix this by adding the missing CONFIG_PINCTRL_S3C24XX

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 drivers/gpio/gpio-samsung.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index a1392f4..c84503e 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -2949,7 +2949,8 @@ static __init int samsung_gpiolib_init(void)
 	int i, nr_chips;
 	int group = 0;
 
-#if defined(CONFIG_PINCTRL_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440)
+#if defined(CONFIG_PINCTRL_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440) || \
+    defined(CONFIG_PINCTRL_S3C24XX)
 	/*
 	* This gpio driver includes support for device tree support and there
 	* are platforms using it. In order to maintain compatibility with those
-- 
1.7.10.4

[PATCH 1/3] gpio: samsung: add PINCTRL_S3C24XX to exclude options

[Kukjin Kim]

Heiko St?bner wrote:
> 
> When a pinctrl driver is loaded legacy gpio support has to be disabled.
> The code checking for the pinctrl presence is contained in an #ifdef
> checking for the presence of a valid samsung pinctrl driver.
> 
> There the new PINCTRL_S3C24XX was missing resulting in the check never
> being run and the gpio being enabled breaking the pinctrl driver.
> 
> Fix this by adding the missing CONFIG_PINCTRL_S3C24XX
> 
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> ---
>  drivers/gpio/gpio-samsung.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
> index a1392f4..c84503e 100644
> --- a/drivers/gpio/gpio-samsung.c
> +++ b/drivers/gpio/gpio-samsung.c
> @@ -2949,7 +2949,8 @@ static __init int samsung_gpiolib_init(void)
>  	int i, nr_chips;
>  	int group = 0;
> 
> -#if defined(CONFIG_PINCTRL_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440)
> +#if defined(CONFIG_PINCTRL_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440)
> || \
> +    defined(CONFIG_PINCTRL_S3C24XX)
>  	/*
>  	* This gpio driver includes support for device tree support and
> there
>  	* are platforms using it. In order to maintain compatibility with
> those
> --
> 1.7.10.4

Yeah, this is needed :-)

Linus, shall I take this into samsung tree? Or since the pinctrl-s3c24xx already merged into arm-soc, this could be picked into your tree...

Thanks,
- Kukjin

[PATCH 1/3] gpio: samsung: add PINCTRL_S3C24XX to exclude options

[Linus Walleij]

On Mon, Jun 17, 2013 at 3:13 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:

> Linus, shall I take this into samsung tree? Or since the pinctrl-s3c24xx already merged into arm-soc, this could be picked into your tree...

I'm not rebasing pinctrl agains the ARM SoC tree,
I only rebase to Torvalds tree.

So please take it through the Samsung tree...

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

[PATCH 1/3] gpio: samsung: add PINCTRL_S3C24XX to exclude options

[Tomasz Figa]

Hi Heiko,

On Friday 14 of June 2013 00:45:27 Heiko St?bner wrote:
> When a pinctrl driver is loaded legacy gpio support has to be disabled.
> The code checking for the pinctrl presence is contained in an #ifdef
> checking for the presence of a valid samsung pinctrl driver.
> 
> There the new PINCTRL_S3C24XX was missing resulting in the check never
> being run and the gpio being enabled breaking the pinctrl driver.
> 
> Fix this by adding the missing CONFIG_PINCTRL_S3C24XX
> 
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> ---
>  drivers/gpio/gpio-samsung.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
> index a1392f4..c84503e 100644
> --- a/drivers/gpio/gpio-samsung.c
> +++ b/drivers/gpio/gpio-samsung.c
> @@ -2949,7 +2949,8 @@ static __init int samsung_gpiolib_init(void)
>  	int i, nr_chips;
>  	int group = 0;
> 
> -#if defined(CONFIG_PINCTRL_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440)
> +#if defined(CONFIG_PINCTRL_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440) ||
> \ +    defined(CONFIG_PINCTRL_S3C24XX)

I wonder if this wouldn't be simply covered by PINCTRL_SAMSUNG (except 
PINCTRL_EXYNOS5440 which doesn't use the common part).

Best regards,
Tomasz

>  	/*
>  	* This gpio driver includes support for device tree support and there
>  	* are platforms using it. In order to maintain compatibility with those

[PATCH 1/3] gpio: samsung: add PINCTRL_S3C24XX to exclude options

[Kukjin Kim]

On 06/17/13 22:19, Tomasz Figa wrote:
> Hi Heiko,
>
> On Friday 14 of June 2013 00:45:27 Heiko St?bner wrote:
>> When a pinctrl driver is loaded legacy gpio support has to be disabled.
>> The code checking for the pinctrl presence is contained in an #ifdef
>> checking for the presence of a valid samsung pinctrl driver.
>>
>> There the new PINCTRL_S3C24XX was missing resulting in the check never
>> being run and the gpio being enabled breaking the pinctrl driver.
>>
>> Fix this by adding the missing CONFIG_PINCTRL_S3C24XX
>>
>> Signed-off-by: Heiko Stuebner<heiko@sntech.de>
>> ---
>>   drivers/gpio/gpio-samsung.c |    3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
>> index a1392f4..c84503e 100644
>> --- a/drivers/gpio/gpio-samsung.c
>> +++ b/drivers/gpio/gpio-samsung.c
>> @@ -2949,7 +2949,8 @@ static __init int samsung_gpiolib_init(void)
>>   	int i, nr_chips;
>>   	int group = 0;
>>
>> -#if defined(CONFIG_PINCTRL_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440)
>> +#if defined(CONFIG_PINCTRL_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440) ||
>> \ +    defined(CONFIG_PINCTRL_S3C24XX)
>
> I wonder if this wouldn't be simply covered by PINCTRL_SAMSUNG (except
> PINCTRL_EXYNOS5440 which doesn't use the common part).
>
Well, not added compatible for 's3c64xx-pinctrl' yet?

- Kukjin

[PATCH 1/3] gpio: samsung: add PINCTRL_S3C24XX to exclude options

[Tomasz Figa]

On Tuesday 18 of June 2013 00:43:41 Kukjin Kim wrote:
> On 06/17/13 22:19, Tomasz Figa wrote:
> > Hi Heiko,
> > 
> > On Friday 14 of June 2013 00:45:27 Heiko St?bner wrote:
> >> When a pinctrl driver is loaded legacy gpio support has to be disabled.
> >> The code checking for the pinctrl presence is contained in an #ifdef
> >> checking for the presence of a valid samsung pinctrl driver.
> >> 
> >> There the new PINCTRL_S3C24XX was missing resulting in the check never
> >> being run and the gpio being enabled breaking the pinctrl driver.
> >> 
> >> Fix this by adding the missing CONFIG_PINCTRL_S3C24XX
> >> 
> >> Signed-off-by: Heiko Stuebner<heiko@sntech.de>
> >> ---
> >> 
> >>   drivers/gpio/gpio-samsung.c |    3 ++-
> >>   1 file changed, 2 insertions(+), 1 deletion(-)
> >> 
> >> diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
> >> index a1392f4..c84503e 100644
> >> --- a/drivers/gpio/gpio-samsung.c
> >> +++ b/drivers/gpio/gpio-samsung.c
> >> @@ -2949,7 +2949,8 @@ static __init int samsung_gpiolib_init(void)
> >> 
> >>   	int i, nr_chips;
> >>   	int group = 0;
> >> 
> >> -#if defined(CONFIG_PINCTRL_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440)
> >> +#if defined(CONFIG_PINCTRL_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440)
> >> || \ +    defined(CONFIG_PINCTRL_S3C24XX)
> > 
> > I wonder if this wouldn't be simply covered by PINCTRL_SAMSUNG (except
> > PINCTRL_EXYNOS5440 which doesn't use the common part).
> 
> Well, not added compatible for 's3c64xx-pinctrl' yet?

Right, but this shouldn't have any effect on this code. PINCTRL_S3C64XX isn't 
selected by anything yet, so PINCTRL_SAMSUNG won't be selected when 
ARCH_S3C64XX is used.

As for s3c64xx DT support, I'm planning to finally post patches this week.

Best regards,
Tomasz

> - Kukjin
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc"
> in the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/3] pinctrl: s3c24xx: use correct header for chained_irq functions

[Heiko Stübner]

chained_irq_enter and chained_irq_exit moved to a real header under
linux/pinctrl instead of asm/.

Update the pinctrl driver to use the correct header and fix the build
error.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 drivers/pinctrl/pinctrl-s3c24xx.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-s3c24xx.c b/drivers/pinctrl/pinctrl-s3c24xx.c
index c8b0399..24446da 100644
--- a/drivers/pinctrl/pinctrl-s3c24xx.c
+++ b/drivers/pinctrl/pinctrl-s3c24xx.c
@@ -19,12 +19,11 @@
 #include <linux/irqdomain.h>
 #include <linux/irq.h>
 #include <linux/of_irq.h>
+#include <linux/irqchip/chained_irq.h>
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/err.h>
 
-#include <asm/mach/irq.h>
-
 #include "pinctrl-samsung.h"
 
 #define NUM_EINT	24
-- 
1.7.10.4

[PATCH 2/3] pinctrl: s3c24xx: use correct header for chained_irq functions

[Kukjin Kim]

Heiko St?bner wrote:
> 
> chained_irq_enter and chained_irq_exit moved to a real header under
> linux/pinctrl instead of asm/.
> 
> Update the pinctrl driver to use the correct header and fix the build
> error.
> 
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> ---
>  drivers/pinctrl/pinctrl-s3c24xx.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/pinctrl/pinctrl-s3c24xx.c b/drivers/pinctrl/pinctrl-
> s3c24xx.c
> index c8b0399..24446da 100644
> --- a/drivers/pinctrl/pinctrl-s3c24xx.c
> +++ b/drivers/pinctrl/pinctrl-s3c24xx.c
> @@ -19,12 +19,11 @@
>  #include <linux/irqdomain.h>
>  #include <linux/irq.h>
>  #include <linux/of_irq.h>
> +#include <linux/irqchip/chained_irq.h>
>  #include <linux/io.h>
>  #include <linux/slab.h>
>  #include <linux/err.h>
> 
> -#include <asm/mach/irq.h>
> -
>  #include "pinctrl-samsung.h"
> 
>  #define NUM_EINT	24
> --
> 1.7.10.4

Hmm, would be nice if I could take 1st and 2nd into samsung tree :-)

Linus, if any problems, please let me know.

Thanks,
- Kukjin

[PATCH 2/3] pinctrl: s3c24xx: use correct header for chained_irq functions

[Linus Walleij]

On Mon, Jun 17, 2013 at 3:16 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> Heiko St?bner wrote:
>>
>> chained_irq_enter and chained_irq_exit moved to a real header under
>> linux/pinctrl instead of asm/.
>>
>> Update the pinctrl driver to use the correct header and fix the build
>> error.
>>
>> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(...)
>
> Hmm, would be nice if I could take 1st and 2nd into samsung tree :-)
>
> Linus, if any problems, please let me know.

No that should work fine. Nothing is touching pinctrl-s3c in my
pinctrl tree so:
Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

[PATCH 2/3] pinctrl: s3c24xx: use correct header for chained_irq functions

[Kukjin Kim]

On 06/18/13 00:45, Linus Walleij wrote:
> On Mon, Jun 17, 2013 at 3:16 PM, Kukjin Kim<kgene.kim@samsung.com>  wrote:
>> Heiko St?bner wrote:
>>>
>>> chained_irq_enter and chained_irq_exit moved to a real header under
>>> linux/pinctrl instead of asm/.
>>>
>>> Update the pinctrl driver to use the correct header and fix the build
>>> error.
>>>
>>> Signed-off-by: Heiko Stuebner<heiko@sntech.de>
> (...)
>>
>> Hmm, would be nice if I could take 1st and 2nd into samsung tree :-)
>>
>> Linus, if any problems, please let me know.
>
> No that should work fine. Nothing is touching pinctrl-s3c in my
> pinctrl tree so:
> Acked-by: Linus Walleij<linus.walleij@linaro.org>
>
Thanks, applied with Linus' ack.

- Kukjin

[PATCH 3/3] ARM: S3C24XX: update uart addresses in s3c2416-dt auxdata

[Heiko Stübner]

Commit 9ee51f01eee8 (tty: serial/samsung: make register definitions global)
removed the S3C2410_PA_UARTX defines that the newly merged s3c2416 dt
support still expected.

So update mach-s3c2416-dt.c to use the S3C24XX_PA_UART constant
until we have support for the common clock framework the the s3c2416-dt.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm/mach-s3c24xx/mach-s3c2416-dt.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c b/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
index f5c9072..f50454a 100644
--- a/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
+++ b/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
@@ -43,13 +43,13 @@
  * data from the device tree.
  */
 static const struct of_dev_auxdata s3c2416_auxdata_lookup[] __initconst = {
-	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART0,
+	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART,
 				"s3c2440-uart.0", NULL),
-	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART1,
+	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0x4000,
 				"s3c2440-uart.1", NULL),
-	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART2,
+	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0x8000,
 				"s3c2440-uart.2", NULL),
-	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2443_PA_UART3,
+	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0xC000,
 				"s3c2440-uart.3", NULL),
 	OF_DEV_AUXDATA("samsung,s3c6410-sdhci", S3C_PA_HSMMC0,
 				"s3c-sdhci.0", NULL),
-- 
1.7.10.4

[PATCH 3/3] ARM: S3C24XX: update uart addresses in s3c2416-dt auxdata

[Kukjin Kim]

On 06/14/13 07:46, Heiko St?bner wrote:
> Commit 9ee51f01eee8 (tty: serial/samsung: make register definitions global)
> removed the S3C2410_PA_UARTX defines that the newly merged s3c2416 dt
> support still expected.
>
> So update mach-s3c2416-dt.c to use the S3C24XX_PA_UART constant
> until we have support for the common clock framework the the s3c2416-dt.
>
OK, applied.

Thanks,
- Kukjin

> Signed-off-by: Heiko Stuebner<heiko@sntech.de>
> ---
>   arch/arm/mach-s3c24xx/mach-s3c2416-dt.c |    8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c b/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
> index f5c9072..f50454a 100644
> --- a/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
> +++ b/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
> @@ -43,13 +43,13 @@
>    * data from the device tree.
>    */
>   static const struct of_dev_auxdata s3c2416_auxdata_lookup[] __initconst = {
> -	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART0,
> +	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART,
>   				"s3c2440-uart.0", NULL),
> -	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART1,
> +	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0x4000,
>   				"s3c2440-uart.1", NULL),
> -	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART2,
> +	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0x8000,
>   				"s3c2440-uart.2", NULL),
> -	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2443_PA_UART3,
> +	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0xC000,
>   				"s3c2440-uart.3", NULL),
>   	OF_DEV_AUXDATA("samsung,s3c6410-sdhci", S3C_PA_HSMMC0,
>   				"s3c-sdhci.0", NULL),