From patchwork Sat Oct 26 00:00:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wendy Ng X-Patchwork-Id: 3097731 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7B3879F372 for ; Sat, 26 Oct 2013 00:02:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 80166202EA for ; Sat, 26 Oct 2013 00:02:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9FDA7201B6 for ; Sat, 26 Oct 2013 00:02:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753342Ab3JZABt (ORCPT ); Fri, 25 Oct 2013 20:01:49 -0400 Received: from mms3.broadcom.com ([216.31.210.19]:4171 "EHLO mms3.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752099Ab3JZABq (ORCPT ); Fri, 25 Oct 2013 20:01:46 -0400 Received: from [10.9.208.53] by mms3.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Fri, 25 Oct 2013 17:01:16 -0700 X-Server-Uuid: B86B6450-0931-4310-942E-F00ED04CA7AF Received: from IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) by IRVEXCHCAS06.corp.ad.broadcom.com (10.9.208.53) with Microsoft SMTP Server (TLS) id 14.1.438.0; Fri, 25 Oct 2013 17:01:37 -0700 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) with Microsoft SMTP Server id 14.1.438.0; Fri, 25 Oct 2013 17:01:37 -0700 Received: from mail.broadcom.com (lbrmn-wendyvm.ric.broadcom.com [10.136.8.93]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id C6D60246D2; Fri, 25 Oct 2013 17:01:27 -0700 (PDT) From: "Wendy Ng" To: "Rob Herring" , "Pawel Moll" , "Mark Rutland" , "Stephen Warren" , "Ian Campbell" , "Eduardo Valentin" cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, "Christian Daudt" , "Markus Mayer" , "Tim Kryger" , "Matt Porter" , "Wendy Ng" Subject: [PATCH 3/3] ARM: dts: Add TMON driver support to bcm281xx Date: Fri, 25 Oct 2013 17:00:29 -0700 Message-ID: <1382745629-1123-4-git-send-email-wendy.ng@broadcom.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1382745629-1123-1-git-send-email-wendy.ng@broadcom.com> References: <1382745629-1123-1-git-send-email-wendy.ng@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 7E75D9C61SC1674948-01-01 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This adds the support of Temperature Monitor (TMON) driver for Broadcom bcm281xx SoCs to the DT node. This also adds the thermal framework device-tree binding such that TMON driver can be used within the thermal framework. Signed-off-by: Wendy Ng Reviewed-by: Markus Mayer Reviewed-by: Christian Daudt Reviewed-by: Matt Porter Reviewed-by: Tim Kryger --- arch/arm/boot/dts/bcm11351-brt.dts | 4 ++++ arch/arm/boot/dts/bcm11351.dtsi | 29 +++++++++++++++++++++++++++++ arch/arm/boot/dts/bcm28155-ap.dts | 4 ++++ 3 files changed, 37 insertions(+) diff --git a/arch/arm/boot/dts/bcm11351-brt.dts b/arch/arm/boot/dts/bcm11351-brt.dts index 5a269c7..c24fd12 100644 --- a/arch/arm/boot/dts/bcm11351-brt.dts +++ b/arch/arm/boot/dts/bcm11351-brt.dts @@ -43,6 +43,10 @@ status = "okay"; }; + tmon: tmon@34008000 { + status = "okay"; + }; + usbotg@3f120000 { status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi index 29987e2..0f17beb 100644 --- a/arch/arm/boot/dts/bcm11351.dtsi +++ b/arch/arm/boot/dts/bcm11351.dtsi @@ -13,6 +13,7 @@ #include #include +#include #include "skeleton.dtsi" @@ -25,6 +26,24 @@ bootargs = "console=ttyS0,115200n8"; }; + thermal-zones { + cpu_thermal: cpu_thermal { + polling-delay-passive = <250>; /* msec */ + polling-delay = <1000>; /* msec */ + + /* sensor */ + thermal-sensors = <&tmon>; + + trips { + cpu_crit: cpu_crit { + temperature = <105000>; /* mCelsius */ + hysteresis = <2000>; /* mCelsius */ + type = THERMAL_TRIP_CRITICAL; + }; + }; + }; + }; + gic: interrupt-controller@3ff00100 { compatible = "arm,cortex-a9-gic"; #interrupt-cells = <3>; @@ -285,6 +304,15 @@ }; }; + tmon: tmon@34008000 { + compatible = "brcm,bcm11351-tmon", "brcm,kona-tmon"; + reg = <0x34008000 0x0024>; + clocks = <&tmon_1m_clk>; + interrupts = ; + #thermal-sensor-cells = <0>; + status = "disabled"; + }; + usbotg: usbotg@3f120000 { compatible = "snps,dwc2"; reg = <0x3f120000 0x10000>; @@ -305,4 +333,5 @@ compatible = "brcm,kona-usb2"; status = "disabled"; }; + }; diff --git a/arch/arm/boot/dts/bcm28155-ap.dts b/arch/arm/boot/dts/bcm28155-ap.dts index 02ebaaf..7151c25 100644 --- a/arch/arm/boot/dts/bcm28155-ap.dts +++ b/arch/arm/boot/dts/bcm28155-ap.dts @@ -63,6 +63,10 @@ status = "okay"; }; + tmon: tmon@34008000 { + status = "okay"; + }; + usbotg@3f120000 { status = "okay"; };