History

Merge tag 'ib-pdx86-simatic-v6.6' into review-hans

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.

Hans de Goede committed 3 years ago

Commit 2dd074c2 parents 38831ea 8766add11 files · +607 −28Browse files

Showing the changes to include/linux/platform_data (2 of 11 files). Show all

Unified · Split

2 files
  1. include/linux/platform_data/x86/simatic-ipc-base.h +3 −1
  2. include/linux/platform_data/x86/simatic-ipc.h +3 −1
include/linux/platform_data/x86/simatic-ipc-base.h+3−1
@@ -2,7 +2,7 @@ · 1 unmodified line
22 /*
33 * Siemens SIMATIC IPC drivers
44 *
5− * Copyright (c) Siemens AG, 2018-2021
5+ * Copyright (c) Siemens AG, 2018-2023
66 *
77 * Authors:
88 * Henning Schild <henning.schild@siemens.com>
@@ -20,6 +20,8 @@ · 11 unmodified lines
2020 #define SIMATIC_IPC_DEVICE_127E 3
2121 #define SIMATIC_IPC_DEVICE_227E 4
2222 #define SIMATIC_IPC_DEVICE_227G 5
23+#define SIMATIC_IPC_DEVICE_BX_21A 6
24+#define SIMATIC_IPC_DEVICE_BX_39A 7
2325
2426 struct simatic_ipc_platform {
2527 u8 devmode;
include/linux/platform_data/x86/simatic-ipc.h+3−1
@@ -2,7 +2,7 @@ · 1 unmodified line
22 /*
33 * Siemens SIMATIC IPC drivers
44 *
5− * Copyright (c) Siemens AG, 2018-2021
5+ * Copyright (c) Siemens AG, 2018-2023
66 *
77 * Authors:
88 * Henning Schild <henning.schild@siemens.com>
@@ -32,8 +32,10 @@ enum simatic_ipc_station_ids { · 23 unmodified lines
3232 SIMATIC_IPC_IPC477E = 0x00000A02,
3333 SIMATIC_IPC_IPC127E = 0x00000D01,
3434 SIMATIC_IPC_IPC227G = 0x00000F01,
35+ SIMATIC_IPC_IPC277G = 0x00000F02,
3536 SIMATIC_IPC_IPCBX_39A = 0x00001001,
3637 SIMATIC_IPC_IPCPX_39A = 0x00001002,
38+ SIMATIC_IPC_IPCBX_21A = 0x00001101,
3739 };
3840
3941 static inline u32 simatic_ipc_get_station_id(u8 *data, int max_len)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t