On Fri, Mar 11, 2016 at 11:09:14AM +0800, Wei Ni wrote:
> Get rid of T124-specific PDIV/HOTSPOT hack.
> tegra-soctherm.c contained a hack to set the SENSOR_PDIV and
> SENSOR_HOTSPOT_OFFSET registers - it just did two writes of
> T124-specific opaque values. Convert these into a form that can be
> substituted on a per-chip basis, and into structure fields that have
> at least some independent meaning.
>
> Signed-off-by: Wei Ni <w...@nvidia.com>
> ---
> drivers/thermal/tegra/tegra-soctherm.c | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/thermal/tegra/tegra-soctherm.c
> b/drivers/thermal/tegra/tegra-soctherm.c
> index b3ec0faa2bee..b4b791ebfbb6 100644
> --- a/drivers/thermal/tegra/tegra-soctherm.c
> +++ b/drivers/thermal/tegra/tegra-soctherm.c
> @@ -48,14 +48,12 @@
> #define SENSOR_CONFIG2_THERMB_SHIFT 0
>
> #define SENSOR_PDIV 0x1c0
> -#define SENSOR_PDIV_T124 0x8888
> #define SENSOR_PDIV_CPU_MASK (0xf << 12)
> #define SENSOR_PDIV_GPU_MASK (0xf << 8)
> #define SENSOR_PDIV_MEM_MASK (0xf << 4)
> #define SENSOR_PDIV_PLLX_MASK (0xf << 0)
>
> #define SENSOR_HOTSPOT_OFF 0x1c4
> -#define SENSOR_HOTSPOT_OFF_T124 0x00060600
> #define SENSOR_HOTSPOT_CPU_MASK (0xff << 16)
> #define SENSOR_HOTSPOT_GPU_MASK (0xff << 8)
> #define SENSOR_HOTSPOT_MEM_MASK (0xff << 0)
> @@ -436,6 +434,7 @@ static int tegra_soctherm_probe(struct platform_device
> *pdev)
> struct resource *res;
> unsigned int i;
> int err;
> + u32 pdiv, hotspot;
>
> const struct tegra_tsensor *tsensors = t124_tsensors;
> const struct tegra_tsensor_group **ttgs = tegra124_tsensor_groups;
> @@ -493,8 +492,19 @@ static int tegra_soctherm_probe(struct platform_device
> *pdev)
> goto disable_clocks;
> }
>
> - writel(SENSOR_PDIV_T124, tegra->regs + SENSOR_PDIV);
> - writel(SENSOR_HOTSPOT_OFF_T124, tegra->regs + SENSOR_HOTSPOT_OFF);
> + /* Program pdiv and hotspot offsets per THERM */
> + pdiv = readl(tegra->regs + SENSOR_PDIV);
> + hotspot = readl(tegra->regs + SENSOR_HOTSPOT_OFF);
> + for (i = 0; i < TEGRA124_SOCTHERM_SENSOR_NUM; ++i) {
> + pdiv = REG_SET_MASK(pdiv, ttgs[i]->pdiv_mask,
> + ttgs[i]->pdiv);
> + if (ttgs[i]->id != TEGRA124_SOCTHERM_SENSOR_PLLX)
> + hotspot = REG_SET_MASK(hotspot,
> + ttgs[i]->pllx_hotspot_mask,
> + ttgs[i]->pllx_hotspot_diff);
> + }
> + writel(pdiv, tegra->regs + SENSOR_PDIV);
> + writel(hotspot, tegra->regs + SENSOR_HOTSPOT_OFF);Is the above logic the same for all supported chips? e.g. do we always skip pllx for hotspot configuration? > > /* Initialize thermctl sensors */ > > -- > 1.9.1 >
signature.asc
Description: Digital signature
