| Message ID | 1360132527-22860-3-git-send-email-andrew@lunn.ch (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Zhang Rui |
| Headers | show |
On Wed, Feb 06, 2013 at 07:35:25AM +0100, Andrew Lunn wrote: > From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> > > 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> > --- > arch/arm/boot/dts/kirkwood-6282.dtsi | 6 ++++++ > arch/arm/configs/kirkwood_defconfig | 2 ++ > 2 files changed, 8 insertions(+) Patches 2 and 4 of this series applied to mvebu/dt_deps with a dependency on thermal/next up to: 74ffa64 Thermal: Dove: Add Themal sensor support for Dove. 7060aa3 thermal: Add support for the thermal sensor on Kirkwood SoCs thx, Jason. -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi index 4ccea21..bd168b6 100644 --- a/arch/arm/boot/dts/kirkwood-6282.dtsi +++ b/arch/arm/boot/dts/kirkwood-6282.dtsi @@ -32,6 +32,12 @@ }; }; + thermal@10078 { + compatible = "marvell,kirkwood-thermal"; + reg = <0x10078 0x4>; + status = "okay"; + }; + i2c@11100 { compatible = "marvell,mv64xxx-i2c"; reg = <0x11100 0x20>; diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig index 93f3794..3d8667f 100644 --- a/arch/arm/configs/kirkwood_defconfig +++ b/arch/arm/configs/kirkwood_defconfig @@ -118,6 +118,8 @@ CONFIG_SPI=y CONFIG_SPI_ORION=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set +CONFIG_THERMAL=y +CONFIG_KIRKWOOD_THERMAL=y CONFIG_WATCHDOG=y CONFIG_ORION_WATCHDOG=y CONFIG_HID_DRAGONRISE=y