pinctrl: merrifield: Adapt to Intel Tangier driver
authorRaag Jadav <raag.jadav@intel.com>
Mon, 14 Aug 2023 05:40:32 +0000 (11:10 +0530)
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 15 Aug 2023 14:31:50 +0000 (17:31 +0300)
Make use of Intel Tangier as a library driver for Merrifield.

Signed-off-by: Raag Jadav <raag.jadav@intel.com>
Link: https://lore.kernel.org/r/20230814054033.12004-3-raag.jadav@intel.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drivers/pinctrl/intel/Kconfig
drivers/pinctrl/intel/Kconfig.tng
drivers/pinctrl/intel/pinctrl-merrifield.c

index f2bdb07..4042d6c 100644 (file)
@@ -36,17 +36,6 @@ config PINCTRL_LYNXPOINT
          provides an interface that allows configuring of PCH pins and
          using them as GPIOs.
 
-config PINCTRL_MERRIFIELD
-       tristate "Intel Merrifield pinctrl driver"
-       depends on X86_INTEL_MID
-       select PINMUX
-       select PINCONF
-       select GENERIC_PINCONF
-       help
-         Merrifield Family-Level Interface Shim (FLIS) driver provides an
-         interface that allows configuring of SoC pins and using them as
-         GPIOs.
-
 config PINCTRL_MOOREFIELD
        tristate "Intel Moorefield pinctrl driver"
        depends on X86_INTEL_MID
index 8d77579..8a6d315 100644 (file)
@@ -14,4 +14,12 @@ config PINCTRL_TANGIER
 
          If built as a module its name will be pinctrl-tangier.
 
+config PINCTRL_MERRIFIELD
+       tristate "Intel Merrifield pinctrl driver"
+       select PINCTRL_TANGIER
+       help
+         Intel Merrifield Family-Level Interface Shim (FLIS) driver provides
+         an interface that allows configuring of SoC pins and using them as
+         GPIOs.
+
 endif
index fb6de38..d809680 100644 (file)
@@ -6,85 +6,17 @@
  * Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  */
 
-#include <linux/bits.h>
-#include <linux/err.h>
-#include <linux/io.h>
-#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
 #include <linux/mod_devicetable.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/seq_file.h>
+#include <linux/types.h>
 
-#include <linux/pinctrl/pinconf-generic.h>
-#include <linux/pinctrl/pinconf.h>
 #include <linux/pinctrl/pinctrl.h>
-#include <linux/pinctrl/pinmux.h>
 
 #include "pinctrl-intel.h"
-
-#define MRFLD_FAMILY_NR                        64
-#define MRFLD_FAMILY_LEN               0x400
-
-#define SLEW_OFFSET                    0x000
-#define BUFCFG_OFFSET                  0x100
-#define MISC_OFFSET                    0x300
-
-#define BUFCFG_PINMODE_SHIFT           0
-#define BUFCFG_PINMODE_MASK            GENMASK(2, 0)
-#define BUFCFG_PINMODE_GPIO            0
-#define BUFCFG_PUPD_VAL_SHIFT          4
-#define BUFCFG_PUPD_VAL_MASK           GENMASK(5, 4)
-#define BUFCFG_PUPD_VAL_2K             0
-#define BUFCFG_PUPD_VAL_20K            1
-#define BUFCFG_PUPD_VAL_50K            2
-#define BUFCFG_PUPD_VAL_910            3
-#define BUFCFG_PU_EN                   BIT(8)
-#define BUFCFG_PD_EN                   BIT(9)
-#define BUFCFG_Px_EN_MASK              GENMASK(9, 8)
-#define BUFCFG_SLEWSEL                 BIT(10)
-#define BUFCFG_OVINEN                  BIT(12)
-#define BUFCFG_OVINEN_EN               BIT(13)
-#define BUFCFG_OVINEN_MASK             GENMASK(13, 12)
-#define BUFCFG_OVOUTEN                 BIT(14)
-#define BUFCFG_OVOUTEN_EN              BIT(15)
-#define BUFCFG_OVOUTEN_MASK            GENMASK(15, 14)
-#define BUFCFG_INDATAOV_VAL            BIT(16)
-#define BUFCFG_INDATAOV_EN             BIT(17)
-#define BUFCFG_INDATAOV_MASK           GENMASK(17, 16)
-#define BUFCFG_OUTDATAOV_VAL           BIT(18)
-#define BUFCFG_OUTDATAOV_EN            BIT(19)
-#define BUFCFG_OUTDATAOV_MASK          GENMASK(19, 18)
-#define BUFCFG_OD_EN                   BIT(21)
-
-/**
- * struct mrfld_family - Intel pin family description
- * @barno: MMIO BAR number where registers for this family reside
- * @pin_base: Starting pin of pins in this family
- * @npins: Number of pins in this family
- * @protected: True if family is protected by access
- * @regs: family specific common registers
- */
-struct mrfld_family {
-       unsigned int barno;
-       unsigned int pin_base;
-       size_t npins;
-       bool protected;
-       void __iomem *regs;
-};
-
-#define MRFLD_FAMILY(b, s, e)                          \
-       {                                               \
-               .barno = (b),                           \
-               .pin_base = (s),                        \
-               .npins = (e) - (s) + 1,                 \
-       }
-
-#define MRFLD_FAMILY_PROTECTED(b, s, e)                        \
-       {                                               \
-               .barno = (b),                           \
-               .pin_base = (s),                        \
-               .npins = (e) - (s) + 1,                 \
-               .protected = true,                      \
-       }
+#include "pinctrl-tangier.h"
 
 static const struct pinctrl_pin_desc mrfld_pins[] = {
        /* Family 0: OCP2SSC (0 pins) */
@@ -389,587 +321,43 @@ static const struct intel_function mrfld_functions[] = {
        FUNCTION("pwm3", mrfld_pwm3_groups),
 };
 
-static const struct mrfld_family mrfld_families[] = {
-       MRFLD_FAMILY(1, 0, 12),
-       MRFLD_FAMILY(2, 13, 36),
-       MRFLD_FAMILY(3, 37, 56),
-       MRFLD_FAMILY(4, 57, 64),
-       MRFLD_FAMILY(5, 65, 78),
-       MRFLD_FAMILY(6, 79, 100),
-       MRFLD_FAMILY_PROTECTED(7, 101, 114),
-       MRFLD_FAMILY(8, 115, 126),
-       MRFLD_FAMILY(9, 127, 145),
-       MRFLD_FAMILY(10, 146, 157),
-       MRFLD_FAMILY(11, 158, 179),
-       MRFLD_FAMILY_PROTECTED(12, 180, 194),
-       MRFLD_FAMILY(13, 195, 214),
-       MRFLD_FAMILY(14, 215, 227),
-       MRFLD_FAMILY(15, 228, 232),
+static const struct tng_family mrfld_families[] = {
+       TNG_FAMILY(1, 0, 12),
+       TNG_FAMILY(2, 13, 36),
+       TNG_FAMILY(3, 37, 56),
+       TNG_FAMILY(4, 57, 64),
+       TNG_FAMILY(5, 65, 78),
+       TNG_FAMILY(6, 79, 100),
+       TNG_FAMILY_PROTECTED(7, 101, 114),
+       TNG_FAMILY(8, 115, 126),
+       TNG_FAMILY(9, 127, 145),
+       TNG_FAMILY(10, 146, 157),
+       TNG_FAMILY(11, 158, 179),
+       TNG_FAMILY_PROTECTED(12, 180, 194),
+       TNG_FAMILY(13, 195, 214),
+       TNG_FAMILY(14, 215, 227),
+       TNG_FAMILY(15, 228, 232),
 };
 
-/**
- * struct mrfld_pinctrl - Intel Merrifield pinctrl private structure
- * @dev: Pointer to the device structure
- * @lock: Lock to serialize register access
- * @pctldesc: Pin controller description
- * @pctldev: Pointer to the pin controller device
- * @families: Array of families this pinctrl handles
- * @nfamilies: Number of families in the array
- * @functions: Array of functions
- * @nfunctions: Number of functions in the array
- * @groups: Array of pin groups
- * @ngroups: Number of groups in the array
- * @pins: Array of pins this pinctrl controls
- * @npins: Number of pins in the array
- */
-struct mrfld_pinctrl {
-       struct device *dev;
-       raw_spinlock_t lock;
-       struct pinctrl_desc pctldesc;
-       struct pinctrl_dev *pctldev;
-
-       /* Pin controller configuration */
-       const struct mrfld_family *families;
-       size_t nfamilies;
-       const struct intel_function *functions;
-       size_t nfunctions;
-       const struct intel_pingroup *groups;
-       size_t ngroups;
-       const struct pinctrl_pin_desc *pins;
-       size_t npins;
-};
-
-#define pin_to_bufno(f, p)             ((p) - (f)->pin_base)
-
-static const struct mrfld_family *mrfld_get_family(struct mrfld_pinctrl *mp,
-                                                  unsigned int pin)
-{
-       const struct mrfld_family *family;
-       unsigned int i;
-
-       for (i = 0; i < mp->nfamilies; i++) {
-               family = &mp->families[i];
-               if (pin >= family->pin_base &&
-                   pin < family->pin_base + family->npins)
-                       return family;
-       }
-
-       dev_warn(mp->dev, "failed to find family for pin %u\n", pin);
-       return NULL;
-}
-
-static bool mrfld_buf_available(struct mrfld_pinctrl *mp, unsigned int pin)
-{
-       const struct mrfld_family *family;
-
-       family = mrfld_get_family(mp, pin);
-       if (!family)
-               return false;
-
-       return !family->protected;
-}
-
-static void __iomem *mrfld_get_bufcfg(struct mrfld_pinctrl *mp, unsigned int pin)
-{
-       const struct mrfld_family *family;
-       unsigned int bufno;
-
-       family = mrfld_get_family(mp, pin);
-       if (!family)
-               return NULL;
-
-       bufno = pin_to_bufno(family, pin);
-       return family->regs + BUFCFG_OFFSET + bufno * 4;
-}
-
-static int mrfld_read_bufcfg(struct mrfld_pinctrl *mp, unsigned int pin, u32 *value)
-{
-       void __iomem *bufcfg;
-
-       if (!mrfld_buf_available(mp, pin))
-               return -EBUSY;
-
-       bufcfg = mrfld_get_bufcfg(mp, pin);
-       *value = readl(bufcfg);
-
-       return 0;
-}
-
-static void mrfld_update_bufcfg(struct mrfld_pinctrl *mp, unsigned int pin,
-                               u32 bits, u32 mask)
-{
-       void __iomem *bufcfg;
-       u32 value;
-
-       bufcfg = mrfld_get_bufcfg(mp, pin);
-       value = readl(bufcfg);
-
-       value &= ~mask;
-       value |= bits & mask;
-
-       writel(value, bufcfg);
-}
-
-static int mrfld_get_groups_count(struct pinctrl_dev *pctldev)
-{
-       struct mrfld_pinctrl *mp = pinctrl_dev_get_drvdata(pctldev);
-
-       return mp->ngroups;
-}
-
-static const char *mrfld_get_group_name(struct pinctrl_dev *pctldev,
-                                       unsigned int group)
-{
-       struct mrfld_pinctrl *mp = pinctrl_dev_get_drvdata(pctldev);
-
-       return mp->groups[group].grp.name;
-}
-
-static int mrfld_get_group_pins(struct pinctrl_dev *pctldev, unsigned int group,
-                               const unsigned int **pins, unsigned int *npins)
-{
-       struct mrfld_pinctrl *mp = pinctrl_dev_get_drvdata(pctldev);
-
-       *pins = mp->groups[group].grp.pins;
-       *npins = mp->groups[group].grp.npins;
-       return 0;
-}
-
-static void mrfld_pin_dbg_show(struct pinctrl_dev *pctldev, struct seq_file *s,
-                              unsigned int pin)
-{
-       struct mrfld_pinctrl *mp = pinctrl_dev_get_drvdata(pctldev);
-       u32 value, mode;
-       int ret;
-
-       ret = mrfld_read_bufcfg(mp, pin, &value);
-       if (ret) {
-               seq_puts(s, "not available");
-               return;
-       }
-
-       mode = (value & BUFCFG_PINMODE_MASK) >> BUFCFG_PINMODE_SHIFT;
-       if (mode == BUFCFG_PINMODE_GPIO)
-               seq_puts(s, "GPIO ");
-       else
-               seq_printf(s, "mode %d ", mode);
-
-       seq_printf(s, "0x%08x", value);
-}
-
-static const struct pinctrl_ops mrfld_pinctrl_ops = {
-       .get_groups_count = mrfld_get_groups_count,
-       .get_group_name = mrfld_get_group_name,
-       .get_group_pins = mrfld_get_group_pins,
-       .pin_dbg_show = mrfld_pin_dbg_show,
+static const struct tng_pinctrl mrfld_soc_data = {
+       .pins = mrfld_pins,
+       .npins = ARRAY_SIZE(mrfld_pins),
+       .groups = mrfld_groups,
+       .ngroups = ARRAY_SIZE(mrfld_groups),
+       .families = mrfld_families,
+       .nfamilies = ARRAY_SIZE(mrfld_families),
+       .functions = mrfld_functions,
+       .nfunctions = ARRAY_SIZE(mrfld_functions),
 };
 
-static int mrfld_get_functions_count(struct pinctrl_dev *pctldev)
-{
-       struct mrfld_pinctrl *mp = pinctrl_dev_get_drvdata(pctldev);
-
-       return mp->nfunctions;
-}
-
-static const char *mrfld_get_function_name(struct pinctrl_dev *pctldev,
-                                          unsigned int function)
-{
-       struct mrfld_pinctrl *mp = pinctrl_dev_get_drvdata(pctldev);
-
-       return mp->functions[function].func.name;
-}
-
-static int mrfld_get_function_groups(struct pinctrl_dev *pctldev,
-                                    unsigned int function,
-                                    const char * const **groups,
-                                    unsigned int * const ngroups)
-{
-       struct mrfld_pinctrl *mp = pinctrl_dev_get_drvdata(pctldev);
-
-       *groups = mp->functions[function].func.groups;
-       *ngroups = mp->functions[function].func.ngroups;
-       return 0;
-}
-
-static int mrfld_pinmux_set_mux(struct pinctrl_dev *pctldev,
-                               unsigned int function,
-                               unsigned int group)
-{
-       struct mrfld_pinctrl *mp = pinctrl_dev_get_drvdata(pctldev);
-       const struct intel_pingroup *grp = &mp->groups[group];
-       u32 bits = grp->mode << BUFCFG_PINMODE_SHIFT;
-       u32 mask = BUFCFG_PINMODE_MASK;
-       unsigned long flags;
-       unsigned int i;
-
-       /*
-        * All pins in the groups needs to be accessible and writable
-        * before we can enable the mux for this group.
-        */
-       for (i = 0; i < grp->grp.npins; i++) {
-               if (!mrfld_buf_available(mp, grp->grp.pins[i]))
-                       return -EBUSY;
-       }
-
-       /* Now enable the mux setting for each pin in the group */
-       raw_spin_lock_irqsave(&mp->lock, flags);
-       for (i = 0; i < grp->grp.npins; i++)
-               mrfld_update_bufcfg(mp, grp->grp.pins[i], bits, mask);
-       raw_spin_unlock_irqrestore(&mp->lock, flags);
-
-       return 0;
-}
-
-static int mrfld_gpio_request_enable(struct pinctrl_dev *pctldev,
-                                    struct pinctrl_gpio_range *range,
-                                    unsigned int pin)
-{
-       struct mrfld_pinctrl *mp = pinctrl_dev_get_drvdata(pctldev);
-       u32 bits = BUFCFG_PINMODE_GPIO << BUFCFG_PINMODE_SHIFT;
-       u32 mask = BUFCFG_PINMODE_MASK;
-       unsigned long flags;
-
-       if (!mrfld_buf_available(mp, pin))
-               return -EBUSY;
-
-       raw_spin_lock_irqsave(&mp->lock, flags);
-       mrfld_update_bufcfg(mp, pin, bits, mask);
-       raw_spin_unlock_irqrestore(&mp->lock, flags);
-
-       return 0;
-}
-
-static const struct pinmux_ops mrfld_pinmux_ops = {
-       .get_functions_count = mrfld_get_functions_count,
-       .get_function_name = mrfld_get_function_name,
-       .get_function_groups = mrfld_get_function_groups,
-       .set_mux = mrfld_pinmux_set_mux,
-       .gpio_request_enable = mrfld_gpio_request_enable,
-};
-
-static int mrfld_config_get(struct pinctrl_dev *pctldev, unsigned int pin,
-                           unsigned long *config)
-{
-       struct mrfld_pinctrl *mp = pinctrl_dev_get_drvdata(pctldev);
-       enum pin_config_param param = pinconf_to_config_param(*config);
-       u32 value, term;
-       u16 arg = 0;
-       int ret;
-
-       ret = mrfld_read_bufcfg(mp, pin, &value);
-       if (ret)
-               return -ENOTSUPP;
-
-       term = (value & BUFCFG_PUPD_VAL_MASK) >> BUFCFG_PUPD_VAL_SHIFT;
-
-       switch (param) {
-       case PIN_CONFIG_BIAS_DISABLE:
-               if (value & BUFCFG_Px_EN_MASK)
-                       return -EINVAL;
-               break;
-
-       case PIN_CONFIG_BIAS_PULL_UP:
-               if ((value & BUFCFG_Px_EN_MASK) != BUFCFG_PU_EN)
-                       return -EINVAL;
-
-               switch (term) {
-               case BUFCFG_PUPD_VAL_910:
-                       arg = 910;
-                       break;
-               case BUFCFG_PUPD_VAL_2K:
-                       arg = 2000;
-                       break;
-               case BUFCFG_PUPD_VAL_20K:
-                       arg = 20000;
-                       break;
-               case BUFCFG_PUPD_VAL_50K:
-                       arg = 50000;
-                       break;
-               }
-
-               break;
-
-       case PIN_CONFIG_BIAS_PULL_DOWN:
-               if ((value & BUFCFG_Px_EN_MASK) != BUFCFG_PD_EN)
-                       return -EINVAL;
-
-               switch (term) {
-               case BUFCFG_PUPD_VAL_910:
-                       arg = 910;
-                       break;
-               case BUFCFG_PUPD_VAL_2K:
-                       arg = 2000;
-                       break;
-               case BUFCFG_PUPD_VAL_20K:
-                       arg = 20000;
-                       break;
-               case BUFCFG_PUPD_VAL_50K:
-                       arg = 50000;
-                       break;
-               }
-
-               break;
-
-       case PIN_CONFIG_DRIVE_PUSH_PULL:
-               if (value & BUFCFG_OD_EN)
-                       return -EINVAL;
-               break;
-
-       case PIN_CONFIG_DRIVE_OPEN_DRAIN:
-               if (!(value & BUFCFG_OD_EN))
-                       return -EINVAL;
-               break;
-
-       case PIN_CONFIG_SLEW_RATE:
-               if (!(value & BUFCFG_SLEWSEL))
-                       arg = 0;
-               else
-                       arg = 1;
-               break;
-
-       default:
-               return -ENOTSUPP;
-       }
-
-       *config = pinconf_to_config_packed(param, arg);
-       return 0;
-}
-
-static int mrfld_config_set_pin(struct mrfld_pinctrl *mp, unsigned int pin,
-                               unsigned long config)
-{
-       unsigned int param = pinconf_to_config_param(config);
-       unsigned int arg = pinconf_to_config_argument(config);
-       u32 bits = 0, mask = 0;
-       unsigned long flags;
-
-       switch (param) {
-       case PIN_CONFIG_BIAS_DISABLE:
-               mask |= BUFCFG_Px_EN_MASK | BUFCFG_PUPD_VAL_MASK;
-               break;
-
-       case PIN_CONFIG_BIAS_PULL_UP:
-               mask |= BUFCFG_Px_EN_MASK | BUFCFG_PUPD_VAL_MASK;
-               bits |= BUFCFG_PU_EN;
-
-               /* Set default strength value in case none is given */
-               if (arg == 1)
-                       arg = 20000;
-
-               switch (arg) {
-               case 50000:
-                       bits |= BUFCFG_PUPD_VAL_50K << BUFCFG_PUPD_VAL_SHIFT;
-                       break;
-               case 20000:
-                       bits |= BUFCFG_PUPD_VAL_20K << BUFCFG_PUPD_VAL_SHIFT;
-                       break;
-               case 2000:
-                       bits |= BUFCFG_PUPD_VAL_2K << BUFCFG_PUPD_VAL_SHIFT;
-                       break;
-               default:
-                       return -EINVAL;
-               }
-
-               break;
-
-       case PIN_CONFIG_BIAS_PULL_DOWN:
-               mask |= BUFCFG_Px_EN_MASK | BUFCFG_PUPD_VAL_MASK;
-               bits |= BUFCFG_PD_EN;
-
-               /* Set default strength value in case none is given */
-               if (arg == 1)
-                       arg = 20000;
-
-               switch (arg) {
-               case 50000:
-                       bits |= BUFCFG_PUPD_VAL_50K << BUFCFG_PUPD_VAL_SHIFT;
-                       break;
-               case 20000:
-                       bits |= BUFCFG_PUPD_VAL_20K << BUFCFG_PUPD_VAL_SHIFT;
-                       break;
-               case 2000:
-                       bits |= BUFCFG_PUPD_VAL_2K << BUFCFG_PUPD_VAL_SHIFT;
-                       break;
-               default:
-                       return -EINVAL;
-               }
-
-               break;
-
-       case PIN_CONFIG_DRIVE_PUSH_PULL:
-               mask |= BUFCFG_OD_EN;
-               bits &= ~BUFCFG_OD_EN;
-               break;
-
-       case PIN_CONFIG_DRIVE_OPEN_DRAIN:
-               mask |= BUFCFG_OD_EN;
-               bits |= BUFCFG_OD_EN;
-               break;
-
-       case PIN_CONFIG_SLEW_RATE:
-               mask |= BUFCFG_SLEWSEL;
-               if (arg)
-                       bits |= BUFCFG_SLEWSEL;
-               break;
-       }
-
-       raw_spin_lock_irqsave(&mp->lock, flags);
-       mrfld_update_bufcfg(mp, pin, bits, mask);
-       raw_spin_unlock_irqrestore(&mp->lock, flags);
-
-       return 0;
-}
-
-static int mrfld_config_set(struct pinctrl_dev *pctldev, unsigned int pin,
-                           unsigned long *configs, unsigned int nconfigs)
-{
-       struct mrfld_pinctrl *mp = pinctrl_dev_get_drvdata(pctldev);
-       unsigned int i;
-       int ret;
-
-       if (!mrfld_buf_available(mp, pin))
-               return -ENOTSUPP;
-
-       for (i = 0; i < nconfigs; i++) {
-               switch (pinconf_to_config_param(configs[i])) {
-               case PIN_CONFIG_BIAS_DISABLE:
-               case PIN_CONFIG_BIAS_PULL_UP:
-               case PIN_CONFIG_BIAS_PULL_DOWN:
-               case PIN_CONFIG_DRIVE_PUSH_PULL:
-               case PIN_CONFIG_DRIVE_OPEN_DRAIN:
-               case PIN_CONFIG_SLEW_RATE:
-                       ret = mrfld_config_set_pin(mp, pin, configs[i]);
-                       if (ret)
-                               return ret;
-                       break;
-
-               default:
-                       return -ENOTSUPP;
-               }
-       }
-
-       return 0;
-}
-
-static int mrfld_config_group_get(struct pinctrl_dev *pctldev,
-                                 unsigned int group, unsigned long *config)
-{
-       const unsigned int *pins;
-       unsigned int npins;
-       int ret;
-
-       ret = mrfld_get_group_pins(pctldev, group, &pins, &npins);
-       if (ret)
-               return ret;
-
-       ret = mrfld_config_get(pctldev, pins[0], config);
-       if (ret)
-               return ret;
-
-       return 0;
-}
-
-static int mrfld_config_group_set(struct pinctrl_dev *pctldev,
-                                 unsigned int group, unsigned long *configs,
-                                 unsigned int num_configs)
-{
-       const unsigned int *pins;
-       unsigned int npins;
-       int i, ret;
-
-       ret = mrfld_get_group_pins(pctldev, group, &pins, &npins);
-       if (ret)
-               return ret;
-
-       for (i = 0; i < npins; i++) {
-               ret = mrfld_config_set(pctldev, pins[i], configs, num_configs);
-               if (ret)
-                       return ret;
-       }
-
-       return 0;
-}
-
-static const struct pinconf_ops mrfld_pinconf_ops = {
-       .is_generic = true,
-       .pin_config_get = mrfld_config_get,
-       .pin_config_set = mrfld_config_set,
-       .pin_config_group_get = mrfld_config_group_get,
-       .pin_config_group_set = mrfld_config_group_set,
-};
-
-static const struct pinctrl_desc mrfld_pinctrl_desc = {
-       .pctlops = &mrfld_pinctrl_ops,
-       .pmxops = &mrfld_pinmux_ops,
-       .confops = &mrfld_pinconf_ops,
-       .owner = THIS_MODULE,
-};
-
-static int mrfld_pinctrl_probe(struct platform_device *pdev)
-{
-       struct device *dev = &pdev->dev;
-       struct mrfld_family *families;
-       struct mrfld_pinctrl *mp;
-       void __iomem *regs;
-       size_t nfamilies;
-       unsigned int i;
-
-       mp = devm_kzalloc(dev, sizeof(*mp), GFP_KERNEL);
-       if (!mp)
-               return -ENOMEM;
-
-       mp->dev = dev;
-       raw_spin_lock_init(&mp->lock);
-
-       regs = devm_platform_ioremap_resource(pdev, 0);
-       if (IS_ERR(regs))
-               return PTR_ERR(regs);
-
-       /*
-        * Make a copy of the families which we can use to hold pointers
-        * to the registers.
-        */
-       nfamilies = ARRAY_SIZE(mrfld_families),
-       families = devm_kmemdup(dev, mrfld_families, sizeof(mrfld_families), GFP_KERNEL);
-       if (!families)
-               return -ENOMEM;
-
-       /* Splice memory resource by chunk per family */
-       for (i = 0; i < nfamilies; i++) {
-               struct mrfld_family *family = &families[i];
-
-               family->regs = regs + family->barno * MRFLD_FAMILY_LEN;
-       }
-
-       mp->families = families;
-       mp->nfamilies = nfamilies;
-       mp->functions = mrfld_functions;
-       mp->nfunctions = ARRAY_SIZE(mrfld_functions);
-       mp->groups = mrfld_groups;
-       mp->ngroups = ARRAY_SIZE(mrfld_groups);
-       mp->pctldesc = mrfld_pinctrl_desc;
-       mp->pctldesc.name = dev_name(dev);
-       mp->pctldesc.pins = mrfld_pins;
-       mp->pctldesc.npins = ARRAY_SIZE(mrfld_pins);
-
-       mp->pctldev = devm_pinctrl_register(dev, &mp->pctldesc, mp);
-       if (IS_ERR(mp->pctldev)) {
-               dev_err(dev, "failed to register pinctrl driver\n");
-               return PTR_ERR(mp->pctldev);
-       }
-
-       platform_set_drvdata(pdev, mp);
-       return 0;
-}
-
 static const struct acpi_device_id mrfld_acpi_table[] = {
-       { "INTC1002" },
+       { "INTC1002", (kernel_ulong_t)&mrfld_soc_data },
        { }
 };
 MODULE_DEVICE_TABLE(acpi, mrfld_acpi_table);
 
 static struct platform_driver mrfld_pinctrl_driver = {
-       .probe = mrfld_pinctrl_probe,
+       .probe = devm_tng_pinctrl_probe,
        .driver = {
                .name = "pinctrl-merrifield",
                .acpi_match_table = mrfld_acpi_table,
@@ -992,3 +380,4 @@ MODULE_AUTHOR("Andy Shevchenko <andriy.shevchenko@linux.intel.com>");
 MODULE_DESCRIPTION("Intel Merrifield SoC pinctrl driver");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:pinctrl-merrifield");
+MODULE_IMPORT_NS(PINCTRL_TANGIER);