diff mbox

VF610 broken by pinctrl: freescale: imx: allow mux_reg offset zero

Message ID 20151123132838.GM13744@tiger (mailing list archive)
State New, archived
Headers show

Commit Message

Shawn Guo Nov. 23, 2015, 1:28 p.m. UTC 
Hi Andrew,

On Sun, Nov 15, 2015 at 03:44:09AM +0100, Andrew Lunn wrote:
> Hi Adrian
> 
> Your patch
> 
> commit e7b37a522aa92da5f47106aa07b6c1fc58bfd922
> Author: Adrian Alonso <aalonso@freescale.com>
> Date:   Fri Sep 25 16:05:59 2015 -0500
> 
>     pinctrl: freescale: imx: allow mux_reg offset zero
>     
>     Allow mux_reg offset zero to be a valid pin_id, on imx7d
>     mux_conf reg offset is zero for iomuxc-lspr controller
> 
> has broken VF610.
> 
> It looks like you partially reverted
> 
> commit 3dac1918a4912cea9375e76cb3916b751cef22db
> Author: Stefan Agner <stefan@agner.ch>
> Date:   Sat Sep 6 18:25:04 2014 +0200
> 
>     pinctrl: imx: detect uninitialized pins
>     
>     The pinctrl driver initialized the register offsets for the pins
>     with 0. On Vybrid an offset of 0 is a valid offset for the pinctrl
>     mux register. So far, this was solved using the ZERO_OFFSET_VALID
>     flag which allowed offsets of 0. However, this does not allow to
>     verify whether a pins struct imx_pmx_func was initialized or not.
>     
>     Use signed offset values for register offsets and initialize those
>     with -1 in order to detect uninitialized offset values reliable.
> 
> and in the process you have broken VF610, which also uses offset 0.
> 
> What i don't yet understand is why you needed to make this change. If
> VF610 can already use mux_reg, why cannot imx7d?
> 
> Anyway, it looks like -rc1 is going to be broken on VF610 for some
> boards, because this pin is the Ethernet clock input/output. Please
> can you get it fixed for -rc2?

Can you please try the following change to see if it fixes your problem?

Shawn

Comments

Andrew Lunn Nov. 23, 2015, 3:08 p.m. UTC | #1 
> Can you please try the following change to see if it fixes your problem?
> 
> Shawn
> 
> diff --git a/drivers/pinctrl/freescale/pinctrl-vf610.c b/drivers/pinctrl/freescale/pinctrl-vf610.c
> index 37a037543d29..587d1ff6210e 100644
> --- a/drivers/pinctrl/freescale/pinctrl-vf610.c
> +++ b/drivers/pinctrl/freescale/pinctrl-vf610.c
> @@ -299,7 +299,7 @@ static const struct pinctrl_pin_desc vf610_pinctrl_pads[] = {
>  static struct imx_pinctrl_soc_info vf610_pinctrl_info = {
>         .pins = vf610_pinctrl_pads,
>         .npins = ARRAY_SIZE(vf610_pinctrl_pads),
> -       .flags = SHARE_MUX_CONF_REG,
> +       .flags = SHARE_MUX_CONF_REG | ZERO_OFFSET_VALID,
>  };
>  
>  static const struct of_device_id vf610_pinctrl_of_match[] = {

Hi Shawn

I'm away from the hardware right now, but yes, that should fix it.

    Andrew
Shawn Guo Nov. 24, 2015, 5:41 a.m. UTC | #2 
On Mon, Nov 23, 2015 at 04:08:23PM +0100, Andrew Lunn wrote:
> > Can you please try the following change to see if it fixes your problem?
> > 
> > Shawn
> > 
> > diff --git a/drivers/pinctrl/freescale/pinctrl-vf610.c b/drivers/pinctrl/freescale/pinctrl-vf610.c
> > index 37a037543d29..587d1ff6210e 100644
> > --- a/drivers/pinctrl/freescale/pinctrl-vf610.c
> > +++ b/drivers/pinctrl/freescale/pinctrl-vf610.c
> > @@ -299,7 +299,7 @@ static const struct pinctrl_pin_desc vf610_pinctrl_pads[] = {
> >  static struct imx_pinctrl_soc_info vf610_pinctrl_info = {
> >         .pins = vf610_pinctrl_pads,
> >         .npins = ARRAY_SIZE(vf610_pinctrl_pads),
> > -       .flags = SHARE_MUX_CONF_REG,
> > +       .flags = SHARE_MUX_CONF_REG | ZERO_OFFSET_VALID,
> >  };
> >  
> >  static const struct of_device_id vf610_pinctrl_of_match[] = {
> 
> Hi Shawn
> 
> I'm away from the hardware right now, but yes, that should fix it.

I would wait for your testing confirmation to send the formal patch.

Shawn
Andrew Lunn Nov. 25, 2015, 2:10 a.m. UTC | #3 
> Can you please try the following change to see if it fixes your problem?
> 
> Shawn
> 
> diff --git a/drivers/pinctrl/freescale/pinctrl-vf610.c b/drivers/pinctrl/freescale/pinctrl-vf610.c
> index 37a037543d29..587d1ff6210e 100644
> --- a/drivers/pinctrl/freescale/pinctrl-vf610.c
> +++ b/drivers/pinctrl/freescale/pinctrl-vf610.c
> @@ -299,7 +299,7 @@ static const struct pinctrl_pin_desc vf610_pinctrl_pads[] = {
>  static struct imx_pinctrl_soc_info vf610_pinctrl_info = {
>         .pins = vf610_pinctrl_pads,
>         .npins = ARRAY_SIZE(vf610_pinctrl_pads),
> -       .flags = SHARE_MUX_CONF_REG,
> +       .flags = SHARE_MUX_CONF_REG | ZERO_OFFSET_VALID,
>  };
>  
>  static const struct of_device_id vf610_pinctrl_of_match[] = {

Hi Shawn

I tested it, and it does work.

Thanks
	Andrew
Stefan Agner Nov. 25, 2015, 3:08 a.m. UTC | #4 
On 2015-11-24 18:10, Andrew Lunn wrote:
>> Can you please try the following change to see if it fixes your problem?
>>
>> Shawn
>>
>> diff --git a/drivers/pinctrl/freescale/pinctrl-vf610.c b/drivers/pinctrl/freescale/pinctrl-vf610.c
>> index 37a037543d29..587d1ff6210e 100644
>> --- a/drivers/pinctrl/freescale/pinctrl-vf610.c
>> +++ b/drivers/pinctrl/freescale/pinctrl-vf610.c
>> @@ -299,7 +299,7 @@ static const struct pinctrl_pin_desc vf610_pinctrl_pads[] = {
>>  static struct imx_pinctrl_soc_info vf610_pinctrl_info = {
>>         .pins = vf610_pinctrl_pads,
>>         .npins = ARRAY_SIZE(vf610_pinctrl_pads),
>> -       .flags = SHARE_MUX_CONF_REG,
>> +       .flags = SHARE_MUX_CONF_REG | ZERO_OFFSET_VALID,
>>  };
>>
>>  static const struct of_device_id vf610_pinctrl_of_match[] = {
> 
> Hi Shawn
> 
> I tested it, and it does work.

Thanks for bringing this up and testing this. FWIW:

Acked-by: Stefan Agner <stefan@agner.ch>

--
Stefan
diff mbox

Patch

diff --git a/drivers/pinctrl/freescale/pinctrl-vf610.c b/drivers/pinctrl/freescale/pinctrl-vf610.c
index 37a037543d29..587d1ff6210e 100644
--- a/drivers/pinctrl/freescale/pinctrl-vf610.c
+++ b/drivers/pinctrl/freescale/pinctrl-vf610.c
@@ -299,7 +299,7 @@  static const struct pinctrl_pin_desc vf610_pinctrl_pads[] = {
 static struct imx_pinctrl_soc_info vf610_pinctrl_info = {
        .pins = vf610_pinctrl_pads,
        .npins = ARRAY_SIZE(vf610_pinctrl_pads),
-       .flags = SHARE_MUX_CONF_REG,
+       .flags = SHARE_MUX_CONF_REG | ZERO_OFFSET_VALID,
 };
 
 static const struct of_device_id vf610_pinctrl_of_match[] = {