pinctrl: intel: Add Intel Merrifield pin controller support
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 23 Jun 2016 10:49:36 +0000 (13:49 +0300)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 29 Jun 2016 07:59:35 +0000 (09:59 +0200)
This driver adds pinctrl support for Intel Merrifield. The IP block which is
called Family-Level Interface Shim is a separate entity in SoC. The GPIO driver
(gpio-intel-mid.c) will be updated accordingly to support pinctrl interface.

Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/intel/Kconfig
drivers/pinctrl/intel/Makefile
drivers/pinctrl/intel/pinctrl-merrifield.c [new file with mode: 0644]

index 1c74e03..00fb055 100644 (file)
@@ -29,6 +29,17 @@ config PINCTRL_CHERRYVIEW
          Cherryview/Braswell pinctrl driver provides an interface that
          allows configuring of SoC 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_INTEL
        tristate
        select PINMUX
index 03bc68e..3080307 100644 (file)
@@ -2,6 +2,7 @@
 
 obj-$(CONFIG_PINCTRL_BAYTRAIL)         += pinctrl-baytrail.o
 obj-$(CONFIG_PINCTRL_CHERRYVIEW)       += pinctrl-cherryview.o
+obj-$(CONFIG_PINCTRL_MERRIFIELD)       += pinctrl-merrifield.o
 obj-$(CONFIG_PINCTRL_INTEL)            += pinctrl-intel.o
 obj-$(CONFIG_PINCTRL_BROXTON)          += pinctrl-broxton.o
 obj-$(CONFIG_PINCTRL_SUNRISEPOINT)     += pinctrl-sunrisepoint.o
diff --git a/drivers/pinctrl/intel/pinctrl-merrifield.c b/drivers/pinctrl/intel/pinctrl-merrifield.c
new file mode 100644 (file)
index 0000000..eb4990f
--- /dev/null
@@ -0,0 +1,911 @@
+/*
+ * Intel Merrifield SoC pinctrl driver
+ *
+ * Copyright (C) 2016, Intel Corporation
+ * Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/bitops.h>
+#include <linux/err.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/pinctrl/pinconf.h>
+#include <linux/pinctrl/pinconf-generic.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,                      \
+       }
+
+static const struct pinctrl_pin_desc mrfld_pins[] = {
+       /* Family 0: OCP2SSC (0 pins) */
+       /* Family 1: ULPI (13 pins) */
+       PINCTRL_PIN(0, "ULPI_CLK"),
+       PINCTRL_PIN(1, "ULPI_D0"),
+       PINCTRL_PIN(2, "ULPI_D1"),
+       PINCTRL_PIN(3, "ULPI_D2"),
+       PINCTRL_PIN(4, "ULPI_D3"),
+       PINCTRL_PIN(5, "ULPI_D4"),
+       PINCTRL_PIN(6, "ULPI_D5"),
+       PINCTRL_PIN(7, "ULPI_D6"),
+       PINCTRL_PIN(8, "ULPI_D7"),
+       PINCTRL_PIN(9, "ULPI_DIR"),
+       PINCTRL_PIN(10, "ULPI_NXT"),
+       PINCTRL_PIN(11, "ULPI_REFCLK"),
+       PINCTRL_PIN(12, "ULPI_STP"),
+       /* Family 2: eMMC (24 pins) */
+       PINCTRL_PIN(13, "EMMC_CLK"),
+       PINCTRL_PIN(14, "EMMC_CMD"),
+       PINCTRL_PIN(15, "EMMC_D0"),
+       PINCTRL_PIN(16, "EMMC_D1"),
+       PINCTRL_PIN(17, "EMMC_D2"),
+       PINCTRL_PIN(18, "EMMC_D3"),
+       PINCTRL_PIN(19, "EMMC_D4"),
+       PINCTRL_PIN(20, "EMMC_D5"),
+       PINCTRL_PIN(21, "EMMC_D6"),
+       PINCTRL_PIN(22, "EMMC_D7"),
+       PINCTRL_PIN(23, "EMMC_RST_N"),
+       PINCTRL_PIN(24, "GP154"),
+       PINCTRL_PIN(25, "GP155"),
+       PINCTRL_PIN(26, "GP156"),
+       PINCTRL_PIN(27, "GP157"),
+       PINCTRL_PIN(28, "GP158"),
+       PINCTRL_PIN(29, "GP159"),
+       PINCTRL_PIN(30, "GP160"),
+       PINCTRL_PIN(31, "GP161"),
+       PINCTRL_PIN(32, "GP162"),
+       PINCTRL_PIN(33, "GP163"),
+       PINCTRL_PIN(34, "GP97"),
+       PINCTRL_PIN(35, "GP14"),
+       PINCTRL_PIN(36, "GP15"),
+       /* Family 3: SDIO (20 pins) */
+       PINCTRL_PIN(37, "GP77_SD_CD"),
+       PINCTRL_PIN(38, "GP78_SD_CLK"),
+       PINCTRL_PIN(39, "GP79_SD_CMD"),
+       PINCTRL_PIN(40, "GP80_SD_D0"),
+       PINCTRL_PIN(41, "GP81_SD_D1"),
+       PINCTRL_PIN(42, "GP82_SD_D2"),
+       PINCTRL_PIN(43, "GP83_SD_D3"),
+       PINCTRL_PIN(44, "GP84_SD_LS_CLK_FB"),
+       PINCTRL_PIN(45, "GP85_SD_LS_CMD_DIR"),
+       PINCTRL_PIN(46, "GP86_SD_LVL_D_DIR"),
+       PINCTRL_PIN(47, "GP88_SD_LS_SEL"),
+       PINCTRL_PIN(48, "GP87_SD_PD"),
+       PINCTRL_PIN(49, "GP89_SD_WP"),
+       PINCTRL_PIN(50, "GP90_SDIO_CLK"),
+       PINCTRL_PIN(51, "GP91_SDIO_CMD"),
+       PINCTRL_PIN(52, "GP92_SDIO_D0"),
+       PINCTRL_PIN(53, "GP93_SDIO_D1"),
+       PINCTRL_PIN(54, "GP94_SDIO_D2"),
+       PINCTRL_PIN(55, "GP95_SDIO_D3"),
+       PINCTRL_PIN(56, "GP96_SDIO_PD"),
+       /* Family 4: HSI (8 pins) */
+       PINCTRL_PIN(57, "HSI_ACDATA"),
+       PINCTRL_PIN(58, "HSI_ACFLAG"),
+       PINCTRL_PIN(59, "HSI_ACREADY"),
+       PINCTRL_PIN(60, "HSI_ACWAKE"),
+       PINCTRL_PIN(61, "HSI_CADATA"),
+       PINCTRL_PIN(62, "HSI_CAFLAG"),
+       PINCTRL_PIN(63, "HSI_CAREADY"),
+       PINCTRL_PIN(64, "HSI_CAWAKE"),
+       /* Family 5: SSP Audio (14 pins) */
+       PINCTRL_PIN(65, "GP70"),
+       PINCTRL_PIN(66, "GP71"),
+       PINCTRL_PIN(67, "GP32_I2S_0_CLK"),
+       PINCTRL_PIN(68, "GP33_I2S_0_FS"),
+       PINCTRL_PIN(69, "GP34_I2S_0_RXD"),
+       PINCTRL_PIN(70, "GP35_I2S_0_TXD"),
+       PINCTRL_PIN(71, "GP36_I2S_1_CLK"),
+       PINCTRL_PIN(72, "GP37_I2S_1_FS"),
+       PINCTRL_PIN(73, "GP38_I2S_1_RXD"),
+       PINCTRL_PIN(74, "GP39_I2S_1_TXD"),
+       PINCTRL_PIN(75, "GP40_I2S_2_CLK"),
+       PINCTRL_PIN(76, "GP41_I2S_2_FS"),
+       PINCTRL_PIN(77, "GP42_I2S_2_RXD"),
+       PINCTRL_PIN(78, "GP43_I2S_2_TXD"),
+       /* Family 6: GP SSP (22 pins) */
+       PINCTRL_PIN(79, "GP120_SPI_3_CLK"),
+       PINCTRL_PIN(80, "GP121_SPI_3_SS"),
+       PINCTRL_PIN(81, "GP122_SPI_3_RXD"),
+       PINCTRL_PIN(82, "GP123_SPI_3_TXD"),
+       PINCTRL_PIN(83, "GP102_SPI_4_CLK"),
+       PINCTRL_PIN(84, "GP103_SPI_4_SS_0"),
+       PINCTRL_PIN(85, "GP104_SPI_4_SS_1"),
+       PINCTRL_PIN(86, "GP105_SPI_4_SS_2"),
+       PINCTRL_PIN(87, "GP106_SPI_4_SS_3"),
+       PINCTRL_PIN(88, "GP107_SPI_4_RXD"),
+       PINCTRL_PIN(89, "GP108_SPI_4_TXD"),
+       PINCTRL_PIN(90, "GP109_SPI_5_CLK"),
+       PINCTRL_PIN(91, "GP110_SPI_5_SS_0"),
+       PINCTRL_PIN(92, "GP111_SPI_5_SS_1"),
+       PINCTRL_PIN(93, "GP112_SPI_5_SS_2"),
+       PINCTRL_PIN(94, "GP113_SPI_5_SS_3"),
+       PINCTRL_PIN(95, "GP114_SPI_5_RXD"),
+       PINCTRL_PIN(96, "GP115_SPI_5_TXD"),
+       PINCTRL_PIN(97, "GP116_SPI_6_CLK"),
+       PINCTRL_PIN(98, "GP117_SPI_6_SS"),
+       PINCTRL_PIN(99, "GP118_SPI_6_RXD"),
+       PINCTRL_PIN(100, "GP119_SPI_6_TXD"),
+       /* Family 7: I2C (14 pins) */
+       PINCTRL_PIN(101, "GP19_I2C_1_SCL"),
+       PINCTRL_PIN(102, "GP20_I2C_1_SDA"),
+       PINCTRL_PIN(103, "GP21_I2C_2_SCL"),
+       PINCTRL_PIN(104, "GP22_I2C_2_SDA"),
+       PINCTRL_PIN(105, "GP17_I2C_3_SCL_HDMI"),
+       PINCTRL_PIN(106, "GP18_I2C_3_SDA_HDMI"),
+       PINCTRL_PIN(107, "GP23_I2C_4_SCL"),
+       PINCTRL_PIN(108, "GP24_I2C_4_SDA"),
+       PINCTRL_PIN(109, "GP25_I2C_5_SCL"),
+       PINCTRL_PIN(110, "GP26_I2C_5_SDA"),
+       PINCTRL_PIN(111, "GP27_I2C_6_SCL"),
+       PINCTRL_PIN(112, "GP28_I2C_6_SDA"),
+       PINCTRL_PIN(113, "GP29_I2C_7_SCL"),
+       PINCTRL_PIN(114, "GP30_I2C_7_SDA"),
+       /* Family 8: UART (12 pins) */
+       PINCTRL_PIN(115, "GP124_UART_0_CTS"),
+       PINCTRL_PIN(116, "GP125_UART_0_RTS"),
+       PINCTRL_PIN(117, "GP126_UART_0_RX"),
+       PINCTRL_PIN(118, "GP127_UART_0_TX"),
+       PINCTRL_PIN(119, "GP128_UART_1_CTS"),
+       PINCTRL_PIN(120, "GP129_UART_1_RTS"),
+       PINCTRL_PIN(121, "GP130_UART_1_RX"),
+       PINCTRL_PIN(122, "GP131_UART_1_TX"),
+       PINCTRL_PIN(123, "GP132_UART_2_CTS"),
+       PINCTRL_PIN(124, "GP133_UART_2_RTS"),
+       PINCTRL_PIN(125, "GP134_UART_2_RX"),
+       PINCTRL_PIN(126, "GP135_UART_2_TX"),
+       /* Family 9: GPIO South (19 pins) */
+       PINCTRL_PIN(127, "GP177"),
+       PINCTRL_PIN(128, "GP178"),
+       PINCTRL_PIN(129, "GP179"),
+       PINCTRL_PIN(130, "GP180"),
+       PINCTRL_PIN(131, "GP181"),
+       PINCTRL_PIN(132, "GP182_PWM2"),
+       PINCTRL_PIN(133, "GP183_PWM3"),
+       PINCTRL_PIN(134, "GP184"),
+       PINCTRL_PIN(135, "GP185"),
+       PINCTRL_PIN(136, "GP186"),
+       PINCTRL_PIN(137, "GP187"),
+       PINCTRL_PIN(138, "GP188"),
+       PINCTRL_PIN(139, "GP189"),
+       PINCTRL_PIN(140, "GP64_FAST_INT0"),
+       PINCTRL_PIN(141, "GP65_FAST_INT1"),
+       PINCTRL_PIN(142, "GP66_FAST_INT2"),
+       PINCTRL_PIN(143, "GP67_FAST_INT3"),
+       PINCTRL_PIN(144, "GP12_PWM0"),
+       PINCTRL_PIN(145, "GP13_PWM1"),
+       /* Family 10: Camera Sideband (12 pins) */
+       PINCTRL_PIN(146, "GP0"),
+       PINCTRL_PIN(147, "GP1"),
+       PINCTRL_PIN(148, "GP2"),
+       PINCTRL_PIN(149, "GP3"),
+       PINCTRL_PIN(150, "GP4"),
+       PINCTRL_PIN(151, "GP5"),
+       PINCTRL_PIN(152, "GP6"),
+       PINCTRL_PIN(153, "GP7"),
+       PINCTRL_PIN(154, "GP8"),
+       PINCTRL_PIN(155, "GP9"),
+       PINCTRL_PIN(156, "GP10"),
+       PINCTRL_PIN(157, "GP11"),
+       /* Family 11: Clock (22 pins) */
+       PINCTRL_PIN(158, "GP137"),
+       PINCTRL_PIN(159, "GP138"),
+       PINCTRL_PIN(160, "GP139"),
+       PINCTRL_PIN(161, "GP140"),
+       PINCTRL_PIN(162, "GP141"),
+       PINCTRL_PIN(163, "GP142"),
+       PINCTRL_PIN(164, "GP16_HDMI_HPD"),
+       PINCTRL_PIN(165, "GP68_DSI_A_TE"),
+       PINCTRL_PIN(166, "GP69_DSI_C_TE"),
+       PINCTRL_PIN(167, "OSC_CLK_CTRL0"),
+       PINCTRL_PIN(168, "OSC_CLK_CTRL1"),
+       PINCTRL_PIN(169, "OSC_CLK0"),
+       PINCTRL_PIN(170, "OSC_CLK1"),
+       PINCTRL_PIN(171, "OSC_CLK2"),
+       PINCTRL_PIN(172, "OSC_CLK3"),
+       PINCTRL_PIN(173, "OSC_CLK4"),
+       PINCTRL_PIN(174, "RESETOUT"),
+       PINCTRL_PIN(175, "PMODE"),
+       PINCTRL_PIN(176, "PRDY"),
+       PINCTRL_PIN(177, "PREQ"),
+       PINCTRL_PIN(178, "GP190"),
+       PINCTRL_PIN(179, "GP191"),
+       /* Family 12: MSIC (15 pins) */
+       PINCTRL_PIN(180, "I2C_0_SCL"),
+       PINCTRL_PIN(181, "I2C_0_SDA"),
+       PINCTRL_PIN(182, "IERR"),
+       PINCTRL_PIN(183, "JTAG_TCK"),
+       PINCTRL_PIN(184, "JTAG_TDI"),
+       PINCTRL_PIN(185, "JTAG_TDO"),
+       PINCTRL_PIN(186, "JTAG_TMS"),
+       PINCTRL_PIN(187, "JTAG_TRST"),
+       PINCTRL_PIN(188, "PROCHOT"),
+       PINCTRL_PIN(189, "RTC_CLK"),
+       PINCTRL_PIN(190, "SVID_ALERT"),
+       PINCTRL_PIN(191, "SVID_CLK"),
+       PINCTRL_PIN(192, "SVID_D"),
+       PINCTRL_PIN(193, "THERMTRIP"),
+       PINCTRL_PIN(194, "STANDBY"),
+       /* Family 13: Keyboard (20 pins) */
+       PINCTRL_PIN(195, "GP44"),
+       PINCTRL_PIN(196, "GP45"),
+       PINCTRL_PIN(197, "GP46"),
+       PINCTRL_PIN(198, "GP47"),
+       PINCTRL_PIN(199, "GP48"),
+       PINCTRL_PIN(200, "GP49"),
+       PINCTRL_PIN(201, "GP50"),
+       PINCTRL_PIN(202, "GP51"),
+       PINCTRL_PIN(203, "GP52"),
+       PINCTRL_PIN(204, "GP53"),
+       PINCTRL_PIN(205, "GP54"),
+       PINCTRL_PIN(206, "GP55"),
+       PINCTRL_PIN(207, "GP56"),
+       PINCTRL_PIN(208, "GP57"),
+       PINCTRL_PIN(209, "GP58"),
+       PINCTRL_PIN(210, "GP59"),
+       PINCTRL_PIN(211, "GP60"),
+       PINCTRL_PIN(212, "GP61"),
+       PINCTRL_PIN(213, "GP62"),
+       PINCTRL_PIN(214, "GP63"),
+       /* Family 14: GPIO North (13 pins) */
+       PINCTRL_PIN(215, "GP164"),
+       PINCTRL_PIN(216, "GP165"),
+       PINCTRL_PIN(217, "GP166"),
+       PINCTRL_PIN(218, "GP167"),
+       PINCTRL_PIN(219, "GP168_MJTAG_TCK"),
+       PINCTRL_PIN(220, "GP169_MJTAG_TDI"),
+       PINCTRL_PIN(221, "GP170_MJTAG_TDO"),
+       PINCTRL_PIN(222, "GP171_MJTAG_TMS"),
+       PINCTRL_PIN(223, "GP172_MJTAG_TRST"),
+       PINCTRL_PIN(224, "GP173"),
+       PINCTRL_PIN(225, "GP174"),
+       PINCTRL_PIN(226, "GP175"),
+       PINCTRL_PIN(227, "GP176"),
+       /* Family 15: PTI (5 pins) */
+       PINCTRL_PIN(228, "GP72_PTI_CLK"),
+       PINCTRL_PIN(229, "GP73_PTI_D0"),
+       PINCTRL_PIN(230, "GP74_PTI_D1"),
+       PINCTRL_PIN(231, "GP75_PTI_D2"),
+       PINCTRL_PIN(232, "GP76_PTI_D3"),
+       /* Family 16: USB3 (0 pins) */
+       /* Family 17: HSIC (0 pins) */
+       /* Family 18: Broadcast (0 pins) */
+};
+
+static const unsigned int mrfld_sdio_pins[] = { 50, 51, 52, 53, 54, 55, 56 };
+static const unsigned int mrfld_spi5_pins[] = { 90, 91, 92, 93, 94, 95, 96 };
+static const unsigned int mrfld_uart0_pins[] = { 124, 125, 126, 127 };
+static const unsigned int mrfld_uart1_pins[] = { 128, 129, 130, 131 };
+static const unsigned int mrfld_uart2_pins[] = { 132, 133, 134, 135 };
+static const unsigned int mrfld_pwm0_pins[] = { 144 };
+static const unsigned int mrfld_pwm1_pins[] = { 145 };
+static const unsigned int mrfld_pwm2_pins[] = { 132 };
+static const unsigned int mrfld_pwm3_pins[] = { 133 };
+
+static const struct intel_pingroup mrfld_groups[] = {
+       PIN_GROUP("sdio_grp", mrfld_sdio_pins, 1),
+       PIN_GROUP("spi5_grp", mrfld_spi5_pins, 1),
+       PIN_GROUP("uart0_grp", mrfld_uart0_pins, 1),
+       PIN_GROUP("uart1_grp", mrfld_uart1_pins, 1),
+       PIN_GROUP("uart2_grp", mrfld_uart2_pins, 1),
+       PIN_GROUP("pwm0_grp", mrfld_pwm0_pins, 1),
+       PIN_GROUP("pwm1_grp", mrfld_pwm1_pins, 1),
+       PIN_GROUP("pwm2_grp", mrfld_pwm2_pins, 1),
+       PIN_GROUP("pwm3_grp", mrfld_pwm3_pins, 1),
+};
+
+static const char * const mrfld_sdio_groups[] = { "sdio_grp" };
+static const char * const mrfld_spi5_groups[] = { "spi5_grp" };
+static const char * const mrfld_uart0_groups[] = { "uart0_grp" };
+static const char * const mrfld_uart1_groups[] = { "uart1_grp" };
+static const char * const mrfld_uart2_groups[] = { "uart2_grp" };
+static const char * const mrfld_pwm0_groups[] = { "pwm0_grp" };
+static const char * const mrfld_pwm1_groups[] = { "pwm1_grp" };
+static const char * const mrfld_pwm2_groups[] = { "pwm2_grp" };
+static const char * const mrfld_pwm3_groups[] = { "pwm3_grp" };
+
+static const struct intel_function mrfld_functions[] = {
+       FUNCTION("sdio", mrfld_sdio_groups),
+       FUNCTION("spi5", mrfld_spi5_groups),
+       FUNCTION("uart0", mrfld_uart0_groups),
+       FUNCTION("uart1", mrfld_uart1_groups),
+       FUNCTION("uart2", mrfld_uart2_groups),
+       FUNCTION("pwm0", mrfld_pwm0_groups),
+       FUNCTION("pwm1", mrfld_pwm1_groups),
+       FUNCTION("pwm2", mrfld_pwm2_groups),
+       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),
+};
+
+/**
+ * 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_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].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].pins;
+       *npins = mp->groups[group].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);
+       void __iomem *bufcfg;
+       u32 value, mode;
+
+       if (!mrfld_buf_available(mp, pin)) {
+               seq_puts(s, "not available");
+               return;
+       }
+
+       bufcfg = mrfld_get_bufcfg(mp, pin);
+       value = readl(bufcfg);
+
+       mode = (value & BUFCFG_PINMODE_MASK) >> BUFCFG_PINMODE_SHIFT;
+       if (!mode)
+               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 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].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].groups;
+       *ngroups = mp->functions[function].ngroups;
+       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_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->npins; i++) {
+               if (!mrfld_buf_available(mp, 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->npins; i++)
+               mrfld_update_bufcfg(mp, 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;
+
+       if (!mrfld_buf_available(mp, pin))
+               return -ENOTSUPP;
+
+       value = readl(mrfld_get_bufcfg(mp, pin));
+       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_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;
+
+               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;
+
+               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_OPEN_DRAIN:
+               mask |= BUFCFG_OD_EN;
+               if (arg)
+                       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;
+
+       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_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 const struct pinconf_ops mrfld_pinconf_ops = {
+       .is_generic = true,
+       .pin_config_get = mrfld_config_get,
+       .pin_config_set = mrfld_config_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 mrfld_family *families;
+       struct mrfld_pinctrl *mp;
+       struct resource *mem;
+       void __iomem *regs;
+       size_t nfamilies;
+       unsigned int i;
+
+       mp = devm_kzalloc(&pdev->dev, sizeof(*mp), GFP_KERNEL);
+       if (!mp)
+               return -ENOMEM;
+
+       mp->dev = &pdev->dev;
+       raw_spin_lock_init(&mp->lock);
+
+       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       regs = devm_ioremap_resource(&pdev->dev, mem);
+       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(&pdev->dev, mrfld_families,
+                                           nfamilies * 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(&pdev->dev);
+       mp->pctldesc.pins = mrfld_pins;
+       mp->pctldesc.npins = ARRAY_SIZE(mrfld_pins);
+
+       mp->pctldev = devm_pinctrl_register(&pdev->dev, &mp->pctldesc, mp);
+       if (IS_ERR(mp->pctldev)) {
+               dev_err(&pdev->dev, "failed to register pinctrl driver\n");
+               return PTR_ERR(mp->pctldev);
+       }
+
+       platform_set_drvdata(pdev, mp);
+       return 0;
+}
+
+static struct platform_driver mrfld_pinctrl_driver = {
+       .probe = mrfld_pinctrl_probe,
+       .driver = {
+               .name = "pinctrl-merrifield",
+       },
+};
+
+static int __init mrfld_pinctrl_init(void)
+{
+       return platform_driver_register(&mrfld_pinctrl_driver);
+}
+subsys_initcall(mrfld_pinctrl_init);
+
+static void __exit mrfld_pinctrl_exit(void)
+{
+       platform_driver_unregister(&mrfld_pinctrl_driver);
+}
+module_exit(mrfld_pinctrl_exit);
+
+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");