diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2023-07-31 16:05:44 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2023-07-31 16:05:44 +0200 |
| commit | 17ffe3a0fded309449e8bf201ad70358f3d52772 (patch) | |
| tree | f3b5e5abc181dd088347e4b374851a8787600489 /include/linux/platform_data | |
| parent | d4e695c016e0d5e15e91c7570ac4eef401b5c771 (diff) | |
| parent | c56beff2037549c951042d178de75e535818a98a (diff) | |
| download | linux-stable-17ffe3a0fded309449e8bf201ad70358f3d52772.tar.gz linux-stable-17ffe3a0fded309449e8bf201ad70358f3d52772.tar.bz2 linux-stable-17ffe3a0fded309449e8bf201ad70358f3d52772.zip | |
Merge tag 'ib-pdx86-simatic-v6.6-2' into review-hans
Immutable branch between pdx86 simatic branch and LED due for the v6.6 merge window
ib-pdx86-simatic-v6.6-2: v6.5-rc1 + ib-pdx86-simatic-v6.6 +
more recent pdx86 simatic-ipc patches for merging into
the LED subsystem for v6.6.
Diffstat (limited to 'include/linux/platform_data')
| -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 4ca21065c862..2d7f7120ba6b 100644 --- a/include/linux/platform_data/x86/simatic-ipc-base.h +++ b/include/linux/platform_data/x86/simatic-ipc-base.h @@ -22,6 +22,7 @@ #define SIMATIC_IPC_DEVICE_227G 5 #define SIMATIC_IPC_DEVICE_BX_21A 6 #define SIMATIC_IPC_DEVICE_BX_39A 7 +#define SIMATIC_IPC_DEVICE_BX_59A 8 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 f2eafa43a605..8d8b3b919674 100644 --- a/include/linux/platform_data/x86/simatic-ipc.h +++ b/include/linux/platform_data/x86/simatic-ipc.h @@ -36,6 +36,8 @@ enum simatic_ipc_station_ids { SIMATIC_IPC_IPCBX_39A = 0x00001001, SIMATIC_IPC_IPCPX_39A = 0x00001002, SIMATIC_IPC_IPCBX_21A = 0x00001101, + SIMATIC_IPC_IPCBX_56A = 0x00001201, + SIMATIC_IPC_IPCBX_59A = 0x00001202, }; static inline u32 simatic_ipc_get_station_id(u8 *data, int max_len) |