From: marek.vasut@gmail.com (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/13] ARM: pxa: Add M41T00 RTC support into Colibri evalboard
Date: Sun, 10 Oct 2010 00:39:23 +0200 [thread overview]
Message-ID: <1286663971-15634-5-git-send-email-marek.vasut@gmail.com> (raw)
In-Reply-To: <1286663971-15634-1-git-send-email-marek.vasut@gmail.com>
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Daniel Mack <daniel@caiaq.de>
---
arch/arm/mach-pxa/colibri-pxa270-evalboard.c | 23 +++++++++++++++++++++++
arch/arm/mach-pxa/colibri-pxa270.c | 4 ++++
arch/arm/mach-pxa/colibri-pxa300.c | 4 ++++
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 f2b740d..bab2545 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 17cfe2f..bd9da55 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 9d8178c..1c64e00 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 = {};
--
1.7.1
next prev parent reply other threads:[~2010-10-09 22:39 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-09 22:39 [PATCH 01/13] ARM: pxa: Introduce pxa[23]xx_map_io Marek Vasut
2010-10-09 22:39 ` [PATCH 02/13] ARM: pxa: Access SMEMC via virtual addresses Marek Vasut
2010-10-10 0:31 ` Haojian Zhuang
2010-10-10 2:03 ` Marek Vasut
2010-10-09 22:39 ` [PATCH 03/13] ARM: pxa: Toradex Colibri PXA270 CF support Marek Vasut
2010-10-09 22:39 ` [PATCH 04/13] ARM: pxa: Push Colibri evalboard MFP into module files Marek Vasut
2010-10-09 22:39 ` Marek Vasut [this message]
2010-10-09 22:39 ` [PATCH 06/13] ARM: pxa: Rename Colibri evalboard Marek Vasut
2010-10-09 22:39 ` [PATCH 07/13] ARM: pxa: Colibri PXA320 PCMCIA driver Marek Vasut
2010-10-09 22:39 ` [PATCH 08/13] ARM: pxa: Modularize Palm Tungsten|C Marek Vasut
2010-10-09 22:39 ` [PATCH 09/13] UCB1400: Pass ucb1400-gpio data through ac97 bus Marek Vasut
2010-10-09 22:39 ` [PATCH 10/13] ARM: pxa: Correct touch IRQ passing to UCB1400 on vpac270 Marek Vasut
2010-10-09 22:39 ` [PATCH 11/13] ARM: pxa: Pass GPIO offset to ucb1400-gpio on PalmTC Marek Vasut
2010-10-09 22:39 ` [PATCH 12/13] ARM: pxa: Add gpio-leds and vibrator support to PalmTC Marek Vasut
2010-10-10 0:34 ` Haojian Zhuang
2010-10-10 2:04 ` Marek Vasut
2010-10-09 22:39 ` [PATCH 13/13] ARM: pxa: Fix pxa2xx-flash section mismatch Marek Vasut
2010-10-10 0:32 ` Haojian Zhuang
2010-10-10 2:05 ` Marek Vasut
2010-10-10 7:38 ` [PATCH 01/13] ARM: pxa: Introduce pxa[23]xx_map_io Igor Grinberg
2010-10-10 18:16 ` Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1286663971-15634-5-git-send-email-marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.