Message ID | e451a4dc1c885921c66da63549a720805c287a6a.1528972165.git.amit.kucheria@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A258F603EE for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 14 Jun 2018 10:48:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90A78289F8 for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 14 Jun 2018 10:48:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8446728A62; Thu, 14 Jun 2018 10:48:18 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI 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 353A8289F8 for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 14 Jun 2018 10:48:18 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To: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:List-Owner; bh=hb7uWo9Olc3c9bZ9rmyoZp33oUr7MHAfaGUbNTuVevE=; b=abwk6OmMoweFi75c3Pk0FliDul Kl5HBqMbzoZerTWid1v+g+E3FE/TPookRsYSFtVHM2P3liDK9wDlRBEw1DVZmBjuhZbfvkUoceq1L 9i9LivlR2S7AFSRtu2uVeEjMX1qwVZhyw6UivzqnYcUYcXuvflyh44w0gmWwZlfTmiKyiv2T3TWwk 6Ou5dz6q27GY4uOVmN+sHufnE+IJtFLgceiAYFdO4Icfo3iBfH+eQUJzM0OFPXzdVDXAi3CMSNP5Q hRuq26A/FLsI9Vd3VyQkUxQUTDU9YjG0AKwvtaB0OQXw4W3lU9MoQab4lrdh1Q9tsmrLYNUoyv+H2 CXCgpumA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fTPnZ-0003RK-6A; Thu, 14 Jun 2018 10:48:13 +0000 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fTPjU-0007pE-Qy for linux-arm-kernel@lists.infradead.org; Thu, 14 Jun 2018 10:44:04 +0000 Received: by mail-lf0-x241.google.com with SMTP id i15-v6so8666495lfc.2 for <linux-arm-kernel@lists.infradead.org>; Thu, 14 Jun 2018 03:43:50 -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:in-reply-to:references :in-reply-to:references; bh=LboO0m9tdUv5OClL5JGmFqiWh7zVC6d1MgWg2XNw1k8=; b=e18n8GM9yMChDMiudEptri7Dt71qtvl/jlXU/Iklt0lISEG+w3XBpsDiMfLrTHJGnw SJtYbJ5Az4TkPoyUpsxipUL2MaXB8lqVFp/v8zSoRQSqT+JS7SRBxAqnpC4POeWGBhR+ 3BzymjBjoW2xSMgaRdwpTMVdbIfz5EtciXV/E= 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:in-reply-to :references:in-reply-to:references; bh=LboO0m9tdUv5OClL5JGmFqiWh7zVC6d1MgWg2XNw1k8=; b=jJxIRXnYBl5WIYECN6hVrxSCQZSHxqjhQLdPpIiyaJQUR4GVrc1gjb34f7YkrtSmjx aDfUZ+cloNhW+rd/1HZbgy5FpIKynBZq7CoODGdyWO8Vx9iBAMXB1aXYdDJOsR7TNtxM xYe94C8JYLUxdVjPtND9MMHpVDKNSDIHBpKR+SmiIiCf8MkaMPQq2JNNtZiMJu8D9NNv gMdvcvegLcgpUFUp94CLEl3yXwF7ummZnHc5/13jyCezANLUuMU2SREVdKrO68JerBBq G+6eZt9Bx2ABNCb6COa3aXMbLHmbC2vVNO3pHIpLU/fkrts3tclwjQ+Qy+iIiOu46cYY CaNg== X-Gm-Message-State: APt69E0ci0Jpgvw8NnJUcZ1AkwISyJB7h6W6SZeB5paMHC9QmTgJHxzj 8qUxniMp+Gl8STvjCB2ikIzhAA== X-Google-Smtp-Source: ADUXVKIyXQ9yD10gqRX2OtCYf+dDZ5B9AJV0sotTQf9SqWcMdAUyNhpEUNqBB1A1hwb8Q4qF05kNKA== X-Received: by 2002:a19:1003:: with SMTP id f3-v6mr6000987lfi.114.1528973028844; Thu, 14 Jun 2018 03:43:48 -0700 (PDT) Received: from localhost (85-76-96-172-nat.elisa-mobile.fi. [85.76.96.172]) by smtp.gmail.com with ESMTPSA id y15-v6sm888556ljj.75.2018.06.14.03.43.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Jun 2018 03:43:48 -0700 (PDT) From: Amit Kucheria <amit.kucheria@linaro.org> To: linux-kernel@vger.kernel.org Subject: [PATCH v3 2/6] dt: qcom: 8996: thermal: Move to DT initialisation Date: Thu, 14 Jun 2018 13:43:12 +0300 Message-Id: <e451a4dc1c885921c66da63549a720805c287a6a.1528972165.git.amit.kucheria@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1528972165.git.amit.kucheria@linaro.org> References: <cover.1528972165.git.amit.kucheria@linaro.org> In-Reply-To: <cover.1528972165.git.amit.kucheria@linaro.org> References: <cover.1528972165.git.amit.kucheria@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180614_034400_906821_336DDFAF X-CRM114-Status: GOOD ( 13.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: Mark Rutland <mark.rutland@arm.com>, "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" <devicetree@vger.kernel.org>, rnayak@codeaurora.org, linux-arm-msm@vger.kernel.org, Will Deacon <will.deacon@arm.com>, smohanad@codeaurora.org, bjorn.andersson@linaro.org, edubezval@gmail.com, David Brown <david.brown@linaro.org>, Rob Herring <robh+dt@kernel.org>, vivek.gautam@codeaurora.org, Catalin Marinas <catalin.marinas@arm.com>, andy.gross@linaro.org, "open list:ARM/QUALCOMM SUPPORT" <linux-soc@vger.kernel.org>, "moderated list:ARM64 PORT AARCH64 ARCHITECTURE" <linux-arm-kernel@lists.infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 8c7f9ca..6c8a857 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -461,7 +461,17 @@ tsens0: thermal-sensor@4a8000 { compatible = "qcom,msm8996-tsens"; - reg = <0x4a8000 0x2000>; + reg = <0x4a9000 0x1000>, /* TM */ + <0x4a8000 0x1000>; /* SROT */ + #qcom,sensors = <13>; + #thermal-sensor-cells = <1>; + }; + + tsens1: thermal-sensor@4ac000 { + compatible = "qcom,msm8996-tsens"; + reg = <0x4ad000 0x1000>, /* TM */ + <0x4ac000 0x1000>; /* SROT */ + #qcom,sensors = <8>; #thermal-sensor-cells = <1>; };
We also split up the regmap address space into two, one for the TM registers, the other for the SROT registers. This was required to deal with different address offsets for the TM and SROT registers across different SoC families. Since tsens-common.c/init_common() currently only registers one address space, the order is important (TM before SROT). This is OK since the code doesn't really use the SROT functionality yet. Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org> --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)