summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaibo Chen <haibo.chen@freescale.com>2015-07-24 16:34:56 +0800
committerHaibo Chen <haibo.chen@freescale.com>2015-07-24 17:06:00 +0800
commitbc4f1c5a938d81e2f0299aa23aff034a3b0ada42 (patch)
treef3f3ca80d25532280aeb85f20cc41881ae3bf4f8
parent754d0090f7cdc33a4dd54bc606a568b4cb3abc8d (diff)
MLK-11283 ARM: dts: imx6ul: correct the 'fsl,pins' property
Change the property 'fsl,pin' to 'fsl,pins', otherwise the pins setting can't be recognized. Signed-off-by: Haibo Chen <haibo.chen@freescale.com> (cherry picked from commit ee173ffef55dce980583f35b56509c98a788f886)
-rw-r--r--arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-lcdif.dts9
-rw-r--r--arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2.dts6
-rw-r--r--arch/arm/boot/dts/imx6ul-14x14-evk.dts2
3 files changed, 13 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-lcdif.dts b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-lcdif.dts
index aeb3f993f9dd..27b6d2d5c1d6 100644
--- a/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-lcdif.dts
+++ b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-lcdif.dts
@@ -18,6 +18,11 @@
};
};
+&reg_usb_otg1_vbus {
+ pinctrl-0 = < >;
+ gpio = < >;
+};
+
&fec1{
status = "disabled";
};
@@ -64,6 +69,10 @@
status = "disabled";
};
+&usbotg1 {
+ status = "disabled";
+};
+
&tsc {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_tsc>;
diff --git a/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2.dts b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2.dts
index 871566c38b62..dc93c7945325 100644
--- a/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2.dts
+++ b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2.dts
@@ -574,7 +574,7 @@
};
pinctrl_tsc: tscgrp {
- fsl,pin = <
+ fsl,pins = <
MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0xb0
MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0xb0
MX6UL_PAD_GPIO1_IO03__GPIO1_IO03 0xb0
@@ -583,14 +583,14 @@
};
pinctrl_adc1: adc1grp {
- fsl,pin = <
+ fsl,pins = <
MX6UL_PAD_GPIO1_IO00__GPIO1_IO00 0xb0
MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0xb0
>;
};
pinctrl_i2c1: i2c1grp {
- fsl,pin = <
+ fsl,pins = <
MX6UL_PAD_GPIO1_IO03__I2C1_SDA 0x4001b8b1
MX6UL_PAD_GPIO1_IO02__I2C1_SCL 0x4001b8b1
>;
diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
index 3a5e9b10384e..06c5bd0a26ff 100644
--- a/arch/arm/boot/dts/imx6ul-14x14-evk.dts
+++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
@@ -604,7 +604,7 @@
};
pinctrl_tsc: tscgrp {
- fsl,pin = <
+ fsl,pins = <
MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0xb0
MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0xb0
MX6UL_PAD_GPIO1_IO03__GPIO1_IO03 0xb0