[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-262-gd3533eb

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  d3533eb7a474eb7071a1abdecda4b31b0b214082 (commit)
      from  807c15de1a0519714e373a0413e18be042b8b33f (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 d3533eb7a474eb7071a1abdecda4b31b0b214082
Author: Eric Jarrige <eri...@ar...>
Date:   Tue May 13 14:34:16 2014 +0200

    [UBOOT] 2014.04: apf51: fix i2c bus

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

Summary of changes:
 .../device/armadeus/apf51/apf51-u-boot-2014.04.h   |    8 +--
 .../0040-i2c-mxc-fix-mx51-i2c-declaration.patch    |   41 ++++++++++++++++
 patches/u-boot/2014.04/401-apf51.patch             |   49 +++++--------------
 3 files changed, 57 insertions(+), 41 deletions(-)
 create mode 100644 patches/u-boot/2014.04/0040-i2c-mxc-fix-mx51-i2c-declaration.patch

diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2014.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2014.04.h
index b42dc59..10633c3 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2014.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2014.04.h
@@ -446,11 +446,9 @@
 #ifdef	CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
-#define	CONFIG_HARD_I2C			/* I2C with hardware support    */
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE		I2C2_BASE_ADDR
-#define CONFIG_SYS_I2C_SPEED		400000
-#define CONFIG_SYS_I2C_SLAVE		0xfe
+#define CONFIG_SYS_MXC_I2C2_SPEED	400000
+#define CONFIG_SYS_MXC_I2C2_SLAVE	0xfe
+#define CONFIG_SYS_SPD_BUS_NUM		1 /* hack to force bus 1 by default */
 #endif /* CONFIG_CMD_I2C */
 
 /*
diff --git a/patches/u-boot/2014.04/0040-i2c-mxc-fix-mx51-i2c-declaration.patch b/patches/u-boot/2014.04/0040-i2c-mxc-fix-mx51-i2c-declaration.patch
new file mode 100644
index 0000000..ab992ec
--- /dev/null
+++ b/patches/u-boot/2014.04/0040-i2c-mxc-fix-mx51-i2c-declaration.patch
@@ -0,0 +1,41 @@
+From 8cc45b2a0332154b9ef2deaa3085da90f4397da7 Mon Sep 17 00:00:00 2001
+From: Eric Jarrige <eri...@ar...>
+Date: Tue, 13 May 2014 14:22:51 +0200
+Subject: [PATCH 1/1] i2c: mxc: fix mx51 i2c declaration
+
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+ drivers/i2c/mxc_i2c.c |    8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
+index 595019b..a4280b4 100644
+--- a/drivers/i2c/mxc_i2c.c
++++ b/drivers/i2c/mxc_i2c.c
+@@ -425,8 +425,11 @@ static void * const i2c_bases[] = {
+ #elif defined(CONFIG_MX27)
+ 	(void *)IMX_I2C1_BASE,
+ 	(void *)IMX_I2C2_BASE
++#elif defined(CONFIG_MX51)
++	(void *)I2C1_BASE_ADDR,
++	(void *)I2C2_BASE_ADDR,
+ #elif defined(CONFIG_MX31) || defined(CONFIG_MX35) || \
+-	defined(CONFIG_MX51) || defined(CONFIG_MX53) ||	\
++	defined(CONFIG_MX53) ||	\
+ 	defined(CONFIG_MX6)
+ 	(void *)I2C1_BASE_ADDR,
+ 	(void *)I2C2_BASE_ADDR,
+@@ -541,8 +544,7 @@ U_BOOT_I2C_ADAP_COMPLETE(mxc1, mxc_i2c_init, mxc_i2c_probe,
+ 			 CONFIG_SYS_MXC_I2C2_SPEED,
+ 			 CONFIG_SYS_MXC_I2C2_SLAVE, 1)
+ #if defined(CONFIG_MX31) || defined(CONFIG_MX35) ||\
+-	defined(CONFIG_MX51) || defined(CONFIG_MX53) ||\
+-	defined(CONFIG_MX6)
++	defined(CONFIG_MX53) || defined(CONFIG_MX6)
+ U_BOOT_I2C_ADAP_COMPLETE(mxc2, mxc_i2c_init, mxc_i2c_probe,
+ 			 mxc_i2c_read, mxc_i2c_write,
+ 			 mxc_i2c_set_bus_speed,
+-- 
+1.7.9.5
+
diff --git a/patches/u-boot/2014.04/401-apf51.patch b/patches/u-boot/2014.04/401-apf51.patch
index 1e09789..0aaf17f 100644
--- a/patches/u-boot/2014.04/401-apf51.patch
+++ b/patches/u-boot/2014.04/401-apf51.patch
@@ -33,7 +33,7 @@ new file mode 100644
 index 0000000..8ff1381
 --- /dev/null
 +++ b/board/armadeus/apf51/apf51.c
-@@ -0,0 +1,684 @@
+@@ -0,0 +1,677 @@
 +/*
 + * Armadeus APF51 baseboard
 + *
@@ -494,36 +494,33 @@ index 0000000..8ff1381
 +	imx_iomux_v3_setup_multiple_pads(spi_pads, ARRAY_SIZE(spi_pads));
 +}
 +
-+#ifdef CONFIG_I2C_MXC
-+#define I2C_PAD_CFG	(PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | \
-+			 PAD_CTL_PUS_100K_UP | PAD_CTL_ODE)
-+
-+static void setup_i2c(unsigned int module_base)
++#ifdef CONFIG_SYS_I2C_MXC
++static void setup_i2c(unsigned int i2c_bus)
 +{
 +	static const iomux_v3_cfg_t i2c1_pads[] = {
-+		NEW_PAD_CTRL(MX51_PAD_I2C1_CLK__I2C1_CLK, I2C_PAD_CFG),
-+		NEW_PAD_CTRL(MX51_PAD_I2C1_DAT__I2C1_DAT, I2C_PAD_CFG),
++		MX51_PAD_I2C1_CLK__I2C1_CLK,
++		MX51_PAD_I2C1_DAT__I2C1_DAT,
 +	};
 +
 +	static const iomux_v3_cfg_t i2c2_pads[] = {
-+		NEW_PAD_CTRL(MX51_PAD_EIM_D24__I2C2_SDA, I2C_PAD_CFG),
-+		NEW_PAD_CTRL(MX51_PAD_EIM_D27__I2C2_SCL, I2C_PAD_CFG),
++		MX51_PAD_EIM_D24__I2C2_SDA,
++		MX51_PAD_EIM_D27__I2C2_SCL,
 +	};
 +
 +	/*
 +	 * Configure iomux for I2C interfaces
 +	 */
-+	switch (module_base) {
-+	case I2C1_BASE_ADDR:
++	switch (i2c_bus) {
++	case 0:
 +		imx_iomux_v3_setup_multiple_pads(i2c1_pads, ARRAY_SIZE(i2c1_pads));
 +		break;
 +
-+	case I2C2_BASE_ADDR:	/* do not use without disabling UART3 first */
++	case 1:
 +		imx_iomux_v3_setup_multiple_pads(i2c2_pads, ARRAY_SIZE(i2c2_pads));
 +		break;
 +
 +	default:
-+		printf("Invalid I2C base: 0x%x\n", module_base);
++		printf("Invalid I2C bus: 0x%x\n", i2c_bus);
 +		break;
 +	}
 +}
@@ -659,8 +656,8 @@ index 0000000..8ff1381
 +	setup_spi_io();
 +	setup_nfc();
 +	setup_fec();
-+#ifdef CONFIG_I2C_MXC
-+	setup_i2c(I2C2_BASE_ADDR);
++#ifdef CONFIG_SYS_I2C_MXC
++	setup_i2c(1);
 +#endif
 +	setup_display();
 +	setup_usb();
@@ -679,10 +676,6 @@ index 0000000..8ff1381
 +	/* address of boot parameters */
 +	gd->bd->bi_boot_params = CSD0_BASE_ADDR + 0x100;
 +
-+#ifdef CONFIG_I2C_MXC
-+	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
-+#endif
-+
 +#if defined(CONFIG_FPGA)
 +	APF51_init_fpga();
 +#endif
@@ -1004,21 +997,5 @@ index 9df6212..1aa7e95 100644
  Active  arm         armv7          mx5         denx            m53evk              m53evk                               m53evk:IMX_CONFIG=board/denx/m53evk/imximage.cfg                                                                                  Marek Vasut <mar...@gm...>
  Active  arm         armv7          mx5         esg             ima3-mx53           ima3-mx53                            ima3-mx53:IMX_CONFIG=board/esg/ima3-mx53/imximage.cfg                                                                             -
  Active  arm         armv7          mx5         freescale       mx51evk             mx51evk                              mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg                                                                           Stefano Babic <sb...@de...>
---- a/drivers/i2c/mxc_i2c.c
-+++ b/drivers/i2c/mxc_i2c.c
-@@ -425,8 +425,11 @@ static void * const i2c_bases[] = {
- #elif defined(CONFIG_MX27)
- 	(void *)IMX_I2C1_BASE,
- 	(void *)IMX_I2C2_BASE
-+#elif defined(CONFIG_MX51)
-+	(void *)I2C1_BASE_ADDR,
-+	(void *)I2C2_BASE_ADDR,
- #elif defined(CONFIG_MX31) || defined(CONFIG_MX35) || \
--	defined(CONFIG_MX51) || defined(CONFIG_MX53) ||	\
-+	defined(CONFIG_MX53) ||	\
- 	defined(CONFIG_MX6)
- 	(void *)I2C1_BASE_ADDR,
- 	(void *)I2C2_BASE_ADDR,
--- 
 1.7.2.5
 


hooks/post-receive
-- 
armadeus


