Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / imx28-evk.dts

diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
index 3637bf3b1d597c6690bd34c5f7e4b8109104043d..1f0d38d7b16f5477d2f3b5ec41e6eb78e0f5068b 100644 (file)
--- a/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@ -155,12 +155,14 @@
                        can0: can@80032000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&can0_pins_a>;
+                               xceiver-supply = <&reg_can_3v3>;
                                status = "okay";
                        };
 
                        can1: can@80034000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&can1_pins_a>;
+                               xceiver-supply = <&reg_can_3v3>;
                                status = "okay";
                        };
                };
@@ -319,6 +321,16 @@
                        gpio = <&gpio3 30 0>;
                        enable-active-high;
                };
+
+               reg_can_3v3: can-3v3 {
+                       compatible = "regulator-fixed";
+                       regulator-name = "can-3v3";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpio = <&gpio2 13 0>;
+                       enable-active-high;
+               };
+
        };
 
        sound {