| Message ID | 1347385599-27558-3-git-send-email-mporter@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Matt Porter <mporter@ti.com> [120911 10:46]: > Enable pinctrl dummy states for all OMAP platforms. This allows > drivers to be converted to pinctrl while still running on > platforms that do not provide pinctrl data. > > Signed-off-by: Matt Porter <mporter@ti.com> > --- > arch/arm/mach-omap2/devices.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c > index c00c689..577cd04 100644 > --- a/arch/arm/mach-omap2/devices.c > +++ b/arch/arm/mach-omap2/devices.c > @@ -17,6 +17,7 @@ > #include <linux/err.h> > #include <linux/slab.h> > #include <linux/of.h> > +#include <linux/pinctrl/machine.h> > #include <linux/platform_data/omap4-keypad.h> > > #include <mach/hardware.h> > @@ -631,6 +632,9 @@ static inline void omap_init_vout(void) {} > > static int __init omap2_init_devices(void) > { > + /* Enable dummy states for those platforms without pinctrl support */ > + pinctrl_provide_dummies(); > + > /* > * please keep these calls, and their implementations above, > * in alphabetical order so they're easier to sort through. Hmm I think this may need to be board specific. And may need to be board specific and depend on unpopulated device tree? For board-generic.c we always want to see the warnings. And some boards insist on doing all the muxing only in the bootloader. Regards, Tony
On Tue, Sep 11, 2012 at 11:03:06AM -0700, Tony Lindgren wrote: > * Matt Porter <mporter@ti.com> [120911 10:46]: > > Enable pinctrl dummy states for all OMAP platforms. This allows > > drivers to be converted to pinctrl while still running on > > platforms that do not provide pinctrl data. > > > > Signed-off-by: Matt Porter <mporter@ti.com> > > --- > > arch/arm/mach-omap2/devices.c | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c > > index c00c689..577cd04 100644 > > --- a/arch/arm/mach-omap2/devices.c > > +++ b/arch/arm/mach-omap2/devices.c > > @@ -17,6 +17,7 @@ > > #include <linux/err.h> > > #include <linux/slab.h> > > #include <linux/of.h> > > +#include <linux/pinctrl/machine.h> > > #include <linux/platform_data/omap4-keypad.h> > > > > #include <mach/hardware.h> > > @@ -631,6 +632,9 @@ static inline void omap_init_vout(void) {} > > > > static int __init omap2_init_devices(void) > > { > > + /* Enable dummy states for those platforms without pinctrl support */ > > + pinctrl_provide_dummies(); > > + > > /* > > * please keep these calls, and their implementations above, > > * in alphabetical order so they're easier to sort through. > > Hmm I think this may need to be board specific. And may need to > be board specific and depend on unpopulated device tree? If I run this on AM33xx with dummy states enabled, I'm able to override that dummy state just fine with an appropriate pinctl/pinmux entry in my DT data for spi. Meanwhile on xM booting from board-omap3evm.c/!DT and debug enabled I get the following: [ 1.837829] omap2_mcspi omap2_mcspi.1: no of_node; not parsing pinctrl DT [ 1.845214] omap2_mcspi omap2_mcspi.1: using pinctrl dummy state (default) [ 1.854278] omap2_mcspi omap2_mcspi.2: no of_node; not parsing pinctrl DT [ 1.861572] omap2_mcspi omap2_mcspi.2: using pinctrl dummy state (default) [ 1.870025] omap2_mcspi omap2_mcspi.3: no of_node; not parsing pinctrl DT [ 1.877288] omap2_mcspi omap2_mcspi.3: using pinctrl dummy state (default) [ 1.885681] omap2_mcspi omap2_mcspi.4: no of_node; not parsing pinctrl DT [ 1.892913] omap2_mcspi omap2_mcspi.4: using pinctrl dummy state (default) which seems to cover things being informative enough about what is going on. Are you wanting to see an explicit warning that the pinctrl dummy state is in use when pinctrl data is not available? > For board-generic.c we always want to see the warnings. And some boards > insist on doing all the muxing only in the bootloader. Which warnings are you saying we should see in the board-generic.c case? Sure, there's plenty of cases where this will be unused due to somebody setting all the muxes in the bootloader and then not using pinctrl data. I'll have to doublecheck but I believe that case is also fine as the -single driver can't override the dummy state if the DT has no pinctrl data for the spi driver. -Matt
Added Linus Walleij to Cc as well. * Matt Porter <mporter@ti.com> [120911 11:24]: > On Tue, Sep 11, 2012 at 11:03:06AM -0700, Tony Lindgren wrote: > > * Matt Porter <mporter@ti.com> [120911 10:46]: > > > Enable pinctrl dummy states for all OMAP platforms. This allows > > > drivers to be converted to pinctrl while still running on > > > platforms that do not provide pinctrl data. > > > > > > Signed-off-by: Matt Porter <mporter@ti.com> > > > --- > > > arch/arm/mach-omap2/devices.c | 4 ++++ > > > 1 file changed, 4 insertions(+) > > > > > > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c > > > index c00c689..577cd04 100644 > > > --- a/arch/arm/mach-omap2/devices.c > > > +++ b/arch/arm/mach-omap2/devices.c > > > @@ -17,6 +17,7 @@ > > > #include <linux/err.h> > > > #include <linux/slab.h> > > > #include <linux/of.h> > > > +#include <linux/pinctrl/machine.h> > > > #include <linux/platform_data/omap4-keypad.h> > > > > > > #include <mach/hardware.h> > > > @@ -631,6 +632,9 @@ static inline void omap_init_vout(void) {} > > > > > > static int __init omap2_init_devices(void) > > > { > > > + /* Enable dummy states for those platforms without pinctrl support */ > > > + pinctrl_provide_dummies(); > > > + > > > /* > > > * please keep these calls, and their implementations above, > > > * in alphabetical order so they're easier to sort through. > > > > Hmm I think this may need to be board specific. And may need to > > be board specific and depend on unpopulated device tree? > > If I run this on AM33xx with dummy states enabled, I'm able to override > that dummy state just fine with an appropriate pinctl/pinmux entry in my > DT data for spi. But do you get an error then if the desired pins are not found? If you do get an error, then sounds like it's OK to do. > Meanwhile on xM booting from board-omap3evm.c/!DT and debug enabled I > get the following: > > [ 1.837829] omap2_mcspi omap2_mcspi.1: no of_node; not parsing > pinctrl DT > [ 1.845214] omap2_mcspi omap2_mcspi.1: using pinctrl dummy state > (default) > [ 1.854278] omap2_mcspi omap2_mcspi.2: no of_node; not parsing > pinctrl DT > [ 1.861572] omap2_mcspi omap2_mcspi.2: using pinctrl dummy state > (default) > [ 1.870025] omap2_mcspi omap2_mcspi.3: no of_node; not parsing > pinctrl DT > [ 1.877288] omap2_mcspi omap2_mcspi.3: using pinctrl dummy state > (default) > [ 1.885681] omap2_mcspi omap2_mcspi.4: no of_node; not parsing > pinctrl DT > [ 1.892913] omap2_mcspi omap2_mcspi.4: using pinctrl dummy state > (default) > > which seems to cover things being informative enough about what is > going on. Are you wanting to see an explicit warning that the pinctrl > dummy state is in use when pinctrl data is not available? Well I think we should consider at least the following: 1. Always see warnings when device tree is populated with board-generic. If somebody wants to use bootloader only muxing with DT, they can patch in pinctrl_provide_dummies() somewhere. But let's assume we always want to see the warnings with board-generic.c and DT. 2. For legacy booting without DT, we should not see any warnings from pinctrl-single.c as it's DT based. 3. There may be other non-pinctrl drivers too that are not DT based, and in those cases we should see the warnings as well for in the non-DT case. > > For board-generic.c we always want to see the warnings. And some boards > > insist on doing all the muxing only in the bootloader. > > Which warnings are you saying we should see in the board-generic.c > case? Sure, there's plenty of cases where this will be unused due to > somebody setting all the muxes in the bootloader and then not using > pinctrl data. I'll have to doublecheck but I believe that case is also > fine as the -single driver can't override the dummy state if the DT has > no pinctrl data for the spi driver. Yeah I guess it's the case #1 above for board-generic.c. Regards, Tony
On Tue, Sep 11, 2012 at 11:35:22AM -0700, Tony Lindgren wrote: > Added Linus Walleij to Cc as well. > > * Matt Porter <mporter@ti.com> [120911 11:24]: > > On Tue, Sep 11, 2012 at 11:03:06AM -0700, Tony Lindgren wrote: > > > * Matt Porter <mporter@ti.com> [120911 10:46]: > > > > Enable pinctrl dummy states for all OMAP platforms. This allows > > > > drivers to be converted to pinctrl while still running on > > > > platforms that do not provide pinctrl data. > > > > > > > > Signed-off-by: Matt Porter <mporter@ti.com> > > > > --- > > > > arch/arm/mach-omap2/devices.c | 4 ++++ > > > > 1 file changed, 4 insertions(+) > > > > > > > > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c > > > > index c00c689..577cd04 100644 > > > > --- a/arch/arm/mach-omap2/devices.c > > > > +++ b/arch/arm/mach-omap2/devices.c > > > > @@ -17,6 +17,7 @@ > > > > #include <linux/err.h> > > > > #include <linux/slab.h> > > > > #include <linux/of.h> > > > > +#include <linux/pinctrl/machine.h> > > > > #include <linux/platform_data/omap4-keypad.h> > > > > > > > > #include <mach/hardware.h> > > > > @@ -631,6 +632,9 @@ static inline void omap_init_vout(void) {} > > > > > > > > static int __init omap2_init_devices(void) > > > > { > > > > + /* Enable dummy states for those platforms without pinctrl support */ > > > > + pinctrl_provide_dummies(); > > > > + > > > > /* > > > > * please keep these calls, and their implementations above, > > > > * in alphabetical order so they're easier to sort through. > > > > > > Hmm I think this may need to be board specific. And may need to > > > be board specific and depend on unpopulated device tree? > > > > If I run this on AM33xx with dummy states enabled, I'm able to override > > that dummy state just fine with an appropriate pinctl/pinmux entry in my > > DT data for spi. > > But do you get an error then if the desired pins are not found? > If you do get an error, then sounds like it's OK to do. Hrm, no. In that case, it will be completely silent (assuming we took care of the pinmuxing in the bootloader) as it uses the dummy state. Only with debug on will you see the information that mcspi has used the dummy state as is the case with !DT. > > Meanwhile on xM booting from board-omap3evm.c/!DT and debug enabled I > > get the following: > > > > [ 1.837829] omap2_mcspi omap2_mcspi.1: no of_node; not parsing > > pinctrl DT > > [ 1.845214] omap2_mcspi omap2_mcspi.1: using pinctrl dummy state > > (default) > > [ 1.854278] omap2_mcspi omap2_mcspi.2: no of_node; not parsing > > pinctrl DT > > [ 1.861572] omap2_mcspi omap2_mcspi.2: using pinctrl dummy state > > (default) > > [ 1.870025] omap2_mcspi omap2_mcspi.3: no of_node; not parsing > > pinctrl DT > > [ 1.877288] omap2_mcspi omap2_mcspi.3: using pinctrl dummy state > > (default) > > [ 1.885681] omap2_mcspi omap2_mcspi.4: no of_node; not parsing > > pinctrl DT > > [ 1.892913] omap2_mcspi omap2_mcspi.4: using pinctrl dummy state > > (default) > > > > which seems to cover things being informative enough about what is > > going on. Are you wanting to see an explicit warning that the pinctrl > > dummy state is in use when pinctrl data is not available? > > Well I think we should consider at least the following: > > 1. Always see warnings when device tree is populated with board-generic. > If somebody wants to use bootloader only muxing with DT, they can patch > in pinctrl_provide_dummies() somewhere. But let's assume we always > want to see the warnings with board-generic.c and DT. Ok, this is clear. > 2. For legacy booting without DT, we should not see any warnings > from pinctrl-single.c as it's DT based. Right, except anything legacy booting without DT will require that dummy states be present otherwise it will fail probe. > > 3. There may be other non-pinctrl drivers too that are not DT > based, and in those cases we should see the warnings as well > for in the non-DT case. I'm not sure what you mean here. "non-pinctrl drivers" means any driver that is not yet pinctrl or DT enabled? It's unclear to me how this case has a bearing on mcspi and pinctrl enablement across legacy board-foo.c !DT booting platforms. However, I think if the approach was modified by only calling pinctrl_provide_dummies() when we are booting with DT populated and using board-generic.c then it will satisfy all of your concerns. Thoughts? i.e. the legacy !DT booting will have dummy states and continue along through mcspi the way it does today, relying on board-foo level pinmux calls (or bootloader pinmuxing). Meanwhile DT booting will now require that a mcspi instance also require pinctrl entry in this dts. The only worrisome thing is the pinctrl requirement on DT booting is now an implicit requirement. > > > For board-generic.c we always want to see the warnings. And some boards > > > insist on doing all the muxing only in the bootloader. > > > > Which warnings are you saying we should see in the board-generic.c > > case? Sure, there's plenty of cases where this will be unused due to > > somebody setting all the muxes in the bootloader and then not using > > pinctrl data. I'll have to doublecheck but I believe that case is also > > fine as the -single driver can't override the dummy state if the DT has > > no pinctrl data for the spi driver. > > Yeah I guess it's the case #1 above for board-generic.c. Right, I just checked that, in any case. -Matt
* Matt Porter <mporter@ti.com> [120911 12:05]: > On Tue, Sep 11, 2012 at 11:35:22AM -0700, Tony Lindgren wrote: > > Added Linus Walleij to Cc as well. Now I think I really managed to add Linus W to Cc, sent too fast earlier. ... > > But do you get an error then if the desired pins are not found? > > If you do get an error, then sounds like it's OK to do. > > Hrm, no. In that case, it will be completely silent (assuming we took > care of the pinmuxing in the bootloader) as it uses the dummy state. > Only with debug on will you see the information that mcspi has used > the dummy state as is the case with !DT. ... > > Well I think we should consider at least the following: > > > > 1. Always see warnings when device tree is populated with board-generic. > > If somebody wants to use bootloader only muxing with DT, they can patch > > in pinctrl_provide_dummies() somewhere. But let's assume we always > > want to see the warnings with board-generic.c and DT. > > Ok, this is clear. > > > 2. For legacy booting without DT, we should not see any warnings > > from pinctrl-single.c as it's DT based. > > Right, except anything legacy booting without DT will require that > dummy states be present otherwise it will fail probe. But I guess we should enable the dummy states only for other board-*.c files, not board-generic.c? > > 3. There may be other non-pinctrl drivers too that are not DT > > based, and in those cases we should see the warnings as well > > for in the non-DT case. > > I'm not sure what you mean here. "non-pinctrl drivers" means any driver > that is not yet pinctrl or DT enabled? It's unclear to me how this > case has a bearing on mcspi and pinctrl enablement across legacy > board-foo.c !DT booting platforms. Right, sorry I meant "non DT pinctrl drivers".. > However, I think if the approach was modified by only calling > pinctrl_provide_dummies() when we are booting with DT populated > and using board-generic.c then it will satisfy all of your > concerns. Thoughts? Hmm but shouldn't it be call pinctrl_provide_dummies() only for other boards except board-generic.c? And that is assuming we don't have any other "non DT pinctrl drivers" around. > i.e. the legacy !DT booting will have dummy states and continue > along through mcspi the way it does today, relying on board-foo level > pinmux calls (or bootloader pinmuxing). Meanwhile DT booting will now > require that a mcspi instance also require pinctrl entry in this dts. Yes agreed, except let's just produce a warning for the pinctrl errors.. > The only worrisome thing is the pinctrl requirement on DT booting is > now an implicit requirement. ..as otherwise not much will work at this point :) > > > > For board-generic.c we always want to see the warnings. And some boards > > > > insist on doing all the muxing only in the bootloader. > > > > > > Which warnings are you saying we should see in the board-generic.c > > > case? Sure, there's plenty of cases where this will be unused due to > > > somebody setting all the muxes in the bootloader and then not using > > > pinctrl data. I'll have to doublecheck but I believe that case is also > > > fine as the -single driver can't override the dummy state if the DT has > > > no pinctrl data for the spi driver. I suggest all pinctrl errors should show up as warnings with board-generic.c, but we should not exit out of the driver probe on errors. Regards, Tony
On Tue, Sep 11, 2012 at 06:03:07PM -0700, Tony Lindgren wrote: > * Matt Porter <mporter@ti.com> [120911 12:05]: > > On Tue, Sep 11, 2012 at 11:35:22AM -0700, Tony Lindgren wrote: > > > Added Linus Walleij to Cc as well. > > Now I think I really managed to add Linus W to Cc, sent too fast > earlier. > ... > > > > But do you get an error then if the desired pins are not found? > > > If you do get an error, then sounds like it's OK to do. > > > > Hrm, no. In that case, it will be completely silent (assuming we took > > care of the pinmuxing in the bootloader) as it uses the dummy state. > > Only with debug on will you see the information that mcspi has used > > the dummy state as is the case with !DT. > ... > > > > Well I think we should consider at least the following: > > > > > > 1. Always see warnings when device tree is populated with board-generic. > > > If somebody wants to use bootloader only muxing with DT, they can patch > > > in pinctrl_provide_dummies() somewhere. But let's assume we always > > > want to see the warnings with board-generic.c and DT. > > > > Ok, this is clear. > > > > > 2. For legacy booting without DT, we should not see any warnings > > > from pinctrl-single.c as it's DT based. > > > > Right, except anything legacy booting without DT will require that > > dummy states be present otherwise it will fail probe. > > But I guess we should enable the dummy states only for other > board-*.c files, not board-generic.c? > > > > 3. There may be other non-pinctrl drivers too that are not DT > > > based, and in those cases we should see the warnings as well > > > for in the non-DT case. > > > > I'm not sure what you mean here. "non-pinctrl drivers" means any driver > > that is not yet pinctrl or DT enabled? It's unclear to me how this > > case has a bearing on mcspi and pinctrl enablement across legacy > > board-foo.c !DT booting platforms. > > Right, sorry I meant "non DT pinctrl drivers".. > > > However, I think if the approach was modified by only calling > > pinctrl_provide_dummies() when we are booting with DT populated > > and using board-generic.c then it will satisfy all of your > > concerns. Thoughts? > > Hmm but shouldn't it be call pinctrl_provide_dummies() only > for other boards except board-generic.c? And that is assuming > we don't have any other "non DT pinctrl drivers" around. Yes, I've addressed this now in v2. > > i.e. the legacy !DT booting will have dummy states and continue > > along through mcspi the way it does today, relying on board-foo level > > pinmux calls (or bootloader pinmuxing). Meanwhile DT booting will now > > require that a mcspi instance also require pinctrl entry in this dts. > > Yes agreed, except let's just produce a warning for the pinctrl > errors.. Sounds good, I changed this in v2 to use the same warning as leds-gpio. > > The only worrisome thing is the pinctrl requirement on DT booting is > > now an implicit requirement. > > ..as otherwise not much will work at this point :) :) > > > > > For board-generic.c we always want to see the warnings. And some boards > > > > > insist on doing all the muxing only in the bootloader. > > > > > > > > Which warnings are you saying we should see in the board-generic.c > > > > case? Sure, there's plenty of cases where this will be unused due to > > > > somebody setting all the muxes in the bootloader and then not using > > > > pinctrl data. I'll have to doublecheck but I believe that case is also > > > > fine as the -single driver can't override the dummy state if the DT has > > > > no pinctrl data for the spi driver. > > I suggest all pinctrl errors should show up as warnings with > board-generic.c, but we should not exit out of the driver probe > on errors. Ok, makes sense to me now. Thanks, Matt
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index c00c689..577cd04 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -17,6 +17,7 @@ #include <linux/err.h> #include <linux/slab.h> #include <linux/of.h> +#include <linux/pinctrl/machine.h> #include <linux/platform_data/omap4-keypad.h> #include <mach/hardware.h> @@ -631,6 +632,9 @@ static inline void omap_init_vout(void) {} static int __init omap2_init_devices(void) { + /* Enable dummy states for those platforms without pinctrl support */ + pinctrl_provide_dummies(); + /* * please keep these calls, and their implementations above, * in alphabetical order so they're easier to sort through.
Enable pinctrl dummy states for all OMAP platforms. This allows drivers to be converted to pinctrl while still running on platforms that do not provide pinctrl data. Signed-off-by: Matt Porter <mporter@ti.com> --- arch/arm/mach-omap2/devices.c | 4 ++++ 1 file changed, 4 insertions(+)