[PATCH 1/2] pinctrl: sh-pfc: r8a73a4: Remove obsolete multi-platform check

[PATCH 1/2] pinctrl: sh-pfc: r8a73a4: Remove obsolete multi-platform check

[Geert Uytterhoeven]

As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove
legacy platform"), r8a73a4 is only supported in generic ARM
multi-platform builds.  Hence CONFIG_ARCH_MULTIPLATFORM is always set,
and the check can be removed.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
index 280a56f977860272..ba18d2e65e674563 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
@@ -21,10 +21,6 @@
 #include <linux/kernel.h>
 #include <linux/pinctrl/pinconf-generic.h>
 
-#ifndef CONFIG_ARCH_MULTIPLATFORM
-#include <mach/irqs.h>
-#endif
-
 #include "core.h"
 #include "sh_pfc.h"
 
-- 
1.9.1

[PATCH 2/2] pinctrl: sh-pfc: Remove r8a73a4 platform_device_id entry

[Geert Uytterhoeven]

As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove
legacy platform"), r8a73a4 is only supported in generic DT-only ARM
multi-platform builds.  The driver doesn't need to match platform
devices by name anymore, hence remove the corresponding
platform_device_id entry.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/pinctrl/sh-pfc/core.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c
index 7b2c9495c3832410..287a3d048a5e1cf9 100644
--- a/drivers/pinctrl/sh-pfc/core.c
+++ b/drivers/pinctrl/sh-pfc/core.c
@@ -579,9 +579,6 @@ static int sh_pfc_remove(struct platform_device *pdev)
 }
 
 static const struct platform_device_id sh_pfc_id_table[] = {
-#ifdef CONFIG_PINCTRL_PFC_R8A73A4
-	{ "pfc-r8a73a4", (kernel_ulong_t)&r8a73a4_pinmux_info },
-#endif
 #ifdef CONFIG_PINCTRL_PFC_R8A7740
 	{ "pfc-r8a7740", (kernel_ulong_t)&r8a7740_pinmux_info },
 #endif
-- 
1.9.1

Re: [PATCH 2/2] pinctrl: sh-pfc: Remove r8a73a4 platform_device_id entry

[Laurent Pinchart]

Hi Geert,

Thank you for the patch.

On Tuesday 28 April 2015 12:15:07 Geert Uytterhoeven wrote:
> As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove
> legacy platform"), r8a73a4 is only supported in generic DT-only ARM
> multi-platform builds.  The driver doesn't need to match platform
> devices by name anymore, hence remove the corresponding
> platform_device_id entry.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/pinctrl/sh-pfc/core.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c
> index 7b2c9495c3832410..287a3d048a5e1cf9 100644
> --- a/drivers/pinctrl/sh-pfc/core.c
> +++ b/drivers/pinctrl/sh-pfc/core.c
> @@ -579,9 +579,6 @@ static int sh_pfc_remove(struct platform_device *pdev)
>  }
> 
>  static const struct platform_device_id sh_pfc_id_table[] = {
> -#ifdef CONFIG_PINCTRL_PFC_R8A73A4
> -	{ "pfc-r8a73a4", (kernel_ulong_t)&r8a73a4_pinmux_info },
> -#endif
>  #ifdef CONFIG_PINCTRL_PFC_R8A7740
>  	{ "pfc-r8a7740", (kernel_ulong_t)&r8a7740_pinmux_info },
>  #endif

-- 
Regards,

Laurent Pinchart

Re: [PATCH 2/2] pinctrl: sh-pfc: Remove r8a73a4 platform_device_id entry

[Simon Horman]

On Tue, Apr 28, 2015 at 12:15:07PM +0200, Geert Uytterhoeven wrote:
> As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove
> legacy platform"), r8a73a4 is only supported in generic DT-only ARM
> multi-platform builds.  The driver doesn't need to match platform
> devices by name anymore, hence remove the corresponding
> platform_device_id entry.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Simon Horman <horms+renesas@verge.net.au>

> ---
>  drivers/pinctrl/sh-pfc/core.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c
> index 7b2c9495c3832410..287a3d048a5e1cf9 100644
> --- a/drivers/pinctrl/sh-pfc/core.c
> +++ b/drivers/pinctrl/sh-pfc/core.c
> @@ -579,9 +579,6 @@ static int sh_pfc_remove(struct platform_device *pdev)
>  }
>  
>  static const struct platform_device_id sh_pfc_id_table[] = {
> -#ifdef CONFIG_PINCTRL_PFC_R8A73A4
> -	{ "pfc-r8a73a4", (kernel_ulong_t)&r8a73a4_pinmux_info },
> -#endif
>  #ifdef CONFIG_PINCTRL_PFC_R8A7740
>  	{ "pfc-r8a7740", (kernel_ulong_t)&r8a7740_pinmux_info },
>  #endif
> -- 
> 1.9.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH 2/2] pinctrl: sh-pfc: Remove r8a73a4 platform_device_id entry

[Linus Walleij]

On Tue, Apr 28, 2015 at 12:15 PM, Geert Uytterhoeven
<geert+renesas@glider.be> wrote:

> As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove
> legacy platform"), r8a73a4 is only supported in generic DT-only ARM
> multi-platform builds.  The driver doesn't need to match platform
> devices by name anymore, hence remove the corresponding
> platform_device_id entry.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Patch applied with all ACKs.

Yours,
Linus Walleij

Re: [PATCH 1/2] pinctrl: sh-pfc: r8a73a4: Remove obsolete multi-platform check

[Laurent Pinchart]

Hi Geert,

Thank you for the patch.

On Tuesday 28 April 2015 12:15:06 Geert Uytterhoeven wrote:
> As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove
> legacy platform"), r8a73a4 is only supported in generic ARM
> multi-platform builds.  Hence CONFIG_ARCH_MULTIPLATFORM is always set,
> and the check can be removed.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
> b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c index
> 280a56f977860272..ba18d2e65e674563 100644
> --- a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
> +++ b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
> @@ -21,10 +21,6 @@
>  #include <linux/kernel.h>
>  #include <linux/pinctrl/pinconf-generic.h>
> 
> -#ifndef CONFIG_ARCH_MULTIPLATFORM
> -#include <mach/irqs.h>
> -#endif
> -
>  #include "core.h"
>  #include "sh_pfc.h"

-- 
Regards,

Laurent Pinchart

Re: [PATCH 1/2] pinctrl: sh-pfc: r8a73a4: Remove obsolete multi-platform check

[Linus Walleij]

On Tue, Apr 28, 2015 at 12:15 PM, Geert Uytterhoeven
<geert+renesas@glider.be> wrote:

> As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove
> legacy platform"), r8a73a4 is only supported in generic ARM
> multi-platform builds.  Hence CONFIG_ARCH_MULTIPLATFORM is always set,
> and the check can be removed.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Patch applied.

Yours,
Linus Walleij

[PATCH 1/2] pinctrl: sh-pfc: r8a73a4: Remove obsolete multi-platform check

[Geert Uytterhoeven]

As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove
legacy platform"), r8a73a4 is only supported in generic ARM
multi-platform builds.  Hence CONFIG_ARCH_MULTIPLATFORM is always set,
and the check can be removed.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
This depends on Simon's branch r8a73a4-ccf-and-multiplatform-for-v4.1
---
 drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
index 280a56f977860272..ba18d2e65e674563 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
@@ -21,10 +21,6 @@
 #include <linux/kernel.h>
 #include <linux/pinctrl/pinconf-generic.h>
 
-#ifndef CONFIG_ARCH_MULTIPLATFORM
-#include <mach/irqs.h>
-#endif
-
 #include "core.h"
 #include "sh_pfc.h"
 
-- 
1.9.1

Re: [PATCH 1/2] pinctrl: sh-pfc: r8a73a4: Remove obsolete multi-platform check

[Simon Horman]

On Tue, Apr 28, 2015 at 12:14:31PM +0200, Geert Uytterhoeven wrote:
> As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove
> legacy platform"), r8a73a4 is only supported in generic ARM
> multi-platform builds.  Hence CONFIG_ARCH_MULTIPLATFORM is always set,
> and the check can be removed.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> This depends on Simon's branch r8a73a4-ccf-and-multiplatform-for-v4.1

Which was tagged as renesas-r8a73a4-ccf-and-multiplatform-for-v4.1 and
is present in v4.0-rc1.

Acked-by: Simon Horman <horms+renesas@verge.net.au>

> ---
>  drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
> index 280a56f977860272..ba18d2e65e674563 100644
> --- a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
> +++ b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
> @@ -21,10 +21,6 @@
>  #include <linux/kernel.h>
>  #include <linux/pinctrl/pinconf-generic.h>
>  
> -#ifndef CONFIG_ARCH_MULTIPLATFORM
> -#include <mach/irqs.h>
> -#endif
> -
>  #include "core.h"
>  #include "sh_pfc.h"
>  
> -- 
> 1.9.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH 1/2] pinctrl: sh-pfc: r8a73a4: Remove obsolete multi-platform check

[Linus Walleij]

On Tue, Apr 28, 2015 at 12:14 PM, Geert Uytterhoeven
<geert+renesas@glider.be> wrote:

> As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove
> legacy platform"), r8a73a4 is only supported in generic ARM
> multi-platform builds.  Hence CONFIG_ARCH_MULTIPLATFORM is always set,
> and the check can be removed.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> This depends on Simon's branch r8a73a4-ccf-and-multiplatform-for-v4.1

I guess I can't merge it to pinctrl then and Simon will take it?

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

Yours,
Linus Walleij

Re: [PATCH 1/2] pinctrl: sh-pfc: r8a73a4: Remove obsolete multi-platform check

[Geert Uytterhoeven]

On Tue, May 12, 2015 at 9:26 AM, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Tue, Apr 28, 2015 at 12:14 PM, Geert Uytterhoeven
> <geert+renesas@glider.be> wrote:
>
>> As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove
>> legacy platform"), r8a73a4 is only supported in generic ARM
>> multi-platform builds.  Hence CONFIG_ARCH_MULTIPLATFORM is always set,
>> and the check can be removed.
>>
>> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>> ---
>> This depends on Simon's branch r8a73a4-ccf-and-multiplatform-for-v4.1

> I guess I can't merge it to pinctrl then and Simon will take it?

Sorry for the confusion, that was a old comment I forgot to remove, as
that branch was already upstream.
The comment was no longer there in the updated version, sent 1 minute later.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 1/2] pinctrl: sh-pfc: r8a73a4: Remove obsolete multi-platform check

[Simon Horman]

Hi Linus,

On Tue, May 12, 2015 at 09:26:53AM +0200, Linus Walleij wrote:
> On Tue, Apr 28, 2015 at 12:14 PM, Geert Uytterhoeven
> <geert+renesas@glider.be> wrote:
> 
> > As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove
> > legacy platform"), r8a73a4 is only supported in generic ARM
> > multi-platform builds.  Hence CONFIG_ARCH_MULTIPLATFORM is always set,
> > and the check can be removed.
> >
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > ---
> > This depends on Simon's branch r8a73a4-ccf-and-multiplatform-for-v4.1
> 
> I guess I can't merge it to pinctrl then and Simon will take it?
> 
> Acked-by: Linus Walleij <linus.walleij@linaro.org>

I am happy to take this with your ack, however, the above mentioned branch
is present in v4.1-rc1 so if it is practical for you to use that as a base
then you can take the patch yourself.

Re: [PATCH 1/2] pinctrl: sh-pfc: r8a73a4: Remove obsolete multi-platform check

[Linus Walleij]

On Thu, May 14, 2015 at 2:49 AM, Simon Horman <horms@verge.net.au> wrote:
> Hi Linus,
>
> On Tue, May 12, 2015 at 09:26:53AM +0200, Linus Walleij wrote:
>> On Tue, Apr 28, 2015 at 12:14 PM, Geert Uytterhoeven
>> <geert+renesas@glider.be> wrote:
>>
>> > As of commit 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove
>> > legacy platform"), r8a73a4 is only supported in generic ARM
>> > multi-platform builds.  Hence CONFIG_ARCH_MULTIPLATFORM is always set,
>> > and the check can be removed.
>> >
>> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>> > ---
>> > This depends on Simon's branch r8a73a4-ccf-and-multiplatform-for-v4.1
>>
>> I guess I can't merge it to pinctrl then and Simon will take it?
>>
>> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>
> I am happy to take this with your ack, however, the above mentioned branch
> is present in v4.1-rc1 so if it is practical for you to use that as a base
> then you can take the patch yourself.

Yeah I took it. Thanks Simon.

Yours,
Linus Walleij