From patchwork Wed Jul 17 06:42:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 11047325 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DED0C112C for ; Wed, 17 Jul 2019 06:44:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB4282870F for ; Wed, 17 Jul 2019 06:44:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BEB9728711; Wed, 17 Jul 2019 06:44:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5C0142870F for ; Wed, 17 Jul 2019 06:44:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=8SnK7ssZhJK5eoQCxJOJxIOdGE0cpH2a35SDir5MjnM=; b=fY9SnYGsAhkcZA yu4DHfVmeV7JBQNhNTqexvR1G2UxZAEHkgwUJGqVsaBzDPa43tn5mHmw+7uCKnO0sP29gcNkACzZe 16JL5zldl9znA+fGt3zfQmwQohMvQrDxkCIyv+Ku5HH+exwFzoVZHw2r8fRjwxmiioVd1uER2yJel LnkjnC5OfeHbRBxTgJMy2dH6TVaQnyMo4yCGQ6WCuPq9+HeZDyba2dWZ8fguiQkfXREBDhXhEmQ2d rx0LgfLChPT0zH0bFbb5Ng8jGmHS88VOn+w50xRrhvtEOOvjeEWSCMpy0PcoyxeLN/qrRCZouolMr dRURhcM6WtGATXZckVqQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hndg1-0005lY-Ln; Wed, 17 Jul 2019 06:44:33 +0000 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hndfy-0005kp-BA for linux-arm-kernel@lists.infradead.org; Wed, 17 Jul 2019 06:44:31 +0000 Received: by mail-lj1-x242.google.com with SMTP id r9so22434353ljg.5 for ; Tue, 16 Jul 2019 23:44:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qQOSa6kWxlLoflHL8OdfTqPq/TojpJrLJGEjx81YQz4=; b=lC9hotHtG2BypEKQBhJAMKQSsKfn9SA9yna9QOpHdb7Au+2o8f5Qe8F8Uj04WBAS8d a1ztZDlrzxFi/VfravWwnHiP1538Z8/wgzcngm+SOjvd7jIikAIs2TgHUHSEJEhhzAbz vH369/VaRyId80mI/Uo/ocHyGdskXYs5+4TxL3WkwLWysriIqhvfU9g8zj3CKsLjc2D8 HmKgztV7xaFYKyExsLSt4pW3WRg53MRQ/NCzMLzyca+aHiPgAt7G++8FgP+hXKqaDSHs QU0DtmmmwmPD0YQCnkMlOqSKnhMik084dBc/28Z6A60a2GTa6mPyCLC2cRNWqKqFbzs3 cyeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qQOSa6kWxlLoflHL8OdfTqPq/TojpJrLJGEjx81YQz4=; b=bSQFIct2DtuCXeYOIqszwNguDJymyFw6FZ99GGzpuA+/U1Jscpitkmi3GSWEV/2/e3 NErwcFbCi4e1IJCWAL/PL4m6Tm8dXwDbwKnYKiWib3kti6G9GGqrMAu9hvPpdgp3cXCp wNd/zbZE3KoePEVQFeF+Q9dXDIwWSeF5thEYrwFmWQtkD7JlBccpFGD7IBNrgq/8D9su l7QCoG6GEnVZGJXrsxZwFDy6nuaJcMbSPCql9XebBPQPNX7H3wzev/mqCJH79/hn07Lm kF0AKkdaT1yHhUcZ/jWswEvO5QoNQsc0POacPeqQmhqpkU7X2Eyf5eNR/pGKJHalDWXC igug== X-Gm-Message-State: APjAAAXGjj7RsLilvw/QFSeF5Oq2Ir4HIcRZFvXFvC+fsPLrqoBLAxrh lvA0LOmQHB2m6qJnAZwQsLjyh1PDi28= X-Google-Smtp-Source: APXvYqy3Ubfcq2E+9PrxIsUWpElGRIEiHjGbg/nBA8IR71urhhgl4nPYVOvAQr43gJoIr7EKoew3cQ== X-Received: by 2002:a2e:970d:: with SMTP id r13mr19921585lji.126.1563345868756; Tue, 16 Jul 2019 23:44:28 -0700 (PDT) Received: from localhost.localdomain (c-22cd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.34]) by smtp.gmail.com with ESMTPSA id c15sm4198246lja.79.2019.07.16.23.44.27 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 23:44:27 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: dts: ux500: Fix up the thermal nodes Date: Wed, 17 Jul 2019 08:42:25 +0200 Message-Id: <20190717064225.7695-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190716_234430_404537_923AB7C8 X-CRM114-Status: GOOD ( 10.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The thermal driver for the DB8500 was never properly converted to device tree, the node should definately be activated for all board variants so move this down into the main SoC DTSI and and default on. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-dbx5x0.dtsi | 22 +++++++++++++++++++++- arch/arm/boot/dts/ste-snowball.dts | 29 ----------------------------- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi index 339da70d4e83..90dcbc3a29c3 100644 --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi @@ -505,10 +505,30 @@ thermal@801573c0 { compatible = "stericsson,db8500-thermal"; reg = <0x801573c0 0x40>; + interrupt-parent = <&prcmu>; interrupts = <21 IRQ_TYPE_LEVEL_HIGH>, <22 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH"; - status = "disabled"; + 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>; }; db8500-prcmu-regulators { diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts index 3428290644ba..064e8abec954 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts @@ -376,40 +376,11 @@ pinctrl-0 = <&ssp0_snowball_mode>; }; - cpufreq-cooling { - status = "okay"; - }; - prcmu@80157000 { cpufreq { status = "okay"; }; - 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-gpio { /*