From a4c59bc3d6a518023752ba8f92d83c2de2cb901e Mon Sep 17 00:00:00 2001
From: Bhupesh Sharma <bhupesh.sharma@freescale.com>
Date: Mon, 15 Jun 2015 17:11:13 +0530
Subject: arm/dts: Add nodes for flexcan devices present on LS1021A-Rev2 SoC

This patch adds the device nodes for flexcan controller(s) present
on LS1021A-Rev2 SoC.

Signed-off-by: Bhupesh Sharma <bhupesh.sharma@freescale.com>
Signed-off-by: Sakar Arora <Sakar.Arora@freescale.com>
Change-Id: Ia301d4db49d337e37def2e6667b6e4e1586fd8fc
Reviewed-on: http://git.am.freescale.net:8181/38096
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Zhengxiong Jin <Jason.Jin@freescale.com>

diff --git a/arch/arm/boot/dts/ls1021a-qds.dts b/arch/arm/boot/dts/ls1021a-qds.dts
index 93cda05..c029e65 100644
--- a/arch/arm/boot/dts/ls1021a-qds.dts
+++ b/arch/arm/boot/dts/ls1021a-qds.dts
@@ -436,6 +436,14 @@
 	status = "okay";
 };
 
+&can2 {
+	status = "disabled";
+};
+
+&can3 {
+	status = "disabled";
+};
+
 &sai2 {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/ls1021a-twr.dts b/arch/arm/boot/dts/ls1021a-twr.dts
index 611433c..f69e745 100755
--- a/arch/arm/boot/dts/ls1021a-twr.dts
+++ b/arch/arm/boot/dts/ls1021a-twr.dts
@@ -58,6 +58,22 @@
 	};
 };
 
+&can0 {
+	status = "okay";
+};
+
+&can1 {
+	status = "okay";
+};
+
+&can2 {
+	status = "disabled";
+};
+
+&can3 {
+	status = "disabled";
+};
+
 &dcu0 {
 	display = <&display>;
 	status = "okay";
diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index 53231b4..ad098bd 100644
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -705,47 +705,39 @@
 		};
 
 		can0: can@2a70000 {
-			compatible = "fsl,ls1021a-flexcan";
+			compatible = "fsl,ls1021ar2-flexcan";
 			reg = <0x0 0x2a70000 0x0 0x1000>;
 			interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&platform_clk 1>;
-			clock-frequency = <150000000>;
-			clock-names = "per";
+			clocks = <&platform_clk 1>, <&platform_clk 1>;
+			clock-names = "ipg", "per";
 			little-endian;
-			status = "disabled";
 		};
 
 		can1: can@2a80000 {
-			compatible = "fsl,ls1021a-flexcan";
+			compatible = "fsl,ls1021ar2-flexcan";
 			reg = <0x0 0x2a80000 0x0 0x1000>;
 			interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&platform_clk 1>;
-			clock-frequency = <150000000>;
-			clock-names = "per";
+			clocks = <&platform_clk 1>, <&platform_clk 1>;
+			clock-names = "ipg", "per";
 			little-endian;
-			status = "disabled";
 		};
 
 		can2: can@2a90000 {
-			compatible = "fsl,ls1021a-flexcan";
+			compatible = "fsl,ls1021ar2-flexcan";
 			reg = <0x0 0x2a90000 0x0 0x1000>;
 			interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&platform_clk 1>;
-			clock-frequency = <150000000>;
-			clock-names = "per";
+			clocks = <&platform_clk 1>, <&platform_clk 1>;
+			clock-names = "ipg", "per";
 			little-endian;
-			status = "disabled";
 		};
 
 		can3: can@2aa0000 {
-			compatible = "fsl,ls1021a-flexcan";
+			compatible = "fsl,ls1021ar2-flexcan";
 			reg = <0x0 0x2aa0000 0x0 0x1000>;
 			interrupts = <GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&platform_clk 1>;
-			clock-frequency = <150000000>;
-			clock-names = "per";
+			clocks = <&platform_clk 1>, <&platform_clk 1>;
+			clock-names = "ipg", "per";
 			little-endian;
-			status = "disabled";
 		};
 
 		usb@8600000 {
-- 
cgit v0.10.2