summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2012-12-28 15:08:50 +0100
committerArnd Bergmann <arnd@arndb.de>2013-02-28 18:57:12 +0100
commitb4d2a24fa522afd3891c9718443686cab71df24f (patch)
tree90713ebb30e28343f5e445482e868b444fc0480b /arch
parent7dcc628349de9a878c43ef4b30e6c8ccbe1d207a (diff)
downloadlinux-b4d2a24fa522afd3891c9718443686cab71df24f.tar.bz2
ARM: Kirkwood: Convert NSA310 I2C to device tree
Add a sub-node into the I2C node to represent the adt7476 device. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/kirkwood-nsa310.dts5
-rw-r--r--arch/arm/mach-kirkwood/board-nsa310.c6
2 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts
index 85cce36491da..dbb3551017fe 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310.dts
@@ -29,6 +29,11 @@
i2c@11000 {
status = "okay";
+
+ adt7476: adt7476a@2e {
+ compatible = "adt7476";
+ reg = <0x2e>;
+ };
};
nand@3000000 {
diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c
index cf2c78cf6513..6966c86e0c34 100644
--- a/arch/arm/mach-kirkwood/board-nsa310.c
+++ b/arch/arm/mach-kirkwood/board-nsa310.c
@@ -36,15 +36,9 @@ static unsigned int nsa310_mpp_config[] __initdata = {
0
};
-static struct i2c_board_info __initdata nsa310_i2c_info[] = {
- { I2C_BOARD_INFO("adt7476", 0x2e) },
-};
-
void __init nsa310_init(void)
{
kirkwood_mpp_conf(nsa310_mpp_config);
-
- i2c_register_board_info(0, ARRAY_AND_SIZE(nsa310_i2c_info));
}
static int __init nsa310_pci_init(void)