diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-07-16 12:54:58 +0200 |
|---|---|---|
| committer | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 16:50:26 +0200 |
| commit | 48135a66c247cfaf99611a19f4272178d3e4f1de (patch) | |
| tree | f04e3b50cd5322329a7de3adc64e20e641195e2e /arch | |
| parent | 157727d6490b31df45f6c1b59beb3950b82f3c21 (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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-iconnect.dts | 8 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/board-iconnect.c | 10 |
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 @@ }; ocp@f1000000 { + i2c@11000 { + status = "okay"; + + lm63: lm63@4c { + compatible = "national,lm63"; + reg = <0x4c>; + }; + }; serial@12000 { clock-frequency = <200000000>; 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 @@ #include <linux/mv643xx_eth.h> #include <linux/gpio.h> #include <linux/leds.h> -#include <linux/i2c.h> #include <linux/input.h> #include <linux/gpio_keys.h> #include <asm/mach/arch.h> @@ -90,12 +89,6 @@ static unsigned int iconnect_mpp_config[] __initdata = { 0 }; -static struct i2c_board_info __initdata iconnect_board_info[] = { - { - I2C_BOARD_INFO("lm63", 0x4c), - }, -}; - static struct mtd_partition iconnect_nand_parts[] = { { .name = "flash", @@ -142,9 +135,6 @@ void __init iconnect_init(void) { kirkwood_mpp_conf(iconnect_mpp_config); kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 25); - kirkwood_i2c_init(); - i2c_register_board_info(0, iconnect_board_info, - ARRAY_SIZE(iconnect_board_info)); kirkwood_ehci_init(); kirkwood_ge00_init(&iconnect_ge00_data); |