[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-48-g9f91480a8

[Julien B a. A. <ar...@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  9f91480a8cdb753bd1dcb09fd6e8a337af117ed5 (commit)
      from  8bee83e7217d461cf4b86351c5e815860a194bea (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 9f91480a8cdb753bd1dcb09fd6e8a337af117ed5
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Tue May 7 17:38:22 2019 +0200

    [LINUX] 3.19: apf27: fix dts build

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

Summary of changes:
 ...1-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch | 56 ++++++++++++++++++++--
 ...dts-apf27dev-add_gpio_key_wakeup_behavior.patch | 10 ++--
 2 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/patches/linux/3.19/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch b/patches/linux/3.19/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
index 8d5b1e410..561343194 100644
--- a/patches/linux/3.19/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
+++ b/patches/linux/3.19/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
@@ -1,18 +1,33 @@
 add i2c eeprom and i2c2 bus to apf27.dts
 
 Signed-off-by: Eric Jarrige <eri...@ar...>
+Signed-off-by: Julien Boibessot <jul...@ar...>
 
-Index: linux-3.15-rc1/arch/arm/boot/dts/imx27-apf27.dts
+Index: linux-3.19.8/arch/arm/boot/dts/imx27-apf27.dts
 ===================================================================
---- linux-3.15-rc1.orig/arch/arm/boot/dts/imx27-apf27.dts
-+++ linux-3.15-rc1/arch/arm/boot/dts/imx27-apf27.dts
-@@ -80,6 +80,18 @@
+--- linux-3.19.8.orig/arch/arm/boot/dts/imx27-apf27.dts
++++ linux-3.19.8/arch/arm/boot/dts/imx27-apf27.dts
+@@ -66,6 +66,13 @@
+ 				MX27_PAD_UART1_RXD__UART1_RXD 0x0
+ 			>;
+ 		};
++
++		pinctrl_i2c2: i2c2grp {
++			fsl,pins = <
++				MX27_PAD_I2C2_SDA__I2C2_SDA 0x0
++				MX27_PAD_I2C2_SCL__I2C2_SCL 0x0
++			>;
++		};
+ 	};
+ };
+ 
+@@ -81,6 +88,18 @@
  	status = "okay";
  };
  
 +&i2c2 {
 +	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_i2c2_1>;
++	pinctrl-0 = <&pinctrl_i2c2>;
 +	status = "okay";
 +
 +	eeprom@50 {
@@ -25,3 +40,34 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx27-apf27.dts
  &nfc {
  	status = "okay";
  	nand-bus-width = <16>;
+Index: linux-3.19.8/arch/arm/boot/dts/imx27-apf27dev.dts
+===================================================================
+--- linux-3.19.8.orig/arch/arm/boot/dts/imx27-apf27dev.dts
++++ linux-3.19.8/arch/arm/boot/dts/imx27-apf27dev.dts
+@@ -158,12 +158,6 @@
+ 	};
+ };
+ 
+-&i2c2 {
+-	pinctrl-names = "default";
+-	pinctrl-0 = <&pinctrl_i2c2>;
+-	status = "okay";
+-};
+-
+ &iomuxc {
+ 	imx27-apf27dev {
+ 		pinctrl_cspi1: cspi1grp {
+@@ -253,13 +247,6 @@
+ 			>;
+ 		};
+ 
+-		pinctrl_i2c2: i2c2grp {
+-			fsl,pins = <
+-				MX27_PAD_I2C2_SDA__I2C2_SDA 0x0
+-				MX27_PAD_I2C2_SCL__I2C2_SCL 0x0
+-			>;
+-		};
+-
+ 		pinctrl_max1027: max1027 {
+ 			 fsl,pins = <
+ 				 MX27_PAD_UART1_CTS__GPIO5_14 0x0 /* CNVST */
diff --git a/patches/linux/3.19/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch b/patches/linux/3.19/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
index b030473be..f3b2e0b3c 100644
--- a/patches/linux/3.19/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
+++ b/patches/linux/3.19/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
@@ -2,13 +2,13 @@ add wakeup capabilities to the apf27dev user button
 
 Signed-off-by: Eric Jarrige <eri...@ar...>
 
-Index: linux-3.13.1/arch/arm/boot/dts/imx27-apf27dev.dts
+Index: linux-3.19/arch/arm/boot/dts/imx27-apf27dev.dts
 ===================================================================
---- linux-3.13.1/arch/arm/boot/dts/imx27-apf27dev.dts
-+++ linux-3.13.1/arch/arm/boot/dts/imx27-apf27dev.dts
-@@ -43,6 +43,7 @@
+--- linux-3.19/arch/arm/boot/dts/imx27-apf27dev.dts
++++ linux-3.19.mod/arch/arm/boot/dts/imx27-apf27dev.dts
+@@ -45,6 +45,7 @@
  			label = "user";
- 			gpios = <&gpio6 13 0>;
+ 			gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>;
  			linux,code = <276>; /* BTN_EXTRA */
 +			gpio-key,wakeup;
  		};


hooks/post-receive
-- 
armadeus