[PATCH linux dev-4.13 00/23] Migrate changes in dev-4.10 to dev-4.13

Andrew Jeffery andrew at aj.id.au
Tue Nov 7 18:30:23 AEDT 2017


Hello,

This is a patchbomb series partly to instigate discussion about how to do this
kind of thing in the future, but also to bring most of the changes I'm
responsible for in dev-4.10 forward to dev-4.13 where appropriate.

The series brings, along with their dependencies:

* The MAX31785 driver
* LEDs enhancements and fixes
* Watchdog enhancements and fixes

Patchbombing like this probably isn't the best thing to do, so we should
probably figure out what is. The approach - rebasing the dev-4.10 stack on
dev-4.13 - seemed to me the easiest way to get the result of having all my
patches up to date where possible, aside from some effort spent cherry-picking
back those which are now upstream but are so beyond 4.13.

It might be slightly less of a patchbomb to split this into smaller
series, which is a bit more fiddly but nothing major. Arguably the end result
is the same as a single series, as the patches themselves are still consumable
on an individual basis.

Another approach is sending some mail detailing the upstream commit IDs to be
cherry-picked back, and further mail for any remaining patches.

Regardless, we need to consider how the OpenBMC-Staging-Count tag is managed in
any case. I haven't fixed the tags in the patches I'm sending here - I figure
it's up to the maintainers to bump that as appropriate when they apply the
change.

Which approach should we take?

In the mean time, here are the patches for your viewing pleasure.

Andrew

Andrew Jeffery (16):
  ARM: aspeed: g4: Add LPC devicetree node and children
  ARM: aspeed: palmetto: Configure mbox and lpc nodes
  dt-bindings: hwmon: pmbus: Add Maxim MAX31785 documentation
  hwmon: pmbus: Add fan control support
  pmbus: Add driver for Maxim MAX31785 Intelligent Fan Controller
  pmbus: max31785: Work around back-to-back writes with FAN_CONFIG_1_2
  dt-bindings: leds: gpio: Add optional retain-state-shutdown property
  leds: gpio: Allow LED to retain state at shutdown
  ARM: dts: aspeed-palmetto: Request mux as per strapping configuration
  dt-bindings: watchdog: aspeed: External reset signal properties
  watchdog: aspeed: Support configuration of external signal properties
  leds: pca955x: Don't invert requested value in
    pca955x_gpio_set_value()
  watchdog: aspeed: Retain watchdog enabled state
  watchdog: aspeed: Fix 'Apseed' typo in Kconfig
  watchdog: aspeed: Remove specific reference to AST2400 in Kconfig
  watchdog: aspeed: Move init to arch_initcall

Christopher Bostic (2):
  drivers/watchdog: Add optional ASPEED device tree properties
  drivers/watchdog: ASPEED reference dev tree properties for config

C├ędric Le Goater (5):
  dt-bindings: leds: add pca955x
  leds: pca955x: add device tree support
  leds: pca955x: use devm_led_classdev_register
  leds: pca955x: add GPIO support
  leds: pca955x: check for I2C errors

 .../devicetree/bindings/hwmon/pmbus/max31785.txt   | 123 ++++
 .../devicetree/bindings/leds/leds-gpio.txt         |   3 +
 .../devicetree/bindings/leds/leds-pca955x.txt      |  88 +++
 .../devicetree/bindings/watchdog/aspeed-wdt.txt    |  40 ++
 arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts      |  18 +
 arch/arm/boot/dts/aspeed-g4.dtsi                   |  38 +
 drivers/hwmon/pmbus/Kconfig                        |  10 +
 drivers/hwmon/pmbus/Makefile                       |   1 +
 drivers/hwmon/pmbus/max31785.c                     | 762 +++++++++++++++++++++
 drivers/hwmon/pmbus/pmbus.h                        |  29 +
 drivers/hwmon/pmbus/pmbus_core.c                   | 222 +++++-
 drivers/leds/Kconfig                               |  11 +
 drivers/leds/leds-gpio.c                           |   7 +-
 drivers/leds/leds-pca955x.c                        | 343 ++++++++--
 drivers/watchdog/Kconfig                           |   4 +-
 drivers/watchdog/aspeed_wdt.c                      | 149 +++-
 include/dt-bindings/leds/leds-pca955x.h            |  16 +
 include/linux/leds.h                               |   2 +
 18 files changed, 1779 insertions(+), 87 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/max31785.txt
 create mode 100644 Documentation/devicetree/bindings/leds/leds-pca955x.txt
 create mode 100644 drivers/hwmon/pmbus/max31785.c
 create mode 100644 include/dt-bindings/leds/leds-pca955x.h

-- 
2.11.0



More information about the openbmc mailing list