[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-340-g1195fd8

[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  1195fd803eb715aeacd780dd56b76016aa83396f (commit)
      from  5f9489ae197d4febd1b7a85cd1942570dfa3110c (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 1195fd803eb715aeacd780dd56b76016aa83396f
Author: Sébastien Szymanski <ss...@us...>
Date:   Mon Jul 28 12:22:54 2014 +0200

    [LINUX] 3.1{5,6}: apf28: move the usb0 id pin muxing node at the right
    place.

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

Summary of changes:
 .../3.15/0420-armadeus-Add-apf28dev-dts.patch      |   42 ++++++++++----------
 .../3.16/0420-armadeus-Add-apf28dev-dts.patch      |   42 ++++++++++----------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/patches/linux/3.15/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.15/0420-armadeus-Add-apf28dev-dts.patch
index 18d88aa..8639882 100644
--- a/patches/linux/3.15/0420-armadeus-Add-apf28dev-dts.patch
+++ b/patches/linux/3.15/0420-armadeus-Add-apf28dev-dts.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Fix spidev
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 ---
-Index: linux-3.15-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
+Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
 ===================================================================
---- linux-3.15-rc1.orig/arch/arm/boot/dts/imx28-apf28dev.dts
-+++ linux-3.15-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
-@@ -109,6 +109,15 @@
-						};
-					};
-				};
+--- linux-3.15.5.orig/arch/arm/boot/dts/imx28-apf28dev.dts
++++ linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
+@@ -77,6 +77,15 @@
+ 					fsl,voltage = <MXS_VOLTAGE_HIGH>;
+ 					fsl,pull-up = <MXS_PULL_DISABLE>;
+ 				};
 +
 +				apf28dev_usb0_id_pins: apf28dev-usb0-id-pins@0 {
 +					reg = <0>;
@@ -22,24 +22,24 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
 +					fsl,voltage = <MXS_VOLTAGE_HIGH>;
 +					fsl,pull-up = <MXS_PULL_ENABLE>;
 +				};
-			};
-		};
-
+ 			};
+ 
+ 			lcdif@80030000 {
 @@ -143,7 +152,8 @@
-	ahb@80080000 {
-		usb0: usb@80080000 {
-			pinctrl-names = "default";
+ 	ahb@80080000 {
+ 		usb0: usb@80080000 {
+ 			pinctrl-names = "default";
 -			pinctrl-0 = <&usb0_otg_apf28dev>;
 +			pinctrl-0 = <&usb0_otg_apf28dev
 +					&apf28dev_usb0_id_pins>;
-			vbus-supply = <&reg_usb0_vbus>;
-			status = "okay";
-		};
+ 			vbus-supply = <&reg_usb0_vbus>;
+ 			status = "okay";
+ 		};
 @@ -202,6 +212,7 @@
-			label = "User button";
-			gpios = <&gpio0 17 0>;
-			linux,code = <0x100>;
+ 			label = "User button";
+ 			gpios = <&gpio0 17 0>;
+ 			linux,code = <0x100>;
 +			gpio-key,wakeup;
-		};
-	};
+ 		};
+ 	};
  };
diff --git a/patches/linux/3.16/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.16/0420-armadeus-Add-apf28dev-dts.patch
index 18d88aa..8639882 100644
--- a/patches/linux/3.16/0420-armadeus-Add-apf28dev-dts.patch
+++ b/patches/linux/3.16/0420-armadeus-Add-apf28dev-dts.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Fix spidev
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 ---
-Index: linux-3.15-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
+Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
 ===================================================================
---- linux-3.15-rc1.orig/arch/arm/boot/dts/imx28-apf28dev.dts
-+++ linux-3.15-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
-@@ -109,6 +109,15 @@
-						};
-					};
-				};
+--- linux-3.15.5.orig/arch/arm/boot/dts/imx28-apf28dev.dts
++++ linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
+@@ -77,6 +77,15 @@
+ 					fsl,voltage = <MXS_VOLTAGE_HIGH>;
+ 					fsl,pull-up = <MXS_PULL_DISABLE>;
+ 				};
 +
 +				apf28dev_usb0_id_pins: apf28dev-usb0-id-pins@0 {
 +					reg = <0>;
@@ -22,24 +22,24 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
 +					fsl,voltage = <MXS_VOLTAGE_HIGH>;
 +					fsl,pull-up = <MXS_PULL_ENABLE>;
 +				};
-			};
-		};
-
+ 			};
+ 
+ 			lcdif@80030000 {
 @@ -143,7 +152,8 @@
-	ahb@80080000 {
-		usb0: usb@80080000 {
-			pinctrl-names = "default";
+ 	ahb@80080000 {
+ 		usb0: usb@80080000 {
+ 			pinctrl-names = "default";
 -			pinctrl-0 = <&usb0_otg_apf28dev>;
 +			pinctrl-0 = <&usb0_otg_apf28dev
 +					&apf28dev_usb0_id_pins>;
-			vbus-supply = <&reg_usb0_vbus>;
-			status = "okay";
-		};
+ 			vbus-supply = <&reg_usb0_vbus>;
+ 			status = "okay";
+ 		};
 @@ -202,6 +212,7 @@
-			label = "User button";
-			gpios = <&gpio0 17 0>;
-			linux,code = <0x100>;
+ 			label = "User button";
+ 			gpios = <&gpio0 17 0>;
+ 			linux,code = <0x100>;
 +			gpio-key,wakeup;
-		};
-	};
+ 		};
+ 	};
  };


hooks/post-receive
-- 
armadeus