diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-07-16 12:19:34 +0200 |
|---|---|---|
| committer | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 16:49:36 +0200 |
| commit | 55650d4e5b0b8de785e4682f4149951e2ce0e731 (patch) | |
| tree | 6a5a21b3c8fa5d91827ad59dab2baf6adddddb5f /arch | |
| parent | 2cef1a2853aece830586453296e413240961a42b (diff) | |
ARM: Kirkwood: Describe DNS325 temperature sensor in DT.
Now that we have I2C support in DT, describe the LM75 in
the DT file for the DNS325.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jamie Lentin <jm@lentin.co.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-dns325.dts | 8 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/board-dnskw.c | 15 |
2 files changed, 10 insertions, 13 deletions
diff --git a/arch/arm/boot/dts/kirkwood-dns325.dts b/arch/arm/boot/dts/kirkwood-dns325.dts index 17895d92d4ba..debb3703dfe7 100644 --- a/arch/arm/boot/dts/kirkwood-dns325.dts +++ b/arch/arm/boot/dts/kirkwood-dns325.dts @@ -16,6 +16,14 @@ }; ocp@f1000000 { + i2c@11000 { + status = "okay"; + + lm75: lm75@48 { + compatible = "national,lm75"; + reg = <0x48>; + }; + }; serial@12000 { clock-frequency = <200000000>; status = "okay"; diff --git a/arch/arm/mach-kirkwood/board-dnskw.c b/arch/arm/mach-kirkwood/board-dnskw.c index 179f4b363d77..1c97efa7705e 100644 --- a/arch/arm/mach-kirkwood/board-dnskw.c +++ b/arch/arm/mach-kirkwood/board-dnskw.c @@ -14,7 +14,6 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h> -#include <linux/i2c.h> #include <linux/ata_platform.h> #include <linux/mv643xx_eth.h> #include <linux/of.h> @@ -153,13 +152,6 @@ static struct platform_device dns320_led_device = { }, }; -static struct i2c_board_info dns325_i2c_board_info[] __initdata = { - { - I2C_BOARD_INFO("lm75", 0x48), - }, - /* Something at 0x0c also */ -}; - static struct gpio_keys_button dnskw_button_pins[] = { { .code = KEY_POWER, @@ -241,17 +233,14 @@ void __init dnskw_init(void) kirkwood_ehci_init(); kirkwood_ge00_init(&dnskw_ge00_data); - kirkwood_i2c_init(); platform_device_register(&dnskw_button_device); platform_device_register(&dnskw_fan_device); - if (of_machine_is_compatible("dlink,dns-325")) { - i2c_register_board_info(0, dns325_i2c_board_info, - ARRAY_SIZE(dns325_i2c_board_info)); + if (of_machine_is_compatible("dlink,dns-325")) platform_device_register(&dns325_led_device); - } else if (of_machine_is_compatible("dlink,dns-320")) + else if (of_machine_is_compatible("dlink,dns-320")) platform_device_register(&dns320_led_device); /* Register power-off GPIO. */ |