Merge drm/drm-fixes into drm-misc-fixes

Backmerging to get updates from v6.15-rc1.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

Merge drm/drm-next into drm-intel-gt-next

We need
4ba4f1afb6a9 ("perf: Generic hotplug support for a PMU with a scope")
in order to land a i915 PMU simplification and a fix. That landed in 6.12
and

Merge drm/drm-next into drm-intel-gt-next

We need
4ba4f1afb6a9 ("perf: Generic hotplug support for a PMU with a scope")
in order to land a i915 PMU simplification and a fix. That landed in 6.12
and we are stuck at 6.9 so lets bump things forward.

Signed-off-by: Tvrtko Ursulin <tursulin@ursulin.net>

show more ...

Merge tag 'hwmon-for-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon updates from Guenter Roeck:
"New drivers:

- Driver for HTU31

- Congatec Board Co

Merge tag 'hwmon-for-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon updates from Guenter Roeck:
"New drivers:

- Driver for HTU31

- Congatec Board Controller monitoring driver

- Driver for TI INA233 Current and Power Monitor

Support for additional chips or boards in existing drivers:

- pmbus/ltc2978: Add support for LT717x and LTM4673

- asus-ec-sensors: Add PRIME X670E-PRO WIFI

- k10temp: Add support for cyan skillfish

- nct6683: Add customer ID for AMD BC-250

- lm90: Add support for NCT7716, NCT7717 and NCT7718

Other notable improvements in existing drivers:

- emc2305: Add devicetree support, and use
devm_thermal_of_cooling_device_register

- acpi_power_meter: Convert to with_info API

- dell-smm: Increase the number of fans

- pmbus/core: Optimize debugfs support and use i2c_client
debugfs directory

- hwmon core: Fix the missing of 'average' word in
hwmon_power_attr_templates

- Various drivers: Use per-client debugfs entry provided by
I2C subsystem"

* tag 'hwmon-for-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (49 commits)
hwmon: emc2305: Use devm_thermal_of_cooling_device_register
hwmon: emc2305: Add OF support
dt-bindings: hwmon: Add Microchip emc2305 support
dt-bindings: hwmon: Drop stray blank line in the header
hwmon: (acpi_power_meter) Replace the deprecated hwmon_device_register
hwmon: add driver for HTU31
dt-bindings: hwmon: Add description for sensor HTU31
hwmon: Add driver for TI INA233 Current and Power Monitor
dt-bindings: hwmon: ti,ina2xx: Add INA233 device
hwmon: Add Congatec Board Controller monitoring driver
hwmon: (pmbus/ltc2978) add support for lt717x
dt-bindings: hwmon: ltc2978: add support for LT717x
hwmon: (pmbus/ltc2978) Add support for LT717x - docs
hwmon: (dell-smm) Increment the number of fans
hwmon: (ntc_thermistor) return error instead of clipping on OOB
hwmon: (pt5161l) Use per-client debugfs entry
hwmon: Fix the missing of 'average' word in hwmon_power_attr_templates
hwmon: (acpi_power_meter) Fix the fake power alarm reporting
hwmon: (gpio-fan) Add missing mutex locks
dt-bindings: hwmon: gpio-fan: Add optional regulator support
...

show more ...

dt-bindings: hwmon: Drop stray blank line in the header

There should be no blank line between the YAML opening header and the
schema '$id'.

Reported-by: Florin Leotescu (OSS) <florin.leotescu@oss.n

dt-bindings: hwmon: Drop stray blank line in the header

There should be no blank line between the YAML opening header and the
schema '$id'.

Reported-by: Florin Leotescu (OSS) <florin.leotescu@oss.nxp.com>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20250321080212.18013-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

show more ...

Merge branch 'next' into for-linus

Prepare input updates for 6.12 merge window.

Merge branch 'ib/6.11-rc6-matrix-keypad-spitz' into next

Bring in changes removing support for platform data from matrix-keypad
driver.

Merge tag 'v6.11-rc1' into clk-meson-next

Linux 6.11-rc1

Merge tag 'v6.11-rc3' into trace/ring-buffer/core

The "reserve_mem" kernel command line parameter has been pulled into
v6.11. Merge the latest -rc3 to allow the persistent ring buffer memory to
be a

Merge tag 'v6.11-rc3' into trace/ring-buffer/core

The "reserve_mem" kernel command line parameter has been pulled into
v6.11. Merge the latest -rc3 to allow the persistent ring buffer memory to
be able to be mapped at the address specified by the "reserve_mem" command
line parameter.

Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

show more ...

Merge tag 'v6.11-rc1' into for-6.12

Linux 6.11-rc1

Merge drm/drm-next into drm-xe-next

Get drm-xe-next on v6.11-rc2 and synchronized with drm-intel-next for
the display side. This resolves the current conflict for the
enable_display module parameter

Merge drm/drm-next into drm-xe-next

Get drm-xe-next on v6.11-rc2 and synchronized with drm-intel-next for
the display side. This resolves the current conflict for the
enable_display module parameter and allows further pending refactors.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

show more ...

Merge drm/drm-next into drm-misc-next

Get drm-misc-next to the state of v6.11-rc2.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

Merge drm/drm-next into drm-intel-next

Sync with v6.11-rc1 in general, and specifically get the new
BACKLIGHT_POWER_ constants for power states.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Merge branch 'linus' into x86/mm

Bring x86 and selftests up to date

Merge drm/drm-fixes into drm-misc-fixes

Let's start the new drm-misc-fixes cycle by bringing in 6.11-rc1.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

Merge tag 'hwmon-for-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon updates from Guenter Roeck:
"Obsolete driver removals:

- Removed obsolete adm1021 an

Merge tag 'hwmon-for-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon updates from Guenter Roeck:
"Obsolete driver removals:

- Removed obsolete adm1021 and max6642 drivers

New drivers:

- MPS MP2891, MP2993, MP9941, and MP5920

- SPD5118 (Temperature Sensor and EEPROM)

Added device support to existing drivers:

- g762: G761

- dell-smm: Dell OptiPlex 7060

- asus-ec-sensors: ProArt X670E-CREATOR WIFI

- corsair-psu: HX1200i Series 2023 psu

- nzxt-smart2: Additional USB IS for NZXT RGB & Fan Controller

Notable enhancements and fixes:

- Removed use of i2c_match_id()

- Constified struct regmap_config where feasible

- Cleaned up amc6821 driver, and converted to use regmap and
with_info API

- Converted max6639 driver to use with_info API; added support for
additional sysfs attributes

- Fixed various sysfs attribute underflows

- Added PEC support to hwmon core, and use in lm90 and max31827
drivers

And various other minor fixes and improvements"

* tag 'hwmon-for-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (103 commits)
hwmon: (max6697) Fix swapped temp{1,8} critical alarms
hwmon: (max6697) Fix underflow when writing limit attributes
hwmon: Remove obsolete adm1021 and max6642 drivers
hwmon: (pmbus/ltc4286) Drop unused i2c device ids
hwmon: (g762) Initialize fans after configuring clock
hwmon: (amc6821) Add support for pwm1_mode attribute
hwmon: (amc6821) Convert to with_info API
hwmon: (amc6821) Convert to use regmap
hwmon: (amc6821) Drop unnecessary enum chips
hwmon: (amc6821) Use BIT() and GENMASK()
hwmon: (amc6821) Use tabs for column alignment in defines
hwmon: (amc6821) Reorder include files, drop unnecessary ones
hwmon: (amc6821) Add support for fan1_target and pwm1_enable mode 4
hwmon: (amc6821) Rename fan1_div to fan1_pulses
hwmon: (amc6821) Make reading and writing fan speed limits consistent
hwmon: (amc6821) Stop accepting invalid pwm values
hwmon: (w83627ehf) Fix underflows seen when writing limit attributes
hwmon: (nct6775-core) Fix underflows seen when writing limit attributes
hwmon: (lm95234) Fix underflows seen when writing limit attributes
hwmon: (adc128d818) Fix underflows seen when writing limit attributes
...

show more ...

dt-bindings: hwmon: Add max6639

Add Devicetree binding documentation for Maxim MAX6639 temperature
monitor with PWM fan-speed controller.

Signed-off-by: Naresh Solanki <naresh.solanki@9elements.com

dt-bindings: hwmon: Add max6639

Add Devicetree binding documentation for Maxim MAX6639 temperature
monitor with PWM fan-speed controller.

Signed-off-by: Naresh Solanki <naresh.solanki@9elements.com>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20240528125122.1129986-1-naresh.solanki@9elements.com
[groeck: Dropped unnecessary '|' after description:]
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

show more ...