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.
Showing the changes to include/linux/platform_data (2 of 11 files). Show all
Unified · Split
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | /* | 2 | /* |
| 3 | * Siemens SIMATIC IPC drivers | 3 | * Siemens SIMATIC IPC drivers |
| 4 | * | 4 | * |
| 5 | * Copyright (c) Siemens AG, 2018-2021 | 5 | * Copyright (c) Siemens AG, 2018-2023 |
| 6 | * | 6 | * |
| 7 | * Authors: | 7 | * Authors: |
| 8 | * Henning Schild <henning.schild@siemens.com> | 8 | * Henning Schild <henning.schild@siemens.com> |
| @@ -20,6 +20,8 @@ · 11 unmodified lines | |||
| 20 | #define SIMATIC_IPC_DEVICE_127E 3 | 20 | #define SIMATIC_IPC_DEVICE_127E 3 |
| 21 | #define SIMATIC_IPC_DEVICE_227E 4 | 21 | #define SIMATIC_IPC_DEVICE_227E 4 |
| 22 | #define SIMATIC_IPC_DEVICE_227G 5 | 22 | #define SIMATIC_IPC_DEVICE_227G 5 |
| 23 | #define SIMATIC_IPC_DEVICE_BX_21A 6 | ||
| 24 | #define SIMATIC_IPC_DEVICE_BX_39A 7 | ||
| 23 | 25 | ||
| 24 | struct simatic_ipc_platform { | 26 | struct simatic_ipc_platform { |
| 25 | u8 devmode; | 27 | u8 devmode; |
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | /* | 2 | /* |
| 3 | * Siemens SIMATIC IPC drivers | 3 | * Siemens SIMATIC IPC drivers |
| 4 | * | 4 | * |
| 5 | * Copyright (c) Siemens AG, 2018-2021 | 5 | * Copyright (c) Siemens AG, 2018-2023 |
| 6 | * | 6 | * |
| 7 | * Authors: | 7 | * Authors: |
| 8 | * Henning Schild <henning.schild@siemens.com> | 8 | * Henning Schild <henning.schild@siemens.com> |
| @@ -32,8 +32,10 @@ enum simatic_ipc_station_ids { · 23 unmodified lines | |||
| 32 | SIMATIC_IPC_IPC477E = 0x00000A02, | 32 | SIMATIC_IPC_IPC477E = 0x00000A02, |
| 33 | SIMATIC_IPC_IPC127E = 0x00000D01, | 33 | SIMATIC_IPC_IPC127E = 0x00000D01, |
| 34 | SIMATIC_IPC_IPC227G = 0x00000F01, | 34 | SIMATIC_IPC_IPC227G = 0x00000F01, |
| 35 | SIMATIC_IPC_IPC277G = 0x00000F02, | ||
| 35 | SIMATIC_IPC_IPCBX_39A = 0x00001001, | 36 | SIMATIC_IPC_IPCBX_39A = 0x00001001, |
| 36 | SIMATIC_IPC_IPCPX_39A = 0x00001002, | 37 | SIMATIC_IPC_IPCPX_39A = 0x00001002, |
| 38 | SIMATIC_IPC_IPCBX_21A = 0x00001101, | ||
| 37 | }; | 39 | }; |
| 38 | 40 | ||
| 39 | static inline u32 simatic_ipc_get_station_id(u8 *data, int max_len) | 41 | static inline u32 simatic_ipc_get_station_id(u8 *data, int max_len) |