From patchwork Fri Nov 30 08:00:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 152495 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3362171ljp; Fri, 30 Nov 2018 00:01:10 -0800 (PST) X-Google-Smtp-Source: AFSGD/Uwm7AE5/t6ODw39OaQuMh/SjBK64M9JrpmJGVtktAzRvhBT3Jsay2PDSP2M1gQNf555A1w X-Received: by 2002:a65:60c2:: with SMTP id r2mr2853629pgv.393.1543564870249; Fri, 30 Nov 2018 00:01:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543564870; cv=none; d=google.com; s=arc-20160816; b=w3egCOA+4FSt1vK+mzmXtFiIB3Q4TS0nL65N/+POnESZDdzPskxOUamGPpG+O3/0qj 1uoZQ9B0vlQHQWOXA6knzsCpc1XubqOtrTZ5RioskD8228bFLcHOU43kNuS9h5X4CRKh Mpr8ZUTtruHRGxMpdcQv5Y0ectObv0RjaZ2A2aUN7ASv1dvmxOO36U/VgPzrkjy3RJQr 0XXUblSxoUr5sHyDtKwg4PU9jYelRFcl1B5Fnm+HoN30F9gnnH6s2/LUly5eIr4PKMRs rJs8U5+/dopDomdgVnpHWaBz2LbvmuQoP1mpn4q1VPT7QWsnm0hkl+zCPnnadyGArMY1 8bDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=BULyaOacFd0d+m8z9WucrlU3IR4UOzS/+4lMifUgKf8=; b=l7nSWavCYrsOkqs8uamlo0hEIpwokQ2UKV6HzGHuO0lu12NxBWMy8Gm/Rc1kWISXEd 7BCiHbPP0ak+N7CybyiU6ma2+YQAFV62iH237iZQ8bmsiNYdHkeujZcJdaYmcaddFLB1 03P8EUrg06i2khu8GZc7GwGtTD6JFz9ENBR/LO98ti6HoGuqVFuW8y7iEa7nW+17R375 1yxAZJ4gjkSuB8xplig+y1MGQdB4nkug51Ju8/SRhIEqX4unz4WwN8umy8SJ7L//Mj0o x4utsksAZh7mnUJ7DO70ytdIb63JLnudJSE1a2ek8zsem4WjaUFq661NmENJCOrVU9kn pIlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BkcwvF6b; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i198si4878474pfe.289.2018.11.30.00.01.10; Fri, 30 Nov 2018 00:01:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BkcwvF6b; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727145AbeK3TJe (ORCPT + 32 others); Fri, 30 Nov 2018 14:09:34 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:56071 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726648AbeK3TJd (ORCPT ); Fri, 30 Nov 2018 14:09:33 -0500 Received: by mail-wm1-f66.google.com with SMTP id y139so4740796wmc.5 for ; Fri, 30 Nov 2018 00:01:06 -0800 (PST) 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; bh=BULyaOacFd0d+m8z9WucrlU3IR4UOzS/+4lMifUgKf8=; b=BkcwvF6bmwP+b3m7YqvDHCbspSIkZHvy1WElrP/igiMnjI9tkcYwVqxQzmylnl/ctG EEh27BUlsfnPLSnMrN4ua5zN7r+h1VuWCyinCxuFWxhubjdn7b0cIwoGPmThA52dguHe FWbmvTiRMtFk/brObMH7jbGF6nH62qUZDjaJ8= 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; bh=BULyaOacFd0d+m8z9WucrlU3IR4UOzS/+4lMifUgKf8=; b=PwF8oKVILcg2ErquMQ/ZO1ydbCRKBtHxOrBShvCbNGpn8CuKPGlxicIO87UMX0h3hF khRfqUO07rnYBv2tnvvezaDuQwoFdHiTT5cZP29spwWP/6Cnqnz/SWox+qt/EcxkBwVz ZAGhoyrnytoS0qE+JEcy6sj2GRCzB2+YntnxCndhAh86sWHrHzqyXT+FcNolD/wwpEdy DUmxuz6w74YDb5GUF4dmhYeNebAVzbnkWP/mTw5SZH47nvWsXrAhGeQpfL7FWe1m9CV7 Mvq1KPWvYrb4GWj2fkszin6KnPTHdAdS0JKXxLzMTZbegGgDhEkwFhP5RBeo/dv7U/Bw 9L0A== X-Gm-Message-State: AA+aEWZYhB/+jsJk1cW6G+VpAqVcabc4k2mixSVwrRmIlMf5aC+GF+Hs wQw/dGdxWgLafLxfhqeOUmlNBw== X-Received: by 2002:a1c:a84f:: with SMTP id r76mr4354622wme.16.1543564865598; Fri, 30 Nov 2018 00:01:05 -0800 (PST) Received: from localhost.localdomain (118.142.136.77.rev.sfr.net. [77.136.142.118]) by smtp.gmail.com with ESMTPSA id h16sm6212393wrb.62.2018.11.30.00.01.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 30 Nov 2018 00:01:05 -0800 (PST) From: Daniel Lezcano To: edubezval@gmail.com, rui.zhang@intel.com Cc: vincent.guittot@linaro.org, john.stultz@linaro.org, linux-pm@vger.kernel.org (open list:THERMAL), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/2] thermal/drivers/hisi: Fix number of sensors on hi3660 Date: Fri, 30 Nov 2018 09:00:32 +0100 Message-Id: <1543564833-643-2-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543564833-643-1-git-send-email-daniel.lezcano@linaro.org> References: <1543564833-643-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Without this patch the thermal driver is broken on hi3660. The dual sensors support patchset was partially merged, unfortunately the dual thermal zones definition is not available in the DT yet, so when the driver tries to register all the sensors that fails. By reducing to 1 the number of sensors on the hi3660, we switch back to the previous functionnality. Fixes: 8c6c36846f11 (thermal/drivers/hisi: Add the dual clusters sensors for hi3660) Signed-off-by: Daniel Lezcano --- drivers/thermal/hisi_thermal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index 50f4d00..2d26ae8 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -424,7 +424,7 @@ static int hi3660_thermal_probe(struct hisi_thermal_data *data) struct platform_device *pdev = data->pdev; struct device *dev = &pdev->dev; - data->nr_sensors = 2; + data->nr_sensors = 1; data->sensor = devm_kzalloc(dev, sizeof(*data->sensor) * data->nr_sensors, GFP_KERNEL);