[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-553-g00a5e39

[Sébastien S. <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  00a5e3936ff3f33b08e570c5af8d8cf87c15b33b (commit)
      from  f40d72a89117147441e33f65de106c9b09aead1b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 00a5e3936ff3f33b08e570c5af8d8cf87c15b33b
Author: Sébastien Szymanski <seb...@ar...>
Date:   Fri Jan 16 13:52:20 2015 +0100

    [LINUX] 3.1{8,9}: apf28: dts: add CAN support

-----------------------------------------------------------------------

Summary of changes:
 .../3.18/0420-armadeus-Improve-apf28dev-dts.patch  |   39 +++++++++++++++++---
 .../3.19/0420-armadeus-Improve-apf28dev-dts.patch  |   39 +++++++++++++++++---
 2 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch b/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
index a331255..48f5367 100644
--- a/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
+++ b/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
@@ -1,10 +1,10 @@
 Remaining Armadeus tweaks for APF28Dev device tree.
 
 ---
-Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
+Index: linux-3.18.2/arch/arm/boot/dts/imx28-apf28dev.dts
 ===================================================================
---- linux-3.15.5.orig/arch/arm/boot/dts/imx28-apf28dev.dts
-+++ linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
+--- linux-3.18.2.orig/arch/arm/boot/dts/imx28-apf28dev.dts
++++ linux-3.18.2/arch/arm/boot/dts/imx28-apf28dev.dts
 @@ -77,6 +77,15 @@
  					fsl,voltage = <MXS_VOLTAGE_HIGH>;
  					fsl,pull-up = <MXS_PULL_DISABLE>;
@@ -21,7 +21,21 @@ Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
  			};
  
  			lcdif@80030000 {
-@@ -143,7 +152,8 @@
+@@ -110,6 +119,13 @@
+ 					};
+ 				};
+ 			};
++
++			can0: can@80032000 {
++				pinctrl-names = "default";
++				pinctrl-0 = <&can0_pins_a>;
++				xceiver-supply = <&reg_can0_vcc>;
++				status = "okay";
++			};
+ 		};
+ 
+ 		apbx@80040000 {
+@@ -143,7 +159,8 @@
  	ahb@80080000 {
  		usb0: usb@80080000 {
  			pinctrl-names = "default";
@@ -31,7 +45,22 @@ Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
  			vbus-supply = <&reg_usb0_vbus>;
  			status = "okay";
  		};
-@@ -202,6 +212,7 @@
+@@ -175,6 +192,14 @@
+ 			gpio = <&gpio1 23 1>;
+ 			enable-active-high;
+ 		};
++
++		reg_can0_vcc: regulator@1 {
++			compatible = "regulator-fixed";
++			reg = <1>;
++			regulator-name = "can0_vcc";
++			regulator-min-microvolt = <5000000>;
++			regulator-max-microvolt = <5000000>;
++		};
+ 	};
+ 
+ 	leds {
+@@ -202,6 +227,7 @@
  			label = "User button";
  			gpios = <&gpio0 17 0>;
  			linux,code = <0x100>;
diff --git a/patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch b/patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch
index a331255..48f5367 100644
--- a/patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch
+++ b/patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch
@@ -1,10 +1,10 @@
 Remaining Armadeus tweaks for APF28Dev device tree.
 
 ---
-Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
+Index: linux-3.18.2/arch/arm/boot/dts/imx28-apf28dev.dts
 ===================================================================
---- linux-3.15.5.orig/arch/arm/boot/dts/imx28-apf28dev.dts
-+++ linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
+--- linux-3.18.2.orig/arch/arm/boot/dts/imx28-apf28dev.dts
++++ linux-3.18.2/arch/arm/boot/dts/imx28-apf28dev.dts
 @@ -77,6 +77,15 @@
  					fsl,voltage = <MXS_VOLTAGE_HIGH>;
  					fsl,pull-up = <MXS_PULL_DISABLE>;
@@ -21,7 +21,21 @@ Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
  			};
  
  			lcdif@80030000 {
-@@ -143,7 +152,8 @@
+@@ -110,6 +119,13 @@
+ 					};
+ 				};
+ 			};
++
++			can0: can@80032000 {
++				pinctrl-names = "default";
++				pinctrl-0 = <&can0_pins_a>;
++				xceiver-supply = <&reg_can0_vcc>;
++				status = "okay";
++			};
+ 		};
+ 
+ 		apbx@80040000 {
+@@ -143,7 +159,8 @@
  	ahb@80080000 {
  		usb0: usb@80080000 {
  			pinctrl-names = "default";
@@ -31,7 +45,22 @@ Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
  			vbus-supply = <&reg_usb0_vbus>;
  			status = "okay";
  		};
-@@ -202,6 +212,7 @@
+@@ -175,6 +192,14 @@
+ 			gpio = <&gpio1 23 1>;
+ 			enable-active-high;
+ 		};
++
++		reg_can0_vcc: regulator@1 {
++			compatible = "regulator-fixed";
++			reg = <1>;
++			regulator-name = "can0_vcc";
++			regulator-min-microvolt = <5000000>;
++			regulator-max-microvolt = <5000000>;
++		};
+ 	};
+ 
+ 	leds {
+@@ -202,6 +227,7 @@
  			label = "User button";
  			gpios = <&gpio0 17 0>;
  			linux,code = <0x100>;


hooks/post-receive
-- 
armadeus