diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2010-08-12 01:30:39 +0200 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2010-12-20 23:07:41 +0800 |
| commit | 072e1ae73c65496355279505de378b33c916e364 (patch) | |
| tree | dd5ba8799f23b20c9f7d82c4b3cd02fdb7c6c9ad /arch/arm | |
| parent | 9b6956f45132f9bf696e9f6c2e457bdfa8e08721 (diff) | |
| download | kernel_samsung_aries-072e1ae73c65496355279505de378b33c916e364.zip kernel_samsung_aries-072e1ae73c65496355279505de378b33c916e364.tar.gz kernel_samsung_aries-072e1ae73c65496355279505de378b33c916e364.tar.bz2 | |
ARM: pxa: Add M41T00 RTC support into Colibri evalboard
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa270-evalboard.c | 23 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa270.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa300.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa320.c | 4 |
4 files changed, 35 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa270-evalboard.c b/arch/arm/mach-pxa/colibri-pxa270-evalboard.c index e1a2b52..7f27aec 100644 --- a/arch/arm/mach-pxa/colibri-pxa270-evalboard.c +++ b/arch/arm/mach-pxa/colibri-pxa270-evalboard.c @@ -19,6 +19,7 @@ #include <asm/mach-types.h> #include <mach/hardware.h> #include <asm/mach/arch.h> +#include <linux/i2c.h> #include <mach/pxa27x.h> #include <mach/colibri.h> @@ -26,6 +27,8 @@ #include <mach/ohci.h> #include <mach/pxa27x-udc.h> +#include <plat/i2c.h> + #include "generic.h" #include "devices.h" @@ -87,6 +90,25 @@ static void __init colibri_pxa270_uhc_init(void) static inline void colibri_pxa270_uhc_init(void) {} #endif +/****************************************************************************** + * I2C RTC + ******************************************************************************/ +#if defined(CONFIG_RTC_DRV_DS1307) || defined(CONFIG_RTC_DRV_DS1307_MODULE) +static struct i2c_board_info __initdata colibri_pxa270_i2c_devs[] = { + { + I2C_BOARD_INFO("m41t00", 0x68), + }, +}; + +static void __init colibri_pxa270_rtc_init(void) +{ + pxa_set_i2c_info(NULL); + i2c_register_board_info(0, ARRAY_AND_SIZE(colibri_pxa270_i2c_devs)); +} +#else +static inline void colibri_pxa270_rtc_init(void) {} +#endif + void __init colibri_pxa270_evalboard_init(void) { pxa_set_ffuart_info(NULL); @@ -95,4 +117,5 @@ void __init colibri_pxa270_evalboard_init(void) colibri_pxa270_mmc_init(); colibri_pxa270_uhc_init(); + colibri_pxa270_rtc_init(); } diff --git a/arch/arm/mach-pxa/colibri-pxa270.c b/arch/arm/mach-pxa/colibri-pxa270.c index e940004..eecbb8b 100644 --- a/arch/arm/mach-pxa/colibri-pxa270.c +++ b/arch/arm/mach-pxa/colibri-pxa270.c @@ -73,6 +73,10 @@ static mfp_cfg_t colibri_pxa270_evalboard_pin_config[] __initdata = { GPIO1_GPIO, /* READY */ GPIO84_GPIO, /* DETECT */ GPIO107_GPIO, /* PPEN */ + + /* I2C */ + GPIO117_I2C_SCL, + GPIO118_I2C_SDA, }; #else static mfp_cfg_t colibri_pxa270_evalboard_pin_config[] __initdata = {}; diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c index 649c83c..9b8d72d 100644 --- a/arch/arm/mach-pxa/colibri-pxa300.c +++ b/arch/arm/mach-pxa/colibri-pxa300.c @@ -46,6 +46,10 @@ static mfp_cfg_t colibri_pxa300_evalboard_pin_config[] __initdata = { /* UHC */ GPIO0_2_USBH_PEN, GPIO1_2_USBH_PWR, + + /* I2C */ + GPIO21_I2C_SCL, + GPIO22_I2C_SDA, }; #else static mfp_cfg_t colibri_pxa300_evalboard_pin_config[] __initdata = {}; diff --git a/arch/arm/mach-pxa/colibri-pxa320.c b/arch/arm/mach-pxa/colibri-pxa320.c index 6f15f2a..0d8faf8 100644 --- a/arch/arm/mach-pxa/colibri-pxa320.c +++ b/arch/arm/mach-pxa/colibri-pxa320.c @@ -69,6 +69,10 @@ static mfp_cfg_t colibri_pxa320_evalboard_pin_config[] __initdata = { /* UHC */ GPIO2_2_USBH_PEN, GPIO3_2_USBH_PWR, + + /* I2C */ + GPIO32_I2C_SCL, + GPIO33_I2C_SDA, }; #else static mfp_cfg_t colibri_pxa320_evalboard_pin_config[] __initdata = {}; |