[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-56-ga408183

[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  a4081835c09d1913c189a8f87fb430a3e75a6af0 (commit)
       via  9fa9cfa6eb2e0bd36f56ac5e8ef23a656a528d4b (commit)
      from  f5cfcb8a60c12c42825c53c7c7ba5f45d3b10fe2 (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 a4081835c09d1913c189a8f87fb430a3e75a6af0
Merge: 9fa9cfa f5cfcb8
Author: Julien Boibessot <jul...@ar...>
Date:   Sat Sep 29 19:02:03 2012 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
    
    Conflicts:
    	patches/linux/3.6/0420-armadeus-Add-apf28dev-dts.patch

commit 9fa9cfa6eb2e0bd36f56ac5e8ef23a656a528d4b
Author: Julien Boibessot <jul...@ar...>
Date:   Sat Sep 29 18:52:48 2012 +0200

    [LINUX] 3.6 APF28Dev DT: Fixes MMC declaration and do not put SPI2 in spidev mode by default

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

Summary of changes:
 .../linux/3.6/0420-armadeus-Add-apf28dev-dts.patch |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/patches/linux/3.6/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.6/0420-armadeus-Add-apf28dev-dts.patch
index cbb8ddb..c13f03c 100644
--- a/patches/linux/3.6/0420-armadeus-Add-apf28dev-dts.patch
+++ b/patches/linux/3.6/0420-armadeus-Add-apf28dev-dts.patch
@@ -29,14 +29,14 @@ Index: linux-3.6-rc6/arch/arm/boot/dts/imx28-apf28dev.dts
 +			ssp0: ssp@80010000 {
 +				compatible = "fsl,imx28-mmc";
 +				pinctrl-names = "default";
-+				pinctrl-0 = <&mmc0_8bit_pins_a
++				pinctrl-0 = <&mmc0_4bit_pins_a
 +					&mmc0_cd_cfg &mmc0_sck_cfg>;
-+				bus-width = <8>;
-+				wp-gpios = <&gpio2 12 0>;
++				bus-width = <4>;
 +				vmmc-supply = <&reg_vddio_sd0>;
 +				status = "okay";
 +			};
 +
++/* Uncomment to have spidev on SPI2 (ChipSelect 0):
 +			ssp2: ssp@80014000 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
@@ -48,11 +48,11 @@ Index: linux-3.6-rc6/arch/arm/boot/dts/imx28-apf28dev.dts
 +					#address-cells = <1>;
 +					#size-cells = <0>;
 +					compatible = "spidev";
-+					reg = <0>; //Chip select 0
++					reg = <0>;
 +					spi-max-frequency = <3125000>;
 +				};
 +			};
-+
++*/
 +			pinctrl@80018000 {
 +				pinctrl-names = "default";
 +				pinctrl-0 = <&hog_pins_apf28dev>;
@@ -177,9 +177,9 @@ Index: linux-3.6-rc6/arch/arm/boot/dts/imx28-apf28dev.dts
 +};
 Index: linux-3.6-rc6/arch/arm/mach-mxs/mach-mxs.c
 ===================================================================
---- linux-3.6-rc6.orig/arch/arm/mach-mxs/mach-mxs.c
-+++ linux-3.6-rc6/arch/arm/mach-mxs/mach-mxs.c
-@@ -97,6 +97,25 @@ static struct fb_videomode apx4devkit_vi
+--- linux-3.6-rc6.orig/arch/arm/mach-mxs/mach-mxs.c	2012-09-28 16:58:54.000000000 +0200
++++ linux-3.6-rc6/arch/arm/mach-mxs/mach-mxs.c	2012-09-28 16:58:54.000000000 +0200
+@@ -97,6 +97,25 @@
  	},
  };
  
@@ -205,11 +205,10 @@ Index: linux-3.6-rc6/arch/arm/mach-mxs/mach-mxs.c
  static struct mxsfb_platform_data mxsfb_pdata __initdata;
  
  static struct of_dev_auxdata mxs_auxdata_lookup[] __initdata = {
-@@ -280,6 +299,12 @@ static void __init apf28_init(void)
+@@ -280,6 +299,11 @@
  {
  	enable_clk_enet_out();
  	/*update_fec_mac_prop(OUI_ARMADEUS);TBDL*/
-+	printk("--------############\n");
 +
 +	mxsfb_pdata.mode_list = apf28dev_video_modes;
 +	mxsfb_pdata.mode_count = ARRAY_SIZE(apf28dev_video_modes);


hooks/post-receive
-- 
armadeus