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.
Showing the changes to include/linux/platform_data (2 of 6 files). Show all
Unified · Split
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | #define SIMATIC_IPC_DEVICE_427E 2 | 19 | #define SIMATIC_IPC_DEVICE_427E 2 |
| 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 | 23 | ||
| 23 | struct simatic_ipc_platform { | 24 | struct simatic_ipc_platform { |
| 24 | u8 devmode; | 25 | u8 devmode; |
| @@ -31,6 +31,8 @@ enum simatic_ipc_station_ids { · 30 unmodified lines | |||
| 31 | SIMATIC_IPC_IPC427E = 0x00000A01, | 31 | SIMATIC_IPC_IPC427E = 0x00000A01, |
| 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, | ||
| 35 | SIMATIC_IPC_IPC427G = 0x00001001, | ||
| 34 | }; | 36 | }; |
| 35 | 37 | ||
| 36 | static inline u32 simatic_ipc_get_station_id(u8 *data, int max_len) | 38 | static inline u32 simatic_ipc_get_station_id(u8 *data, int max_len) |