Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 60852
b: refs/heads/master
c: c00593f
h: refs/heads/master
v: v3
  • Loading branch information
Martin Michlmayr authored and Linus Torvalds committed Jul 17, 2007
1 parent 8faa7f6 commit 3fe717b
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: d815461c7a73903d0a926b3cace6f69e144c54a3
refs/heads/master: c00593f6f816e5cfa6d193a2561ca77541f71424
10 changes: 10 additions & 0 deletions trunk/arch/arm/mach-iop32x/n2100.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <linux/serial_core.h>
#include <linux/serial_8250.h>
#include <linux/mtd/physmap.h>
#include <linux/i2c.h>
#include <linux/platform_device.h>
#include <linux/reboot.h>
#include <asm/hardware.h>
Expand Down Expand Up @@ -199,6 +200,12 @@ static struct platform_device n2100_serial_device = {
.resource = &n2100_uart_resource,
};

static struct i2c_board_info __initdata n2100_i2c_devices[] = {
{
I2C_BOARD_INFO("rtc-rs5c372", 0x32),
.type = "rs5c372b",
},
};

/*
* Pull PCA9532 GPIO #8 low to power off the machine.
Expand Down Expand Up @@ -248,6 +255,9 @@ static void __init n2100_init_machine(void)
platform_device_register(&iop3xx_dma_0_channel);
platform_device_register(&iop3xx_dma_1_channel);

i2c_register_board_info(0, n2100_i2c_devices,
ARRAY_SIZE(n2100_i2c_devices));

pm_power_off = n2100_power_off;

init_timer(&power_button_poll_timer);
Expand Down

0 comments on commit 3fe717b

Please sign in to comment.