* [PATCH 0/2] pinctrl: sh-pfc: r8a7795: Misc fixes and cleanups
@ 2017-03-13 16:41 Geert Uytterhoeven
2017-03-13 16:41 ` [PATCH 1/2] pinctrl: sh-pfc: r8a7795: Fix hscif2_clk_b and hscif4_ctrl Geert Uytterhoeven
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Geert Uytterhoeven @ 2017-03-13 16:41 UTC (permalink / raw)
To: Linus Walleij, Laurent Pinchart
Cc: linux-renesas-soc, linux-gpio, Geert Uytterhoeven
Hi Linus, Laurent,
This patch series contains miscellaneous fixes and cleanups for the
Renesas R-Car H3 pinctrl driver:
I plan to queue these up in sh-pfc-for-v4.12.
Thanks for your comments!
Geert Uytterhoeven (2):
pinctrl: sh-pfc: r8a7795: Fix hscif2_clk_b and hscif4_ctrl
pinctrl: sh-pfc: r8a7795: Restore sort order
drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 175 ++++++++++++++++++-----------------
1 file changed, 88 insertions(+), 87 deletions(-)
--
2.7.4
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
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/2] pinctrl: sh-pfc: r8a7795: Fix hscif2_clk_b and hscif4_ctrl 2017-03-13 16:41 [PATCH 0/2] pinctrl: sh-pfc: r8a7795: Misc fixes and cleanups Geert Uytterhoeven @ 2017-03-13 16:41 ` Geert Uytterhoeven 2017-03-13 16:57 ` Sergei Shtylyov 2017-03-13 16:41 ` [PATCH 2/2] pinctrl: sh-pfc: r8a7795: Restore sort order Geert Uytterhoeven ` (2 subsequent siblings) 3 siblings, 1 reply; 10+ messages in thread From: Geert Uytterhoeven @ 2017-03-13 16:41 UTC (permalink / raw) To: Linus Walleij, Laurent Pinchart Cc: linux-renesas-soc, linux-gpio, Geert Uytterhoeven Fix typos in hscif2_clk_[bc]_mux[] and hscif4_ctrl_mux[]. Fixes: a56069c46c102710 ("pinctrl: sh-pfc: r8a7795: Add HSCIF pins, groups, and functions") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c index 504d0c3d7f741849..6ba7ed15a4610366 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c @@ -2167,7 +2167,7 @@ static const unsigned int hscif2_clk_b_pins[] = { RCAR_GP_PIN(6, 21), }; static const unsigned int hscif2_clk_b_mux[] = { - HSCK1_B_MARK, + HSCK2_B_MARK, }; static const unsigned int hscif2_ctrl_b_pins[] = { /* RTS, CTS */ @@ -2240,7 +2240,7 @@ static const unsigned int hscif4_ctrl_pins[] = { RCAR_GP_PIN(1, 15), RCAR_GP_PIN(1, 14), }; static const unsigned int hscif4_ctrl_mux[] = { - HRTS4_N_MARK, HCTS3_N_MARK, + HRTS4_N_MARK, HCTS4_N_MARK, }; static const unsigned int hscif4_data_b_pins[] = { -- 2.7.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] pinctrl: sh-pfc: r8a7795: Fix hscif2_clk_b and hscif4_ctrl 2017-03-13 16:41 ` [PATCH 1/2] pinctrl: sh-pfc: r8a7795: Fix hscif2_clk_b and hscif4_ctrl Geert Uytterhoeven @ 2017-03-13 16:57 ` Sergei Shtylyov 2017-03-16 12:49 ` Geert Uytterhoeven 0 siblings, 1 reply; 10+ messages in thread From: Sergei Shtylyov @ 2017-03-13 16:57 UTC (permalink / raw) To: Geert Uytterhoeven, Linus Walleij, Laurent Pinchart Cc: linux-renesas-soc, linux-gpio On 03/13/2017 07:41 PM, Geert Uytterhoeven wrote: > Fix typos in hscif2_clk_[bc]_mux[] and hscif4_ctrl_mux[]. Only seeing hscif2_clk_b_mux[] fix... > Fixes: a56069c46c102710 ("pinctrl: sh-pfc: r8a7795: Add HSCIF pins, groups, and functions") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c > index 504d0c3d7f741849..6ba7ed15a4610366 100644 > --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c > @@ -2167,7 +2167,7 @@ static const unsigned int hscif2_clk_b_pins[] = { > RCAR_GP_PIN(6, 21), > }; > static const unsigned int hscif2_clk_b_mux[] = { > - HSCK1_B_MARK, > + HSCK2_B_MARK, > }; > static const unsigned int hscif2_ctrl_b_pins[] = { > /* RTS, CTS */ [...] MBR, Sergei ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] pinctrl: sh-pfc: r8a7795: Fix hscif2_clk_b and hscif4_ctrl 2017-03-13 16:57 ` Sergei Shtylyov @ 2017-03-16 12:49 ` Geert Uytterhoeven 2017-03-16 12:49 ` Geert Uytterhoeven 0 siblings, 1 reply; 10+ messages in thread From: Geert Uytterhoeven @ 2017-03-16 12:49 UTC (permalink / raw) To: Sergei Shtylyov Cc: Geert Uytterhoeven, Linus Walleij, Laurent Pinchart, Linux-Renesas, linux-gpio@vger.kernel.org Hei Sergey, On Mon, Mar 13, 2017 at 5:57 PM, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> wrote: > On 03/13/2017 07:41 PM, Geert Uytterhoeven wrote: > >> Fix typos in hscif2_clk_[bc]_mux[] and hscif4_ctrl_mux[]. > > Only seeing hscif2_clk_b_mux[] fix... Thanks for noticing, I had copied this line from another patch for r8a7796, but forgot to update it. 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 ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] pinctrl: sh-pfc: r8a7795: Fix hscif2_clk_b and hscif4_ctrl 2017-03-16 12:49 ` Geert Uytterhoeven @ 2017-03-16 12:49 ` Geert Uytterhoeven 0 siblings, 0 replies; 10+ messages in thread From: Geert Uytterhoeven @ 2017-03-16 12:49 UTC (permalink / raw) To: Sergei Shtylyov Cc: Geert Uytterhoeven, Linus Walleij, Laurent Pinchart, Linux-Renesas, linux-gpio@vger.kernel.org On Thu, Mar 16, 2017 at 1:49 PM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > Hei Sergey, "Hi Sergei", of course. 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 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/2] pinctrl: sh-pfc: r8a7795: Restore sort order 2017-03-13 16:41 [PATCH 0/2] pinctrl: sh-pfc: r8a7795: Misc fixes and cleanups Geert Uytterhoeven 2017-03-13 16:41 ` [PATCH 1/2] pinctrl: sh-pfc: r8a7795: Fix hscif2_clk_b and hscif4_ctrl Geert Uytterhoeven @ 2017-03-13 16:41 ` Geert Uytterhoeven 2017-03-15 10:26 ` [PATCH 0/2] pinctrl: sh-pfc: r8a7795: Misc fixes and cleanups Linus Walleij 2017-03-22 13:25 ` Geert Uytterhoeven 3 siblings, 0 replies; 10+ messages in thread From: Geert Uytterhoeven @ 2017-03-13 16:41 UTC (permalink / raw) To: Linus Walleij, Laurent Pinchart Cc: linux-renesas-soc, linux-gpio, Geert Uytterhoeven Somehow the QSPI and SCIF_CLK fragments were inserted at the wrong positions. Restore sort order (alphabetically, per group). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 171 ++++++++++++++++++----------------- 1 file changed, 86 insertions(+), 85 deletions(-) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c index 6ba7ed15a4610366..3d1c32cca16a0398 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c @@ -3101,6 +3101,55 @@ static const unsigned int pwm6_b_mux[] = { PWM6_B_MARK, }; +/* - QSPI0 ------------------------------------------------------------------ */ +static const unsigned int qspi0_ctrl_pins[] = { + /* QSPI0_SPCLK, QSPI0_SSL */ + PIN_NUMBER('W', 3), PIN_NUMBER('Y', 3), +}; +static const unsigned int qspi0_ctrl_mux[] = { + QSPI0_SPCLK_MARK, QSPI0_SSL_MARK, +}; +static const unsigned int qspi0_data2_pins[] = { + /* QSPI0_MOSI_IO0, QSPI0_MISO_IO1 */ + PIN_A_NUMBER('C', 5), PIN_A_NUMBER('B', 4), +}; +static const unsigned int qspi0_data2_mux[] = { + QSPI0_MOSI_IO0_MARK, QSPI0_MISO_IO1_MARK, +}; +static const unsigned int qspi0_data4_pins[] = { + /* QSPI0_MOSI_IO0, QSPI0_MISO_IO1, QSPI0_IO2, QSPI0_IO3 */ + PIN_A_NUMBER('C', 5), PIN_A_NUMBER('B', 4), + PIN_NUMBER('Y', 6), PIN_A_NUMBER('B', 6), +}; +static const unsigned int qspi0_data4_mux[] = { + QSPI0_MOSI_IO0_MARK, QSPI0_MISO_IO1_MARK, + QSPI0_IO2_MARK, QSPI0_IO3_MARK, +}; +/* - QSPI1 ------------------------------------------------------------------ */ +static const unsigned int qspi1_ctrl_pins[] = { + /* QSPI1_SPCLK, QSPI1_SSL */ + PIN_NUMBER('V', 3), PIN_NUMBER('V', 5), +}; +static const unsigned int qspi1_ctrl_mux[] = { + QSPI1_SPCLK_MARK, QSPI1_SSL_MARK, +}; +static const unsigned int qspi1_data2_pins[] = { + /* QSPI1_MOSI_IO0, QSPI1_MISO_IO1 */ + PIN_A_NUMBER('C', 7), PIN_A_NUMBER('E', 5), +}; +static const unsigned int qspi1_data2_mux[] = { + QSPI1_MOSI_IO0_MARK, QSPI1_MISO_IO1_MARK, +}; +static const unsigned int qspi1_data4_pins[] = { + /* QSPI1_MOSI_IO0, QSPI1_MISO_IO1, QSPI1_IO2, QSPI1_IO3 */ + PIN_A_NUMBER('C', 7), PIN_A_NUMBER('E', 5), + PIN_A_NUMBER('E', 4), PIN_A_NUMBER('C', 3), +}; +static const unsigned int qspi1_data4_mux[] = { + QSPI1_MOSI_IO0_MARK, QSPI1_MISO_IO1_MARK, + QSPI1_IO2_MARK, QSPI1_IO3_MARK, +}; + /* - SATA --------------------------------------------------------------------*/ static const unsigned int sata0_devslp_a_pins[] = { /* DEVSLP */ @@ -3299,6 +3348,23 @@ static const unsigned int scif5_clk_pins[] = { static const unsigned int scif5_clk_mux[] = { SCK5_MARK, }; + +/* - SCIF Clock ------------------------------------------------------------- */ +static const unsigned int scif_clk_a_pins[] = { + /* SCIF_CLK */ + RCAR_GP_PIN(6, 23), +}; +static const unsigned int scif_clk_a_mux[] = { + SCIF_CLK_A_MARK, +}; +static const unsigned int scif_clk_b_pins[] = { + /* SCIF_CLK */ + RCAR_GP_PIN(5, 9), +}; +static const unsigned int scif_clk_b_mux[] = { + SCIF_CLK_B_MARK, +}; + /* - SDHI0 ------------------------------------------------------------------ */ static const unsigned int sdhi0_data1_pins[] = { /* D0 */ @@ -3506,22 +3572,6 @@ static const unsigned int sdhi3_ds_mux[] = { SD3_DS_MARK, }; -/* - SCIF Clock ------------------------------------------------------------- */ -static const unsigned int scif_clk_a_pins[] = { - /* SCIF_CLK */ - RCAR_GP_PIN(6, 23), -}; -static const unsigned int scif_clk_a_mux[] = { - SCIF_CLK_A_MARK, -}; -static const unsigned int scif_clk_b_pins[] = { - /* SCIF_CLK */ - RCAR_GP_PIN(5, 9), -}; -static const unsigned int scif_clk_b_mux[] = { - SCIF_CLK_B_MARK, -}; - /* - SSI -------------------------------------------------------------------- */ static const unsigned int ssi0_data_pins[] = { /* SDATA */ @@ -3724,55 +3774,6 @@ static const unsigned int usb2_mux[] = { USB2_PWEN_MARK, USB2_OVC_MARK, }; -/* - QSPI0 ------------------------------------------------------------------ */ -static const unsigned int qspi0_ctrl_pins[] = { - /* QSPI0_SPCLK, QSPI0_SSL */ - PIN_NUMBER('W', 3), PIN_NUMBER('Y', 3), -}; -static const unsigned int qspi0_ctrl_mux[] = { - QSPI0_SPCLK_MARK, QSPI0_SSL_MARK, -}; -static const unsigned int qspi0_data2_pins[] = { - /* QSPI0_MOSI_IO0, QSPI0_MISO_IO1 */ - PIN_A_NUMBER('C', 5), PIN_A_NUMBER('B', 4), -}; -static const unsigned int qspi0_data2_mux[] = { - QSPI0_MOSI_IO0_MARK, QSPI0_MISO_IO1_MARK, -}; -static const unsigned int qspi0_data4_pins[] = { - /* QSPI0_MOSI_IO0, QSPI0_MISO_IO1, QSPI0_IO2, QSPI0_IO3 */ - PIN_A_NUMBER('C', 5), PIN_A_NUMBER('B', 4), - PIN_NUMBER('Y', 6), PIN_A_NUMBER('B', 6), -}; -static const unsigned int qspi0_data4_mux[] = { - QSPI0_MOSI_IO0_MARK, QSPI0_MISO_IO1_MARK, - QSPI0_IO2_MARK, QSPI0_IO3_MARK, -}; -/* - QSPI1 ------------------------------------------------------------------ */ -static const unsigned int qspi1_ctrl_pins[] = { - /* QSPI1_SPCLK, QSPI1_SSL */ - PIN_NUMBER('V', 3), PIN_NUMBER('V', 5), -}; -static const unsigned int qspi1_ctrl_mux[] = { - QSPI1_SPCLK_MARK, QSPI1_SSL_MARK, -}; -static const unsigned int qspi1_data2_pins[] = { - /* QSPI1_MOSI_IO0, QSPI1_MISO_IO1 */ - PIN_A_NUMBER('C', 7), PIN_A_NUMBER('E', 5), -}; -static const unsigned int qspi1_data2_mux[] = { - QSPI1_MOSI_IO0_MARK, QSPI1_MISO_IO1_MARK, -}; -static const unsigned int qspi1_data4_pins[] = { - /* QSPI1_MOSI_IO0, QSPI1_MISO_IO1, QSPI1_IO2, QSPI1_IO3 */ - PIN_A_NUMBER('C', 7), PIN_A_NUMBER('E', 5), - PIN_A_NUMBER('E', 4), PIN_A_NUMBER('C', 3), -}; -static const unsigned int qspi1_data4_mux[] = { - QSPI1_MOSI_IO0_MARK, QSPI1_MISO_IO1_MARK, - QSPI1_IO2_MARK, QSPI1_IO3_MARK, -}; - static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(audio_clk_a_a), SH_PFC_PIN_GROUP(audio_clk_a_b), @@ -3990,6 +3991,12 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(pwm5_b), SH_PFC_PIN_GROUP(pwm6_a), SH_PFC_PIN_GROUP(pwm6_b), + SH_PFC_PIN_GROUP(qspi0_ctrl), + SH_PFC_PIN_GROUP(qspi0_data2), + SH_PFC_PIN_GROUP(qspi0_data4), + SH_PFC_PIN_GROUP(qspi1_ctrl), + SH_PFC_PIN_GROUP(qspi1_data2), + SH_PFC_PIN_GROUP(qspi1_data4), SH_PFC_PIN_GROUP(sata0_devslp_a), SH_PFC_PIN_GROUP(sata0_devslp_b), SH_PFC_PIN_GROUP(scif0_data), @@ -4073,12 +4080,6 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(usb0), SH_PFC_PIN_GROUP(usb1), SH_PFC_PIN_GROUP(usb2), - SH_PFC_PIN_GROUP(qspi0_ctrl), - SH_PFC_PIN_GROUP(qspi0_data2), - SH_PFC_PIN_GROUP(qspi0_data4), - SH_PFC_PIN_GROUP(qspi1_ctrl), - SH_PFC_PIN_GROUP(qspi1_data2), - SH_PFC_PIN_GROUP(qspi1_data4), }; static const char * const audio_clk_groups[] = { @@ -4393,6 +4394,18 @@ static const char * const pwm6_groups[] = { "pwm6_b", }; +static const char * const qspi0_groups[] = { + "qspi0_ctrl", + "qspi0_data2", + "qspi0_data4", +}; + +static const char * const qspi1_groups[] = { + "qspi1_ctrl", + "qspi1_data2", + "qspi1_data4", +}; + static const char * const sata0_groups[] = { "sata0_devslp_a", "sata0_devslp_b", @@ -4524,18 +4537,6 @@ static const char * const usb2_groups[] = { "usb2", }; -static const char * const qspi0_groups[] = { - "qspi0_ctrl", - "qspi0_data2", - "qspi0_data4", -}; - -static const char * const qspi1_groups[] = { - "qspi1_ctrl", - "qspi1_data2", - "qspi1_data4", -}; - static const struct sh_pfc_function pinmux_functions[] = { SH_PFC_FUNCTION(audio_clk), SH_PFC_FUNCTION(avb), @@ -4569,6 +4570,8 @@ static const struct sh_pfc_function pinmux_functions[] = { SH_PFC_FUNCTION(pwm4), SH_PFC_FUNCTION(pwm5), SH_PFC_FUNCTION(pwm6), + SH_PFC_FUNCTION(qspi0), + SH_PFC_FUNCTION(qspi1), SH_PFC_FUNCTION(sata0), SH_PFC_FUNCTION(scif0), SH_PFC_FUNCTION(scif1), @@ -4585,8 +4588,6 @@ static const struct sh_pfc_function pinmux_functions[] = { SH_PFC_FUNCTION(usb0), SH_PFC_FUNCTION(usb1), SH_PFC_FUNCTION(usb2), - SH_PFC_FUNCTION(qspi0), - SH_PFC_FUNCTION(qspi1), }; static const struct pinmux_cfg_reg pinmux_config_regs[] = { -- 2.7.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 0/2] pinctrl: sh-pfc: r8a7795: Misc fixes and cleanups 2017-03-13 16:41 [PATCH 0/2] pinctrl: sh-pfc: r8a7795: Misc fixes and cleanups Geert Uytterhoeven 2017-03-13 16:41 ` [PATCH 1/2] pinctrl: sh-pfc: r8a7795: Fix hscif2_clk_b and hscif4_ctrl Geert Uytterhoeven 2017-03-13 16:41 ` [PATCH 2/2] pinctrl: sh-pfc: r8a7795: Restore sort order Geert Uytterhoeven @ 2017-03-15 10:26 ` Linus Walleij 2017-03-15 10:46 ` Geert Uytterhoeven 2017-03-22 13:25 ` Geert Uytterhoeven 3 siblings, 1 reply; 10+ messages in thread From: Linus Walleij @ 2017-03-15 10:26 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Laurent Pinchart, Linux-Renesas, linux-gpio@vger.kernel.org On Mon, Mar 13, 2017 at 5:41 PM, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > I plan to queue these up in sh-pfc-for-v4.12. Thanks, looking forward to pull request. I realized I needed a maintainer collecting Samsung patches as well this week, so we may get more people maintaining subdirs in pinctrl... Yours, Linus Walleij ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/2] pinctrl: sh-pfc: r8a7795: Misc fixes and cleanups 2017-03-15 10:26 ` [PATCH 0/2] pinctrl: sh-pfc: r8a7795: Misc fixes and cleanups Linus Walleij @ 2017-03-15 10:46 ` Geert Uytterhoeven 0 siblings, 0 replies; 10+ messages in thread From: Geert Uytterhoeven @ 2017-03-15 10:46 UTC (permalink / raw) To: Linus Walleij Cc: Geert Uytterhoeven, Laurent Pinchart, Linux-Renesas, linux-gpio@vger.kernel.org Hi Linus, On Wed, Mar 15, 2017 at 11:26 AM, Linus Walleij <linus.walleij@linaro.org> wrote: > On Mon, Mar 13, 2017 at 5:41 PM, Geert Uytterhoeven > <geert+renesas@glider.be> wrote: > >> I plan to queue these up in sh-pfc-for-v4.12. > > Thanks, looking forward to pull request. Thanks! > I realized I needed a maintainer collecting Samsung patches > as well this week, so we may get more people maintaining > subdirs in pinctrl... Good. I'll refrain from making updates to drivers/pinctrl/samsung/ myself ;-) 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 ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/2] pinctrl: sh-pfc: r8a7795: Misc fixes and cleanups 2017-03-13 16:41 [PATCH 0/2] pinctrl: sh-pfc: r8a7795: Misc fixes and cleanups Geert Uytterhoeven ` (2 preceding siblings ...) 2017-03-15 10:26 ` [PATCH 0/2] pinctrl: sh-pfc: r8a7795: Misc fixes and cleanups Linus Walleij @ 2017-03-22 13:25 ` Geert Uytterhoeven 3 siblings, 0 replies; 10+ messages in thread From: Geert Uytterhoeven @ 2017-03-22 13:25 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Linus Walleij, Laurent Pinchart, Linux-Renesas, linux-gpio@vger.kernel.org On Mon, Mar 13, 2017 at 5:41 PM, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > This patch series contains miscellaneous fixes and cleanups for the > Renesas R-Car H3 pinctrl driver: > > I plan to queue these up in sh-pfc-for-v4.12. Queued in sh-pfc-for-v4.12, after adressing Sergei's comment. > Geert Uytterhoeven (2): > pinctrl: sh-pfc: r8a7795: Fix hscif2_clk_b and hscif4_ctrl > pinctrl: sh-pfc: r8a7795: Restore sort order 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 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 0/2] pinctrl: sh-pfc: Restore sort order
@ 2017-10-05 10:20 Geert Uytterhoeven
2017-10-05 10:20 ` [PATCH 2/2] pinctrl: sh-pfc: r8a7795: " Geert Uytterhoeven
0 siblings, 1 reply; 10+ messages in thread
From: Geert Uytterhoeven @ 2017-10-05 10:20 UTC (permalink / raw)
To: Laurent Pinchart, Linus Walleij
Cc: linux-renesas-soc, linux-gpio, Geert Uytterhoeven
Hi,
This patch series restores sort order in the R-Car H3 pinctrl files.
Queuing up in sh-pfc-for-v4.15, as usual.
Geert Uytterhoeven (2):
pinctrl: sh-pfc: r8a7795-es1: Restore sort order
pinctrl: sh-pfc: r8a7795: Restore sort order
drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 34 ++++++++++++++++----------------
drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 32 +++++++++++++++---------------
2 files changed, 33 insertions(+), 33 deletions(-)
--
2.7.4
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
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 2/2] pinctrl: sh-pfc: r8a7795: Restore sort order 2017-10-05 10:20 [PATCH 0/2] pinctrl: sh-pfc: Restore sort order Geert Uytterhoeven @ 2017-10-05 10:20 ` Geert Uytterhoeven 0 siblings, 0 replies; 10+ messages in thread From: Geert Uytterhoeven @ 2017-10-05 10:20 UTC (permalink / raw) To: Laurent Pinchart, Linus Walleij Cc: linux-renesas-soc, linux-gpio, Geert Uytterhoeven Move the SCIF_CLK pins where they belong. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c index df6a95bce4f8061a..9772a6c7b303b5b7 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c @@ -3121,6 +3121,22 @@ static const unsigned int scif5_clk_b_mux[] = { SCK5_B_MARK, }; +/* - SCIF Clock ------------------------------------------------------------- */ +static const unsigned int scif_clk_a_pins[] = { + /* SCIF_CLK */ + RCAR_GP_PIN(6, 23), +}; +static const unsigned int scif_clk_a_mux[] = { + SCIF_CLK_A_MARK, +}; +static const unsigned int scif_clk_b_pins[] = { + /* SCIF_CLK */ + RCAR_GP_PIN(5, 9), +}; +static const unsigned int scif_clk_b_mux[] = { + SCIF_CLK_B_MARK, +}; + /* - SDHI0 ------------------------------------------------------------------ */ static const unsigned int sdhi0_data1_pins[] = { /* D0 */ @@ -3505,22 +3521,6 @@ static const unsigned int ssi9_ctrl_b_mux[] = { SSI_SCK9_B_MARK, SSI_WS9_B_MARK, }; -/* - SCIF Clock ------------------------------------------------------------- */ -static const unsigned int scif_clk_a_pins[] = { - /* SCIF_CLK */ - RCAR_GP_PIN(6, 23), -}; -static const unsigned int scif_clk_a_mux[] = { - SCIF_CLK_A_MARK, -}; -static const unsigned int scif_clk_b_pins[] = { - /* SCIF_CLK */ - RCAR_GP_PIN(5, 9), -}; -static const unsigned int scif_clk_b_mux[] = { - SCIF_CLK_B_MARK, -}; - /* - USB0 ------------------------------------------------------------------- */ static const unsigned int usb0_pins[] = { /* PWEN, OVC */ -- 2.7.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2017-10-05 10:20 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-03-13 16:41 [PATCH 0/2] pinctrl: sh-pfc: r8a7795: Misc fixes and cleanups Geert Uytterhoeven 2017-03-13 16:41 ` [PATCH 1/2] pinctrl: sh-pfc: r8a7795: Fix hscif2_clk_b and hscif4_ctrl Geert Uytterhoeven 2017-03-13 16:57 ` Sergei Shtylyov 2017-03-16 12:49 ` Geert Uytterhoeven 2017-03-16 12:49 ` Geert Uytterhoeven 2017-03-13 16:41 ` [PATCH 2/2] pinctrl: sh-pfc: r8a7795: Restore sort order Geert Uytterhoeven 2017-03-15 10:26 ` [PATCH 0/2] pinctrl: sh-pfc: r8a7795: Misc fixes and cleanups Linus Walleij 2017-03-15 10:46 ` Geert Uytterhoeven 2017-03-22 13:25 ` Geert Uytterhoeven -- strict thread matches above, loose matches on Subject: below -- 2017-10-05 10:20 [PATCH 0/2] pinctrl: sh-pfc: Restore sort order Geert Uytterhoeven 2017-10-05 10:20 ` [PATCH 2/2] pinctrl: sh-pfc: r8a7795: " Geert Uytterhoeven
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).