diff options
author | Hans de Goede <hdegoede@redhat.com> | 2022-08-01 16:21:31 +0200 |
---|---|---|
committer | Hans de Goede <hdegoede@redhat.com> | 2022-08-01 16:21:31 +0200 |
commit | 8906ced9a909158a3688dd90940a0a075ba32631 (patch) | |
tree | 10f251dd405e67d49ec96db1a3cf8ae74e8b76b6 /include/linux/platform_data | |
parent | platform/x86: pmc_atom: Fix comment typo (diff) | |
parent | leds: simatic-ipc-leds-gpio: Add GPIO version of Siemens driver (diff) | |
download | linux-dev-8906ced9a909158a3688dd90940a0a075ba32631.tar.xz linux-dev-8906ced9a909158a3688dd90940a0a075ba32631.zip |
Merge tag 'ib-mfd-edac-i2c-leds-pinctrl-platform-watchdog-v5.20' into review-hans
Immutable branch between MFD, EDAC, I2C, LEDs, PinCtrl, Platform and Watchdog due for the v5.20 merge window
Diffstat (limited to 'include/linux/platform_data')
-rw-r--r-- | include/linux/platform_data/x86/p2sb.h | 28 | ||||
-rw-r--r-- | include/linux/platform_data/x86/simatic-ipc-base.h | 2 |
2 files changed, 28 insertions, 2 deletions
diff --git a/include/linux/platform_data/x86/p2sb.h b/include/linux/platform_data/x86/p2sb.h new file mode 100644 index 000000000000..a1d5fddc8f13 --- /dev/null +++ b/include/linux/platform_data/x86/p2sb.h @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Primary to Sideband (P2SB) bridge access support + */ + +#ifndef _PLATFORM_DATA_X86_P2SB_H +#define _PLATFORM_DATA_X86_P2SB_H + +#include <linux/errno.h> +#include <linux/kconfig.h> + +struct pci_bus; +struct resource; + +#if IS_BUILTIN(CONFIG_P2SB) + +int p2sb_bar(struct pci_bus *bus, unsigned int devfn, struct resource *mem); + +#else /* CONFIG_P2SB */ + +static inline int p2sb_bar(struct pci_bus *bus, unsigned int devfn, struct resource *mem) +{ + return -ENODEV; +} + +#endif /* CONFIG_P2SB is not set */ + +#endif /* _PLATFORM_DATA_X86_P2SB_H */ diff --git a/include/linux/platform_data/x86/simatic-ipc-base.h b/include/linux/platform_data/x86/simatic-ipc-base.h index 62d2bc774067..39fefd48cf4d 100644 --- a/include/linux/platform_data/x86/simatic-ipc-base.h +++ b/include/linux/platform_data/x86/simatic-ipc-base.h @@ -24,6 +24,4 @@ struct simatic_ipc_platform { u8 devmode; }; -u32 simatic_ipc_get_membase0(unsigned int p2sb); - #endif /* __PLATFORM_DATA_X86_SIMATIC_IPC_BASE_H */ |