* [PATCH] ARM: shmobile: armadillo: fixup ether pinctrol naming
@ 2013-09-02 3:33 Kuninori Morimoto
2013-09-02 10:37 ` Laurent Pinchart
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Kuninori Morimoto @ 2013-09-02 3:33 UTC (permalink / raw)
To: linux-sh
e5c9b4cd665106d9b5397114ea81a53059410b6a
(sh_eth: get R8A7740 support out of #ifdef)
exchanged sh-eth driver name to r8a7740-gether,
but, eva_pinctrl_map[] didn't follow it.
This patch fixes it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
arch/arm/mach-shmobile/board-armadillo800eva.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index c5be60d..33f219e 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1069,9 +1069,9 @@ static const struct pinctrl_map eva_pinctrl_map[] = {
PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.1", "pfc-r8a7740",
"fsib_mclk_in", "fsib"),
/* GETHER */
- PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740",
+ PIN_MAP_MUX_GROUP_DEFAULT("r8a7740-gether", "pfc-r8a7740",
"gether_mii", "gether"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740",
+ PIN_MAP_MUX_GROUP_DEFAULT("r8a7740-gether", "pfc-r8a7740",
"gether_int", "gether"),
/* HDMI */
PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-r8a7740",
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: shmobile: armadillo: fixup ether pinctrol naming
2013-09-02 3:33 [PATCH] ARM: shmobile: armadillo: fixup ether pinctrol naming Kuninori Morimoto
@ 2013-09-02 10:37 ` Laurent Pinchart
2013-09-02 10:59 ` Sergei Shtylyov
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Laurent Pinchart @ 2013-09-02 10:37 UTC (permalink / raw)
To: linux-sh
Hi Morimoto-san,
Thank you for the patch.
On Sunday 01 September 2013 20:33:49 Kuninori Morimoto wrote:
> e5c9b4cd665106d9b5397114ea81a53059410b6a
> (sh_eth: get R8A7740 support out of #ifdef)
> exchanged sh-eth driver name to r8a7740-gether,
> but, eva_pinctrl_map[] didn't follow it.
> This patch fixes it.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
I've taken the patch in my tree and will push it to v3.13.
> ---
> arch/arm/mach-shmobile/board-armadillo800eva.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c
> b/arch/arm/mach-shmobile/board-armadillo800eva.c index c5be60d..33f219e
> 100644
> --- a/arch/arm/mach-shmobile/board-armadillo800eva.c
> +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
> @@ -1069,9 +1069,9 @@ static const struct pinctrl_map eva_pinctrl_map[] = {
> PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.1", "pfc-r8a7740",
> "fsib_mclk_in", "fsib"),
> /* GETHER */
> - PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740",
> + PIN_MAP_MUX_GROUP_DEFAULT("r8a7740-gether", "pfc-r8a7740",
> "gether_mii", "gether"),
> - PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740",
> + PIN_MAP_MUX_GROUP_DEFAULT("r8a7740-gether", "pfc-r8a7740",
> "gether_int", "gether"),
> /* HDMI */
> PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-r8a7740",
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: shmobile: armadillo: fixup ether pinctrol naming
2013-09-02 3:33 [PATCH] ARM: shmobile: armadillo: fixup ether pinctrol naming Kuninori Morimoto
2013-09-02 10:37 ` Laurent Pinchart
@ 2013-09-02 10:59 ` Sergei Shtylyov
2013-09-02 11:03 ` Laurent Pinchart
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Sergei Shtylyov @ 2013-09-02 10:59 UTC (permalink / raw)
To: linux-sh
Hello.
On 02-09-2013 14:37, Laurent Pinchart wrote:
>> e5c9b4cd665106d9b5397114ea81a53059410b6a
>> (sh_eth: get R8A7740 support out of #ifdef)
>> exchanged sh-eth driver name to r8a7740-gether,
>> but, eva_pinctrl_map[] didn't follow it.
>> This patch fixes it.
>> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> I've taken the patch in my tree and will push it to v3.13.
Why to 3.13 if this is a bug fix?
WBR, Sergei
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: shmobile: armadillo: fixup ether pinctrol naming
2013-09-02 3:33 [PATCH] ARM: shmobile: armadillo: fixup ether pinctrol naming Kuninori Morimoto
2013-09-02 10:37 ` Laurent Pinchart
2013-09-02 10:59 ` Sergei Shtylyov
@ 2013-09-02 11:03 ` Laurent Pinchart
2013-09-02 14:02 ` Sergei Shtylyov
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Laurent Pinchart @ 2013-09-02 11:03 UTC (permalink / raw)
To: linux-sh
Hi Sergei,
On Monday 02 September 2013 14:59:45 Sergei Shtylyov wrote:
> Hello.
>
> On 02-09-2013 14:37, Laurent Pinchart wrote:
> >> e5c9b4cd665106d9b5397114ea81a53059410b6a
> >> (sh_eth: get R8A7740 support out of #ifdef)
> >> exchanged sh-eth driver name to r8a7740-gether,
> >> but, eva_pinctrl_map[] didn't follow it.
> >> This patch fixes it.
> >>
> >> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >
> > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> >
> > I've taken the patch in my tree and will push it to v3.13.
>
> Why to 3.13 if this is a bug fix?
My bad, I meant v3.12. I've added the patch to my fixes branch, which I will
ask Simon to pull into v3.12-rc.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: shmobile: armadillo: fixup ether pinctrol naming
2013-09-02 3:33 [PATCH] ARM: shmobile: armadillo: fixup ether pinctrol naming Kuninori Morimoto
` (2 preceding siblings ...)
2013-09-02 11:03 ` Laurent Pinchart
@ 2013-09-02 14:02 ` Sergei Shtylyov
2013-09-02 14:07 ` Sergei Shtylyov
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Sergei Shtylyov @ 2013-09-02 14:02 UTC (permalink / raw)
To: linux-sh
Hello.
On 09/02/2013 07:33 AM, Kuninori Morimoto wrote:
> e5c9b4cd665106d9b5397114ea81a53059410b6a
> (sh_eth: get R8A7740 support out of #ifdef)
> exchanged sh-eth driver name to r8a7740-gether,
> but, eva_pinctrl_map[] didn't follow it.
> This patch fixes it.
You're too quick to blame my patch. It was just merged in the same
timeframe of 3.11-rc1 with the Armadillo800EVA GEther PFC support but thru the
different (net-next.git) tree, so it couldn't have done this change because in
that tree the code you're modifying wasn't present; likewise, in the
renesas.git, the network patches weren't seen and accounted for (although they
could have been in principle). I'd therefore like to see more fair and
complete changelog. :-)
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> arch/arm/mach-shmobile/board-armadillo800eva.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
> index c5be60d..33f219e 100644
> --- a/arch/arm/mach-shmobile/board-armadillo800eva.c
> +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
> @@ -1069,9 +1069,9 @@ static const struct pinctrl_map eva_pinctrl_map[] = {
> PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.1", "pfc-r8a7740",
> "fsib_mclk_in", "fsib"),
> /* GETHER */
> - PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740",
> + PIN_MAP_MUX_GROUP_DEFAULT("r8a7740-gether", "pfc-r8a7740",
> "gether_mii", "gether"),
> - PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740",
> + PIN_MAP_MUX_GROUP_DEFAULT("r8a7740-gether", "pfc-r8a7740",
> "gether_int", "gether"),
> /* HDMI */
> PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-r8a7740",
WBR, Sergei
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: shmobile: armadillo: fixup ether pinctrol naming
2013-09-02 3:33 [PATCH] ARM: shmobile: armadillo: fixup ether pinctrol naming Kuninori Morimoto
` (3 preceding siblings ...)
2013-09-02 14:02 ` Sergei Shtylyov
@ 2013-09-02 14:07 ` Sergei Shtylyov
2013-12-03 8:07 ` [PATCH] ARM: shmobile: armadillo: fixup FSI address size Kuninori Morimoto
2013-12-05 5:06 ` Simon Horman
6 siblings, 0 replies; 8+ messages in thread
From: Sergei Shtylyov @ 2013-09-02 14:07 UTC (permalink / raw)
To: linux-sh
On 09/02/2013 06:02 PM, Sergei Shtylyov wrote:
>> e5c9b4cd665106d9b5397114ea81a53059410b6a
>> (sh_eth: get R8A7740 support out of #ifdef)
>> exchanged sh-eth driver name to r8a7740-gether,
>> but, eva_pinctrl_map[] didn't follow it.
>> This patch fixes it.
> You're too quick to blame my patch. It was just merged in the same
Although, I probably misread your changelog, and you didn't blame my patch
but just didn't mention another patch which modified eva_pinctrl_map[].
Anyway, it would have been good if you mentioned that other commit.
WBR, Sergei
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ARM: shmobile: armadillo: fixup FSI address size
2013-09-02 3:33 [PATCH] ARM: shmobile: armadillo: fixup ether pinctrol naming Kuninori Morimoto
` (4 preceding siblings ...)
2013-09-02 14:07 ` Sergei Shtylyov
@ 2013-12-03 8:07 ` Kuninori Morimoto
2013-12-05 5:06 ` Simon Horman
6 siblings, 0 replies; 8+ messages in thread
From: Kuninori Morimoto @ 2013-12-03 8:07 UTC (permalink / raw)
To: linux-sh
FSI address size is 0x400, not 0x8400
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 958e3cb..d9e28c7a 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -958,7 +958,7 @@ static struct resource fsi_resources[] = {
[0] = {
.name = "FSI",
.start = 0xfe1f0000,
- .end = 0xfe1f8400 - 1,
+ .end = 0xfe1f0400 - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: shmobile: armadillo: fixup FSI address size
2013-09-02 3:33 [PATCH] ARM: shmobile: armadillo: fixup ether pinctrol naming Kuninori Morimoto
` (5 preceding siblings ...)
2013-12-03 8:07 ` [PATCH] ARM: shmobile: armadillo: fixup FSI address size Kuninori Morimoto
@ 2013-12-05 5:06 ` Simon Horman
6 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2013-12-05 5:06 UTC (permalink / raw)
To: linux-sh
On Tue, Dec 03, 2013 at 12:07:03AM -0800, Kuninori Morimoto wrote:
> FSI address size is 0x400, not 0x8400
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Thanks, I will queue this up.
>
> diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
> index 958e3cb..d9e28c7a 100644
> --- a/arch/arm/mach-shmobile/board-armadillo800eva.c
> +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
> @@ -958,7 +958,7 @@ static struct resource fsi_resources[] = {
> [0] = {
> .name = "FSI",
> .start = 0xfe1f0000,
> - .end = 0xfe1f8400 - 1,
> + .end = 0xfe1f0400 - 1,
> .flags = IORESOURCE_MEM,
> },
> [1] = {
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-12-05 5:06 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-02 3:33 [PATCH] ARM: shmobile: armadillo: fixup ether pinctrol naming Kuninori Morimoto
2013-09-02 10:37 ` Laurent Pinchart
2013-09-02 10:59 ` Sergei Shtylyov
2013-09-02 11:03 ` Laurent Pinchart
2013-09-02 14:02 ` Sergei Shtylyov
2013-09-02 14:07 ` Sergei Shtylyov
2013-12-03 8:07 ` [PATCH] ARM: shmobile: armadillo: fixup FSI address size Kuninori Morimoto
2013-12-05 5:06 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).