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
2/*2/*
3 * Siemens SIMATIC IPC drivers3 * Siemens SIMATIC IPC drivers
4 *4 *
5 * Copyright (c) Siemens AG, 2018-20215 * 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 320#define SIMATIC_IPC_DEVICE_127E 3
21#define SIMATIC_IPC_DEVICE_227E 421#define SIMATIC_IPC_DEVICE_227E 4
22#define SIMATIC_IPC_DEVICE_227G 522#define SIMATIC_IPC_DEVICE_227G 5
23#define SIMATIC_IPC_DEVICE_BX_21A 6
24#define SIMATIC_IPC_DEVICE_BX_39A 7
23 25
24struct simatic_ipc_platform {26struct simatic_ipc_platform {
25 u8 devmode;27 u8 devmode;
include/linux/platform_data/x86/simatic-ipc.h+3−1
@@ -2,7 +2,7 @@ · 1 unmodified line
2/*2/*
3 * Siemens SIMATIC IPC drivers3 * Siemens SIMATIC IPC drivers
4 *4 *
5 * Copyright (c) Siemens AG, 2018-20215 * 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
39static inline u32 simatic_ipc_get_station_id(u8 *data, int max_len)41static 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