diff options
| author |   Bartosz Golaszewski <brgl@bgdev.pl> | 2022-09-01 17:19:15 +0200 |
|---|---|---|
| committer | Bartosz Golaszewski <brgl@bgdev.pl> | 2022-09-01 17:19:15 +0200 |
| commit | 6ae8e1d0d5e5de922315830aea975c63e8c70b2f (patch) | |
| tree | 5532dc5dd711788eb8340a4a7c33f7f2fcf68c3c /include/linux | |
| parent | dt-bindings: gpio: stmpe: Remove node name requirement (diff) | |
| parent | platform/x86: simatic-ipc: add new model 427G (diff) | |
| download | linux-dev-6ae8e1d0d5e5de922315830aea975c63e8c70b2f.tar.xz linux-dev-6ae8e1d0d5e5de922315830aea975c63e8c70b2f.zip | |
Merge tag 'platform-drivers-x86-simatec-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86 into gpio/for-next
Tag (immutable branch) for:
v6.0-rc1 + "[PATCH v6 0/7] add support for another simatic board" series
for merging into the gpio, leds and pdx86 subsystems.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/platform_data/x86/simatic-ipc-base.h | 1 | ||||
| -rw-r--r-- | include/linux/platform_data/x86/simatic-ipc.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/platform_data/x86/simatic-ipc-base.h b/include/linux/platform_data/x86/simatic-ipc-base.h index 39fefd48cf4d..57d6a10dfc9e 100644 --- a/include/linux/platform_data/x86/simatic-ipc-base.h +++ b/include/linux/platform_data/x86/simatic-ipc-base.h @@ -19,6 +19,7 @@ #define SIMATIC_IPC_DEVICE_427E 2 #define SIMATIC_IPC_DEVICE_127E 3 #define SIMATIC_IPC_DEVICE_227E 4 +#define SIMATIC_IPC_DEVICE_227G 5 struct simatic_ipc_platform { u8 devmode; diff --git a/include/linux/platform_data/x86/simatic-ipc.h b/include/linux/platform_data/x86/simatic-ipc.h index f3b76b39776b..632320ec8f08 100644 --- a/include/linux/platform_data/x86/simatic-ipc.h +++ b/include/linux/platform_data/x86/simatic-ipc.h @@ -31,6 +31,8 @@ enum simatic_ipc_station_ids { SIMATIC_IPC_IPC427E = 0x00000A01, 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) |