History

Merge tag 'platform-drivers-x86-simatec-1' into review-hans

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.

Hans de Goede committed 4 years ago

Commit 3e891e92 parents f81fead 8f5c9856 files · +216 −117Browse files

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

Unified · Split

2 files
  1. include/linux/platform_data/x86/simatic-ipc-base.h +1 −0
  2. include/linux/platform_data/x86/simatic-ipc.h +2 −0
include/linux/platform_data/x86/simatic-ipc-base.h+1−0
@@ -19,6 +19,7 @@ · 18 unmodified lines
1919 #define SIMATIC_IPC_DEVICE_427E 2
2020 #define SIMATIC_IPC_DEVICE_127E 3
2121 #define SIMATIC_IPC_DEVICE_227E 4
22+#define SIMATIC_IPC_DEVICE_227G 5
2223
2324 struct simatic_ipc_platform {
2425 u8 devmode;
include/linux/platform_data/x86/simatic-ipc.h+2−0
@@ -31,6 +31,8 @@ enum simatic_ipc_station_ids { · 30 unmodified lines
3131 SIMATIC_IPC_IPC427E = 0x00000A01,
3232 SIMATIC_IPC_IPC477E = 0x00000A02,
3333 SIMATIC_IPC_IPC127E = 0x00000D01,
34+ SIMATIC_IPC_IPC227G = 0x00000F01,
35+ SIMATIC_IPC_IPC427G = 0x00001001,
3436 };
3537
3638 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