From patchwork Tue Apr 2 13:21:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 15815 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4815A23E10 for ; Tue, 2 Apr 2013 13:22:16 +0000 (UTC) Received: from mail-gg0-f199.google.com (mail-gg0-f199.google.com [209.85.161.199]) by fiordland.canonical.com (Postfix) with ESMTP id DFEF0A18EE3 for ; Tue, 2 Apr 2013 13:22:15 +0000 (UTC) Received: by mail-gg0-f199.google.com with SMTP id v2sf514653ggc.6 for ; Tue, 02 Apr 2013 06:22:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=Z/O0ibQOeD3qnvSNgZB7h25kE30w/J/vM/ELHZYZntA=; b=O5R22/+uPlIexBO30LLx+eFKoSeIRrOZVob5rohctH28sOJ8bpV4B0kz/wL0Pi1cUc QBfa+7PM+FSvrLFeZUqjXqHFjW0zI3QIfKBSSFOtNcWV+LfWja3xRV7rGPHqWpeLxYx4 fAyKy6HAlBKodiXDTYH56MzcZSrDfUZxoJAr1+dxmCUj3eAYJLgkp810CRusXWcYinBj kOsP0IAgal9V7Z57A5EZ+7RxrJGix/lKY8nhWjUF4XLJZCGFHswrzpiNC4eOb7G/IqdD ss2Xmhxu90ajcBSvQYro7U6SezdpccTDdFpzXdFpnMu5l7IQkyfo93b1kxtisNzwbLzQ tacA== X-Received: by 10.224.219.146 with SMTP id hu18mr10539030qab.3.1364908935278; Tue, 02 Apr 2013 06:22:15 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.127.137 with SMTP id ng9ls376669qeb.42.gmail; Tue, 02 Apr 2013 06:22:15 -0700 (PDT) X-Received: by 10.58.143.116 with SMTP id sd20mr12519365veb.39.1364908935180; Tue, 02 Apr 2013 06:22:15 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id a1si1037895vdk.99.2013.04.02.06.22.15 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Apr 2013 06:22:15 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id m17so395068vca.11 for ; Tue, 02 Apr 2013 06:22:15 -0700 (PDT) X-Received: by 10.52.76.103 with SMTP id j7mr10767977vdw.90.1364908935018; Tue, 02 Apr 2013 06:22:15 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.4.204 with SMTP id cg12csp125120ved; Tue, 2 Apr 2013 06:22:14 -0700 (PDT) X-Received: by 10.180.89.243 with SMTP id br19mr8726162wib.5.1364908934041; Tue, 02 Apr 2013 06:22:14 -0700 (PDT) Received: from mail-we0-x22e.google.com ([2a00:1450:400c:c03::22e]) by mx.google.com with ESMTPS id ld8si549992wjb.85.2013.04.02.06.22.13 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Apr 2013 06:22:14 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::22e is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::22e; Received: by mail-we0-f174.google.com with SMTP id u12so324076wey.19 for ; Tue, 02 Apr 2013 06:22:13 -0700 (PDT) X-Received: by 10.180.81.232 with SMTP id d8mr15862435wiy.25.1364908933500; Tue, 02 Apr 2013 06:22:13 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id n2sm18968272wiy.6.2013.04.02.06.22.11 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Apr 2013 06:22:12 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones Subject: [PATCH 4/9] ARM: ux500: Move Snowball's thermal DT node into existing PRCMU one Date: Tue, 2 Apr 2013 14:21:51 +0100 Message-Id: <1364908916-29803-4-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1364908916-29803-1-git-send-email-lee.jones@linaro.org> References: <1364908916-29803-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkOlJiZcQIjExWUwg4039CXKLp2D9FllE1tIQ/D5Ffb0n7gL8hg3RckoDaBuJfwQTey9Jph X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , When the thermal DT node was inserted a new PRCMU node was created; however, one already exists in the Snowball DTS file. Here we amalgamate the two into a single consolidated node. Signed-off-by: Lee Jones --- arch/arm/boot/dts/snowball.dts | 53 +++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index d3ec32f..cc99447 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -99,33 +99,6 @@ status = "okay"; }; - prcmu@80157000 { - thermal@801573c0 { - num-trips = <4>; - - trip0-temp = <70000>; - trip0-type = "active"; - trip0-cdev-num = <1>; - trip0-cdev-name0 = "thermal-cpufreq-0"; - - trip1-temp = <75000>; - trip1-type = "active"; - trip1-cdev-num = <1>; - trip1-cdev-name0 = "thermal-cpufreq-0"; - - trip2-temp = <80000>; - trip2-type = "active"; - trip2-cdev-num = <1>; - trip2-cdev-name0 = "thermal-cpufreq-0"; - - trip3-temp = <85000>; - trip3-type = "critical"; - trip3-cdev-num = <0>; - - status = "okay"; - }; - }; - external-bus@50000000 { status = "okay"; @@ -296,7 +269,31 @@ db8500_esram34_ret_reg: db8500_esram34_ret { regulator-name = "db8500-esram34-ret"; }; - }; + + thermal@801573c0 { + num-trips = <4>; + + trip0-temp = <70000>; + trip0-type = "active"; + trip0-cdev-num = <1>; + trip0-cdev-name0 = "thermal-cpufreq-0"; + + trip1-temp = <75000>; + trip1-type = "active"; + trip1-cdev-num = <1>; + trip1-cdev-name0 = "thermal-cpufreq-0"; + + trip2-temp = <80000>; + trip2-type = "active"; + trip2-cdev-num = <1>; + trip2-cdev-name0 = "thermal-cpufreq-0"; + + trip3-temp = <85000>; + trip3-type = "critical"; + trip3-cdev-num = <0>; + + status = "okay"; + }; ab8500 { ab8500-regulators {