---

yaml
---
r: 313247
b: refs/heads/master
c: 6ca44ac
h: refs/heads/master
i:
  313245: 0f5a4d3
  313243: 7850ed1
  313239: 6cdab91
  313231: 6f18427
  313215: a012f3e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9df44919cd0a776abab442b59c8bf9a8b7301fc
+refs/heads/master: 6ca44acfc31ad485b18e2fca0428479b7d4f141d

trunk/arch/arm/boot/dts/imx28-evk.dts

@@ -72,6 +72,18 @@
 				panel-enable-gpios = <&gpio3 30 0>;
 				status = "okay";
 			};
+
+			can0: can@80032000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&can0_pins_a>;
+				status = "okay";
+			};
+
+			can1: can@80034000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&can1_pins_a>;
+				status = "okay";
+			};
 		};
 
 		apbx@80040000 {

trunk/arch/arm/boot/dts/imx28.dtsi

@@ -411,6 +411,28 @@
 					fsl,voltage = <1>;
 					fsl,pull-up = <0>;
 				};
+
+				can0_pins_a: can0@0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x0161 /* MX28_PAD_GPMI_RDY2__CAN0_TX */
+						0x0171 /* MX28_PAD_GPMI_RDY3__CAN0_RX */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
+
+				can1_pins_a: can1@0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						0x0121 /* MX28_PAD_GPMI_CE2N__CAN1_TX */
+						0x0131 /* MX28_PAD_GPMI_CE3N__CAN1_RX */
+					>;
+					fsl,drive-strength = <0>;
+					fsl,voltage = <1>;
+					fsl,pull-up = <0>;
+				};
 			};
 
 			digctl@8001c000 {
@@ -459,12 +481,14 @@
 			};
 
 			can0: can@80032000 {
+				compatible = "fsl,imx28-flexcan", "fsl,p1010-flexcan";
 				reg = <0x80032000 2000>;
 				interrupts = <8>;
 				status = "disabled";
 			};
 
 			can1: can@80034000 {
+				compatible = "fsl,imx28-flexcan", "fsl,p1010-flexcan";
 				reg = <0x80034000 2000>;
 				interrupts = <9>;
 				status = "disabled";