ARM: dts: fix usb pin control for imx-rex dts
authorFelipe F. Tonello <eu@felipetonello.com>
Wed, 16 Sep 2015 17:40:32 +0000 (18:40 +0100)
committerShawn Guo <shawnguo@kernel.org>
Thu, 24 Sep 2015 12:13:40 +0000 (05:13 -0700)
commit0af822110871400908d5b6f83a8908c45f881d8f
treebb3118b88675a10da20b479768952ea25c20dc3e
parente1ffceb078c6bc8a674077b29aee0926bbb54131
ARM: dts: fix usb pin control for imx-rex dts

This fixes a duplicated pin control causing this error:

imx6q-pinctrl 20e0000.iomuxc: pin MX6Q_PAD_GPIO_1 already
requested by regulators:regulator@2; cannot claim for 2184000.usb
imx6q-pinctrl 20e0000.iomuxc: pin-137 (2184000.usb) status -22
imx6q-pinctrl 20e0000.iomuxc: could not request pin 137
(MX6Q_PAD_GPIO_1) from group usbotggrp  on device 20e0000.iomuxc
imx_usb 2184000.usb: Error applying setting, reverse things
back
imx6q-pinctrl 20e0000.iomuxc: pin MX6Q_PAD_EIM_D31 already
requested by regulators:regulator@1; cannot claim for 2184200.usb
imx6q-pinctrl 20e0000.iomuxc: pin-52 (2184200.usb) status -22
imx6q-pinctrl 20e0000.iomuxc: could not request pin 52 (MX6Q_PAD_EIM_D31)
from group usbh1grp  on device 20e0000.iomuxc
imx_usb 2184200.usb: Error applying setting, reverse things
back

Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
Fixes: e2047e33f2bd ("ARM: dts: add initial Rex Pro board support")
Cc: <stable@vger.kernel.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/imx6qdl-rex.dtsi