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

Pull pin control updates from Linus Walleij:
 "This kernel cycle was quite calm when it comes to pin control and
  there is really just one major change, and that is the introduction of
  devm_pinctrl_register() managed resources.

  Apart from that linear development, details below.

  Core changes:

   - Add the devm_pinctrl_register() API and switch all applicable
     drivers to use it, saving lots of lines of code all over the place.

  New drivers:

   - driver for the Broadcom NS2 SoC

   - subdriver for the PXA25x SoCs

   - subdriver for the AMLogic Meson GXBB SoC

  Driver improvements:

   - the Intel Baytrail driver now properly supports pin control

   - Nomadik, Rockchip, Broadcom BCM2835 support the .get_direction()
     callback in the GPIO portions

   - continued development and stabilization of several SH-PFC SoC
     subdrivers: r8a7795, r8a7790, r8a7794 etc"

* tag 'pinctrl-v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (85 commits)
  Revert "pinctrl: tegra: avoid parked_reg and parked_bank"
  pinctrl: meson: Fix eth_tx_en bit index
  pinctrl: tegra: avoid parked_reg and parked_bank
  pinctrl: tegra: Correctly check the supported configuration
  pinctrl: amlogic: Add support for Amlogic Meson GXBB SoC
  pinctrl: rockchip: fix pull setting error for rk3399
  pinctrl: stm32: Implement .pin_config_dbg_show()
  pinctrl: nomadik: hide nmk_gpio_get_mode when unused
  pinctrl: ns2: rename pinctrl_utils_dt_free_map
  pinctrl: at91: Merge clk_prepare and clk_enable into clk_prepare_enable
  pinctrl: at91: Make at91_gpio_template const
  pinctrl: baytrail: fix some error handling in debugfs
  pinctrl: ns2: add pinmux driver support for Broadcom NS2 SoC
  pinctrl: sirf/atlas7: trivial fix of spelling mistake on flagged
  pinctrl: sh-pfc: Kill unused variable in sh_pfc_remove()
  pinctrl: nomadik: implement .get_direction()
  pinctrl: nomadik: use BIT() with offsets consequently
  pinctrl: exynos5440: Use off-stack memory for pinctrl_gpio_range
  pinctrl: zynq: Use devm_pinctrl_register() for pinctrl registration
  pinctrl: u300: Use devm_pinctrl_register() for pinctrl registration
  ...

8 files changed, 47 insertions, 30 deletions

diff --git a/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c b/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c
index 946cda3fee35..6f68a9eebc58 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c
@@ -267,7 +267,7 @@ static const struct pinctrl_ops tegra_xusb_padctl_pinctrl_ops = {
         .get_group_name = tegra_xusb_padctl_get_group_name,
         .get_group_pins = tegra_xusb_padctl_get_group_pins,
         .dt_node_to_map = tegra_xusb_padctl_dt_node_to_map,
-        .dt_free_map = pinctrl_utils_dt_free_map,
+        .dt_free_map = pinctrl_utils_free_map,
 };
 
 static int tegra_xusb_padctl_get_functions_count(struct pinctrl_dev *pinctrl)
@@ -914,7 +914,8 @@ int tegra_xusb_padctl_legacy_probe(struct platform_device *pdev)
         padctl->desc.confops = &tegra_xusb_padctl_pinconf_ops;
         padctl->desc.owner = THIS_MODULE;
 
-        padctl->pinctrl = pinctrl_register(&padctl->desc, &pdev->dev, padctl);
+        padctl->pinctrl = devm_pinctrl_register(&pdev->dev, &padctl->desc,
+                                                padctl);
         if (IS_ERR(padctl->pinctrl)) {
                 dev_err(&pdev->dev, "failed to register pincontrol\n");
                 err = PTR_ERR(padctl->pinctrl);
@@ -924,7 +925,7 @@ int tegra_xusb_padctl_legacy_probe(struct platform_device *pdev)
         phy = devm_phy_create(&pdev->dev, NULL, &pcie_phy_ops);
         if (IS_ERR(phy)) {
                 err = PTR_ERR(phy);
-                goto unregister;
+                goto reset;
         }
 
         padctl->phys[TEGRA_XUSB_PADCTL_PCIE] = phy;
@@ -933,7 +934,7 @@ int tegra_xusb_padctl_legacy_probe(struct platform_device *pdev)
         phy = devm_phy_create(&pdev->dev, NULL, &sata_phy_ops);
         if (IS_ERR(phy)) {
                 err = PTR_ERR(phy);
-                goto unregister;
+                goto reset;
         }
 
         padctl->phys[TEGRA_XUSB_PADCTL_SATA] = phy;
@@ -944,13 +945,11 @@ int tegra_xusb_padctl_legacy_probe(struct platform_device *pdev)
         if (IS_ERR(padctl->provider)) {
                 err = PTR_ERR(padctl->provider);
                 dev_err(&pdev->dev, "failed to register PHYs: %d\n", err);
-                goto unregister;
+                goto reset;
         }
 
         return 0;
 
-unregister:
-        pinctrl_unregister(padctl->pinctrl);
 reset:
         reset_control_assert(padctl->rst);
         return err;
@@ -962,8 +961,6 @@ int tegra_xusb_padctl_legacy_remove(struct platform_device *pdev)
         struct tegra_xusb_padctl *padctl = platform_get_drvdata(pdev);
         int err;
 
-        pinctrl_unregister(padctl->pinctrl);
-
         err = reset_control_assert(padctl->rst);
         if (err < 0)
                 dev_err(&pdev->dev, "failed to assert reset: %d\n", err);
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra.c b/drivers/pinctrl/tegra/pinctrl-tegra.c
index 49388822c0e9..6e82b290cb4f 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra.c
@@ -215,7 +215,7 @@ static int tegra_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
                 ret = tegra_pinctrl_dt_subnode_to_map(pctldev, np, map,
                                                       &reserved_maps, num_maps);
                 if (ret < 0) {
-                        pinctrl_utils_dt_free_map(pctldev, *map,
+                        pinctrl_utils_free_map(pctldev, *map,
                                 *num_maps);
                         of_node_put(np);
                         return ret;
@@ -233,7 +233,7 @@ static const struct pinctrl_ops tegra_pinctrl_ops = {
         .pin_dbg_show = tegra_pinctrl_pin_dbg_show,
 #endif
         .dt_node_to_map = tegra_pinctrl_dt_node_to_map,
-        .dt_free_map = pinctrl_utils_dt_free_map,
+        .dt_free_map = pinctrl_utils_free_map,
 };
 
 static int tegra_pinctrl_get_funcs_count(struct pinctrl_dev *pctldev)
@@ -417,7 +417,7 @@ static int tegra_pinconf_reg(struct tegra_pmx *pmx,
                 return -ENOTSUPP;
         }
 
-        if (*reg < 0 || *bit > 31) {
+        if (*reg < 0 || *bit < 0)  {
                 if (report_err) {
                         const char *prop = "unknown";
                         int i;
@@ -625,6 +625,22 @@ static struct pinctrl_desc tegra_pinctrl_desc = {
         .owner = THIS_MODULE,
 };
 
+static void tegra_pinctrl_clear_parked_bits(struct tegra_pmx *pmx)
+{
+        int i = 0;
+        const struct tegra_pingroup *g;
+        u32 val;
+
+        for (i = 0; i < pmx->soc->ngroups; ++i) {
+                if (pmx->soc->groups[i].parked_reg >= 0) {
+                        g = &pmx->soc->groups[i];
+                        val = pmx_readl(pmx, g->parked_bank, g->parked_reg);
+                        val &= ~(1 << g->parked_bit);
+                        pmx_writel(pmx, val, g->parked_bank, g->parked_reg);
+                }
+        }
+}
+
 static bool gpio_node_has_range(void)
 {
         struct device_node *np;
@@ -719,12 +735,14 @@ int tegra_pinctrl_probe(struct platform_device *pdev,
                         return PTR_ERR(pmx->regs[i]);
         }
 
-        pmx->pctl = pinctrl_register(&tegra_pinctrl_desc, &pdev->dev, pmx);
+        pmx->pctl = devm_pinctrl_register(&pdev->dev, &tegra_pinctrl_desc, pmx);
         if (IS_ERR(pmx->pctl)) {
                 dev_err(&pdev->dev, "Couldn't register pinctrl driver\n");
                 return PTR_ERR(pmx->pctl);
         }
 
+        tegra_pinctrl_clear_parked_bits(pmx);
+
         if (!gpio_node_has_range())
                 pinctrl_add_gpio_range(pmx->pctl, &tegra_pinctrl_gpio_range);
 
@@ -735,13 +753,3 @@ int tegra_pinctrl_probe(struct platform_device *pdev,
         return 0;
 }
 EXPORT_SYMBOL_GPL(tegra_pinctrl_probe);
-
-int tegra_pinctrl_remove(struct platform_device *pdev)
-{
-        struct tegra_pmx *pmx = platform_get_drvdata(pdev);
-
-        pinctrl_unregister(pmx->pctl);
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(tegra_pinctrl_remove);
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra.h b/drivers/pinctrl/tegra/pinctrl-tegra.h
index 1615db7e3a4b..d2ced17382b5 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra.h
+++ b/drivers/pinctrl/tegra/pinctrl-tegra.h
@@ -93,6 +93,9 @@ struct tegra_function {
  * @tri_reg:            Tri-state register offset.
  * @tri_bank:           Tri-state register bank.
  * @tri_bit:            Tri-state register bit.
+ * @parked_reg:         Parked register offset. -1 if unsupported.
+ * @parked_bank:        Parked register bank. 0 if unsupported.
+ * @parked_bit:         Parked register bit. 0 if unsupported.
  * @einput_bit:         Enable-input register bit.
  * @odrain_bit:         Open-drain register bit.
  * @lock_bit:           Lock register bit.
@@ -135,13 +138,16 @@ struct tegra_pingroup {
         s16 pupd_reg;
         s16 tri_reg;
         s16 drv_reg;
+        s16 parked_reg;
         u32 mux_bank:2;
         u32 pupd_bank:2;
         u32 tri_bank:2;
         u32 drv_bank:2;
+        u32 parked_bank:2;
         s32 mux_bit:6;
         s32 pupd_bit:6;
         s32 tri_bit:6;
+        s32 parked_bit:6;
         s32 einput_bit:6;
         s32 odrain_bit:6;
         s32 lock_bit:6;
@@ -189,6 +195,4 @@ struct tegra_pinctrl_soc_data {
 
 int tegra_pinctrl_probe(struct platform_device *pdev,
                         const struct tegra_pinctrl_soc_data *soc_data);
-int tegra_pinctrl_remove(struct platform_device *pdev);
-
 #endif
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra114.c b/drivers/pinctrl/tegra/pinctrl-tegra114.c
index 05e49d5137ab..4851d169f4c7 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra114.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra114.c
@@ -1578,6 +1578,7 @@ static struct tegra_function tegra114_functions[] = {
                 .lock_bit = 7,                                          \
                 .ioreset_bit = PINGROUP_BIT_##ior(8),                   \
                 .rcv_sel_bit = PINGROUP_BIT_##rcv_sel(9),               \
+                .parked_reg = -1,                                       \
                 .drv_reg = -1,                                          \
         }
 
@@ -1598,6 +1599,7 @@ static struct tegra_function tegra114_functions[] = {
                 .rcv_sel_bit = -1,                                      \
                 .drv_reg = DRV_PINGROUP_REG(r),                         \
                 .drv_bank = 0,                                          \
+                .parked_reg = -1,                                       \
                 .hsm_bit = hsm_b,                                       \
                 .schmitt_bit = schmitt_b,                               \
                 .lpmd_bit = lpmd_b,                                     \
@@ -1863,7 +1865,6 @@ static struct platform_driver tegra114_pinctrl_driver = {
                 .of_match_table = tegra114_pinctrl_of_match,
         },
         .probe = tegra114_pinctrl_probe,
-        .remove = tegra_pinctrl_remove,
 };
 module_platform_driver(tegra114_pinctrl_driver);
 
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra124.c b/drivers/pinctrl/tegra/pinctrl-tegra124.c
index 7cd44c7c296d..a0ce723a9482 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra124.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra124.c
@@ -1747,6 +1747,7 @@ static struct tegra_function tegra124_functions[] = {
                 .lock_bit = 7,                                          \
                 .ioreset_bit = PINGROUP_BIT_##ior(8),                   \
                 .rcv_sel_bit = PINGROUP_BIT_##rcv_sel(9),               \
+                .parked_reg = -1,                                       \
                 .drv_reg = -1,                                          \
         }
 
@@ -1767,6 +1768,7 @@ static struct tegra_function tegra124_functions[] = {
                 .rcv_sel_bit = -1,                                      \
                 .drv_reg = DRV_PINGROUP_REG(r),                         \
                 .drv_bank = 0,                                          \
+                .parked_reg = -1,                                       \
                 .hsm_bit = hsm_b,                                       \
                 .schmitt_bit = schmitt_b,                               \
                 .lpmd_bit = lpmd_b,                                     \
@@ -2075,7 +2077,6 @@ static struct platform_driver tegra124_pinctrl_driver = {
                 .of_match_table = tegra124_pinctrl_of_match,
         },
         .probe = tegra124_pinctrl_probe,
-        .remove = tegra_pinctrl_remove,
 };
 module_platform_driver(tegra124_pinctrl_driver);
 
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra20.c b/drivers/pinctrl/tegra/pinctrl-tegra20.c
index 4833db4433d9..09bad6980ad1 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra20.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra20.c
@@ -1994,6 +1994,7 @@ static struct tegra_function tegra20_functions[] = {
                 .tri_reg = ((tri_r) - TRISTATE_REG_A),          \
                 .tri_bank = 0,                                  \
                 .tri_bit = tri_b,                               \
+                .parked_reg = -1,                               \
                 .einput_bit = -1,                               \
                 .odrain_bit = -1,                               \
                 .lock_bit = -1,                                 \
@@ -2013,6 +2014,7 @@ static struct tegra_function tegra20_functions[] = {
                 .pupd_bank = 2,                                 \
                 .pupd_bit = pupd_b,                             \
                 .drv_reg = -1,                                  \
+                .parked_reg = -1,                               \
         }
 
 /* Pin groups for drive strength registers (configurable version) */
@@ -2028,6 +2030,7 @@ static struct tegra_function tegra20_functions[] = {
                 .tri_reg = -1,                                  \
                 .drv_reg = ((r) - PINGROUP_REG_A),              \
                 .drv_bank = 3,                                  \
+                .parked_reg = -1,                               \
                 .hsm_bit = hsm_b,                               \
                 .schmitt_bit = schmitt_b,                       \
                 .lpmd_bit = lpmd_b,                             \
@@ -2242,7 +2245,6 @@ static struct platform_driver tegra20_pinctrl_driver = {
                 .of_match_table = tegra20_pinctrl_of_match,
         },
         .probe = tegra20_pinctrl_probe,
-        .remove = tegra_pinctrl_remove,
 };
 module_platform_driver(tegra20_pinctrl_driver);
 
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra210.c b/drivers/pinctrl/tegra/pinctrl-tegra210.c
index 252b464901c0..2d856af389ef 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra210.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra210.c
@@ -1310,6 +1310,9 @@ static struct tegra_function tegra210_functions[] = {
                 .lock_bit = 7,                                          \
                 .ioreset_bit = -1,                                      \
                 .rcv_sel_bit = PINGROUP_BIT_##e_io_hv(10),              \
+                .parked_reg = PINGROUP_REG(r),                          \
+                .parked_bank = 1,                                       \
+                .parked_bit = 5,                                        \
                 .hsm_bit = PINGROUP_BIT_##hsm(9),                       \
                 .schmitt_bit = 12,                                      \
                 .drvtype_bit = PINGROUP_BIT_##drvtype(13),              \
@@ -1342,6 +1345,7 @@ static struct tegra_function tegra210_functions[] = {
                 .rcv_sel_bit = -1,                                      \
                 .drv_reg = DRV_PINGROUP_REG(r),                         \
                 .drv_bank = 0,                                          \
+                .parked_reg = -1,                                       \
                 .hsm_bit = -1,                                          \
                 .schmitt_bit = -1,                                      \
                 .lpmd_bit = -1,                                         \
@@ -1579,7 +1583,6 @@ static struct platform_driver tegra210_pinctrl_driver = {
                 .of_match_table = tegra210_pinctrl_of_match,
         },
         .probe = tegra210_pinctrl_probe,
-        .remove = tegra_pinctrl_remove,
 };
 module_platform_driver(tegra210_pinctrl_driver);
 
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra30.c b/drivers/pinctrl/tegra/pinctrl-tegra30.c
index 47b2fd8bb2e9..fb7817fea2d9 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra30.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra30.c
@@ -2139,6 +2139,7 @@ static struct tegra_function tegra30_functions[] = {
                 .lock_bit = 7,                                          \
                 .ioreset_bit = PINGROUP_BIT_##ior(8),                   \
                 .rcv_sel_bit = -1,                                      \
+                .parked_reg = -1,                                       \
                 .drv_reg = -1,                                          \
         }
 
@@ -2159,6 +2160,7 @@ static struct tegra_function tegra30_functions[] = {
                 .rcv_sel_bit = -1,                                      \
                 .drv_reg = DRV_PINGROUP_REG(r),                         \
                 .drv_bank = 0,                                          \
+                .parked_reg = -1,                                       \
                 .hsm_bit = hsm_b,                                       \
                 .schmitt_bit = schmitt_b,                               \
                 .lpmd_bit = lpmd_b,                                     \
@@ -2498,7 +2500,6 @@ static struct platform_driver tegra30_pinctrl_driver = {
                 .of_match_table = tegra30_pinctrl_of_match,
         },
         .probe = tegra30_pinctrl_probe,
-        .remove = tegra_pinctrl_remove,
 };
 module_platform_driver(tegra30_pinctrl_driver);