Hi Hans,
i actually do have a bug-fix commit on top of that, with a
Fixes: 917f54340794 ("platform/x86: simatic-ipc: add CMOS battery
monitoring")
one IPC model had a small issue left with reading out the battery state.
How should i proceed with that? Send that fix on top or make a v2 of
the CMOS battery patch after all? And if i send on top, can i assume
that the current sha will also be "immutable" when Linus takes it?
That last question goes into the direction of using "Fixes:", which
might not be needed/wanted anyhow because no backporting would ever be
needed if the fix gets in together with the patch bringing the bug.
Henning
Am Fri, 14 Jul 2023 15:21:12 +0200
schrieb Hans de Goede <hdegoede@xxxxxxxxxx>:
> Hi Lee, Guenter,
>
> Here is a pull-request for some pending pdx86 simatic-ipc changes
> which are a pre-requisite for merging the follow LED patch:
>
> https://lore.kernel.org/linux-leds/20230713115639.16419-3-henning.schild@xxxxxxxxxxx/
>
> (Guenter this also includes the watchdog change you acked for merging
> through the pdx86 tree in case you want to merge this into the wd
> tree)
>
> Regards,
>
> Hans
>
>
> The following changes since commit
> 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5:
>
> Linux 6.5-rc1 (2023-07-09 13:53:13 -0700)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
> tags/ib-pdx86-simatic-v6.6
>
> for you to fetch changes up to
> 8766addf665e9f0ace15cca894ba225e5a4d580a:
>
> platform/x86: simatic-ipc: use extra module loading for watchdog
> (2023-07-14 15:06:40 +0200)
>
> ----------------------------------------------------------------
> Immutable branch between pdx86 simatic branch and LED due for the
> v6.6 merge window
>
> v6.5-rc1 + recent pdx86 simatic-ipc patches for
> merging into the LED subsystem for v6.6.
>
> ----------------------------------------------------------------
> Henning Schild (7):
> platform/x86: simatic-ipc: add another model BX-21A
> watchdog: simatic-ipc-wdt: make IO region access of one model
> muxed platform/x86: simatic-ipc: add CMOS battery monitoring
> platform/x86: simatic-ipc: drop PCI runtime depends and header
> platform/x86: simatic-ipc: add another model
> platform/x86: simatic-ipc: add auto-loading of hwmon modules
> platform/x86: simatic-ipc: use extra module loading for watchdog
>
> drivers/platform/x86/Kconfig | 49 +++-
> drivers/platform/x86/Makefile | 6 +-
> drivers/platform/x86/simatic-ipc-batt-apollolake.c | 51 +++++
> .../platform/x86/simatic-ipc-batt-elkhartlake.c | 51 +++++
> drivers/platform/x86/simatic-ipc-batt-f7188x.c | 70 ++++++
> drivers/platform/x86/simatic-ipc-batt.c | 252
> +++++++++++++++++++++ drivers/platform/x86/simatic-ipc-batt.h
> | 20 ++ drivers/platform/x86/simatic-ipc.c | 119
> ++++++++-- drivers/watchdog/simatic-ipc-wdt.c | 9 +-
> include/linux/platform_data/x86/simatic-ipc-base.h | 4 +-
> include/linux/platform_data/x86/simatic-ipc.h | 4 +-
> 11 files changed, 607 insertions(+), 28 deletions(-)
> create mode 100644 drivers/platform/x86/simatic-ipc-batt-apollolake.c
> create mode 100644
> drivers/platform/x86/simatic-ipc-batt-elkhartlake.c create mode
> 100644 drivers/platform/x86/simatic-ipc-batt-f7188x.c create mode
> 100644 drivers/platform/x86/simatic-ipc-batt.c create mode 100644
> drivers/platform/x86/simatic-ipc-batt.h
>
