| Message ID | 1441147753-13239-6-git-send-email-aalonso@freescale.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Sep 01, 2015 at 05:49:11PM -0500, Adrian Alonso wrote: > - Add shared input select register support > - imx7d has two iomux controllers iomuxc and iomuxc-lpsr > which share select_input register for daisy chain settings > > Signed-off-by: Adrian Alonso <aalonso@freescale.com> > --- > Changes for V2: Resend > > drivers/pinctrl/freescale/pinctrl-imx.c | 28 +++++++++++++++++++++++++++- > drivers/pinctrl/freescale/pinctrl-imx.h | 1 + > 2 files changed, 28 insertions(+), 1 deletion(-) > > diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c > index 9f019be..597319d 100644 > --- a/drivers/pinctrl/freescale/pinctrl-imx.c > +++ b/drivers/pinctrl/freescale/pinctrl-imx.c > @@ -18,6 +18,7 @@ > #include <linux/module.h> > #include <linux/of.h> > #include <linux/of_device.h> > +#include <linux/of_address.h> > #include <linux/pinctrl/machine.h> > #include <linux/pinctrl/pinconf.h> > #include <linux/pinctrl/pinctrl.h> > @@ -39,6 +40,7 @@ struct imx_pinctrl { > struct device *dev; > struct pinctrl_dev *pctl; > void __iomem *base; > + void __iomem *input_sel_base; > const struct imx_pinctrl_soc_info *info; > }; > > @@ -254,7 +256,12 @@ static int imx_pmx_set(struct pinctrl_dev *pctldev, unsigned selector, > * Regular select input register can never be at offset > * 0, and we only print register value for regular case. > */ > - writel(pin->input_val, ipctl->base + pin->input_reg); > + if (info->flags & SHARE_INPUT_SELECT_REG) This can be replaced by a NULL checking on input_sel_base. > + writel(pin->input_val, ipctl->input_sel_base + > + pin->input_reg); > + else > + writel(pin->input_val, ipctl->base + > + pin->input_reg); > dev_dbg(ipctl->dev, > "==>select_input: offset 0x%x val 0x%x\n", > pin->input_reg, pin->input_val); > @@ -690,6 +697,8 @@ static int imx_pinctrl_probe_dt(struct platform_device *pdev, > int imx_pinctrl_probe(struct platform_device *pdev, > struct imx_pinctrl_soc_info *info) > { > + struct device_node *dev_np = pdev->dev.of_node; > + struct device_node *np; > struct imx_pinctrl *ipctl; > struct resource *res; > int ret; > @@ -715,6 +724,23 @@ int imx_pinctrl_probe(struct platform_device *pdev, > if (IS_ERR(ipctl->base)) > return PTR_ERR(ipctl->base); > > + if (info->flags & SHARE_INPUT_SELECT_REG) { > + np = of_get_child_by_name(dev_np->parent, "iomuxc"); This doesn't scale well. First of all, we do not generally recommend searching node by name, because most of time node name is not enforced to be stable, and some nodes are named quite arbitrarily. Secondly, we do not know if the hardware people will move select_input registers to somewhere else than IOMUXC in the future. Hence, I suggest you have a device tree phandle pointing the device where select_input registers are located. In that case, flag SHARE_INPUT_SELECT_REG can even be saved completely. > + if (np) { > + ipctl->input_sel_base = of_iomap(np, 0); > + if (IS_ERR(ipctl->input_sel_base)) { > + of_node_put(np); > + dev_err(&pdev->dev, > + "iomuxc base address not found\n"); > + return PTR_ERR(ipctl->input_sel_base); > + } > + } else { > + dev_err(&pdev->dev, "iomuxc device node not foud\n"); s/foud/found Shawn > + return -EINVAL; > + } > + of_node_put(np); > + } > + > imx_pinctrl_desc.name = dev_name(&pdev->dev); > imx_pinctrl_desc.pins = info->pins; > imx_pinctrl_desc.npins = info->npins; > diff --git a/drivers/pinctrl/freescale/pinctrl-imx.h b/drivers/pinctrl/freescale/pinctrl-imx.h > index 67c07c2..d11a827 100644 > --- a/drivers/pinctrl/freescale/pinctrl-imx.h > +++ b/drivers/pinctrl/freescale/pinctrl-imx.h > @@ -86,6 +86,7 @@ struct imx_pinctrl_soc_info { > > #define SHARE_MUX_CONF_REG 0x1 > #define ZERO_OFFSET_VALID 0x2 > +#define SHARE_INPUT_SELECT_REG 0x4 > > #define NO_MUX 0x0 > #define NO_PAD 0x0 > -- > 2.1.4 >
Hi Shawn, See comments below. Regards Adrian
diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c index 9f019be..597319d 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx.c +++ b/drivers/pinctrl/freescale/pinctrl-imx.c @@ -18,6 +18,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/of_address.h> #include <linux/pinctrl/machine.h> #include <linux/pinctrl/pinconf.h> #include <linux/pinctrl/pinctrl.h> @@ -39,6 +40,7 @@ struct imx_pinctrl { struct device *dev; struct pinctrl_dev *pctl; void __iomem *base; + void __iomem *input_sel_base; const struct imx_pinctrl_soc_info *info; }; @@ -254,7 +256,12 @@ static int imx_pmx_set(struct pinctrl_dev *pctldev, unsigned selector, * Regular select input register can never be at offset * 0, and we only print register value for regular case. */ - writel(pin->input_val, ipctl->base + pin->input_reg); + if (info->flags & SHARE_INPUT_SELECT_REG) + writel(pin->input_val, ipctl->input_sel_base + + pin->input_reg); + else + writel(pin->input_val, ipctl->base + + pin->input_reg); dev_dbg(ipctl->dev, "==>select_input: offset 0x%x val 0x%x\n", pin->input_reg, pin->input_val); @@ -690,6 +697,8 @@ static int imx_pinctrl_probe_dt(struct platform_device *pdev, int imx_pinctrl_probe(struct platform_device *pdev, struct imx_pinctrl_soc_info *info) { + struct device_node *dev_np = pdev->dev.of_node; + struct device_node *np; struct imx_pinctrl *ipctl; struct resource *res; int ret; @@ -715,6 +724,23 @@ int imx_pinctrl_probe(struct platform_device *pdev, if (IS_ERR(ipctl->base)) return PTR_ERR(ipctl->base); + if (info->flags & SHARE_INPUT_SELECT_REG) { + np = of_get_child_by_name(dev_np->parent, "iomuxc"); + if (np) { + ipctl->input_sel_base = of_iomap(np, 0); + if (IS_ERR(ipctl->input_sel_base)) { + of_node_put(np); + dev_err(&pdev->dev, + "iomuxc base address not found\n"); + return PTR_ERR(ipctl->input_sel_base); + } + } else { + dev_err(&pdev->dev, "iomuxc device node not foud\n"); + return -EINVAL; + } + of_node_put(np); + } + imx_pinctrl_desc.name = dev_name(&pdev->dev); imx_pinctrl_desc.pins = info->pins; imx_pinctrl_desc.npins = info->npins; diff --git a/drivers/pinctrl/freescale/pinctrl-imx.h b/drivers/pinctrl/freescale/pinctrl-imx.h index 67c07c2..d11a827 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx.h +++ b/drivers/pinctrl/freescale/pinctrl-imx.h @@ -86,6 +86,7 @@ struct imx_pinctrl_soc_info { #define SHARE_MUX_CONF_REG 0x1 #define ZERO_OFFSET_VALID 0x2 +#define SHARE_INPUT_SELECT_REG 0x4 #define NO_MUX 0x0 #define NO_PAD 0x0
- Add shared input select register support - imx7d has two iomux controllers iomuxc and iomuxc-lpsr which share select_input register for daisy chain settings Signed-off-by: Adrian Alonso <aalonso@freescale.com> --- Changes for V2: Resend drivers/pinctrl/freescale/pinctrl-imx.c | 28 +++++++++++++++++++++++++++- drivers/pinctrl/freescale/pinctrl-imx.h | 1 + 2 files changed, 28 insertions(+), 1 deletion(-)