diff options
author | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2013-02-06 01:35:25 -0500 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-03-12 07:33:13 -0400 |
commit | 590c96b178c5a01360f4138674aaa031c7a56278 (patch) | |
tree | 850a5f65eb72dc2a9feefc6a7ad659e314f2a9aa | |
parent | 66bcb58ba430034e7d58a37bf4f7c6904d6442cf (diff) |
ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
Kirkwood 88F6282 and 88F6283 have a thermal sensor.
This patch adds a DT node and enables the driver in the kernel config.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r-- | arch/arm/boot/dts/kirkwood-6282.dtsi | 6 | ||||
-rw-r--r-- | arch/arm/configs/kirkwood_defconfig | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi index 192cf76fbf93..23991e45bc55 100644 --- a/arch/arm/boot/dts/kirkwood-6282.dtsi +++ b/arch/arm/boot/dts/kirkwood-6282.dtsi | |||
@@ -49,6 +49,12 @@ | |||
49 | }; | 49 | }; |
50 | }; | 50 | }; |
51 | 51 | ||
52 | thermal@10078 { | ||
53 | compatible = "marvell,kirkwood-thermal"; | ||
54 | reg = <0x10078 0x4>; | ||
55 | status = "okay"; | ||
56 | }; | ||
57 | |||
52 | i2c@11100 { | 58 | i2c@11100 { |
53 | compatible = "marvell,mv64xxx-i2c"; | 59 | compatible = "marvell,mv64xxx-i2c"; |
54 | reg = <0x11100 0x20>; | 60 | reg = <0x11100 0x20>; |
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig index 13482ea58b09..8f0065bb6f39 100644 --- a/arch/arm/configs/kirkwood_defconfig +++ b/arch/arm/configs/kirkwood_defconfig | |||
@@ -119,6 +119,8 @@ CONFIG_SPI=y | |||
119 | CONFIG_SPI_ORION=y | 119 | CONFIG_SPI_ORION=y |
120 | CONFIG_GPIO_SYSFS=y | 120 | CONFIG_GPIO_SYSFS=y |
121 | # CONFIG_HWMON is not set | 121 | # CONFIG_HWMON is not set |
122 | CONFIG_THERMAL=y | ||
123 | CONFIG_KIRKWOOD_THERMAL=y | ||
122 | CONFIG_WATCHDOG=y | 124 | CONFIG_WATCHDOG=y |
123 | CONFIG_ORION_WATCHDOG=y | 125 | CONFIG_ORION_WATCHDOG=y |
124 | CONFIG_HID_DRAGONRISE=y | 126 | CONFIG_HID_DRAGONRISE=y |