Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5b9068c authored by David Brownell's avatar David Brownell Committed by Linus Torvalds
Browse files

csb337 supports "new style" rtc-ds1307 



Update csb337 board specific init to support "new style" rtc-ds1307 code.

Signed-off-by: default avatarDavid 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c065f35c

arch/arm/mach-at91/board-csb337.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/mm.h>

#include <linux/mm.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/i2c.h>

#include <linux/spi/spi.h>

#include <linux/spi/spi.h>

#include <linux/mtd/physmap.h>

#include <linux/mtd/physmap.h>
@@ -83,6 +84,13 @@ static struct at91_udc_data __initdata csb337_udc_data = { 
	.pullup_pin	= AT91_PIN_PA24,

	.pullup_pin	= AT91_PIN_PA24,

};

};





static struct i2c_board_info __initdata csb337_i2c_devices[] = {

	{ I2C_BOARD_INFO("rtc-ds1307", 0x68),

	  .type = "ds1307",

	},

};





static struct at91_cf_data __initdata csb337_cf_data = {

static struct at91_cf_data __initdata csb337_cf_data = {

	/*

	/*

	 * connector P4 on the CSB 337 mates to

	 * connector P4 on the CSB 337 mates to
@@ -161,6 +169,8 @@ static void __init csb337_board_init(void) 
	at91_add_device_udc(&csb337_udc_data);

	at91_add_device_udc(&csb337_udc_data);

	/* I2C */

	/* I2C */

	at91_add_device_i2c();

	at91_add_device_i2c();

	i2c_register_board_info(0, csb337_i2c_devices,

			ARRAY_SIZE(csb337_i2c_devices));

	/* Compact Flash */

	/* Compact Flash */

	at91_set_gpio_input(AT91_PIN_PB22, 1);		/* IOIS16 */

	at91_set_gpio_input(AT91_PIN_PB22, 1);		/* IOIS16 */

	at91_add_device_cf(&csb337_cf_data);

	at91_add_device_cf(&csb337_cf_data);