Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 191887
b: refs/heads/master
c: 83a4a10
h: refs/heads/master
i:
  191885: 765f314
  191883: 3f05621
  191879: 49a5862
  191871: e8a77f4
v: v3
  • Loading branch information
Marek Vasut authored and Eric Miao committed May 11, 2010
1 parent bc2362c commit b9684ff
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1a8fb70e484589105a77f44bcd11e531c5fbe789
refs/heads/master: 83a4a1022654cbb9dd55fcf7c28807a634db54bc
26 changes: 26 additions & 0 deletions trunk/arch/arm/mach-pxa/vpac270.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
#include <mach/pxa27x-udc.h>
#include <mach/udc.h>

#include <plat/i2c.h>

#include "generic.h"
#include "devices.h"

Expand Down Expand Up @@ -132,6 +134,10 @@ static unsigned long vpac270_pin_config[] __initdata = {
GPIO95_AC97_nRESET,
GPIO98_AC97_SYSCLK,
GPIO113_GPIO, /* TS IRQ */

/* I2C */
GPIO117_I2C_SCL,
GPIO118_I2C_SDA,
};

/******************************************************************************
Expand Down Expand Up @@ -397,6 +403,25 @@ static void __init vpac270_ts_init(void)
static inline void vpac270_ts_init(void) {}
#endif

/******************************************************************************
* RTC
******************************************************************************/
#if defined(CONFIG_RTC_DRV_DS1307) || defined(CONFIG_RTC_DRV_DS1307_MODULE)
static struct i2c_board_info __initdata vpac270_i2c_devs[] = {
{
I2C_BOARD_INFO("ds1339", 0x68),
},
};

static void __init vpac270_rtc_init(void)
{
pxa_set_i2c_info(NULL);
i2c_register_board_info(0, ARRAY_AND_SIZE(vpac270_i2c_devs));
}
#else
static inline void vpac270_rtc_init(void) {}
#endif

/******************************************************************************
* Framebuffer
******************************************************************************/
Expand Down Expand Up @@ -481,6 +506,7 @@ static void __init vpac270_init(void)
vpac270_udc_init();
vpac270_eth_init();
vpac270_ts_init();
vpac270_rtc_init();
}

MACHINE_START(VPAC270, "Voipac PXA270")
Expand Down

0 comments on commit b9684ff

Please sign in to comment.