[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-118-g7a044ab
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-118-g7a044ab
|
From: jorasse <jo...@us...> - 2013-01-14 23:13:56
|
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 7a044ab38e21c3c79f11c7b936326b9ab0781c50 (commit)
from 288d696b320bd58b59fa008555ffd6b413eb71c7 (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 7a044ab38e21c3c79f11c7b936326b9ab0781c50
Author: Eric Jarrige <eri...@ar...>
Date: Tue Jan 15 00:18:09 2013 +0100
[UBOOT] 2012.10: APF27: add I2C driver with support for I2C multibus
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2012.10.h | 14 ++++++----
...-add-support-for-the-armadeus-APF27-board.patch | 15 +++++++++++-
...pf27-Add-FPGA-support-for-the-apf27-board.patch | 2 +-
.../u-boot/2012.10/370-imx27-add-i2c-driver.patch | 25 ++++++++++++++++++++
4 files changed, 48 insertions(+), 8 deletions(-)
create mode 100644 patches/u-boot/2012.10/370-imx27-add-i2c-driver.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
index da1cb11..4839d5b 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
@@ -25,7 +25,7 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "3.3"
-#define CONFIG_IDENT_STRING " apf27 patch 3.8"
+#define CONFIG_IDENT_STRING " apf27 patch 3.9"
#define CONFIG_BOARD_NAME apf27
/*
@@ -92,11 +92,14 @@
#define CONFIG_CMD_ASKENV /* ask for env variable */
#define CONFIG_CMD_BSP /* Board Specific functions */
#define CONFIG_CMD_CACHE /* icache, dcache */
+#define CONFIG_CMD_DATE
#define CONFIG_CMD_DHCP /* DHCP Support */
#define CONFIG_CMD_DNS
+#define CONFIG_CMD_EEPROM
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT /* FAT support */
#define CONFIG_CMD_IMX_FUSE /* imx iim fuse */
+#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII /* MII support */
#define CONFIG_CMD_MMC
#define CONFIG_CMD_MTDPARTS /* MTD partition support */
@@ -376,13 +379,12 @@
*/
#ifdef CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C 1
-
+#define CONFIG_HARD_I2C
+#define CONFIG_I2C_MXC
+#define CONFIG_I2C_MULTI_BUS
+#define CONFIG_SYS_I2C_BASE IMX_I2C1_BASE
#define CONFIG_SYS_I2C_SPEED 100000 /* 100 kHz */
#define CONFIG_SYS_I2C_SLAVE 0x7F
-
-#define CONFIG_I2C_CMD_TREE
-#define CONFIG_I2C_MULTI_BUS 2
#define CONFIG_SYS_I2C_NOPROBES { }
#ifdef CONFIG_CMD_EEPROM
diff --git a/patches/u-boot/2012.10/302-apf27-add-support-for-the-armadeus-APF27-board.patch b/patches/u-boot/2012.10/302-apf27-add-support-for-the-armadeus-APF27-board.patch
index 2b90aec..228d747 100644
--- a/patches/u-boot/2012.10/302-apf27-add-support-for-the-armadeus-APF27-board.patch
+++ b/patches/u-boot/2012.10/302-apf27-add-support-for-the-armadeus-APF27-board.patch
@@ -81,7 +81,7 @@ new file mode 100644
index 0000000..bf3e5ec
--- /dev/null
+++ b/board/armadeus/apf27/apf27.c
-@@ -0,0 +1,410 @@
+@@ -0,0 +1,423 @@
+/*
+ * Copyright (C) 2007 Sascha Hauer, Pengutronix
+ * Copyright (C) 2008-2012 Eric Jarrige <eri...@ar...>
@@ -253,6 +253,9 @@ index 0000000..bf3e5ec
+ writel(ACFG_GIUS_F_VAL, ®s->port[PORTF].gius);
+}
+
++void bus_i2c_init(void *base, int speed, int slave_addr,
++ int (*idle_bus_fn)(void *p), void *p);
++
+static int apf27_devices_init(void)
+{
+ struct gpio_port_regs *regs = (struct gpio_port_regs *)IMX_GPIO_BASE;
@@ -278,6 +281,10 @@ index 0000000..bf3e5ec
+ PF23_AIN_FEC_TX_EN,
+ PE12_PF_UART1_TXD,
+ PE13_PF_UART1_RXD,
++ PC5_PF_I2C2_DATA,
++ PC6_PF_I2C2_CLK,
++ PD17_PF_I2C_DATA,
++ PD18_PF_I2C_CLK,
+ };
+
+ for (i = 0; i < ARRAY_SIZE(mode); i++)
@@ -289,6 +296,12 @@ index 0000000..bf3e5ec
+ writel(readl(®s->port[PORTF].gpio_dr) | (1 << 16),
+ ®s->port[PORTF].gpio_dr);
+#endif
++#if defined(CONFIG_I2C_MXC) && defined(CONFIG_I2C_MULTI_BUS)
++ bus_i2c_init(IMX_I2C1_BASE, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE,
++ NULL, NULL);
++ bus_i2c_init(IMX_I2C2_BASE, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE,
++ NULL, NULL);
++#endif
+ return 0;
+}
+
diff --git a/patches/u-boot/2012.10/304-apf27-Add-FPGA-support-for-the-apf27-board.patch b/patches/u-boot/2012.10/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
index 5055b2c..a3c013e 100644
--- a/patches/u-boot/2012.10/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
+++ b/patches/u-boot/2012.10/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
@@ -32,7 +32,7 @@ index bf3e5ec..fa5dfd8 100644
#include <jffs2/jffs2.h>
#include <nand.h>
#include <netdev.h>
-@@ -359,6 +360,21 @@ misc_init_r(void)
+@@ -386,6 +387,21 @@ misc_init_r(void)
struct mtd_device *dev;
struct part_info *part;
diff --git a/patches/u-boot/2012.10/370-imx27-add-i2c-driver.patch b/patches/u-boot/2012.10/370-imx27-add-i2c-driver.patch
new file mode 100644
index 0000000..913d98e
--- /dev/null
+++ b/patches/u-boot/2012.10/370-imx27-add-i2c-driver.patch
@@ -0,0 +1,25 @@
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+diff -purN uboot/arch/arm/cpu/arm926ejs/mx27/generic.c uboot/arch/arm/cpu/arm926ejs/mx27/generic.c
+--- uboot/arch/arm/cpu/arm926ejs/mx27/generic.c
++++ uboot/arch/arm/cpu/arm926ejs/mx27/generic.c
+@@ -159,6 +159,8 @@ unsigned int mxc_get_clock(enum mxc_cloc
+ switch (clk) {
+ case MXC_ARM_CLK:
+ return imx_get_armclk();
++ case MXC_IPG_PERCLK:
++ return imx_get_ahbclk()/2;
+ case MXC_UART_CLK:
+ return imx_get_perclk1();
+ case MXC_FEC_CLK:
+diff -purN uboot/arch/arm/include/asm/arch-mx27/clock.h uboot/arch/arm/include/asm/arch-mx27/clock.h
+--- uboot/arch/arm/include/asm/arch-mx27/clock.h
++++ uboot/arch/arm/include/asm/arch-mx27/clock.h
+@@ -26,6 +26,7 @@
+
+ enum mxc_clock {
+ MXC_ARM_CLK,
++ MXC_IPG_PERCLK,
+ MXC_UART_CLK,
+ MXC_ESDHC_CLK,
+ MXC_FEC_CLK,
hooks/post-receive
--
armadeus
|
