aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2007-07-17 07:05:12 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 13:23:09 -0400
commitb5b9068c1ef2ea760beb4962cf611b45bd303fb6 (patch)
tree3e55fda84608316fb723fd513349f9707852f24f /arch
parentc065f35c17929067a367139d14e26897d60c7f6d (diff)
csb337 supports "new style" rtc-ds1307
Update csb337 board specific init to support "new style" rtc-ds1307 code. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Cc: Andrew Victor <andrew@sanpeople.com> Cc: Bill Gatliff <bgat@billgatliff.com> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-at91/board-csb337.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c
index e18a41e61f0c..dde089922e3b 100644
--- a/arch/arm/mach-at91/board-csb337.c
+++ b/arch/arm/mach-at91/board-csb337.c
@@ -23,6 +23,7 @@
23#include <linux/mm.h> 23#include <linux/mm.h>
24#include <linux/module.h> 24#include <linux/module.h>
25#include <linux/platform_device.h> 25#include <linux/platform_device.h>
26#include <linux/i2c.h>
26#include <linux/spi/spi.h> 27#include <linux/spi/spi.h>
27#include <linux/mtd/physmap.h> 28#include <linux/mtd/physmap.h>
28 29
@@ -83,6 +84,13 @@ static struct at91_udc_data __initdata csb337_udc_data = {
83 .pullup_pin = AT91_PIN_PA24, 84 .pullup_pin = AT91_PIN_PA24,
84}; 85};
85 86
87static struct i2c_board_info __initdata csb337_i2c_devices[] = {
88 { I2C_BOARD_INFO("rtc-ds1307", 0x68),
89 .type = "ds1307",
90 },
91};
92
93
86static struct at91_cf_data __initdata csb337_cf_data = { 94static struct at91_cf_data __initdata csb337_cf_data = {
87 /* 95 /*
88 * connector P4 on the CSB 337 mates to 96 * connector P4 on the CSB 337 mates to
@@ -161,6 +169,8 @@ static void __init csb337_board_init(void)
161 at91_add_device_udc(&csb337_udc_data); 169 at91_add_device_udc(&csb337_udc_data);
162 /* I2C */ 170 /* I2C */
163 at91_add_device_i2c(); 171 at91_add_device_i2c();
172 i2c_register_board_info(0, csb337_i2c_devices,
173 ARRAY_SIZE(csb337_i2c_devices));
164 /* Compact Flash */ 174 /* Compact Flash */
165 at91_set_gpio_input(AT91_PIN_PB22, 1); /* IOIS16 */ 175 at91_set_gpio_input(AT91_PIN_PB22, 1); /* IOIS16 */
166 at91_add_device_cf(&csb337_cf_data); 176 at91_add_device_cf(&csb337_cf_data);