From patchwork Wed Oct 19 14:17:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amjad Ouled-Ameur X-Patchwork-Id: 5597 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp366922wrs; Wed, 19 Oct 2022 07:45:52 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7q//gC1jiaT2nlKJAG4lPbReDMeiweXj20eCCkz0nQNa+O6Gz5EnYECBCMx50hTnbBkAcq X-Received: by 2002:a05:6402:1391:b0:459:cb69:9a2b with SMTP id b17-20020a056402139100b00459cb699a2bmr7844840edv.201.1666190752207; Wed, 19 Oct 2022 07:45:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666190752; cv=none; d=google.com; s=arc-20160816; b=hKhCEQe9h4cg6zvkDNXyPCkLWch0CkB5lro5HebuuVyxGLwOj98IAy4i7LN3vZP5s+ WS6Qz5lpfDA9k/Ruj05yVWZteEP7ywZ6eYOQmGJAbckmajJyG1dWc2ZVGrUf3UjSDzbq C674CWiz1zBHWCYE3WXdF1oHZjjFFw1f256qJJjWeSRT2RPbe2kettdrXB8k5u59flbi nq7lkL3R/l+wlkE7BnO9j/iVzEr2La2Qjvt/WoKfPlB+7Qr7K6liklB4zVm1DovYbbhw 1zTaVQHi2XtoX2fWMakAEUiO7b1U6+L4kUyCXuq1KHPJukq3/RgJ3eOSEbvViu/BdAXC uKqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=fyeoHLNYgE+7jRWrI7Gid0gjC7DyyjDTDuyVioxNv2s=; b=mQMxJUGWWlnxy1MfKb8pSOziH/Y/UzKgDcppSUuhTj0VQI8MiMMekSB5pUkGMOBJgY x3y/rsYz6nsBAt0bM7yq7Fb01psZnmkt9bTo/ctukc/PXt+G/lCR5m71+ZsKMDM5Lb1z UEQc2ZTAB5qY9CilnQ0Bpvl0Y/JtuMXW9MA67hAd3p/uIWIrLLhaN6j554/irI8tYv46 FtwQGZe4ZHPEYWRg464ETOfZqA2bzArOShPxvzi0RvmKvfVcQMuiBPO+ImIdOcebvF1H KPzxYgZADqqz36rtJuaUgwoq7xHdywY5MTYdoomH14Hzu5eeEjxMJ/1nFYw7wKa0IoO5 C0ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20210112.gappssmtp.com header.s=20210112 header.b=fd2H3oNq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f10-20020a50d54a000000b0045c3f6adb7csi13535030edj.215.2022.10.19.07.45.25; Wed, 19 Oct 2022 07:45:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20210112.gappssmtp.com header.s=20210112 header.b=fd2H3oNq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232270AbiJSOdy (ORCPT + 99 others); Wed, 19 Oct 2022 10:33:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232083AbiJSOdY (ORCPT ); Wed, 19 Oct 2022 10:33:24 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76E5B193744 for ; Wed, 19 Oct 2022 07:18:11 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id j16so29402290wrh.5 for ; Wed, 19 Oct 2022 07:18:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=fyeoHLNYgE+7jRWrI7Gid0gjC7DyyjDTDuyVioxNv2s=; b=fd2H3oNq5MmlrHBIUeEAt5HznMAZ2POQtEIeR09QEcojJHXyuzAyCpqcKtxRmHv939 e4Z7TpU6LrsAVi7ME645aV5eRSukfeCtUwEzga1p+sF2bPzK9BT0F/bqlpvT7XTnlDMV U6IZmMD4pxg5qJh2kGnDnP+Xuh8nhP9JM4u68gkEm0H779qBk+j1YzU3ycjtIOVxWI0h /EJhekxrIKT0c9Lm9QokfFAM3McA67e5PccyWNPZoTgFMgJ9NmA1jZ0zHanvRL5oNODZ 1Btlq0O8pbi8sKHIIhS7KNFnjAl7c3zzDyMjHImKcHVFgfGedsSQahyhJrmsMtCeF0pm JDyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fyeoHLNYgE+7jRWrI7Gid0gjC7DyyjDTDuyVioxNv2s=; b=JnMjMnx+JcE+aHlvu4iuivBm+GbdZxm+5bQI/lOjkwiBVIEajB7PPv7nIN0UeQjJXD ys230ZXdwzfXpzNAOe51ejSVyhGizkX4zZKgsyBxCD4JL7f1J8T0GVJ3ND7esNqtCYNY 1mCfiN16vstadxJVSq6SJgSXLa1/Asi1r2O+PXYMOuLlFPg5zserehOtNwvQssFKA54R uLNn0ozDcLeS2ik6qn0XQEVr415cE4nl3XBJrUCi1jz/M1MEolWIYD+J5Xa92lwEuIoP PuEoilw6yU3SECsWFaMb+GX1jTLzqzupSkulCaTKtFlYQY9f/mzdVdsHRRjfgpoC5Bys 34+A== X-Gm-Message-State: ACrzQf0qV0QxCETGv01OshI1nRtD7IlNN2Jokew8hMPEPN7yO8+Y+jM2 4OJGBPMvPW15Pu16imYZkkFCAA== X-Received: by 2002:a5d:6a48:0:b0:22e:34f0:617f with SMTP id t8-20020a5d6a48000000b0022e34f0617fmr5220654wrw.644.1666189079254; Wed, 19 Oct 2022 07:17:59 -0700 (PDT) Received: from [127.0.1.1] (rtr.23.90.200.126.unyc.it. [23.90.200.126]) by smtp.googlemail.com with ESMTPSA id n9-20020a05600c3b8900b003b4ff30e566sm2126577wms.3.2022.10.19.07.17.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 07:17:58 -0700 (PDT) From: Amjad Ouled-Ameur Date: Wed, 19 Oct 2022 16:17:55 +0200 Subject: [PATCH v6 2/4] thermal: mediatek: control buffer enablement tweaks MIME-Version: 1.0 Message-Id: <20221018-up-i350-thermal-bringup-v6-2-c87b9f75550b@baylibre.com> References: <20221018-up-i350-thermal-bringup-v6-0-c87b9f75550b@baylibre.com> In-Reply-To: <20221018-up-i350-thermal-bringup-v6-0-c87b9f75550b@baylibre.com> To: Krzysztof Kozlowski , Zhang Rui , Amit Kucheria , Rob Herring , "Rafael J. Wysocki" , Daniel Lezcano Cc: Fabien Parent , linux-mediatek@lists.infradead.org, Rob Herring , Markus Schneider-Pargmann , linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, AngeloGioacchino Del Regno , Michael Kao , Hsin-Yi Wang , Amjad Ouled-Ameur , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Matthias Brugger X-Mailer: b4 0.10.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1666189076; l=2549; i=aouledameur@baylibre.com; s=20220920; h=from:subject:message-id; bh=BUYgiWUyEmLmv5YqBlzSOjPnRULIXZAPNGFdkdhmkOQ=; b=DuTCH2nYQby2Rp3rUYfbKfiiNFfGGwSHOKQAOBeLAf4oWTYlJ5qTJGiqvCQvObkl5s1dpqQ5GpOv 3eK/2IoPDmqAKTAP4GM6xGNbfcEtstHqPfVKPpPJpZh3kiuqEiPL X-Developer-Key: i=aouledameur@baylibre.com; a=ed25519; pk=HgYWawSL4qLGPx+RzJ+Cuu+V8Pi/KQnDDm1wjWPMOFE= X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747127634069773870?= X-GMAIL-MSGID: =?utf-8?q?1747127634069773870?= From: Markus Schneider-Pargmann Add logic in order to be able to turn on the control buffer on MT8365. This change now allows to have control buffer support for MTK_THERMAL_V1, and it allows to define the register offset, and mask used to enable it. Signed-off-by: Markus Schneider-Pargmann Signed-off-by: Fabien Parent Signed-off-by: Amjad Ouled-Ameur Reviewed-by: AngeloGioacchino Del Regno --- drivers/thermal/mtk_thermal.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c index 8440692e3890..d8ddceb75372 100644 --- a/drivers/thermal/mtk_thermal.c +++ b/drivers/thermal/mtk_thermal.c @@ -271,6 +271,9 @@ struct mtk_thermal_data { bool need_switch_bank; struct thermal_bank_cfg bank_data[MAX_NUM_ZONES]; enum mtk_thermal_version version; + u32 apmixed_buffer_ctl_reg; + u32 apmixed_buffer_ctl_mask; + u32 apmixed_buffer_ctl_set; }; struct mtk_thermal { @@ -514,6 +517,9 @@ static const struct mtk_thermal_data mt7622_thermal_data = { .adcpnp = mt7622_adcpnp, .sensor_mux_values = mt7622_mux_values, .version = MTK_THERMAL_V2, + .apmixed_buffer_ctl_reg = APMIXED_SYS_TS_CON1, + .apmixed_buffer_ctl_mask = GENMASK(31, 6) | BIT(3), + .apmixed_buffer_ctl_set = BIT(0), }; /* @@ -963,14 +969,18 @@ static const struct of_device_id mtk_thermal_of_match[] = { }; MODULE_DEVICE_TABLE(of, mtk_thermal_of_match); -static void mtk_thermal_turn_on_buffer(void __iomem *apmixed_base) +static void mtk_thermal_turn_on_buffer(struct mtk_thermal *mt, + void __iomem *apmixed_base) { - int tmp; + u32 tmp; + + if (!mt->conf->apmixed_buffer_ctl_reg) + return; - tmp = readl(apmixed_base + APMIXED_SYS_TS_CON1); - tmp &= ~(0x37); - tmp |= 0x1; - writel(tmp, apmixed_base + APMIXED_SYS_TS_CON1); + tmp = readl(apmixed_base + mt->conf->apmixed_buffer_ctl_reg); + tmp &= mt->conf->apmixed_buffer_ctl_mask; + tmp |= mt->conf->apmixed_buffer_ctl_set; + writel(tmp, apmixed_base + mt->conf->apmixed_buffer_ctl_reg); udelay(200); } @@ -1070,8 +1080,9 @@ static int mtk_thermal_probe(struct platform_device *pdev) goto err_disable_clk_auxadc; } + mtk_thermal_turn_on_buffer(mt, apmixed_base); + if (mt->conf->version == MTK_THERMAL_V2) { - mtk_thermal_turn_on_buffer(apmixed_base); mtk_thermal_release_periodic_ts(mt, auxadc_base); }