| Message ID | 1359815749-27705-3-git-send-email-andrew@lunn.ch (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Delegated to: | Zhang Rui |
| Headers | show |
On Sat, 2013-02-02 at 15:35 +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> I can take this one but I need ACK from ARM experts first. thanks, rui > --- > arch/arm/boot/dts/kirkwood-6282.dtsi | 6 ++++++ > arch/arm/configs/kirkwood_defconfig | 2 ++ > 2 files changed, 8 insertions(+) > > 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 -- 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
On Mon, Feb 04, 2013 at 11:14:53AM +0800, Zhang Rui wrote: > On Sat, 2013-02-02 at 15:35 +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> > > I can take this one but I need ACK from ARM experts first. If you don't mind, I prefer to take patches 2 and 4. If you could take 1 and 3 and let me know what tree/branch you place them in, then I'll depend on them when I push them up. 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
Hi, Jason, On Mon, 2013-02-04 at 09:19 -0500, Jason Cooper wrote: > On Mon, Feb 04, 2013 at 11:14:53AM +0800, Zhang Rui wrote: > > On Sat, 2013-02-02 at 15:35 +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> > > > > I can take this one but I need ACK from ARM experts first. > > If you don't mind, I prefer to take patches 2 and 4. If you could take > 1 and 3 and let me know what tree/branch you place them in, then I'll > depend on them when I push them up. > great. patch 1/4, 3/4 in V5 have been applied to thermal tree -next branch. git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git but I'll put all the 3.9 candidates in thermal -release branch before next merge window opened. does this still work for you? thanks, rui -- 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
On Fri, Feb 08, 2013 at 03:31:25PM +0800, Zhang Rui wrote: > Hi, Jason, > > On Mon, 2013-02-04 at 09:19 -0500, Jason Cooper wrote: > > On Mon, Feb 04, 2013 at 11:14:53AM +0800, Zhang Rui wrote: > > > On Sat, 2013-02-02 at 15:35 +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> > > > > > > I can take this one but I need ACK from ARM experts first. > > > > If you don't mind, I prefer to take patches 2 and 4. If you could take > > 1 and 3 and let me know what tree/branch you place them in, then I'll > > depend on them when I push them up. > > > great. > patch 1/4, 3/4 in V5 have been applied to thermal tree -next branch. > git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git > > but I'll put all the 3.9 candidates in thermal -release branch before > next merge window opened. does this still work for you? great, thanks. 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