On Wed, Jun 05, 2013 at 05:18:49PM +0200, Lucas Stach wrote: > This commit isn't included in the 2013.06 release. > > I hereby nominate it as a candidate for the v2013.06 stable branch. Ok, just queued it for stable. Sascha > > Am Dienstag, den 21.05.2013, 09:38 +0200 schrieb Sascha Hauer: > > The pinctrl support is devicetree only, so only register it > > when we actually have a devicetree. Otherwise we crash boards > > using the iomux-v3 from platform code in pinctrl_register(). > > > > Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> > > --- > > drivers/pinctrl/imx-iomux-v3.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/pinctrl/imx-iomux-v3.c b/drivers/pinctrl/imx-iomux-v3.c > > index 3ff3c15..c867a23 100644 > > --- a/drivers/pinctrl/imx-iomux-v3.c > > +++ b/drivers/pinctrl/imx-iomux-v3.c > > @@ -177,7 +177,7 @@ static int imx_iomux_v3_probe(struct device_d *dev) > > iomuxv3_base = dev_request_mem_region(dev, 0); > > iomuxv3_dev = dev; > > > > - if (IS_ENABLED(CONFIG_PINCTRL)) > > + if (IS_ENABLED(CONFIG_PINCTRL) && dev->device_node) > > ret = imx_pinctrl_dt(dev, iomuxv3_base); > > > > return ret; > > -- > Pengutronix e.K. | Lucas Stach | > Industrial Linux Solutions | http://www.pengutronix.de/ | > Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-5076 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
