lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add i2c_board_info for RiscPC PCF8583

Browse Source 
Add the necessary i2c_board_info structure to fix the lack of PCF8583
RTC on RiscPC.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
This commit is contained in:
Russell King
2009-02-24 19:19:50 +01:00
committed by Jean Delvare
parent 082a4cf809
commit 531660ef56
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-rpc/riscpc.c
View File

@@ -19,6 +19,7 @@
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
#include <linux/ata_platform.h> #include <linux/ata_platform.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/i2c.h>
#include <asm/elf.h> #include <asm/elf.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
@@ -201,8 +202,13 @@ static struct platform_device *devs[] __initdata = {
&pata_device, &pata_device,
}; };
static struct i2c_board_info i2c_rtc = {
I2C_BOARD_INFO("pcf8583", 0x50)
};
static int __init rpc_init(void) static int __init rpc_init(void)
{ {
i2c_register_board_info(0, &i2c_rtc, 1);
return platform_add_devices(devs, ARRAY_SIZE(devs)); return platform_add_devices(devs, ARRAY_SIZE(devs));
} }

3
drivers/i2c/busses/i2c-acorn.c
View File

@@ -83,6 +83,7 @@ static struct i2c_algo_bit_data ioc_data = {
}; };
static struct i2c_adapter ioc_ops = { static struct i2c_adapter ioc_ops = {
.nr = 0,
.algo_data = &ioc_data, .algo_data = &ioc_data,
}; };
@@ -90,7 +91,7 @@ static int __init i2c_ioc_init(void)
{ {
force_ones = FORCE_ONES | SCL | SDA; force_ones = FORCE_ONES | SCL | SDA;
return i2c_bit_add_bus(&ioc_ops); return i2c_bit_add_numbered_bus(&ioc_ops);
} }
module_init(i2c_ioc_init); module_init(i2c_ioc_init);