From patchwork Fri Dec 14 11:03:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 1878351 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id AB57140AF9 for ; Fri, 14 Dec 2012 11:03:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756352Ab2LNLDY (ORCPT ); Fri, 14 Dec 2012 06:03:24 -0500 Received: from londo.lunn.ch ([80.238.139.98]:46146 "EHLO londo.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756191Ab2LNLDX (ORCPT ); Fri, 14 Dec 2012 06:03:23 -0500 Received: from lunn by londo.lunn.ch with local (Exim 3.36 #1 (Debian)) id 1TjT2u-0000F6-00; Fri, 14 Dec 2012 12:03:12 +0100 From: Andrew Lunn To: linux ARM , iwamatsu@nigauri.org, linux-pm@vger.kernel.org Cc: Jason Cooper , Sebastian Hesselbarth , Thomas Petazzoni , jgunthorpe@obsidianresearch.com, Andrew Lunn Subject: [PATCH 2/2] ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283 Date: Fri, 14 Dec 2012 12:03:06 +0100 Message-Id: <1355482986-885-3-git-send-email-andrew@lunn.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355482986-885-1-git-send-email-andrew@lunn.ch> References: <1355482986-885-1-git-send-email-andrew@lunn.ch> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Nobuhiro Iwamatsu 88F6282 and 88F6283 has thermal sensor. This patch enables DT and kernel config. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Andrew Lunn --- arch/arm/boot/dts/kirkwood-6282.dtsi | 7 +++++++ arch/arm/configs/kirkwood_defconfig | 2 ++ 2 files changed, 9 insertions(+) diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi index 9ae2004..28fe90b 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>; @@ -41,5 +47,6 @@ clock-frequency = <100000>; status = "disabled"; }; + }; }; diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig index 93f3794..f9ce566 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_ORION_THERMAL=y CONFIG_WATCHDOG=y CONFIG_ORION_WATCHDOG=y CONFIG_HID_DRAGONRISE=y