| Message ID | 1446148654-20551-1-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 781f278a16fbd74ffa2acf3f14134953631f076d |
| Delegated to: | Simon Horman |
| Headers | show |
On Thu, Oct 29, 2015 at 08:57:34PM +0100, Geert Uytterhoeven wrote: > From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> > > Ensures that the pull-ups for pins SD0_CD and SD0_WP are enabled. > > This is one of two features from the DT reference platform that are > still missing in MP. > > Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> > Acked-by: Linus Walleij <linus.walleij@linaro.org> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > The dependencies are now in pinctrl/for-next: > ae7465a0972aee88 pinctrl: sh-pfc: r8a7778: Add bias (pull-up) pinconf support > 22768fc60abbf58b pinctrl: sh-pfc: Add macros defining GP ports with config flags > Am I correct in thinking that it is safe for me to apply this patch without those dependencies present in my dt-for-v4.5 branch? -- 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 Simon, On Fri, Oct 30, 2015 at 8:55 AM, Simon Horman <horms@verge.net.au> wrote: > On Thu, Oct 29, 2015 at 08:57:34PM +0100, Geert Uytterhoeven wrote: >> From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> >> >> Ensures that the pull-ups for pins SD0_CD and SD0_WP are enabled. >> >> This is one of two features from the DT reference platform that are >> still missing in MP. >> >> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> >> Acked-by: Linus Walleij <linus.walleij@linaro.org> >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> >> --- >> The dependencies are now in pinctrl/for-next: >> ae7465a0972aee88 pinctrl: sh-pfc: r8a7778: Add bias (pull-up) pinconf support >> 22768fc60abbf58b pinctrl: sh-pfc: Add macros defining GP ports with config flags > > Am I correct in thinking that it is safe for me to apply this patch > without those dependencies present in my dt-for-v4.5 branch? Pinctrl may fail in that branch, and device probing may fail due to that (still puzzled about when pinctrl failures are hard vs. soft). But you will rebase the *-for-v4.5 branches on top of v4.4-rc1 later, right? Then that problem will be resolved. Note that not having this patch in v4.4 may be considered a regression compared to bockw-legacy... 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 -- 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 ?, 10? 30, 2015 at 09:11:49?? +0100, Geert Uytterhoeven wrote: > Hi Simon, > > On Fri, Oct 30, 2015 at 8:55 AM, Simon Horman <horms@verge.net.au> wrote: > > On Thu, Oct 29, 2015 at 08:57:34PM +0100, Geert Uytterhoeven wrote: > >> From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> > >> > >> Ensures that the pull-ups for pins SD0_CD and SD0_WP are enabled. > >> > >> This is one of two features from the DT reference platform that are > >> still missing in MP. > >> > >> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> > >> Acked-by: Linus Walleij <linus.walleij@linaro.org> > >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > >> --- > >> The dependencies are now in pinctrl/for-next: > >> ae7465a0972aee88 pinctrl: sh-pfc: r8a7778: Add bias (pull-up) pinconf support > >> 22768fc60abbf58b pinctrl: sh-pfc: Add macros defining GP ports with config flags > > > > Am I correct in thinking that it is safe for me to apply this patch > > without those dependencies present in my dt-for-v4.5 branch? > > Pinctrl may fail in that branch, and device probing may fail due to that > (still puzzled about when pinctrl failures are hard vs. soft). > But you will rebase the *-for-v4.5 branches on top of v4.4-rc1 later, right? > Then that problem will be resolved. Ok. I think it would be best if I queued up these patches after I rebase dt-for-v4.5 on top of v4.4-rca (once the latter has been released). Could you repost this patch then? > Note that not having this patch in v4.4 may be considered a regression > compared to bockw-legacy... Understood. -- 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 Sat, Oct 31, 2015 at 04:24:30PM +0900, Simon Horman wrote: > On ?, 10? 30, 2015 at 09:11:49?? +0100, Geert Uytterhoeven wrote: > > Hi Simon, > > > > On Fri, Oct 30, 2015 at 8:55 AM, Simon Horman <horms@verge.net.au> wrote: > > > On Thu, Oct 29, 2015 at 08:57:34PM +0100, Geert Uytterhoeven wrote: > > >> From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> > > >> > > >> Ensures that the pull-ups for pins SD0_CD and SD0_WP are enabled. > > >> > > >> This is one of two features from the DT reference platform that are > > >> still missing in MP. > > >> > > >> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> > > >> Acked-by: Linus Walleij <linus.walleij@linaro.org> > > >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > >> --- > > >> The dependencies are now in pinctrl/for-next: > > >> ae7465a0972aee88 pinctrl: sh-pfc: r8a7778: Add bias (pull-up) pinconf support > > >> 22768fc60abbf58b pinctrl: sh-pfc: Add macros defining GP ports with config flags > > > > > > Am I correct in thinking that it is safe for me to apply this patch > > > without those dependencies present in my dt-for-v4.5 branch? > > > > Pinctrl may fail in that branch, and device probing may fail due to that > > (still puzzled about when pinctrl failures are hard vs. soft). > > But you will rebase the *-for-v4.5 branches on top of v4.4-rc1 later, right? > > Then that problem will be resolved. > > Ok. I think it would be best if I queued up these patches after I rebase > dt-for-v4.5 on top of v4.4-rca (once the latter has been released). Could > you repost this patch then? > > > Note that not having this patch in v4.4 may be considered a regression > > compared to bockw-legacy... > > Understood. I have now queued up the patch for v4.5. -- 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/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts index 90543b12d7e26bcb..8a540767871792c6 100644 --- a/arch/arm/boot/dts/r8a7778-bockw.dts +++ b/arch/arm/boot/dts/r8a7778-bockw.dts @@ -137,10 +137,14 @@ }; sdhi0_pins: sd0 { - renesas,groups = "sdhi0_data4", "sdhi0_ctrl", - "sdhi0_cd"; + renesas,groups = "sdhi0_data4", "sdhi0_ctrl"; renesas,function = "sdhi0"; }; + sdhi0_pup_pins: sd0_pup { + renesas,groups = "sdhi0_cd", "sdhi0_wp"; + renesas,function = "sdhi0"; + bias-pull-up; + }; hspi0_pins: hspi0 { renesas,groups = "hspi0_a"; @@ -169,7 +173,7 @@ }; &sdhi0 { - pinctrl-0 = <&sdhi0_pins>; + pinctrl-0 = <&sdhi0_pins>, <&sdhi0_pup_pins>; pinctrl-names = "default"; vmmc-supply = <&fixedregulator3v3>;