git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-at91
/
board-ek.c
diff --git
a/arch/arm/mach-at91/board-ek.c
b/arch/arm/mach-at91/board-ek.c
index d05b1b2be9fbe34fd70a0c2912a8372f999f13bc..53a5ef9e72eeec7844007282896002f0e0f8552e 100644
(file)
--- a/
arch/arm/mach-at91/board-ek.c
+++ b/
arch/arm/mach-at91/board-ek.c
@@
-109,6
+109,15
@@
static struct spi_board_info ek_spi_devices[] = {
#endif
};
+static struct i2c_board_info __initdata ek_i2c_devices[] = {
+ {
+ I2C_BOARD_INFO("ics1523", 0x26),
+ },
+ {
+ I2C_BOARD_INFO("dac3550", 0x4d),
+ }
+};
+
#define EK_FLASH_BASE AT91_CHIPSELECT_0
#define EK_FLASH_SIZE 0x200000