From 4b77e455a5aa67920b2d4e0f1dbb53541a6e0338 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 17 May 2013 11:42:13 +0200 Subject: pinctrl: imx-iomux-v3: only register pinctrl when device node is available 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 --- drivers/pinctrl/imx-iomux-v3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/pinctrl/imx-iomux-v3.c b/drivers/pinctrl/imx-iomux-v3.c index 3ff3c1571d..c867a23703 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; -- cgit v1.2.3