| Message ID | sk3tppb46bmrbk6x67lzrrqmuu45jhfxlb7tazol36av7i6ozr@pdmyqxobq3yj (mailing list archive) |
|---|---|
| State | Handled Elsewhere, archived |
| Headers | show |
| Series | [GIT,PULL] power-supply changes for 6.11 | expand |
The pull request you sent on Mon, 22 Jul 2024 23:10:23 +0200:
> https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git tags/for-v6.11
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/fd71b9a07b6327bed6ef9d572b9cede98c868baf
Thank you!
Hi Linus, This time Stephen Rothwell noticed one merge conflict with the LED tree. The discussion around that can be found here: https://lore.kernel.org/all/20240709133420.55645c59@canb.auug.org.au/ All changes have been in -next for 3 weeks and are well-hung by now. Greetings, -- Sebastian The following changes since commit 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0: Linux 6.10-rc1 (2024-05-26 15:20:12 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git tags/for-v6.11 for you to fetch changes up to be6299c6e55e971ffc060495708740a59aa0e45b: power: supply: sysfs: use power_supply_property_is_writeable() (2024-07-04 12:30:49 +0200) ---------------------------------------------------------------- power supply and reset changes for the 6.11 series * power-supply core - new charging_orange_full_green RGB LED trigger - simplify and cleanup power-supply LED trigger code - expose power information via hwmon compatibility layer * new hardware support - enable battery support for Qualcomm Snapdragon X Elite - new battery driver for Maxim MAX17201/MAX17205 - new battery driver for Lenovo Yoga C630 laptop (custom EC) * cleanup 'struct i2c_device_id' initializations * misc. small battery driver cleanups and fixes ---------------------------------------------------------------- Abel Vesa (1): power: supply: qcom_battmgr: Enable battery support on x1e80100 Armin Wolf (1): power: supply: hwmon: Add support for power sensors Bjorn Andersson (1): dt-bindings: platform: Add Lenovo Yoga C630 EC Christophe JAILLET (6): power: supply: ab8500: Fix error handling when calling iio_read_channel_processed() power: supply: ab8500: Use iio_read_channel_processed_scale() power: supply: ab8500: Clean some error messages power: supply: ingenic: Fix some error handling paths in ingenic_battery_get_property() power: supply: samsung-sdi-battery: Constify struct power_supply_vbat_ri_table power: supply: samsung-sdi-battery: Constify struct power_supply_maintenance_charge_table Dimitri Fedrau (2): dt-bindings: power: supply: add support for MAX17201/MAX17205 fuel gauge power: supply: add support for MAX1720x standalone fuel gauge Dmitry Baryshkov (3): platform: arm64: add Lenovo Yoga C630 WOS EC driver platform/arm64: build drivers even on non-ARM64 platforms power: supply: lenovo_yoga_c630_battery: add Lenovo C630 driver Dr. David Alan Gilbert (2): power: supply: bd99954: remove unused struct 'battery_data' power: supply: ab8500: remove unused struct 'inst_curr_result_list' Hans de Goede (6): leds: rgb: leds-ktd202x: Initialize mutex earlier leds: core: Add led_mc_set_brightness() function leds: trigger: Add led_mc_trigger_event() function power: supply: leds: Add power_supply_[un]register_led_trigger() power: supply: leds: Share trig pointer for online and charging_full power: supply: leds: Add activate() callback to triggers Jeff Johnson (1): power: reset: piix4: add missing MODULE_DESCRIPTION() macro Kate Hsuan (3): leds: rgb: leds-ktd202x: Get device properties through fwnode to support ACPI leds: rgb: leds-ktd202x: I2C ID tables for KTD2026 and 2027 power: supply: power-supply-leds: Add charging_orange_full_green trigger for RGB LED Sebastian Reichel (2): Merge tag 'ib-leds-platform-power-v6.11' Merge tag 'platform-drivers-x86-ib-lenovo-c630-v6.11-2' Thomas Weißschuh (1): power: supply: sysfs: use power_supply_property_is_writeable() Uwe Kleine-König (1): power: supply: Drop explicit initialization of struct i2c_device_id::driver_data to 0 .../bindings/platform/lenovo,yoga-c630-ec.yaml | 83 ++++ .../bindings/power/supply/maxim,max17201.yaml | 58 +++ drivers/leds/led-class-multicolor.c | 1 + drivers/leds/led-core.c | 31 ++ drivers/leds/led-triggers.c | 20 + drivers/leds/rgb/Kconfig | 1 - drivers/leds/rgb/leds-ktd202x.c | 80 ++-- drivers/platform/Makefile | 2 +- drivers/platform/arm64/Kconfig | 14 + drivers/platform/arm64/Makefile | 1 + drivers/platform/arm64/lenovo-yoga-c630.c | 291 ++++++++++++ drivers/power/reset/piix4-poweroff.c | 1 + drivers/power/supply/Kconfig | 21 + drivers/power/supply/Makefile | 2 + drivers/power/supply/ab8500_chargalg.c | 2 +- drivers/power/supply/ab8500_charger.c | 52 ++- drivers/power/supply/ab8500_fg.c | 5 - drivers/power/supply/adp5061.c | 2 +- drivers/power/supply/bd99954-charger.c | 7 - drivers/power/supply/bq24735-charger.c | 2 +- drivers/power/supply/bq25890_charger.c | 10 +- drivers/power/supply/cw2015_battery.c | 2 +- drivers/power/supply/ingenic-battery.c | 10 +- drivers/power/supply/lenovo_yoga_c630_battery.c | 501 +++++++++++++++++++++ drivers/power/supply/lp8727_charger.c | 2 +- drivers/power/supply/ltc4162-l-charger.c | 4 +- drivers/power/supply/max14656_charger_detector.c | 2 +- drivers/power/supply/max1720x_battery.c | 337 ++++++++++++++ drivers/power/supply/max77976_charger.c | 4 +- drivers/power/supply/mm8013.c | 2 +- drivers/power/supply/power_supply_core.c | 4 +- drivers/power/supply/power_supply_hwmon.c | 25 + drivers/power/supply/power_supply_leds.c | 179 +++++--- drivers/power/supply/power_supply_sysfs.c | 3 +- drivers/power/supply/qcom_battmgr.c | 1 + drivers/power/supply/rt9455_charger.c | 4 +- drivers/power/supply/samsung-sdi-battery.c | 26 +- drivers/power/supply/sbs-charger.c | 2 +- drivers/power/supply/sbs-manager.c | 4 +- include/linux/leds.h | 26 ++ include/linux/platform_data/lenovo-yoga-c630.h | 44 ++ include/linux/power_supply.h | 19 +- 42 files changed, 1700 insertions(+), 187 deletions(-) create mode 100644 Documentation/devicetree/bindings/platform/lenovo,yoga-c630-ec.yaml create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max17201.yaml create mode 100644 drivers/platform/arm64/lenovo-yoga-c630.c create mode 100644 drivers/power/supply/lenovo_yoga_c630_battery.c create mode 100644 drivers/power/supply/max1720x_battery.c create mode 100644 include/linux/platform_data/lenovo-yoga-c630.h