Merge remote-tracking branch 'pinctrl/for-next'

Conflicts:
	drivers/pinctrl/sh-pfc/pfc-r8a7740.c
	drivers/pinctrl/sh-pfc/pfc-sh7372.c

diff --cc drivers/pinctrl/pinctrl-baytrail.c
Simple merge

diff --cc drivers/pinctrl/sh-pfc/pfc-r8a7740.c
index bc5eb453a45ccfb7826e60825b75afed8de868a7,a189b962a1eba6181f4392422182c2272e87430a..61e258577881a0e083cce15ab9596efd0431738c
--- 1/drivers/pinctrl/sh-pfc/pfc-r8a7740.c
--- 2/drivers/pinctrl/sh-pfc/pfc-r8a7740.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c
@@@ -3720,8 -3709,8 +3709,8 @@@ static void __iomem *r8a7740_pinmux_por
                const struct r8a7740_portcr_group *group =
                        &r8a7740_portcr_offsets[i];
  
 -              if (i <= group->end_pin)
 +              if (pin <= group->end_pin)
-                       return pfc->window->virt + group->offset + pin;
+                       return pfc->windows->virt + group->offset + pin;
        }
  
        return NULL;

diff --cc drivers/pinctrl/sh-pfc/pfc-sh7372.c
index cc097b6938208ea029902f8dc2f68af548f9429a,bcdd5c3cdcf08ed3500af15f0b5002f12f2d079a..9f66a5025db0c8a3c226d4b7446eac6147325b0e
--- 1/drivers/pinctrl/sh-pfc/pfc-sh7372.c
--- 2/drivers/pinctrl/sh-pfc/pfc-sh7372.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh7372.c
@@@ -2584,8 -2573,8 +2573,8 @@@ static void __iomem *sh7372_pinmux_port
                const struct sh7372_portcr_group *group =
                        &sh7372_portcr_offsets[i];
  
 -              if (i <= group->end_pin)
 +              if (pin <= group->end_pin)
-                       return pfc->window->virt + group->offset + pin;
+                       return pfc->windows->virt + group->offset + pin;
        }
  
        return NULL;

diff --cc drivers/pinctrl/sh-pfc/sh_pfc.h
Simple merge