aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2012-07-16 06:54:58 -0400
committerAndrew Lunn <andrew@lunn.ch>2012-07-27 10:50:26 -0400
commit48135a66c247cfaf99611a19f4272178d3e4f1de (patch)
treef04e3b50cd5322329a7de3adc64e20e641195e2e
parent157727d6490b31df45f6c1b59beb3950b82f3c21 (diff)
ARM: Kirkwood: Describe iConnects temperature sensor in DT.
Now that we have I2C support in DT, describe the LM63 in the DT file for the iConnect. Signed-off-by: Andrew Lunn <andrew@lunn.ch>
-rw-r--r--arch/arm/boot/dts/kirkwood-iconnect.dts8
-rw-r--r--arch/arm/mach-kirkwood/board-iconnect.c10
2 files changed, 8 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
index 026a1f82d813..1b5898eab32c 100644
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
@@ -18,6 +18,14 @@
18 }; 18 };
19 19
20 ocp@f1000000 { 20 ocp@f1000000 {
21 i2c@11000 {
22 status = "okay";
23
24 lm63: lm63@4c {
25 compatible = "national,lm63";
26 reg = <0x4c>;
27 };
28 };
21 serial@12000 { 29 serial@12000 {
22 clock-frequency = <200000000>; 30 clock-frequency = <200000000>;
23 status = "ok"; 31 status = "ok";
diff --git a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c
index b0d3cc49269d..df043aa754a4 100644
--- a/arch/arm/mach-kirkwood/board-iconnect.c
+++ b/arch/arm/mach-kirkwood/board-iconnect.c
@@ -20,7 +20,6 @@
20#include <linux/mv643xx_eth.h> 20#include <linux/mv643xx_eth.h>
21#include <linux/gpio.h> 21#include <linux/gpio.h>
22#include <linux/leds.h> 22#include <linux/leds.h>
23#include <linux/i2c.h>
24#include <linux/input.h> 23#include <linux/input.h>
25#include <linux/gpio_keys.h> 24#include <linux/gpio_keys.h>
26#include <asm/mach/arch.h> 25#include <asm/mach/arch.h>
@@ -90,12 +89,6 @@ static unsigned int iconnect_mpp_config[] __initdata = {
90 0 89 0
91}; 90};
92 91
93static struct i2c_board_info __initdata iconnect_board_info[] = {
94 {
95 I2C_BOARD_INFO("lm63", 0x4c),
96 },
97};
98
99static struct mtd_partition iconnect_nand_parts[] = { 92static struct mtd_partition iconnect_nand_parts[] = {
100 { 93 {
101 .name = "flash", 94 .name = "flash",
@@ -142,9 +135,6 @@ void __init iconnect_init(void)
142{ 135{
143 kirkwood_mpp_conf(iconnect_mpp_config); 136 kirkwood_mpp_conf(iconnect_mpp_config);
144 kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 25); 137 kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 25);
145 kirkwood_i2c_init();
146 i2c_register_board_info(0, iconnect_board_info,
147 ARRAY_SIZE(iconnect_board_info));
148 138
149 kirkwood_ehci_init(); 139 kirkwood_ehci_init();
150 kirkwood_ge00_init(&iconnect_ge00_data); 140 kirkwood_ge00_init(&iconnect_ge00_data);