Re: [U-Boot] [PATCH 12/18] pinctrl: Add i.MX7ULP pinctrl driver

[Simon Glass]

On 26 December 2016 at 00:00, Peng Fan  wrote:
> Add i.MX7ULP pinctrl driver.
> Select CONFIG_PINCTRL_IMX7ULP to use this driver.
>
> Signed-off-by: Peng Fan 
> Cc: Simon Glass 
> Cc: Stefano Babic 
> ---
>  drivers/pinctrl/nxp/Kconfig   | 14 
>  drivers/pinctrl/nxp/Makefile  |  1 +
>  drivers/pinctrl/nxp/pinctrl-imx.c | 10 +
>  drivers/pinctrl/nxp/pinctrl-imx.h |  3 +++
>  drivers/pinctrl/nxp/pinctrl-imx7ulp.c | 41 
> +++
>  5 files changed, 65 insertions(+), 4 deletions(-)
>  create mode 100644 drivers/pinctrl/nxp/pinctrl-imx7ulp.c

Reviewed-by: Simon Glass 
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 12/18] pinctrl: Add i.MX7ULP pinctrl driver

[Peng Fan]

Add i.MX7ULP pinctrl driver.
Select CONFIG_PINCTRL_IMX7ULP to use this driver.

Signed-off-by: Peng Fan 
Cc: Simon Glass 
Cc: Stefano Babic 
---
 drivers/pinctrl/nxp/Kconfig   | 14 
 drivers/pinctrl/nxp/Makefile  |  1 +
 drivers/pinctrl/nxp/pinctrl-imx.c | 10 +
 drivers/pinctrl/nxp/pinctrl-imx.h |  3 +++
 drivers/pinctrl/nxp/pinctrl-imx7ulp.c | 41 +++
 5 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 drivers/pinctrl/nxp/pinctrl-imx7ulp.c

diff --git a/drivers/pinctrl/nxp/Kconfig b/drivers/pinctrl/nxp/Kconfig
index 238f77d..b668359 100644
--- a/drivers/pinctrl/nxp/Kconfig
+++ b/drivers/pinctrl/nxp/Kconfig
@@ -42,3 +42,17 @@ config PINCTRL_IMX7
  configuration. This driver is different from the linux one,
  this is a simple implementation, only parses the 'fsl,pins'
  property and configure related registers.
+
+config PINCTRL_IMX7ULP
+   bool "IMX7ULP pinctrl driver"
+   depends on ARCH_MX7ULP && PINCTRL_FULL
+   select DEVRES
+   select PINCTRL_IMX
+   help
+ Say Y here to enable the imx7ulp pinctrl driver
+
+ This provides a simple pinctrl driver for i.MX7ULP SoC familiy.
+ This feature depends on device tree configuration. This driver
+ is different from the linux one, this is a simple implementation,
+ only parses the 'fsl,pins' property and configure related
+ registers.
diff --git a/drivers/pinctrl/nxp/Makefile b/drivers/pinctrl/nxp/Makefile
index e0f7325..c763948 100644
--- a/drivers/pinctrl/nxp/Makefile
+++ b/drivers/pinctrl/nxp/Makefile
@@ -2,3 +2,4 @@ obj-$(CONFIG_PINCTRL_IMX)   += pinctrl-imx.o
 obj-$(CONFIG_PINCTRL_IMX5) += pinctrl-imx5.o
 obj-$(CONFIG_PINCTRL_IMX6) += pinctrl-imx6.o
 obj-$(CONFIG_PINCTRL_IMX7) += pinctrl-imx7.o
+obj-$(CONFIG_PINCTRL_IMX7ULP)  += pinctrl-imx7ulp.o
diff --git a/drivers/pinctrl/nxp/pinctrl-imx.c 
b/drivers/pinctrl/nxp/pinctrl-imx.c
index 949d0f3..eaf2091 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx.c
@@ -24,6 +24,7 @@ static int imx_pinctrl_set_state(struct udevice *dev, struct 
udevice *config)
u32 *pin_data;
int npins, size, pin_size;
int mux_reg, conf_reg, input_reg, input_val, mux_mode, config_val;
+   u32 mux_shift = info->mux_mask ? ffs(info->mux_mask) - 1 : 0;
int i, j = 0;
 
dev_dbg(dev, "%s: %s\n", __func__, config->name);
@@ -97,8 +98,8 @@ static int imx_pinctrl_set_state(struct udevice *dev, struct 
udevice *config)
 
/* Set Mux */
if (info->flags & SHARE_MUX_CONF_REG) {
-   clrsetbits_le32(info->base + mux_reg, 0x7 << 20,
-   mux_mode << 20);
+   clrsetbits_le32(info->base + mux_reg, info->mux_mask,
+   mux_mode << mux_shift);
} else {
writel(mux_mode, info->base + mux_reg);
}
@@ -154,8 +155,8 @@ static int imx_pinctrl_set_state(struct udevice *dev, 
struct udevice *config)
/* Set config */
if (!(config_val & IMX_NO_PAD_CTL)) {
if (info->flags & SHARE_MUX_CONF_REG) {
-   clrsetbits_le32(info->base + conf_reg, 0x,
-   config_val);
+   clrsetbits_le32(info->base + conf_reg,
+   info->mux_mask, config_val);
} else {
writel(config_val, info->base + conf_reg);
}
@@ -199,6 +200,7 @@ int imx_pinctrl_probe(struct udevice *dev,
return -ENOMEM;
priv->info = info;
 
+   info->mux_mask = fdtdec_get_int(gd->fdt_blob, node, "fsl,mux_mask", 0);
/*
 * Refer to linux documentation for details:
 * Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt
diff --git a/drivers/pinctrl/nxp/pinctrl-imx.h 
b/drivers/pinctrl/nxp/pinctrl-imx.h
index 037c491..a26ba85 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx.h
+++ b/drivers/pinctrl/nxp/pinctrl-imx.h
@@ -11,11 +11,13 @@
  * @base: the address to the controller in virtual memory
  * @input_sel_base: the address of the select input in virtual memory.
  * @flags: flags specific for each soc
+ * @mux_mask: Used when SHARE_MUX_CONF_REG flag is added
  */
 struct imx_pinctrl_soc_info {
void __iomem *base;
void __iomem *input_sel_base;
unsigned int flags;
+   unsigned int mux_mask;
 };
 
 /**
@@ -41,6 +43,7 @@ extern const struct pinctrl_ops imx_pinctrl_ops;
 
 #define SHARE_MUX_CONF_REG 0x1
 #define ZERO_OFFSET_VALID  0x2
+#define CONFIG_IBE_OBE 0x4
 
 #define IOMUXC_CONFIG_SION