diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-17 01:47:19 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-17 01:47:19 +0300 |
commit | 15114e8fb58ffd574da83951e89cb5ab0055cc1e (patch) | |
tree | 9f0ca1563240e6f6fbd01d348bfaed48af8c3350 /include/linux/platform_data | |
parent | 42b5a01596f1f9471b58a2f59e1fceeb8db79ffc (diff) | |
parent | 281cfec53b4484ce2092c89b6909f5573cb23443 (diff) | |
download | linux-15114e8fb58ffd574da83951e89cb5ab0055cc1e.tar.xz |
Merge tag 'thermal-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control updates from Rafael Wysocki:
"These add some new hardware support (notably, the Lunar Lake platform
support in int340x and X1E80100 temperature sensor), continue to
rework the thermal driver interface to eliminate trip point IDs from
it, update DT bindings for a number of platforms and simplify probe in
a number of thermal drivers, address issues and clean up code.
Specifics:
- Add DLVR and MSI interrupt support for the Lunar Lake platform to
the int340x thermal driver (Srinivas Pandruvada)
- Enable workload type hints (WLT) support and power floor interrupt
support for the Lunar Lake platform in int340x ((Srinivas
Pandruvada)
- Switch Intel thermal drivers to new Intel CPU model defines (Tony
Luck)
- Clean up the int3400 and int3403 drivers (Erick Archer and David
Alan Gilbert)
- Improve intel_pch_thermal kernel log messages printed during
suspend to idle (Zhang Rui)
- Make the intel_tcc_cooling driver use a model-specific bitmask for
TCC offset (Ricardo Neri)
- Redesign the .set_trip_temp() thermal zone callback to take a trip
pointer instead of a trip ID and update its users (Rafael Wysocki)
- Avoid using invalid combinations of polling_delay and passive_delay
thermal zone parameters (Rafael Wysocki)
- Update a cooling device registration function to take a const
argument (Krzysztof Kozlowski)
- Make the uniphier thermal driver use thermal_zone_for_each_trip()
for walking trip points (Rafael Wysocki)
- Fix and clean up several minor shortcomings in thermal debug
(Rafael Wysocki)
- Rename __thermal_zone_set_trips() to thermal_zone_set_trips() and
make it use trip thresholds (Rafael Wysocki)
- Use READ_ONCE() for lockless access to trip temperature and
hysteresis (Rafael Wysocki)
- Drop unnecessary cooling device target state checks from the
Bang-Bang thermal governor (Rafael Wysocki)
- Avoid invoking thermal governor .trip_crossed() callback for
critical and hot trip points (Rafael Wysocki)
- Group all Renesas drivers inside a dedicated sub directory and add
the missing dependency to OF (Niklas Söderlund)
- Add suspend/resume support on k3_j72xx_bandgap and take the
opportunity to remove an unneeded delay in the init time code path
(Théo Lebrun)
- Fix thermal zone definition for MT8186 and MT8188 (Julien Panis)
- Convert hisilicon-thermal.txt to dt-schema (Abdulrasaq Lawani)
- Add DT bindings for the X1E80100 temperature sensor (Abel Vesa)
- Fix the thermal zone node name regular expression in the DT schema
(Krzysztof Kozlowski)
- Avoid failing thermal control initialization by using default
values on some platforms where calibration data is missing (Chen-Yu
Tsai)
- Fix the sensor cell size in DT for the Exynos platform (Krzysztof
Kozlowski)
- Bring the common definition of '#thermal-sensor-cells' property in
order to simplify the bindings on all the platforms where this
change makes sense and do some minor cleanups (Krzysztof Kozlowski)
- Fix a race between removal and clock disable in the broadcom
thermal driver (Krzysztof Kozlowski)
- Drop 'trips' DT node as required from the thermal zone bindings in
order to fix the remaining warnings appearing for thermal zones
without trip points (Rob Herring)
- Simplify all the drivers where dev_err_probe() can apply (Krzysztof
Kozlowski)
- Clean up code related to stih416 as this platform is not described
anywhere (Raphael Gallais-Pou)"
* tag 'thermal-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (81 commits)
thermal/drivers/sti: Cleanup code related to stih416
thermal/drivers/generic-adc: Simplify with dev_err_probe()
thermal/drivers/generic-adc: Simplify probe() with local dev variable
thermal/drivers/qcom-tsens: Simplify with dev_err_probe()
thermal/drivers/qcom-spmi-adc-tm5: Simplify with dev_err_probe()
thermal/drivers/imx: Simplify with dev_err_probe()
thermal/drivers/imx: Simplify probe() with local dev variable
thermal/drivers/hisi: Simplify with dev_err_probe()
thermal/drivers/exynos: Simplify with dev_err_probe()
thermal/drivers/exynos: Simplify probe() with local dev variable
thermal/drivers/broadcom: Simplify with dev_err_probe()
thermal/drivers/broadcom: Simplify probe() with local dev variable
thermal/drivers/broadcom: Fix race between removal and clock disable
dt-bindings: thermal: Drop 'trips' node as required
dt-bindings: thermal: qoriq: reference thermal-sensor schema
dt-bindings: thermal: cleanup examples indentation
dt-bindings: thermal: simplify few bindings
dt-bindings: thermal: ti,j72xx: reference thermal-sensor schema
dt-bindings: thermal: ti,am654: reference thermal-sensor schema
dt-bindings: thermal: st,stm32: reference thermal-sensor schema
...
Diffstat (limited to 'include/linux/platform_data')
-rw-r--r-- | include/linux/platform_data/x86/soc.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/platform_data/x86/soc.h b/include/linux/platform_data/x86/soc.h index a5705189e2ac..f981907a5cb0 100644 --- a/include/linux/platform_data/x86/soc.h +++ b/include/linux/platform_data/x86/soc.h @@ -20,7 +20,7 @@ static inline bool soc_intel_is_##soc(void) \ { \ static const struct x86_cpu_id soc##_cpu_ids[] = { \ - X86_MATCH_INTEL_FAM6_MODEL(type, NULL), \ + X86_MATCH_VFM(type, NULL), \ {} \ }; \ const struct x86_cpu_id *id; \ @@ -31,11 +31,11 @@ static inline bool soc_intel_is_##soc(void) \ return false; \ } -SOC_INTEL_IS_CPU(byt, ATOM_SILVERMONT); -SOC_INTEL_IS_CPU(cht, ATOM_AIRMONT); -SOC_INTEL_IS_CPU(apl, ATOM_GOLDMONT); -SOC_INTEL_IS_CPU(glk, ATOM_GOLDMONT_PLUS); -SOC_INTEL_IS_CPU(cml, KABYLAKE_L); +SOC_INTEL_IS_CPU(byt, INTEL_ATOM_SILVERMONT); +SOC_INTEL_IS_CPU(cht, INTEL_ATOM_AIRMONT); +SOC_INTEL_IS_CPU(apl, INTEL_ATOM_GOLDMONT); +SOC_INTEL_IS_CPU(glk, INTEL_ATOM_GOLDMONT_PLUS); +SOC_INTEL_IS_CPU(cml, INTEL_KABYLAKE_L); #undef SOC_INTEL_IS_CPU |