From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E7F9C46464 for ; Thu, 9 Aug 2018 19:32:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 02C8B2238E for ; Thu, 9 Aug 2018 19:32:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="HZdbuJIP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 02C8B2238E Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727167AbeHIV7G (ORCPT ); Thu, 9 Aug 2018 17:59:06 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:37980 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727088AbeHIV7G (ORCPT ); Thu, 9 Aug 2018 17:59:06 -0400 Received: by mail-pf1-f195.google.com with SMTP id x17-v6so3316817pfh.5 for ; Thu, 09 Aug 2018 12:32:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=QBZRD5BKiPj4VpAeIcAs9xcI0Bhjvm4PYg84XHu/HNo=; b=HZdbuJIPb7MQr7MmcC6nDR41K0ZEFnmJLQ2oc8pYApZXY7OQaQjnW74FItu+K0RIOx +1G/jdJAVexLKyAxnclb8mgfEM8mukTUkeCoj5cSxu2iyCNnQK2kID8JJ7UdSKQXfs0x Qe/Y5QQq5fCByu3Ht9On/V/rtvPFM4nSUXrOU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=QBZRD5BKiPj4VpAeIcAs9xcI0Bhjvm4PYg84XHu/HNo=; b=Wq6XTeGgTe5o5paY8HQxaLp7vKyxAoQBWvA4JbzTHDda0SKfvp7MJGroTvqA08uYOQ jd4+IURbHxxU54mW1Q7tXgDxk/ihMjysYyWp1fo3MaWq2XC9K67pP2wEorlYQCs7X5Eo GeccdTKmBwDDPzUy3ugyHLr3gx33GdF5IhbgS27y+iCWR7j5952nKPpWAUUyPzOGFPs7 Z153TL1XEaKEw9b0APHeuUkifQXAldZYd6MWflFyApQCo45Qm05/yU0k3hIMK9ve+TJ6 aQozEKPHAUFar9Ij8nHmRrGbNEgnG/SMm8qlzzXzT00flPl4WiN9l2LUE4hUgnY07ST+ +g5A== X-Gm-Message-State: AOUpUlF5LwTVkUzHcAWphecwcU4MvDG0hHvSYlXmvun/GJiLL/PEJ8SK 0Y6cL3e7AzjyN0McSBSmi5FKLg== X-Google-Smtp-Source: AA+uWPwLrOS0yrpwFl9HgoZsejPOqsxWeE80ImN0DddbyW2FGjZGYK/taBlfzlcJ+JqOExNpmxAkxw== X-Received: by 2002:a65:4384:: with SMTP id m4-v6mr3391763pgp.265.1533843169436; Thu, 09 Aug 2018 12:32:49 -0700 (PDT) Received: from localhost ([2620:15c:202:1:b6af:f85:ed6c:ac6a]) by smtp.gmail.com with ESMTPSA id n80-v6sm21177932pfb.95.2018.08.09.12.32.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 Aug 2018 12:32:48 -0700 (PDT) Date: Thu, 9 Aug 2018 12:32:48 -0700 From: Matthias Kaehlcke To: Amit Kucheria Cc: linux-kernel@vger.kernel.org, rnayak@codeaurora.org, linux-arm-msm@vger.kernel.org, bjorn.andersson@linaro.org, edubezval@gmail.com, smohanad@codeaurora.org, andy.gross@linaro.org, dianders@chromium.org, Zhang Rui , linux-pm@vger.kernel.org Subject: Re: [PATCH v1 05/10] thermal: tsens: Rename map field in order to add a second address map Message-ID: <20180809193248.GM160295@google.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.2 (2017-12-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Aug 09, 2018 at 06:02:37PM +0530, Amit Kucheria wrote: > The TSENS driver currently only uses a limited set of registers from the TM > address space. So it was ok to map just that set of registers and call it > "map". > > We'd now like to map a second set: SROT registers to introduce new > functionality. Rename the "map" field to a more appropriate "tm_map". > > The 8960 doesn't have a clear split between TM and SROT registers. To avoid > complicating the data structure, it will switchover to using tm_map for its > maps. > > There is no functional change with this patch. > > Signed-off-by: Amit Kucheria > --- > drivers/thermal/qcom/tsens-8960.c | 30 ++++++++++++++--------------- > drivers/thermal/qcom/tsens-common.c | 17 ++++++++-------- > drivers/thermal/qcom/tsens-v2.c | 6 +++--- > drivers/thermal/qcom/tsens.h | 2 +- > 4 files changed, 27 insertions(+), 28 deletions(-) > > diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c > index 4af76de7dc2e..0f0adb302a7b 100644 > --- a/drivers/thermal/qcom/tsens-8960.c > +++ b/drivers/thermal/qcom/tsens-8960.c > @@ -60,7 +60,7 @@ static int suspend_8960(struct tsens_device *tmdev) > { > int ret; > unsigned int mask; > - struct regmap *map = tmdev->map; > + struct regmap *map = tmdev->tm_map; > > ret = regmap_read(map, THRESHOLD_ADDR, &tmdev->ctx.threshold); > if (ret) > @@ -85,7 +85,7 @@ static int suspend_8960(struct tsens_device *tmdev) > static int resume_8960(struct tsens_device *tmdev) > { > int ret; > - struct regmap *map = tmdev->map; > + struct regmap *map = tmdev->tm_map; > > ret = regmap_update_bits(map, CNTL_ADDR, SW_RST, SW_RST); > if (ret) > @@ -117,12 +117,12 @@ static int enable_8960(struct tsens_device *tmdev, int id) > int ret; > u32 reg, mask; > > - ret = regmap_read(tmdev->map, CNTL_ADDR, ®); > + ret = regmap_read(tmdev->tm_map, CNTL_ADDR, ®); > if (ret) > return ret; > > mask = BIT(id + SENSOR0_SHIFT); > - ret = regmap_write(tmdev->map, CNTL_ADDR, reg | SW_RST); > + ret = regmap_write(tmdev->tm_map, CNTL_ADDR, reg | SW_RST); > if (ret) > return ret; > > @@ -131,7 +131,7 @@ static int enable_8960(struct tsens_device *tmdev, int id) > else > reg |= mask | SLP_CLK_ENA_8660 | EN; > > - ret = regmap_write(tmdev->map, CNTL_ADDR, reg); > + ret = regmap_write(tmdev->tm_map, CNTL_ADDR, reg); > if (ret) > return ret; > > @@ -148,7 +148,7 @@ static void disable_8960(struct tsens_device *tmdev) > mask <<= SENSOR0_SHIFT; > mask |= EN; > > - ret = regmap_read(tmdev->map, CNTL_ADDR, ®_cntl); > + ret = regmap_read(tmdev->tm_map, CNTL_ADDR, ®_cntl); > if (ret) > return; > > @@ -159,7 +159,7 @@ static void disable_8960(struct tsens_device *tmdev) > else > reg_cntl &= ~SLP_CLK_ENA_8660; > > - regmap_write(tmdev->map, CNTL_ADDR, reg_cntl); > + regmap_write(tmdev->tm_map, CNTL_ADDR, reg_cntl); > } > > static int init_8960(struct tsens_device *tmdev) > @@ -167,8 +167,8 @@ static int init_8960(struct tsens_device *tmdev) > int ret, i; > u32 reg_cntl; > > - tmdev->map = dev_get_regmap(tmdev->dev, NULL); > - if (!tmdev->map) > + tmdev->tm_map = dev_get_regmap(tmdev->dev, NULL); > + if (!tmdev->tm_map) > return -ENODEV; > > /* > @@ -184,14 +184,14 @@ static int init_8960(struct tsens_device *tmdev) > } > > reg_cntl = SW_RST; > - ret = regmap_update_bits(tmdev->map, CNTL_ADDR, SW_RST, reg_cntl); > + ret = regmap_update_bits(tmdev->tm_map, CNTL_ADDR, SW_RST, reg_cntl); > if (ret) > return ret; > > if (tmdev->num_sensors > 1) { > reg_cntl |= SLP_CLK_ENA | (MEASURE_PERIOD << 18); > reg_cntl &= ~SW_RST; > - ret = regmap_update_bits(tmdev->map, CONFIG_ADDR, > + ret = regmap_update_bits(tmdev->tm_map, CONFIG_ADDR, > CONFIG_MASK, CONFIG); > } else { > reg_cntl |= SLP_CLK_ENA_8660 | (MEASURE_PERIOD << 16); > @@ -200,12 +200,12 @@ static int init_8960(struct tsens_device *tmdev) > } > > reg_cntl |= GENMASK(tmdev->num_sensors - 1, 0) << SENSOR0_SHIFT; > - ret = regmap_write(tmdev->map, CNTL_ADDR, reg_cntl); > + ret = regmap_write(tmdev->tm_map, CNTL_ADDR, reg_cntl); > if (ret) > return ret; > > reg_cntl |= EN; > - ret = regmap_write(tmdev->map, CNTL_ADDR, reg_cntl); > + ret = regmap_write(tmdev->tm_map, CNTL_ADDR, reg_cntl); > if (ret) > return ret; > > @@ -252,12 +252,12 @@ static int get_temp_8960(struct tsens_device *tmdev, int id, int *temp) > > timeout = jiffies + usecs_to_jiffies(TIMEOUT_US); > do { > - ret = regmap_read(tmdev->map, INT_STATUS_ADDR, &trdy); > + ret = regmap_read(tmdev->tm_map, INT_STATUS_ADDR, &trdy); > if (ret) > return ret; > if (!(trdy & TRDY_MASK)) > continue; > - ret = regmap_read(tmdev->map, s->status, &code); > + ret = regmap_read(tmdev->tm_map, s->status, &code); > if (ret) > return ret; > *temp = code_to_mdegC(code, s); > diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c > index 303e3fdaca98..0585084630b3 100644 > --- a/drivers/thermal/qcom/tsens-common.c > +++ b/drivers/thermal/qcom/tsens-common.c > @@ -99,8 +99,7 @@ int get_temp_common(struct tsens_device *tmdev, int id, int *temp) > int last_temp = 0, ret; > > status_reg = tmdev->tm_offset + STATUS_OFFSET + s->hw_id * SN_ADDR_OFFSET; > - ret = regmap_read(tmdev->map, status_reg, &code); > - > + ret = regmap_read(tmdev->tm_map, status_reg, &code); > if (ret) > return ret; > last_temp = code & SN_ST_TEMP_MASK; > @@ -118,7 +117,7 @@ static const struct regmap_config tsens_config = { > > int __init init_common(struct tsens_device *tmdev) > { > - void __iomem *base; > + void __iomem *tm_base; > struct resource *res; > struct platform_device *op = of_find_device_by_node(tmdev->dev->of_node); > > @@ -134,13 +133,13 @@ int __init init_common(struct tsens_device *tmdev) > } > > res = platform_get_resource(op, IORESOURCE_MEM, 0); > - base = devm_ioremap_resource(&op->dev, res); > - if (IS_ERR(base)) > - return PTR_ERR(base); > + tm_base = devm_ioremap_resource(&op->dev, res); > + if (IS_ERR(tm_base)) > + return PTR_ERR(tm_base); > > - tmdev->map = devm_regmap_init_mmio(tmdev->dev, base, &tsens_config); > - if (IS_ERR(tmdev->map)) > - return PTR_ERR(tmdev->map); > + tmdev->tm_map = devm_regmap_init_mmio(tmdev->dev, tm_base, &tsens_config); > + if (IS_ERR(tmdev->tm_map)) > + return PTR_ERR(tmdev->tm_map); > > return 0; > } > diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c > index 44da02f594ac..1bdef92e4521 100644 > --- a/drivers/thermal/qcom/tsens-v2.c > +++ b/drivers/thermal/qcom/tsens-v2.c > @@ -21,7 +21,7 @@ static int get_temp_tsens_v2(struct tsens_device *tmdev, int id, int *temp) > int ret; > > status_reg = tmdev->tm_offset + STATUS_OFFSET + s->hw_id * 4; > - ret = regmap_read(tmdev->map, status_reg, &code); > + ret = regmap_read(tmdev->tm_map, status_reg, &code); > if (ret) > return ret; > last_temp = code & LAST_TEMP_MASK; > @@ -29,7 +29,7 @@ static int get_temp_tsens_v2(struct tsens_device *tmdev, int id, int *temp) > goto done; > > /* Try a second time */ > - ret = regmap_read(tmdev->map, status_reg, &code); > + ret = regmap_read(tmdev->tm_map, status_reg, &code); > if (ret) > return ret; > if (code & STATUS_VALID_BIT) { > @@ -40,7 +40,7 @@ static int get_temp_tsens_v2(struct tsens_device *tmdev, int id, int *temp) > } > > /* Try a third/last time */ > - ret = regmap_read(tmdev->map, status_reg, &code); > + ret = regmap_read(tmdev->tm_map, status_reg, &code); > if (ret) > return ret; > if (code & STATUS_VALID_BIT) { > diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h > index 8207610f326a..58e98c4d3a8b 100644 > --- a/drivers/thermal/qcom/tsens.h > +++ b/drivers/thermal/qcom/tsens.h > @@ -69,7 +69,7 @@ struct tsens_context { > struct tsens_device { > struct device *dev; > u32 num_sensors; > - struct regmap *map; > + struct regmap *tm_map; > u32 tm_offset; > struct tsens_context ctx; > const struct tsens_ops *ops; Reviewed-by: Matthias Kaehlcke