Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 82933
b: refs/heads/master
c: 400d823
h: refs/heads/master
i:
  82931: ef67b83
v: v3
  • Loading branch information
Rod Whitby authored and Russell King committed Feb 4, 2008
1 parent 08ec39a commit b33f8a8
Show file tree
Hide file tree
Showing 2 changed files with 11 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: e28067d533f1c6fc8c5e31495994f1c9bf7febe6
refs/heads/master: 400d8231484ce3485d04310beaef778efee1efb3
10 changes: 10 additions & 0 deletions trunk/arch/arm/mach-ixp4xx/nas100d-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <linux/serial.h>
#include <linux/serial_8250.h>
#include <linux/leds.h>
#include <linux/i2c.h>
#include <linux/i2c-gpio.h>

#include <asm/mach-types.h>
Expand All @@ -39,6 +40,12 @@ static struct platform_device nas100d_flash = {
.resource = &nas100d_flash_resource,
};

static struct i2c_board_info __initdata nas100d_i2c_board_info [] = {
{
I2C_BOARD_INFO("rtc-pcf8563", 0x51),
},
};

#ifdef CONFIG_LEDS_IXP4XX
static struct resource nas100d_led_resources[] = {
{
Expand Down Expand Up @@ -157,6 +164,9 @@ static void __init nas100d_init(void)

pm_power_off = nas100d_power_off;

i2c_register_board_info(0, nas100d_i2c_board_info,
ARRAY_SIZE(nas100d_i2c_board_info));

/*
* This is only useful on a modified machine, but it is valuable
* to have it first in order to see debug messages, and so that
Expand Down

0 comments on commit b33f8a8

Please sign in to comment.