Commit cb063a83 authored by Linus Walleij's avatar Linus Walleij Committed by Eduardo Valentin
Browse files

thermal: db8500: Finalize device tree conversion 



At some point there was an attempt to convert the DB8500
thermal sensor to device tree: a probe path was added
and the device tree was augmented for the Snowball board.
The switchover was never completed: instead the thermal
devices came from from the PRCMU MFD device and the probe
on the Snowball was confused as another set of configuration
appeared from the device tree.

Move over to a device-tree only approach, as we fixed up
the device trees.

Cc: Vincent Guittot <vincent.guittot@linaro.org>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Reviewed-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent dd89d82e

drivers/mfd/db8500-prcmu.c

+1 −52
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <linux/regulator/db8500-prcmu.h>

#include <linux/regulator/machine.h>

#include <linux/platform_data/ux500_wdt.h>

#include <linux/platform_data/db8500_thermal.h>

#include "dbx500-prcmu-regs.h"



/* Index of different voltages to be used when accessing AVSData */
@@ -2984,53 +2983,6 @@ static struct ux500_wdt_data db8500_wdt_pdata = { 
	.timeout = 600, /* 10 minutes */

	.has_28_bits_resolution = true,

};

/*

 * Thermal Sensor

 */



static struct resource db8500_thsens_resources[] = {

	{

		.name = "IRQ_HOTMON_LOW",

		.start  = IRQ_PRCMU_HOTMON_LOW,

		.end    = IRQ_PRCMU_HOTMON_LOW,

		.flags  = IORESOURCE_IRQ,

	},

	{

		.name = "IRQ_HOTMON_HIGH",

		.start  = IRQ_PRCMU_HOTMON_HIGH,

		.end    = IRQ_PRCMU_HOTMON_HIGH,

		.flags  = IORESOURCE_IRQ,

	},

};



static struct db8500_thsens_platform_data db8500_thsens_data = {

	.trip_points[0] = {

		.temp = 70000,

		.type = THERMAL_TRIP_ACTIVE,

		.cdev_name = {

			[0] = "thermal-cpufreq-0",

		},

	},

	.trip_points[1] = {

		.temp = 75000,

		.type = THERMAL_TRIP_ACTIVE,

		.cdev_name = {

			[0] = "thermal-cpufreq-0",

		},

	},

	.trip_points[2] = {

		.temp = 80000,

		.type = THERMAL_TRIP_ACTIVE,

		.cdev_name = {

			[0] = "thermal-cpufreq-0",

		},

	},

	.trip_points[3] = {

		.temp = 85000,

		.type = THERMAL_TRIP_CRITICAL,

	},

	.num_trips = 4,

};



static const struct mfd_cell common_prcmu_devs[] = {

	{
@@ -3054,10 +3006,7 @@ static const struct mfd_cell db8500_prcmu_devs[] = { 
	},

	{

		.name = "db8500-thermal",

		.num_resources = ARRAY_SIZE(db8500_thsens_resources),

		.resources = db8500_thsens_resources,

		.platform_data = &db8500_thsens_data,

		.pdata_size = sizeof(db8500_thsens_data),

		.of_compatible = "stericsson,db8500-thermal",

	},

};

drivers/thermal/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ config DOVE_THERMAL 


config DB8500_THERMAL

	tristate "DB8500 thermal management"

	depends on MFD_DB8500_PRCMU

	depends on MFD_DB8500_PRCMU && OF

	default y

	help

	  Adds DB8500 thermal management implementation according to the thermal

drivers/thermal/db8500_thermal.c

+15 −15
Original line number Diff line number Diff line
@@ -13,13 +13,24 @@ 
#include <linux/mfd/dbx500-prcmu.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/platform_data/db8500_thermal.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/thermal.h>



#define PRCMU_DEFAULT_MEASURE_TIME	0xFFF

#define PRCMU_DEFAULT_LOW_TEMP		0

#define COOLING_DEV_MAX 8



struct db8500_trip_point {

	unsigned long temp;

	enum thermal_trip_type type;

	char cdev_name[COOLING_DEV_MAX][THERMAL_NAME_LENGTH];

};



struct db8500_thsens_platform_data {

	struct db8500_trip_point trip_points[THERMAL_MAX_TRIPS];

	int num_trips;

};



struct db8500_thermal_zone {

	struct thermal_zone_device *therm_dev;
@@ -301,7 +312,6 @@ static void db8500_thermal_work(struct work_struct *work) 
	dev_dbg(&pzone->therm_dev->device, "thermal work finished.\n");

}



#ifdef CONFIG_OF

static struct db8500_thsens_platform_data*

		db8500_thermal_parse_dt(struct platform_device *pdev)

{
@@ -370,13 +380,6 @@ err_parse_dt: 
	dev_err(&pdev->dev, "Parsing device tree data error.\n");

	return NULL;

}

#else

static inline struct db8500_thsens_platform_data*

		db8500_thermal_parse_dt(struct platform_device *pdev)

{

	return NULL;

}

#endif



static int db8500_thermal_probe(struct platform_device *pdev)

{
@@ -386,11 +389,10 @@ static int db8500_thermal_probe(struct platform_device *pdev) 
	int low_irq, high_irq, ret = 0;

	unsigned long dft_low, dft_high;



	if (np)

		ptrips = db8500_thermal_parse_dt(pdev);

	else

		ptrips = dev_get_platdata(&pdev->dev);

	if (!np)

		return -EINVAL;



	ptrips = db8500_thermal_parse_dt(pdev);

	if (!ptrips)

		return -EINVAL;
@@ -498,13 +500,11 @@ static int db8500_thermal_resume(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_OF

static const struct of_device_id db8500_thermal_match[] = {

	{ .compatible = "stericsson,db8500-thermal" },

	{},

};

MODULE_DEVICE_TABLE(of, db8500_thermal_match);

#endif



static struct platform_driver db8500_thermal_driver = {

	.driver = {

include/linux/platform_data/db8500_thermal.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 * db8500_thermal.h - DB8500 Thermal Management Implementation

 *

 * Copyright (C) 2012 ST-Ericsson

 * Copyright (C) 2012 Linaro Ltd.

 *

 * Author: Hongbo Zhang <hongbo.zhang@linaro.com>

 */



#ifndef _DB8500_THERMAL_H_

#define _DB8500_THERMAL_H_



#include <linux/thermal.h>



#define COOLING_DEV_MAX 8



struct db8500_trip_point {

	unsigned long temp;

	enum thermal_trip_type type;

	char cdev_name[COOLING_DEV_MAX][THERMAL_NAME_LENGTH];

};



struct db8500_thsens_platform_data {

	struct db8500_trip_point trip_points[THERMAL_MAX_TRIPS];

	int num_trips;

};



#endif /* _DB8500_THERMAL_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE