Merge tag 'pinctrl-v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

Pull pin control updates from Linus Walleij:
 "This is the bulk of pin control changes for the v4.3 development
  cycle.

  Like with GPIO it's a lot of stuff.  If my subsystems are any sign of
  the overall tempo of the kernel v4.3 will be a gigantic diff.

[ It looks like 4.3 is calmer than 4.2 in most other subsystems, but
  we'll see - Linus ]

  Core changes:

   - It is possible configure groups in debugfs.

   - Consolidation of chained IRQ handler install/remove replacing all
     call sites where irq_set_handler_data() and
     irq_set_chained_handler() were done in succession with a combined
     call to irq_set_chained_handler_and_data().  This series was
     created by Thomas Gleixner after the problem was observed by
     Russell King.

   - Tglx also made another series of patches switching
     __irq_set_handler_locked() for irq_set_handler_locked() which is
     way cleaner.

   - Tglx also wrote a good bunch of patches to make use of
     irq_desc_get_xxx() accessors and avoid looking up irq_descs from
     IRQ numbers.  The goal is to get rid of the irq number from the
     handlers in the IRQ flow which is nice.

  Driver feature enhancements:

   - Power management support for the SiRF SoC Atlas 7.

   - Power down support for the Qualcomm driver.

   - Intel Cherryview and Baytrail: switch drivers to use raw spinlocks
     in IRQ handlers to play nice with the realtime patch set.

   - Rework and new modes handling for Qualcomm SPMI-MPP.

   - Pinconf power source config for SH PFC.

  New drivers and subdrivers:

   - A new driver for Conexant Digicolor CX92755.

   - A new driver for UniPhier PH1-LD4, PH1-Pro4, PH1-sLD8, PH1-Pro5,
     ProXtream2 and PH1-LD6b SoC pin control support.

   - Reverse-egineered the S/PDIF settings for the Allwinner sun4i
     driver.

   - Support for Qualcomm Technologies QDF2xxx ARM64 SoCs

   - A new Freescale i.mx6ul subdriver.

  Cleanup:

   - Remove platform data support in a number of SH PFC subdrivers"

* tag 'pinctrl-v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (95 commits)
  pinctrl: at91: fix null pointer dereference
  pinctrl: mediatek: Implement wake handler and suspend resume
  pinctrl: mediatek: Fix multiple registration issue.
  pinctrl: sh-pfc: r8a7794: add USB pin groups
  pinctrl: at91: Use generic irq_{request,release}_resources()
  pinctrl: cherryview: Use raw_spinlock for locking
  pinctrl: baytrail: Use raw_spinlock for locking
  pinctrl: imx6ul: Remove .owner field
  pinctrl: zynq: Fix typos in smc0_nand_grp and smc0_nor_grp
  pinctrl: sh-pfc: Implement pinconf power-source param for voltage switching
  clk: rockchip: add pclk_pd_pmu to the list of rk3288 critical clocks
  pinctrl: sun4i: add spdif to pin description.
  pinctrl: atlas7: clear ugly branch statements for pull and drivestrength
  pinctrl: baytrail: Serialize all register access
  pinctrl: baytrail: Drop FSF mailing address
  pinctrl: rockchip: only enable gpio clock when it setting
  pinctrl/mediatek: fix spelling mistake in dev_err error message
  pinctrl: cherryview: Serialize all register access
  pinctrl: UniPhier: PH1-Pro5: add I2C ch6 pin-mux setting
  pinctrl: nomadik: reflect current input value
  ...

8 files changed, 168 insertions, 53 deletions

diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c
index 865d235612c5..fb9c44805234 100644
--- a/drivers/pinctrl/sh-pfc/core.c
+++ b/drivers/pinctrl/sh-pfc/core.c
@@ -29,24 +29,25 @@
 static int sh_pfc_map_resources(struct sh_pfc *pfc,
                                 struct platform_device *pdev)
 {
-        unsigned int num_windows = 0;
-        unsigned int num_irqs = 0;
+        unsigned int num_windows, num_irqs;
         struct sh_pfc_window *windows;
         unsigned int *irqs = NULL;
         struct resource *res;
         unsigned int i;
+        int irq;
 
         /* Count the MEM and IRQ resources. */
-        for (i = 0; i < pdev->num_resources; ++i) {
-                switch (resource_type(&pdev->resource[i])) {
-                case IORESOURCE_MEM:
-                        num_windows++;
+        for (num_windows = 0;; num_windows++) {
+                res = platform_get_resource(pdev, IORESOURCE_MEM, num_windows);
+                if (!res)
                         break;
-
-                case IORESOURCE_IRQ:
-                        num_irqs++;
+        }
+        for (num_irqs = 0;; num_irqs++) {
+                irq = platform_get_irq(pdev, num_irqs);
+                if (irq == -EPROBE_DEFER)
+                        return irq;
+                if (irq < 0)
                         break;
-                }
         }
 
         if (num_windows == 0)
@@ -72,22 +73,17 @@ static int sh_pfc_map_resources(struct sh_pfc *pfc,
         }
 
         /* Fill them. */
-        for (i = 0, res = pdev->resource; i < pdev->num_resources; i++, res++) {
-                switch (resource_type(res)) {
-                case IORESOURCE_MEM:
-                        windows->phys = res->start;
-                        windows->size = resource_size(res);
-                        windows->virt = devm_ioremap_resource(pfc->dev, res);
-                        if (IS_ERR(windows->virt))
-                                return -ENOMEM;
-                        windows++;
-                        break;
-
-                case IORESOURCE_IRQ:
-                        *irqs++ = res->start;
-                        break;
-                }
+        for (i = 0; i < num_windows; i++) {
+                res = platform_get_resource(pdev, IORESOURCE_MEM, i);
+                windows->phys = res->start;
+                windows->size = resource_size(res);
+                windows->virt = devm_ioremap_resource(pfc->dev, res);
+                if (IS_ERR(windows->virt))
+                        return -ENOMEM;
+                windows++;
         }
+        for (i = 0; i < num_irqs; i++)
+                *irqs++ = platform_get_irq(pdev, i);
 
         return 0;
 }
@@ -591,9 +587,6 @@ static int sh_pfc_remove(struct platform_device *pdev)
 }
 
 static const struct platform_device_id sh_pfc_id_table[] = {
-#ifdef CONFIG_PINCTRL_PFC_R8A7740
-        { "pfc-r8a7740", (kernel_ulong_t)&r8a7740_pinmux_info },
-#endif
 #ifdef CONFIG_PINCTRL_PFC_R8A7778
         { "pfc-r8a7778", (kernel_ulong_t)&r8a7778_pinmux_info },
 #endif
@@ -609,9 +602,6 @@ static const struct platform_device_id sh_pfc_id_table[] = {
 #ifdef CONFIG_PINCTRL_PFC_SH7269
         { "pfc-sh7269", (kernel_ulong_t)&sh7269_pinmux_info },
 #endif
-#ifdef CONFIG_PINCTRL_PFC_SH73A0
-        { "pfc-sh73a0", (kernel_ulong_t)&sh73a0_pinmux_info },
-#endif
 #ifdef CONFIG_PINCTRL_PFC_SH7720
         { "pfc-sh7720", (kernel_ulong_t)&sh7720_pinmux_info },
 #endif
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c
index d0bb1459783a..82ef1862dd1b 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c
@@ -22,10 +22,6 @@
 #include <linux/kernel.h>
 #include <linux/pinctrl/pinconf-generic.h>
 
-#ifndef CONFIG_ARCH_MULTIPLATFORM
-#include <mach/irqs.h>
-#endif
-
 #include "core.h"
 #include "sh_pfc.h"
 
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
index baab81ead9ff..fc344a7c2b53 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
@@ -27,10 +27,27 @@
 #include "core.h"
 #include "sh_pfc.h"
 
+#define PORT_GP_30(bank, fn, sfx)                                       \
+        PORT_GP_1(bank, 0,  fn, sfx), PORT_GP_1(bank, 1,  fn, sfx),     \
+        PORT_GP_1(bank, 2,  fn, sfx), PORT_GP_1(bank, 3,  fn, sfx),     \
+        PORT_GP_1(bank, 4,  fn, sfx), PORT_GP_1(bank, 5,  fn, sfx),     \
+        PORT_GP_1(bank, 6,  fn, sfx), PORT_GP_1(bank, 7,  fn, sfx),     \
+        PORT_GP_1(bank, 8,  fn, sfx), PORT_GP_1(bank, 9,  fn, sfx),     \
+        PORT_GP_1(bank, 10, fn, sfx), PORT_GP_1(bank, 11, fn, sfx),     \
+        PORT_GP_1(bank, 12, fn, sfx), PORT_GP_1(bank, 13, fn, sfx),     \
+        PORT_GP_1(bank, 14, fn, sfx), PORT_GP_1(bank, 15, fn, sfx),     \
+        PORT_GP_1(bank, 16, fn, sfx), PORT_GP_1(bank, 17, fn, sfx),     \
+        PORT_GP_1(bank, 18, fn, sfx), PORT_GP_1(bank, 19, fn, sfx),     \
+        PORT_GP_1(bank, 20, fn, sfx), PORT_GP_1(bank, 21, fn, sfx),     \
+        PORT_GP_1(bank, 22, fn, sfx), PORT_GP_1(bank, 23, fn, sfx),     \
+        PORT_GP_1(bank, 24, fn, sfx), PORT_GP_1(bank, 25, fn, sfx),     \
+        PORT_GP_1(bank, 26, fn, sfx), PORT_GP_1(bank, 27, fn, sfx),     \
+        PORT_GP_1(bank, 28, fn, sfx), PORT_GP_1(bank, 29, fn, sfx)
+
 #define CPU_ALL_PORT(fn, sfx)                                           \
         PORT_GP_32(0, fn, sfx),                                         \
-        PORT_GP_32(1, fn, sfx),                                         \
-        PORT_GP_32(2, fn, sfx),                                         \
+        PORT_GP_30(1, fn, sfx),                                         \
+        PORT_GP_30(2, fn, sfx),                                         \
         PORT_GP_32(3, fn, sfx),                                         \
         PORT_GP_32(4, fn, sfx),                                         \
         PORT_GP_32(5, fn, sfx)
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
index 3ddf23ec9f0b..25e8117f5a1a 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
@@ -14,15 +14,30 @@
 #include "core.h"
 #include "sh_pfc.h"
 
+#define PORT_GP_26(bank, fn, sfx)                                       \
+        PORT_GP_1(bank, 0,  fn, sfx), PORT_GP_1(bank, 1,  fn, sfx),     \
+        PORT_GP_1(bank, 2,  fn, sfx), PORT_GP_1(bank, 3,  fn, sfx),     \
+        PORT_GP_1(bank, 4,  fn, sfx), PORT_GP_1(bank, 5,  fn, sfx),     \
+        PORT_GP_1(bank, 6,  fn, sfx), PORT_GP_1(bank, 7,  fn, sfx),     \
+        PORT_GP_1(bank, 8,  fn, sfx), PORT_GP_1(bank, 9,  fn, sfx),     \
+        PORT_GP_1(bank, 10, fn, sfx), PORT_GP_1(bank, 11, fn, sfx),     \
+        PORT_GP_1(bank, 12, fn, sfx), PORT_GP_1(bank, 13, fn, sfx),     \
+        PORT_GP_1(bank, 14, fn, sfx), PORT_GP_1(bank, 15, fn, sfx),     \
+        PORT_GP_1(bank, 16, fn, sfx), PORT_GP_1(bank, 17, fn, sfx),     \
+        PORT_GP_1(bank, 18, fn, sfx), PORT_GP_1(bank, 19, fn, sfx),     \
+        PORT_GP_1(bank, 20, fn, sfx), PORT_GP_1(bank, 21, fn, sfx),     \
+        PORT_GP_1(bank, 22, fn, sfx), PORT_GP_1(bank, 23, fn, sfx),     \
+        PORT_GP_1(bank, 24, fn, sfx), PORT_GP_1(bank, 25, fn, sfx)
+
 #define CPU_ALL_PORT(fn, sfx)                                           \
         PORT_GP_32(0, fn, sfx),                                         \
-        PORT_GP_32(1, fn, sfx),                                         \
+        PORT_GP_26(1, fn, sfx),                                         \
         PORT_GP_32(2, fn, sfx),                                         \
         PORT_GP_32(3, fn, sfx),                                         \
         PORT_GP_32(4, fn, sfx),                                         \
         PORT_GP_32(5, fn, sfx),                                         \
         PORT_GP_32(6, fn, sfx),                                         \
-        PORT_GP_32(7, fn, sfx)
+        PORT_GP_26(7, fn, sfx)
 
 enum {
         PINMUX_RESERVED = 0,
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7794.c b/drivers/pinctrl/sh-pfc/pfc-r8a7794.c
index bfdcac4b3bc4..5248685dbb4e 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7794.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7794.c
@@ -2770,6 +2770,24 @@ static const unsigned int sdhi2_wp_pins[] = {
 static const unsigned int sdhi2_wp_mux[] = {
         SD2_WP_MARK,
 };
+/* - USB0 ------------------------------------------------------------------- */
+static const unsigned int usb0_pins[] = {
+        RCAR_GP_PIN(5, 24), /* PWEN */
+        RCAR_GP_PIN(5, 25), /* OVC */
+};
+static const unsigned int usb0_mux[] = {
+        USB0_PWEN_MARK,
+        USB0_OVC_MARK,
+};
+/* - USB1 ------------------------------------------------------------------- */
+static const unsigned int usb1_pins[] = {
+        RCAR_GP_PIN(5, 26), /* PWEN */
+        RCAR_GP_PIN(5, 27), /* OVC */
+};
+static const unsigned int usb1_mux[] = {
+        USB1_PWEN_MARK,
+        USB1_OVC_MARK,
+};
 
 static const struct sh_pfc_pin_group pinmux_groups[] = {
         SH_PFC_PIN_GROUP(eth_link),
@@ -2945,6 +2963,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
         SH_PFC_PIN_GROUP(sdhi2_ctrl),
         SH_PFC_PIN_GROUP(sdhi2_cd),
         SH_PFC_PIN_GROUP(sdhi2_wp),
+        SH_PFC_PIN_GROUP(usb0),
+        SH_PFC_PIN_GROUP(usb1),
 };
 
 static const char * const eth_groups[] = {
@@ -3219,6 +3239,14 @@ static const char * const sdhi2_groups[] = {
         "sdhi2_wp",
 };
 
+static const char * const usb0_groups[] = {
+        "usb0",
+};
+
+static const char * const usb1_groups[] = {
+        "usb1",
+};
+
 static const struct sh_pfc_function pinmux_functions[] = {
         SH_PFC_FUNCTION(eth),
         SH_PFC_FUNCTION(hscif0),
@@ -3253,6 +3281,8 @@ static const struct sh_pfc_function pinmux_functions[] = {
         SH_PFC_FUNCTION(sdhi0),
         SH_PFC_FUNCTION(sdhi1),
         SH_PFC_FUNCTION(sdhi2),
+        SH_PFC_FUNCTION(usb0),
+        SH_PFC_FUNCTION(usb1),
 };
 
 static const struct pinmux_cfg_reg pinmux_config_regs[] = {
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c b/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
index d2efbfb776ac..097526576f88 100644
--- a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
@@ -26,10 +26,6 @@
 #include <linux/regulator/machine.h>
 #include <linux/slab.h>
 
-#ifndef CONFIG_ARCH_MULTIPLATFORM
-#include <mach/irqs.h>
-#endif
-
 #include "core.h"
 #include "sh_pfc.h"
 
diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c
index ff678966008b..863c3e30ce05 100644
--- a/drivers/pinctrl/sh-pfc/pinctrl.c
+++ b/drivers/pinctrl/sh-pfc/pinctrl.c
@@ -40,6 +40,10 @@ struct sh_pfc_pinctrl {
 
         struct pinctrl_pin_desc *pins;
         struct sh_pfc_pin_config *configs;
+
+        const char *func_prop_name;
+        const char *groups_prop_name;
+        const char *pins_prop_name;
 };
 
 static int sh_pfc_get_groups_count(struct pinctrl_dev *pctldev)
@@ -96,10 +100,13 @@ static int sh_pfc_map_add_config(struct pinctrl_map *map,
         return 0;
 }
 
-static int sh_pfc_dt_subnode_to_map(struct device *dev, struct device_node *np,
+static int sh_pfc_dt_subnode_to_map(struct pinctrl_dev *pctldev,
+                                    struct device_node *np,
                                     struct pinctrl_map **map,
                                     unsigned int *num_maps, unsigned int *index)
 {
+        struct sh_pfc_pinctrl *pmx = pinctrl_dev_get_drvdata(pctldev);
+        struct device *dev = pmx->pfc->dev;
         struct pinctrl_map *maps = *map;
         unsigned int nmaps = *num_maps;
         unsigned int idx = *index;
@@ -113,10 +120,27 @@ static int sh_pfc_dt_subnode_to_map(struct device *dev, struct device_node *np,
         const char *pin;
         int ret;
 
+        /* Support both the old Renesas-specific properties and the new standard
+         * properties. Mixing old and new properties isn't allowed, neither
+         * inside a subnode nor across subnodes.
+         */
+        if (!pmx->func_prop_name) {
+                if (of_find_property(np, "groups", NULL) ||
+                    of_find_property(np, "pins", NULL)) {
+                        pmx->func_prop_name = "function";
+                        pmx->groups_prop_name = "groups";
+                        pmx->pins_prop_name = "pins";
+                } else {
+                        pmx->func_prop_name = "renesas,function";
+                        pmx->groups_prop_name = "renesas,groups";
+                        pmx->pins_prop_name = "renesas,pins";
+                }
+        }
+
         /* Parse the function and configuration properties. At least a function
          * or one configuration must be specified.
          */
-        ret = of_property_read_string(np, "renesas,function", &function);
+        ret = of_property_read_string(np, pmx->func_prop_name, &function);
         if (ret < 0 && ret != -EINVAL) {
                 dev_err(dev, "Invalid function in DT\n");
                 return ret;
@@ -129,11 +153,12 @@ static int sh_pfc_dt_subnode_to_map(struct device *dev, struct device_node *np,
         if (!function && num_configs == 0) {
                 dev_err(dev,
                         "DT node must contain at least a function or config\n");
+                ret = -ENODEV;
                 goto done;
         }
 
         /* Count the number of pins and groups and reallocate mappings. */
-        ret = of_property_count_strings(np, "renesas,pins");
+        ret = of_property_count_strings(np, pmx->pins_prop_name);
         if (ret == -EINVAL) {
                 num_pins = 0;
         } else if (ret < 0) {
@@ -143,7 +168,7 @@ static int sh_pfc_dt_subnode_to_map(struct device *dev, struct device_node *np,
                 num_pins = ret;
         }
 
-        ret = of_property_count_strings(np, "renesas,groups");
+        ret = of_property_count_strings(np, pmx->groups_prop_name);
         if (ret == -EINVAL) {
                 num_groups = 0;
         } else if (ret < 0) {
@@ -174,7 +199,7 @@ static int sh_pfc_dt_subnode_to_map(struct device *dev, struct device_node *np,
         *num_maps = nmaps;
 
         /* Iterate over pins and groups and create the mappings. */
-        of_property_for_each_string(np, "renesas,groups", prop, group) {
+        of_property_for_each_string(np, pmx->groups_prop_name, prop, group) {
                 if (function) {
                         maps[idx].type = PIN_MAP_TYPE_MUX_GROUP;
                         maps[idx].data.mux.group = group;
@@ -198,7 +223,7 @@ static int sh_pfc_dt_subnode_to_map(struct device *dev, struct device_node *np,
                 goto done;
         }
 
-        of_property_for_each_string(np, "renesas,pins", prop, pin) {
+        of_property_for_each_string(np, pmx->pins_prop_name, prop, pin) {
                 ret = sh_pfc_map_add_config(&maps[idx], pin,
                                             PIN_MAP_TYPE_CONFIGS_PIN,
                                             configs, num_configs);
@@ -246,7 +271,7 @@ static int sh_pfc_dt_node_to_map(struct pinctrl_dev *pctldev,
         index = 0;
 
         for_each_child_of_node(np, child) {
-                ret = sh_pfc_dt_subnode_to_map(dev, child, map, num_maps,
+                ret = sh_pfc_dt_subnode_to_map(pctldev, child, map, num_maps,
                                                &index);
                 if (ret < 0)
                         goto done;
@@ -254,7 +279,8 @@ static int sh_pfc_dt_node_to_map(struct pinctrl_dev *pctldev,
 
         /* If no mapping has been found in child nodes try the config node. */
         if (*num_maps == 0) {
-                ret = sh_pfc_dt_subnode_to_map(dev, np, map, num_maps, &index);
+                ret = sh_pfc_dt_subnode_to_map(pctldev, np, map, num_maps,
+                                               &index);
                 if (ret < 0)
                         goto done;
         }
@@ -465,6 +491,9 @@ static bool sh_pfc_pinconf_validate(struct sh_pfc *pfc, unsigned int _pin,
         case PIN_CONFIG_BIAS_PULL_DOWN:
                 return pin->configs & SH_PFC_PIN_CFG_PULL_DOWN;
 
+        case PIN_CONFIG_POWER_SOURCE:
+                return pin->configs & SH_PFC_PIN_CFG_IO_VOLTAGE;
+
         default:
                 return false;
         }
@@ -477,7 +506,6 @@ static int sh_pfc_pinconf_get(struct pinctrl_dev *pctldev, unsigned _pin,
         struct sh_pfc *pfc = pmx->pfc;
         enum pin_config_param param = pinconf_to_config_param(*config);
         unsigned long flags;
-        unsigned int bias;
 
         if (!sh_pfc_pinconf_validate(pfc, _pin, param))
                 return -ENOTSUPP;
@@ -485,7 +513,9 @@ static int sh_pfc_pinconf_get(struct pinctrl_dev *pctldev, unsigned _pin,
         switch (param) {
         case PIN_CONFIG_BIAS_DISABLE:
         case PIN_CONFIG_BIAS_PULL_UP:
-        case PIN_CONFIG_BIAS_PULL_DOWN:
+        case PIN_CONFIG_BIAS_PULL_DOWN: {
+                unsigned int bias;
+
                 if (!pfc->info->ops || !pfc->info->ops->get_bias)
                         return -ENOTSUPP;
 
@@ -498,6 +528,24 @@ static int sh_pfc_pinconf_get(struct pinctrl_dev *pctldev, unsigned _pin,
 
                 *config = 0;
                 break;
+        }
+
+        case PIN_CONFIG_POWER_SOURCE: {
+                int ret;
+
+                if (!pfc->info->ops || !pfc->info->ops->get_io_voltage)
+                        return -ENOTSUPP;
+
+                spin_lock_irqsave(&pfc->lock, flags);
+                ret = pfc->info->ops->get_io_voltage(pfc, _pin);
+                spin_unlock_irqrestore(&pfc->lock, flags);
+
+                if (ret < 0)
+                        return ret;
+
+                *config = ret;
+                break;
+        }
 
         default:
                 return -ENOTSUPP;
@@ -534,6 +582,24 @@ static int sh_pfc_pinconf_set(struct pinctrl_dev *pctldev, unsigned _pin,
 
                         break;
 
+                case PIN_CONFIG_POWER_SOURCE: {
+                        unsigned int arg =
+                                pinconf_to_config_argument(configs[i]);
+                        int ret;
+
+                        if (!pfc->info->ops || !pfc->info->ops->set_io_voltage)
+                                return -ENOTSUPP;
+
+                        spin_lock_irqsave(&pfc->lock, flags);
+                        ret = pfc->info->ops->set_io_voltage(pfc, _pin, arg);
+                        spin_unlock_irqrestore(&pfc->lock, flags);
+
+                        if (ret)
+                                return ret;
+
+                        break;
+                }
+
                 default:
                         return -ENOTSUPP;
                 }
diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h
index 0874cfee6889..15afd49fd4e3 100644
--- a/drivers/pinctrl/sh-pfc/sh_pfc.h
+++ b/drivers/pinctrl/sh-pfc/sh_pfc.h
@@ -12,6 +12,7 @@
 #define __SH_PFC_H
 
 #include <linux/bug.h>
+#include <linux/pinctrl/pinconf-generic.h>
 #include <linux/stringify.h>
 
 enum {
@@ -26,6 +27,7 @@ enum {
 #define SH_PFC_PIN_CFG_OUTPUT           (1 << 1)
 #define SH_PFC_PIN_CFG_PULL_UP          (1 << 2)
 #define SH_PFC_PIN_CFG_PULL_DOWN        (1 << 3)
+#define SH_PFC_PIN_CFG_IO_VOLTAGE       (1 << 4)
 #define SH_PFC_PIN_CFG_NO_GPIO          (1 << 31)
 
 struct sh_pfc_pin {
@@ -121,6 +123,9 @@ struct sh_pfc_soc_operations {
         unsigned int (*get_bias)(struct sh_pfc *pfc, unsigned int pin);
         void (*set_bias)(struct sh_pfc *pfc, unsigned int pin,
                          unsigned int bias);
+        int (*get_io_voltage)(struct sh_pfc *pfc, unsigned int pin);
+        int (*set_io_voltage)(struct sh_pfc *pfc, unsigned int pin,
+                              u16 voltage_mV);
 };
 
 struct sh_pfc_soc_info {