[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-190-g9469621

[Gwenhael Goavec-M. <gwe...@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  9469621400c9a743ae59d18add534290252e0ad3 (commit)
       via  f596dd59a6ca89e566f2e3dd4c50240173ba6252 (commit)
       via  d6150ad10164887f5ef68c1a6e42a13559102482 (commit)
      from  ff9c15a913f7001c7d450bc37dc808380852ea40 (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 9469621400c9a743ae59d18add534290252e0ad3
Merge: f596dd5 ff9c15a
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sat Mar 9 14:48:06 2013 +0100

    Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code

commit f596dd59a6ca89e566f2e3dd4c50240173ba6252
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sat Mar 9 14:47:49 2013 +0100

    [LINUX][3.8] apf51dev: dt: add basic support for i2c2

commit d6150ad10164887f5ef68c1a6e42a13559102482
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sat Mar 9 14:46:17 2013 +0100

    [LINUX][3.8] imx51: dt: add second pinctrl group for i2c2

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

Summary of changes:
 .../3.8/0401-armadeus-add_apf51dev_baseboard.patch |    8 +++++-
 ...x51-dt-add_second_pinctrl_group_for_i2c2.patch} |   24 +++++++++----------
 2 files changed, 18 insertions(+), 14 deletions(-)
 copy patches/linux/3.8/{0406-armadeus-imx51-dtb-add_ecspi2_pinmux.patch => 0407-armadeus-imx51-dt-add_second_pinctrl_group_for_i2c2.patch} (51%)

diff --git a/patches/linux/3.8/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.8/0401-armadeus-add_apf51dev_baseboard.patch
index 504b3c9..5030f34 100644
--- a/patches/linux/3.8/0401-armadeus-add_apf51dev_baseboard.patch
+++ b/patches/linux/3.8/0401-armadeus-add_apf51dev_baseboard.patch
@@ -7,7 +7,7 @@ Index: linux-3.8/arch/arm/boot/dts/imx51-apf51dev.dts
 ===================================================================
 --- /dev/null
 +++ linux-3.8/arch/arm/boot/dts/imx51-apf51dev.dts
-@@ -0,0 +1,102 @@
+@@ -0,0 +1,108 @@
 +/*
 + * Copyright 2013 Armadeus Systems - <su...@ar...>
 + *
@@ -90,6 +90,12 @@ Index: linux-3.8/arch/arm/boot/dts/imx51-apf51dev.dts
 +	status = "okay";
 +};
 +
++&i2c2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_i2c2_2>;
++	status = "okay";
++};
++
 +&iomuxc {
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&pinctrl_hog>;
diff --git a/patches/linux/3.8/0406-armadeus-imx51-dtb-add_ecspi2_pinmux.patch b/patches/linux/3.8/0407-armadeus-imx51-dt-add_second_pinctrl_group_for_i2c2.patch
similarity index 51%
copy from patches/linux/3.8/0406-armadeus-imx51-dtb-add_ecspi2_pinmux.patch
copy to patches/linux/3.8/0407-armadeus-imx51-dt-add_second_pinctrl_group_for_i2c2.patch
index d9a21c6..fd6fd8c 100644
--- a/patches/linux/3.8/0406-armadeus-imx51-dtb-add_ecspi2_pinmux.patch
+++ b/patches/linux/3.8/0407-armadeus-imx51-dt-add_second_pinctrl_group_for_i2c2.patch
@@ -1,3 +1,4 @@
+Add a second group of pinctrl for i2c2.
 
 Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
 ---
@@ -6,20 +7,17 @@ Index: linux-3.8/arch/arm/boot/dts/imx51.dtsi
 ===================================================================
 --- linux-3.8.orig/arch/arm/boot/dts/imx51.dtsi
 +++ linux-3.8/arch/arm/boot/dts/imx51.dtsi
-@@ -308,6 +308,16 @@
+@@ -351,6 +351,13 @@
+ 							454 0x400001ed	/* MX51_PAD_KEY_COL5__I2C2_SDA */
+ 						>;
  					};
- 				};
- 
-+				ecspi2 {
-+					pinctrl_ecspi2_1: ecspi2grp-1 {
++
++					pinctrl_i2c2_2: i2c2grp-2 {
 +						fsl,pins = <
-+							212 0x185	/* MX51_PAD_NANDF_RB3__ECSPI2_MISO */
-+							264 0x185	/* MX51_PAD_NANDF_D15__ECSPI2_MOSI */
-+							205 0x185	/* MX51_PAD_NANDF_RB2__ECSPI2_SCLK */
++							64 0x400001ed	/* MX51_PAD_EIM_D27__I2C2_SCL */
++							48 0x400001ed	/* MX51_PAD_EIM_D24__I2C2_SDA */
 +						>;
 +					};
-+				};
-+
- 				esdhc1 {
- 					pinctrl_esdhc1_1: esdhc1grp-1 {
- 						fsl,pins = <
+ 				};
+ 
+ 				ipu_disp1 {


hooks/post-receive
-- 
armadeus