thermal: Remove core header inclusion from drivers
As the name states "thermal_core.h" is the header file for the core components of the thermal framework. Too many drivers are including it. Hopefully the recent cleanups helped to self encapsulate the code a bit more and prevented the drivers to need this header. Remove this inclusion in every place where it is possible. Some other drivers did a confusion with the core header and the one exported in linux/thermal.h. They include the former instead of the latter. The changes also fix this. The tegra/soctherm driver still remains as it uses an internal function which need to be replaced. The Intel HFI driver uses the netlink internal framework core and should be changed to prevent to deal with the internals. No functional changes intended. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> # armada_thermal.c Reviewed-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> # uniphier_thermal.c Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> # rcar_gen3_thermal.c Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> # amlogic_thermal.c Acked-by: Florian Fainelli <f.fainelli@gmail.com> # bcm2835_thermal.c Acked-by: Thierry Reding <treding@nvidia.com> # tegra30-tsensor.c Link: https://lore.kernel.org/r/20230206153432.1017282-1-daniel.lezcano@linaro.org Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
ef1ab1657f
commit
9272d2d43b
|
@ -28,7 +28,6 @@
|
||||||
#include <linux/regmap.h>
|
#include <linux/regmap.h>
|
||||||
#include <linux/thermal.h>
|
#include <linux/thermal.h>
|
||||||
|
|
||||||
#include "thermal_core.h"
|
|
||||||
#include "thermal_hwmon.h"
|
#include "thermal_hwmon.h"
|
||||||
|
|
||||||
#define TSENSOR_CFG_REG1 0x4
|
#define TSENSOR_CFG_REG1 0x4
|
||||||
|
|
|
@ -19,8 +19,6 @@
|
||||||
#include <linux/regmap.h>
|
#include <linux/regmap.h>
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
|
|
||||||
#include "thermal_core.h"
|
|
||||||
|
|
||||||
/* Thermal Manager Control and Status Register */
|
/* Thermal Manager Control and Status Register */
|
||||||
#define PMU_TDC0_SW_RST_MASK (0x1 << 1)
|
#define PMU_TDC0_SW_RST_MASK (0x1 << 1)
|
||||||
#define PMU_TM_DISABLE_OFFS 0
|
#define PMU_TM_DISABLE_OFFS 0
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/thermal.h>
|
#include <linux/thermal.h>
|
||||||
|
|
||||||
#include "../thermal_core.h"
|
|
||||||
#include "../thermal_hwmon.h"
|
#include "../thermal_hwmon.h"
|
||||||
|
|
||||||
#define BCM2835_TS_TSENSCTL 0x00
|
#define BCM2835_TS_TSENSCTL 0x00
|
||||||
|
|
|
@ -16,8 +16,7 @@
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/of_device.h>
|
#include <linux/of_device.h>
|
||||||
|
#include <linux/thermal.h>
|
||||||
#include "thermal_core.h"
|
|
||||||
|
|
||||||
#define HI6220_TEMP0_LAG (0x0)
|
#define HI6220_TEMP0_LAG (0x0)
|
||||||
#define HI6220_TEMP0_TH (0x4)
|
#define HI6220_TEMP0_TH (0x4)
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/thermal.h>
|
#include <linux/thermal.h>
|
||||||
|
|
||||||
#include "thermal_core.h"
|
|
||||||
#include "thermal_hwmon.h"
|
#include "thermal_hwmon.h"
|
||||||
|
|
||||||
#define TER 0x0 /* TMU enable */
|
#define TER 0x0 /* TMU enable */
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/thermal.h>
|
#include <linux/thermal.h>
|
||||||
|
|
||||||
#include "thermal_core.h"
|
|
||||||
#include "thermal_hwmon.h"
|
#include "thermal_hwmon.h"
|
||||||
|
|
||||||
#define IMX_SC_MISC_FUNC_GET_TEMP 13
|
#define IMX_SC_MISC_FUNC_GET_TEMP 13
|
||||||
|
|
|
@ -40,10 +40,11 @@
|
||||||
|
|
||||||
#include <asm/msr.h>
|
#include <asm/msr.h>
|
||||||
|
|
||||||
#include "../thermal_core.h"
|
|
||||||
#include "intel_hfi.h"
|
#include "intel_hfi.h"
|
||||||
#include "thermal_interrupt.h"
|
#include "thermal_interrupt.h"
|
||||||
|
|
||||||
|
#include "../thermal_netlink.h"
|
||||||
|
|
||||||
/* Hardware Feedback Interface MSR configuration bits */
|
/* Hardware Feedback Interface MSR configuration bits */
|
||||||
#define HW_FEEDBACK_PTR_VALID_BIT BIT(0)
|
#define HW_FEEDBACK_PTR_VALID_BIT BIT(0)
|
||||||
#define HW_FEEDBACK_CONFIG_HFI_ENABLE_BIT BIT(0)
|
#define HW_FEEDBACK_CONFIG_HFI_ENABLE_BIT BIT(0)
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
#include <linux/regmap.h>
|
#include <linux/regmap.h>
|
||||||
#include <linux/thermal.h>
|
#include <linux/thermal.h>
|
||||||
|
|
||||||
#include "../thermal_core.h"
|
|
||||||
#include "../thermal_hwmon.h"
|
#include "../thermal_hwmon.h"
|
||||||
|
|
||||||
#define QPNP_TM_REG_DIG_MAJOR 0x01
|
#define QPNP_TM_REG_DIG_MAJOR 0x01
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
#include <linux/thermal.h>
|
#include <linux/thermal.h>
|
||||||
#include <linux/units.h>
|
#include <linux/units.h>
|
||||||
|
|
||||||
#include "thermal_core.h"
|
|
||||||
#include "thermal_hwmon.h"
|
#include "thermal_hwmon.h"
|
||||||
|
|
||||||
#define SITES_MAX 16
|
#define SITES_MAX 16
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
#include <linux/sys_soc.h>
|
#include <linux/sys_soc.h>
|
||||||
#include <linux/thermal.h>
|
#include <linux/thermal.h>
|
||||||
|
|
||||||
#include "thermal_core.h"
|
|
||||||
#include "thermal_hwmon.h"
|
#include "thermal_hwmon.h"
|
||||||
|
|
||||||
/* Register offsets */
|
/* Register offsets */
|
||||||
|
|
|
@ -20,11 +20,10 @@
|
||||||
#include <linux/of_irq.h>
|
#include <linux/of_irq.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/regulator/consumer.h>
|
#include <linux/regulator/consumer.h>
|
||||||
|
#include <linux/thermal.h>
|
||||||
|
|
||||||
#include <dt-bindings/thermal/thermal_exynos.h>
|
#include <dt-bindings/thermal/thermal_exynos.h>
|
||||||
|
|
||||||
#include "../thermal_core.h"
|
|
||||||
|
|
||||||
/* Exynos generic registers */
|
/* Exynos generic registers */
|
||||||
#define EXYNOS_TMU_REG_TRIMINFO 0x0
|
#define EXYNOS_TMU_REG_TRIMINFO 0x0
|
||||||
#define EXYNOS_TMU_REG_CONTROL 0x20
|
#define EXYNOS_TMU_REG_CONTROL 0x20
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/thermal.h>
|
#include <linux/thermal.h>
|
||||||
|
|
||||||
#include "../thermal_core.h"
|
|
||||||
#include "../thermal_hwmon.h"
|
#include "../thermal_hwmon.h"
|
||||||
|
|
||||||
/* DTS register offsets */
|
/* DTS register offsets */
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
|
|
||||||
#include <soc/tegra/fuse.h>
|
#include <soc/tegra/fuse.h>
|
||||||
|
|
||||||
#include "../thermal_core.h"
|
|
||||||
#include "../thermal_hwmon.h"
|
#include "../thermal_hwmon.h"
|
||||||
|
|
||||||
#define TSENSOR_SENSOR0_CONFIG0 0x0
|
#define TSENSOR_SENSOR0_CONFIG0 0x0
|
||||||
|
|
|
@ -17,8 +17,6 @@
|
||||||
#include <linux/regmap.h>
|
#include <linux/regmap.h>
|
||||||
#include <linux/thermal.h>
|
#include <linux/thermal.h>
|
||||||
|
|
||||||
#include "thermal_core.h"
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* block registers
|
* block registers
|
||||||
* addresses are the offset from .block_base
|
* addresses are the offset from .block_base
|
||||||
|
|
Loading…
Reference in New Issue