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

Pull pin control changes from Linus Walleij:
 "Here is the bulk of pin control changes for the v3.12 series.  Most of
  the relevant information is in the tag.

  I merged in v3.11-rc7 last week to get rid of a largeish conflict
  within the sunxi (AllWinner) driver in linux-next and fix up the
  non-trivial merge the right way.  That driver had a rather large fix
  adding locking late in the release cycle.

  Overall the bulk changes this time is cleanups and refactorings and
  not much new features, which is nice.

   - Refactorings for generic pin config handling in the core.

   - Factor out a set of device tree utilities for use in all drivers,
     to parse and allocate maps from the device tree.

   - Some fixes to the core such as more nitpicky locking.

   - Pushed down config array iteration into the drivers.

     This patch is necessary for drivers that want to iterate over
     configs and pile up a stack of alterations to the same register(s),
     or if the driver wants to take a local spinlock when committing the
     configuration.

   - A new driver for the Texas Instruments Palmas PMIC by Laxman
     Dewangan.  This is used on the Tegra systems.

   - A major cleanup and modernization of the PFC (Super Hitachi and ARM
     SHmobile) pin controller and subdrivers.

   - Support for the A20 and A31 sunxi (AllWinner) SoCs.

   - A huge pile of fixes and cleanups: Axel Lin, Jingoo Han Dan
     Carpenter, Julia Lawall and Sachin Kamat did an excellent job here"

* tag 'pinctrl-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (124 commits)
  pinctrl: sunxi: Fix off-by-one for valid offset range checking
  pinctrl: sunxi: drop lock on error path
  pinctrl: pinconf-generic: Remove ti prefix in dev_err messages
  pinctrl: rockchip: Implement .request() and .free() callbacks
  pinctrl: at91: fix get_pullup/down function return
  pinctrl: sh-pfc: remove unnecessary platform_set_drvdata()
  pinctrl: Add s5pv210 support to pinctrl-exynos
  pinctrl: utils: include export.h to avoid warnings
  pinctrl: s3c24xx: off by one in s3c24xx_eint_init()
  pinctrl: mvebu: testing the wrong variable
  pinctrl: abx500: fix bitwise AND test
  pinctrl: mvebu: Convert to use devm_ioremap_resource
  pinctrl: Pass all configs to driver on pin_config_set()
  pinctrl: tz1090-pdc: Convert to devm_ioremap_resource
  pinctrl: tz1090: Convert to devm_ioremap_resource
  pinctrl: tegra: Convert to devm_ioremap_resource
  pinctrl: rockchip: Simplify pin_to_bank equation
  pinctrl: spear: Convert to devm_ioremap_resource
  pinctrl: rockchip: Remove of_match_ptr macro for DT only driver
  pinctrl: palmas: PINCTRL_PALMAS needs to select PINMUX
  ...

4 files changed, 61 insertions, 37 deletions

diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index e6090d88e91d..37e48c957791 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -448,7 +448,7 @@ enum usb_irq_events {
 #define PALMAS_DVFS_BASE                                        0x180
 #define PALMAS_PMU_CONTROL_BASE                                 0x1A0
 #define PALMAS_RESOURCE_BASE                                    0x1D4
-#define PALMAS_PU_PD_OD_BASE                                    0x1F4
+#define PALMAS_PU_PD_OD_BASE                                    0x1F0
 #define PALMAS_LED_BASE                                         0x200
 #define PALMAS_INTERRUPT_BASE                                   0x210
 #define PALMAS_USB_OTG_BASE                                     0x250
@@ -1733,16 +1733,20 @@ enum usb_irq_events {
 #define PALMAS_REGEN3_CTRL_MODE_ACTIVE_SHIFT                    0
 
 /* Registers for function PAD_CONTROL */
-#define PALMAS_PU_PD_INPUT_CTRL1                                0x0
-#define PALMAS_PU_PD_INPUT_CTRL2                                0x1
-#define PALMAS_PU_PD_INPUT_CTRL3                                0x2
-#define PALMAS_OD_OUTPUT_CTRL                                   0x4
-#define PALMAS_POLARITY_CTRL                                    0x5
-#define PALMAS_PRIMARY_SECONDARY_PAD1                           0x6
-#define PALMAS_PRIMARY_SECONDARY_PAD2                           0x7
-#define PALMAS_I2C_SPI                                          0x8
-#define PALMAS_PU_PD_INPUT_CTRL4                                0x9
-#define PALMAS_PRIMARY_SECONDARY_PAD3                           0xA
+#define PALMAS_OD_OUTPUT_CTRL2                                  0x2
+#define PALMAS_POLARITY_CTRL2                                   0x3
+#define PALMAS_PU_PD_INPUT_CTRL1                                0x4
+#define PALMAS_PU_PD_INPUT_CTRL2                                0x5
+#define PALMAS_PU_PD_INPUT_CTRL3                                0x6
+#define PALMAS_PU_PD_INPUT_CTRL5                                0x7
+#define PALMAS_OD_OUTPUT_CTRL                                   0x8
+#define PALMAS_POLARITY_CTRL                                    0x9
+#define PALMAS_PRIMARY_SECONDARY_PAD1                           0xA
+#define PALMAS_PRIMARY_SECONDARY_PAD2                           0xB
+#define PALMAS_I2C_SPI                                          0xC
+#define PALMAS_PU_PD_INPUT_CTRL4                                0xD
+#define PALMAS_PRIMARY_SECONDARY_PAD3                           0xE
+#define PALMAS_PRIMARY_SECONDARY_PAD4                           0xF
 
 /* Bit definitions for PU_PD_INPUT_CTRL1 */
 #define PALMAS_PU_PD_INPUT_CTRL1_RESET_IN_PD                    0x40
@@ -2500,6 +2504,15 @@ enum usb_irq_events {
 #define PALMAS_PU_PD_GPIO_CTRL1                                 0x6
 #define PALMAS_PU_PD_GPIO_CTRL2                                 0x7
 #define PALMAS_OD_OUTPUT_GPIO_CTRL                              0x8
+#define PALMAS_GPIO_DATA_IN2                                    0x9
+#define PALMAS_GPIO_DATA_DIR2                                   0x0A
+#define PALMAS_GPIO_DATA_OUT2                                   0x0B
+#define PALMAS_GPIO_DEBOUNCE_EN2                                0x0C
+#define PALMAS_GPIO_CLEAR_DATA_OUT2                             0x0D
+#define PALMAS_GPIO_SET_DATA_OUT2                               0x0E
+#define PALMAS_PU_PD_GPIO_CTRL3                                 0x0F
+#define PALMAS_PU_PD_GPIO_CTRL4                                 0x10
+#define PALMAS_OD_OUTPUT_GPIO_CTRL2                             0x11
 
 /* Bit definitions for GPIO_DATA_IN */
 #define PALMAS_GPIO_DATA_IN_GPIO_7_IN                           0x80
diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h
index bf7e989abcb5..fb90ef5eb038 100644
--- a/include/linux/pinctrl/pinconf-generic.h
+++ b/include/linux/pinctrl/pinconf-generic.h
@@ -137,6 +137,39 @@ static inline unsigned long pinconf_to_config_packed(enum pin_config_param param
         return PIN_CONF_PACKED(param, argument);
 }
 
+#ifdef CONFIG_OF
+
+#include <linux/device.h>
+#include <linux/pinctrl/machine.h>
+struct pinctrl_dev;
+struct pinctrl_map;
+
+int pinconf_generic_dt_subnode_to_map(struct pinctrl_dev *pctldev,
+                struct device_node *np, struct pinctrl_map **map,
+                unsigned *reserved_maps, unsigned *num_maps,
+                enum pinctrl_map_type type);
+int pinconf_generic_dt_node_to_map(struct pinctrl_dev *pctldev,
+                struct device_node *np_config, struct pinctrl_map **map,
+                unsigned *num_maps, enum pinctrl_map_type type);
+
+static inline int pinconf_generic_dt_node_to_map_group(
+                struct pinctrl_dev *pctldev, struct device_node *np_config,
+                struct pinctrl_map **map, unsigned *num_maps)
+{
+        return pinconf_generic_dt_node_to_map(pctldev, np_config, map, num_maps,
+                        PIN_MAP_TYPE_CONFIGS_GROUP);
+}
+
+static inline int pinconf_generic_dt_node_to_map_pin(
+                struct pinctrl_dev *pctldev, struct device_node *np_config,
+                struct pinctrl_map **map, unsigned *num_maps)
+{
+        return pinconf_generic_dt_node_to_map(pctldev, np_config, map, num_maps,
+                        PIN_MAP_TYPE_CONFIGS_PIN);
+}
+
+#endif
+
 #endif /* CONFIG_GENERIC_PINCONF */
 
 #endif /* __LINUX_PINCTRL_PINCONF_GENERIC_H */
diff --git a/include/linux/pinctrl/pinconf.h b/include/linux/pinctrl/pinconf.h
index f6998692bdc9..09eb80f2574a 100644
--- a/include/linux/pinctrl/pinconf.h
+++ b/include/linux/pinctrl/pinconf.h
@@ -47,13 +47,15 @@ struct pinconf_ops {
                                unsigned long *config);
         int (*pin_config_set) (struct pinctrl_dev *pctldev,
                                unsigned pin,
-                               unsigned long config);
+                               unsigned long *configs,
+                               unsigned num_configs);
         int (*pin_config_group_get) (struct pinctrl_dev *pctldev,
                                      unsigned selector,
                                      unsigned long *config);
         int (*pin_config_group_set) (struct pinctrl_dev *pctldev,
                                      unsigned selector,
-                                     unsigned long config);
+                                     unsigned long *configs,
+                                     unsigned num_configs);
         int (*pin_config_dbg_parse_modify) (struct pinctrl_dev *pctldev,
                                            const char *arg,
                                            unsigned long *config);
diff --git a/include/linux/platform_data/pinctrl-nomadik.h b/include/linux/platform_data/pinctrl-nomadik.h
index f73b2f0c55b7..abf5bed84df3 100644
--- a/include/linux/platform_data/pinctrl-nomadik.h
+++ b/include/linux/platform_data/pinctrl-nomadik.h
@@ -226,30 +226,6 @@ enum nmk_gpio_slpm {
         NMK_GPIO_SLPM_WAKEUP_DISABLE = NMK_GPIO_SLPM_NOCHANGE,
 };
 
-/* Older deprecated pin config API that should go away soon */
-extern int nmk_config_pin(pin_cfg_t cfg, bool sleep);
-extern int nmk_config_pins(pin_cfg_t *cfgs, int num);
-extern int nmk_config_pins_sleep(pin_cfg_t *cfgs, int num);
-extern int nmk_gpio_set_slpm(int gpio, enum nmk_gpio_slpm mode);
-extern int nmk_gpio_set_pull(int gpio, enum nmk_gpio_pull pull);
-#ifdef CONFIG_PINCTRL_NOMADIK
-extern int nmk_gpio_set_mode(int gpio, int gpio_mode);
-#else
-static inline int nmk_gpio_set_mode(int gpio, int gpio_mode)
-{
-        return -ENODEV;
-}
-#endif
-extern int nmk_gpio_get_mode(int gpio);
-
-extern void nmk_gpio_wakeups_suspend(void);
-extern void nmk_gpio_wakeups_resume(void);
-
-extern void nmk_gpio_clocks_enable(void);
-extern void nmk_gpio_clocks_disable(void);
-
-extern void nmk_gpio_read_pull(int gpio_bank, u32 *pull_up);
-
 /*
  * Platform data to register a block: only the initial gpio/irq number.
  */