| From d088f31e5ec5c4017d0d51c42471540de4c2d197 Mon Sep 17 00:00:00 2001 |
| From: Keiya Nobuta <nobuta.keiya@fujitsu.com> |
| Date: Tue, 8 Oct 2019 15:01:12 +0900 |
| Subject: [PATCH] pinctrl: sh-pfc: Fix PINMUX_IPSR_PHYS() to set GPSR |
| |
| commit d30710b8cce3a581c170d69002e311cc18ed47d3 upstream. |
| |
| This patch allows PINMUX_IPSR_PHYS() to set bits in GPSR. |
| When assigning function to pin, GPSR should be set to peripheral |
| function. |
| For example when using SCL3, GPSR2 bit7 (PWM1_A pin) should be set to |
| peripheral function. |
| |
| Signed-off-by: Keiya Nobuta <nobuta.keiya@fujitsu.com> |
| Link: https://lore.kernel.org/r/20191008060112.29819-1-nobuta.keiya@fujitsu.com |
| Fixes: 50d1ba1764b3e00a ("pinctrl: sh-pfc: Add physical pin multiplexing helper macros") |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h |
| index 7db5819eea7e..24469f9a3b0c 100644 |
| --- a/drivers/pinctrl/sh-pfc/sh_pfc.h |
| +++ b/drivers/pinctrl/sh-pfc/sh_pfc.h |
| @@ -418,12 +418,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 |
| |
