[PATCH] pinctrl: sh-pfc: Fix PINMUX_IPSR_PHYS() to set to GPSR

[PATCH] pinctrl: sh-pfc: Fix PINMUX_IPSR_PHYS() to set to GPSR

[Keiya Nobuta]

This patch allows PINMUX_IPSR_PHYS() to set bits to GPSR.
When assigning function to pin, GPSR should be set peripheral function.
For example in using SCL3, GPSR2 bit7 (PWM1_A pin) should be set to
peripheral function.

Signed-off-by: Keiya Nobuta <nobuta.keiya@fujitsu.com>
---
 drivers/pinctrl/sh-pfc/sh_pfc.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h
index 63d2089..12d15b6 100644
--- a/drivers/pinctrl/sh-pfc/sh_pfc.h
+++ b/drivers/pinctrl/sh-pfc/sh_pfc.h
@@ -423,12 +423,12 @@ extern const struct sh_pfc_soc_info shx3_pinmux_info;
 /*
  * Describe a pinmux configuration in which a pin is physically multiplexed
  * with other pins.
- *   - ipsr: IPSR field (unused, for documentation purposes only)
+ *   - ipsr: IPSR field
  *   - fn: Function name
  *   - psel: Physical multiplexing selector
  */
 #define PINMUX_IPSR_PHYS(ipsr, fn, psel) \
-	PINMUX_DATA(fn##_MARK, FN_##psel)
+	PINMUX_DATA(fn##_MARK, FN_##psel, FN_##ipsr)
 
 /*
  * Describe a pinmux configuration for a single-function pin with GPIO
-- 
2.7.4

Re: [PATCH] pinctrl: sh-pfc: Fix PINMUX_IPSR_PHYS() to set to GPSR

[Geert Uytterhoeven]

On Tue, Oct 8, 2019 at 8:02 AM Keiya Nobuta <nobuta.keiya@fujitsu.com> wrote:
> This patch allows PINMUX_IPSR_PHYS() to set bits to GPSR.
> When assigning function to pin, GPSR should be set peripheral function.
> For example in using SCL3, GPSR2 bit7 (PWM1_A pin) should be set to
> peripheral function.
>
> Signed-off-by: Keiya Nobuta <nobuta.keiya@fujitsu.com>

Fixes: 50d1ba1764b3e00a ("pinctrl: sh-pfc: Add physical pin
multiplexing helper macros")
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
i.e. will queue in sh-pfc-for-v5.5.

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