---

yaml --- r: 359941 b: refs/heads/master c: b4d2a24 h: refs/heads/master i: 359939: e2d697f v: v3
git-mirror · Feb 28, 2013 · 56d5d0b · 56d5d0b
1 parent e4cdc27
commit 56d5d0b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7dcc628349de9a878c43ef4b30e6c8ccbe1d207a
+refs/heads/master: b4d2a24fa522afd3891c9718443686cab71df24f
diff --git a/trunk/arch/arm/boot/dts/kirkwood-nsa310.dts b/trunk/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/trunk/arch/arm/mach-kirkwood/board-nsa310.c b/trunk/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)