Merge tag 'stable/for-linus-3.12-rc0-tag-three' of git://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / arch / arm / boot / dts / imx28-cfa10037.dts

diff --git a/arch/arm/boot/dts/imx28-cfa10037.dts b/arch/arm/boot/dts/imx28-cfa10037.dts
index c2ef3a3d655e5f65341abef241cb844d5c6be861..182b99fe35f39b77b0c43cb396593624a043f7ba 100644 (file)
--- a/arch/arm/boot/dts/imx28-cfa10037.dts
+++ b/arch/arm/boot/dts/imx28-cfa10037.dts
@@ -22,13 +22,19 @@
        apb@80000000 {
                apbh@80000000 {
                        pinctrl@80018000 {
-                               pinctrl-names = "default", "default";
-                               pinctrl-1 = <&hog_pins_cfa10037>;
-
-                               hog_pins_cfa10037: hog-10037@0 {
+                               usb_pins_cfa10037: usb-10037@0 {
                                        reg = <0>;
                                        fsl,pinmux-ids = <
                                                0x0073 /* MX28_PAD_GPMI_D7__GPIO_0_7 */
+                                       >;
+                                       fsl,drive-strength = <0>;
+                                       fsl,voltage = <1>;
+                                       fsl,pull-up = <0>;
+                               };
+
+                               mac0_pins_cfa10037: mac0-10037@0 {
+                                       reg = <0>;
+                                       fsl,pinmux-ids = <
                                                0x2153 /* MX28_PAD_SSP2_D5__GPIO_2_21 */
                                        >;
                                        fsl,drive-strength = <0>;
@@ -56,7 +62,8 @@
                mac0: ethernet@800f0000 {
                        phy-mode = "rmii";
                        pinctrl-names = "default";
-                       pinctrl-0 = <&mac0_pins_a>;
+                       pinctrl-0 = <&mac0_pins_a
+                               &mac0_pins_cfa10037>;
                        phy-reset-gpios = <&gpio2 21 0>;
                        phy-reset-duration = <100>;
                        status = "okay";
@@ -68,6 +75,8 @@
 
                reg_usb1_vbus: usb1_vbus {
                        compatible = "regulator-fixed";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&usb_pins_cfa10037>;
                        regulator-name = "usb1_vbus";
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;