diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/imx28-cfa10037.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28-cfa10049.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28-cfa10057.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28-cfa10058.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28-m28cu3.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28-m28evk.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28-sps1.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28.dtsi | 6 |
8 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/imx28-cfa10037.dts b/arch/arm/boot/dts/imx28-cfa10037.dts index 6729872ffe9a..e5beaa58bb40 100644 --- a/arch/arm/boot/dts/imx28-cfa10037.dts +++ b/arch/arm/boot/dts/imx28-cfa10037.dts | |||
@@ -54,7 +54,7 @@ | |||
54 | ahb@80080000 { | 54 | ahb@80080000 { |
55 | usb1: usb@80090000 { | 55 | usb1: usb@80090000 { |
56 | vbus-supply = <®_usb1_vbus>; | 56 | vbus-supply = <®_usb1_vbus>; |
57 | pinctrl-0 = <&usbphy1_pins_a>; | 57 | pinctrl-0 = <&usb1_pins_a>; |
58 | pinctrl-names = "default"; | 58 | pinctrl-names = "default"; |
59 | status = "okay"; | 59 | status = "okay"; |
60 | }; | 60 | }; |
diff --git a/arch/arm/boot/dts/imx28-cfa10049.dts b/arch/arm/boot/dts/imx28-cfa10049.dts index 093fd7b69a48..7d51459de5e8 100644 --- a/arch/arm/boot/dts/imx28-cfa10049.dts +++ b/arch/arm/boot/dts/imx28-cfa10049.dts | |||
@@ -298,7 +298,7 @@ | |||
298 | ahb@80080000 { | 298 | ahb@80080000 { |
299 | usb1: usb@80090000 { | 299 | usb1: usb@80090000 { |
300 | vbus-supply = <®_usb1_vbus>; | 300 | vbus-supply = <®_usb1_vbus>; |
301 | pinctrl-0 = <&usbphy1_pins_a>; | 301 | pinctrl-0 = <&usb1_pins_a>; |
302 | pinctrl-names = "default"; | 302 | pinctrl-names = "default"; |
303 | status = "okay"; | 303 | status = "okay"; |
304 | }; | 304 | }; |
diff --git a/arch/arm/boot/dts/imx28-cfa10057.dts b/arch/arm/boot/dts/imx28-cfa10057.dts index 1ebd44edaf8d..c4e00ce4b6da 100644 --- a/arch/arm/boot/dts/imx28-cfa10057.dts +++ b/arch/arm/boot/dts/imx28-cfa10057.dts | |||
@@ -134,7 +134,7 @@ | |||
134 | ahb@80080000 { | 134 | ahb@80080000 { |
135 | usb1: usb@80090000 { | 135 | usb1: usb@80090000 { |
136 | vbus-supply = <®_usb1_vbus>; | 136 | vbus-supply = <®_usb1_vbus>; |
137 | pinctrl-0 = <&usbphy1_pins_a>; | 137 | pinctrl-0 = <&usb1_pins_a>; |
138 | pinctrl-names = "default"; | 138 | pinctrl-names = "default"; |
139 | status = "okay"; | 139 | status = "okay"; |
140 | }; | 140 | }; |
diff --git a/arch/arm/boot/dts/imx28-cfa10058.dts b/arch/arm/boot/dts/imx28-cfa10058.dts index a4f0acb93437..7c9cc783f0d1 100644 --- a/arch/arm/boot/dts/imx28-cfa10058.dts +++ b/arch/arm/boot/dts/imx28-cfa10058.dts | |||
@@ -101,7 +101,7 @@ | |||
101 | ahb@80080000 { | 101 | ahb@80080000 { |
102 | usb1: usb@80090000 { | 102 | usb1: usb@80090000 { |
103 | vbus-supply = <®_usb1_vbus>; | 103 | vbus-supply = <®_usb1_vbus>; |
104 | pinctrl-0 = <&usbphy1_pins_a>; | 104 | pinctrl-0 = <&usb1_pins_a>; |
105 | pinctrl-names = "default"; | 105 | pinctrl-names = "default"; |
106 | status = "okay"; | 106 | status = "okay"; |
107 | }; | 107 | }; |
diff --git a/arch/arm/boot/dts/imx28-m28cu3.dts b/arch/arm/boot/dts/imx28-m28cu3.dts index d6e71ed3147b..15f3b39716e8 100644 --- a/arch/arm/boot/dts/imx28-m28cu3.dts +++ b/arch/arm/boot/dts/imx28-m28cu3.dts | |||
@@ -180,7 +180,7 @@ | |||
180 | usb1: usb@80090000 { | 180 | usb1: usb@80090000 { |
181 | vbus-supply = <®_usb1_vbus>; | 181 | vbus-supply = <®_usb1_vbus>; |
182 | pinctrl-names = "default"; | 182 | pinctrl-names = "default"; |
183 | pinctrl-0 = <&usbphy1_pins_a>; | 183 | pinctrl-0 = <&usb1_pins_a>; |
184 | disable-over-current; | 184 | disable-over-current; |
185 | status = "okay"; | 185 | status = "okay"; |
186 | }; | 186 | }; |
diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts index e6d0fa69973e..8536b0db9018 100644 --- a/arch/arm/boot/dts/imx28-m28evk.dts +++ b/arch/arm/boot/dts/imx28-m28evk.dts | |||
@@ -248,14 +248,14 @@ | |||
248 | usb0: usb@80080000 { | 248 | usb0: usb@80080000 { |
249 | vbus-supply = <®_usb0_vbus>; | 249 | vbus-supply = <®_usb0_vbus>; |
250 | pinctrl-names = "default"; | 250 | pinctrl-names = "default"; |
251 | pinctrl-0 = <&usbphy0_pins_a>; | 251 | pinctrl-0 = <&usb0_pins_a>; |
252 | status = "okay"; | 252 | status = "okay"; |
253 | }; | 253 | }; |
254 | 254 | ||
255 | usb1: usb@80090000 { | 255 | usb1: usb@80090000 { |
256 | vbus-supply = <®_usb1_vbus>; | 256 | vbus-supply = <®_usb1_vbus>; |
257 | pinctrl-names = "default"; | 257 | pinctrl-names = "default"; |
258 | pinctrl-0 = <&usbphy1_pins_a>; | 258 | pinctrl-0 = <&usb1_pins_a>; |
259 | status = "okay"; | 259 | status = "okay"; |
260 | }; | 260 | }; |
261 | 261 | ||
diff --git a/arch/arm/boot/dts/imx28-sps1.dts b/arch/arm/boot/dts/imx28-sps1.dts index 2612a01e8da9..0ce3cb8e7914 100644 --- a/arch/arm/boot/dts/imx28-sps1.dts +++ b/arch/arm/boot/dts/imx28-sps1.dts | |||
@@ -106,7 +106,7 @@ | |||
106 | usb0: usb@80080000 { | 106 | usb0: usb@80080000 { |
107 | vbus-supply = <®_usb0_vbus>; | 107 | vbus-supply = <®_usb0_vbus>; |
108 | pinctrl-names = "default"; | 108 | pinctrl-names = "default"; |
109 | pinctrl-0 = <&usbphy0_pins_b>; | 109 | pinctrl-0 = <&usb0_pins_b>; |
110 | status = "okay"; | 110 | status = "okay"; |
111 | }; | 111 | }; |
112 | 112 | ||
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index df783c2648a9..f7deccd60eaa 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi | |||
@@ -783,7 +783,7 @@ | |||
783 | fsl,pull-up = <MXS_PULL_DISABLE>; | 783 | fsl,pull-up = <MXS_PULL_DISABLE>; |
784 | }; | 784 | }; |
785 | 785 | ||
786 | usbphy0_pins_a: usbphy0@0 { | 786 | usb0_pins_a: usb0@0 { |
787 | reg = <0>; | 787 | reg = <0>; |
788 | fsl,pinmux-ids = < | 788 | fsl,pinmux-ids = < |
789 | MX28_PAD_SSP2_SS2__USB0_OVERCURRENT | 789 | MX28_PAD_SSP2_SS2__USB0_OVERCURRENT |
@@ -793,7 +793,7 @@ | |||
793 | fsl,pull-up = <MXS_PULL_DISABLE>; | 793 | fsl,pull-up = <MXS_PULL_DISABLE>; |
794 | }; | 794 | }; |
795 | 795 | ||
796 | usbphy0_pins_b: usbphy0@1 { | 796 | usb0_pins_b: usb0@1 { |
797 | reg = <1>; | 797 | reg = <1>; |
798 | fsl,pinmux-ids = < | 798 | fsl,pinmux-ids = < |
799 | MX28_PAD_AUART1_CTS__USB0_OVERCURRENT | 799 | MX28_PAD_AUART1_CTS__USB0_OVERCURRENT |
@@ -803,7 +803,7 @@ | |||
803 | fsl,pull-up = <MXS_PULL_DISABLE>; | 803 | fsl,pull-up = <MXS_PULL_DISABLE>; |
804 | }; | 804 | }; |
805 | 805 | ||
806 | usbphy1_pins_a: usbphy1@0 { | 806 | usb1_pins_a: usb1@0 { |
807 | reg = <0>; | 807 | reg = <0>; |
808 | fsl,pinmux-ids = < | 808 | fsl,pinmux-ids = < |
809 | MX28_PAD_SSP2_SS1__USB1_OVERCURRENT | 809 | MX28_PAD_SSP2_SS1__USB1_OVERCURRENT |