| Message ID | 87fvtnsxr9.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
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",
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 -- 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
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.
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 -- 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
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 -- 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
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",
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(-)