From: Henning Schild <henning.schild@siemens.com>
To: Linus Walleij <linus.walleij@linaro.org>,
Bartosz Golaszewski <brgl@bgdev.pl>, Pavel Machek <pavel@ucw.cz>,
Hans de Goede <hdegoede@redhat.com>,
Mark Gross <markgross@kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Lee Jones <lee@kernel.org>, <linux-gpio@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-leds@vger.kernel.org>,
<platform-driver-x86@vger.kernel.org>
Cc: Sheng-Yuan Huang <syhuang3@nuvoton.com>,
Tasanakorn Phaipool <tasanakorn@gmail.com>,
<simon.guinot@sequanux.org>,
Henning Schild <henning.schild@siemens.com>
Subject: [PATCH v6 7/7] platform/x86: simatic-ipc: add new model 427G
Date: Thu, 25 Aug 2022 12:44:22 +0200 [thread overview]
Message-ID: <20220825104422.14156-8-henning.schild@siemens.com> (raw)
In-Reply-To: <20220825104422.14156-1-henning.schild@siemens.com>
This adds support for the Siemens Simatic IPC427G. A board which
basically works like the 227G added in a previous patch. So all there is
to do is to add the station_id and make it take all the 227G branches.
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
drivers/platform/x86/simatic-ipc.c | 11 +++++++----
include/linux/platform_data/x86/simatic-ipc.h | 1 +
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/x86/simatic-ipc.c b/drivers/platform/x86/simatic-ipc.c
index 8dd686d1c9f1..ca76076fc706 100644
--- a/drivers/platform/x86/simatic-ipc.c
+++ b/drivers/platform/x86/simatic-ipc.c
@@ -41,11 +41,12 @@ static struct {
{SIMATIC_IPC_IPC127E, SIMATIC_IPC_DEVICE_127E, SIMATIC_IPC_DEVICE_NONE},
{SIMATIC_IPC_IPC227D, SIMATIC_IPC_DEVICE_227D, SIMATIC_IPC_DEVICE_NONE},
{SIMATIC_IPC_IPC227E, SIMATIC_IPC_DEVICE_427E, SIMATIC_IPC_DEVICE_227E},
- {SIMATIC_IPC_IPC227G, SIMATIC_IPC_DEVICE_227G, SIMATIC_IPC_DEVICE_NONE},
+ {SIMATIC_IPC_IPC227G, SIMATIC_IPC_DEVICE_227G, SIMATIC_IPC_DEVICE_227G},
{SIMATIC_IPC_IPC277E, SIMATIC_IPC_DEVICE_NONE, SIMATIC_IPC_DEVICE_227E},
{SIMATIC_IPC_IPC427D, SIMATIC_IPC_DEVICE_427E, SIMATIC_IPC_DEVICE_NONE},
{SIMATIC_IPC_IPC427E, SIMATIC_IPC_DEVICE_427E, SIMATIC_IPC_DEVICE_427E},
{SIMATIC_IPC_IPC477E, SIMATIC_IPC_DEVICE_NONE, SIMATIC_IPC_DEVICE_427E},
+ {SIMATIC_IPC_IPC427G, SIMATIC_IPC_DEVICE_227G, SIMATIC_IPC_DEVICE_227G},
};
static int register_platform_devices(u32 station_id)
@@ -82,6 +83,11 @@ static int register_platform_devices(u32 station_id)
ipc_led_platform_device->name);
}
+ if (wdtmode == SIMATIC_IPC_DEVICE_227G) {
+ request_module("w83627hf_wdt");
+ return 0;
+ }
+
if (wdtmode != SIMATIC_IPC_DEVICE_NONE) {
platform_data.devmode = wdtmode;
ipc_wdt_platform_device =
@@ -96,9 +102,6 @@ static int register_platform_devices(u32 station_id)
ipc_wdt_platform_device->name);
}
- if (station_id == SIMATIC_IPC_IPC227G)
- request_module("w83627hf_wdt");
-
if (ledmode == SIMATIC_IPC_DEVICE_NONE &&
wdtmode == SIMATIC_IPC_DEVICE_NONE) {
pr_warn("unsupported IPC detected, station id=%08x\n",
diff --git a/include/linux/platform_data/x86/simatic-ipc.h b/include/linux/platform_data/x86/simatic-ipc.h
index 7a2e79f3be0b..632320ec8f08 100644
--- a/include/linux/platform_data/x86/simatic-ipc.h
+++ b/include/linux/platform_data/x86/simatic-ipc.h
@@ -32,6 +32,7 @@ enum simatic_ipc_station_ids {
SIMATIC_IPC_IPC477E = 0x00000A02,
SIMATIC_IPC_IPC127E = 0x00000D01,
SIMATIC_IPC_IPC227G = 0x00000F01,
+ SIMATIC_IPC_IPC427G = 0x00001001,
};
static inline u32 simatic_ipc_get_station_id(u8 *data, int max_len)
--
2.35.1
next prev parent reply other threads:[~2022-08-25 10:45 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-25 10:44 [PATCH v6 0/7] add support for another simatic board Henning Schild
2022-08-25 10:44 ` [PATCH v6 1/7] gpio-f7188x: switch over to using pr_fmt Henning Schild
2022-08-25 11:19 ` Andy Shevchenko
2022-08-25 12:02 ` simon.guinot
2022-08-26 21:42 ` Linus Walleij
2022-08-25 10:44 ` [PATCH v6 2/7] gpio-f7188x: add a prefix to macros to keep gpio namespace clean Henning Schild
2022-08-25 11:20 ` Andy Shevchenko
2022-08-25 10:44 ` [PATCH v6 3/7] gpio-f7188x: Add GPIO support for Nuvoton NCT6116 Henning Schild
2022-08-25 10:44 ` [PATCH v6 4/7] gpio-f7188x: use unique labels for banks/chips Henning Schild
2022-08-25 10:44 ` [PATCH v6 5/7] leds: simatic-ipc-leds-gpio: add new model 227G Henning Schild
2022-08-25 17:33 ` Henning Schild
2022-08-25 18:03 ` Andy Shevchenko
2022-08-25 18:27 ` Henning Schild
2022-08-25 10:44 ` [PATCH v6 6/7] platform/x86: simatic-ipc: enable watchdog for 227G Henning Schild
2022-08-25 10:44 ` Henning Schild [this message]
2022-08-25 14:25 ` [PATCH v6 0/7] add support for another simatic board Hans de Goede
2022-08-25 14:29 ` Henning Schild
2022-08-25 14:31 ` Hans de Goede
2022-08-28 13:36 ` Bartosz Golaszewski
2022-09-01 14:24 ` Hans de Goede
2022-09-01 14:53 ` [GIT PULL] Immutable branch with 6.0-rc1 + "[PATCH v6 0/7] add support for another simatic board" series Hans de Goede
2022-09-01 15:19 ` Bartosz Golaszewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220825104422.14156-8-henning.schild@siemens.com \
--to=henning.schild@siemens.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=brgl@bgdev.pl \
--cc=hdegoede@redhat.com \
--cc=lee@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=markgross@kernel.org \
--cc=pavel@ucw.cz \
--cc=platform-driver-x86@vger.kernel.org \
--cc=simon.guinot@sequanux.org \
--cc=syhuang3@nuvoton.com \
--cc=tasanakorn@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.