platform/x86: p2sb: Move out of X86_PLATFORM_DEVICES dependency
PATCH 1/1 platform/x86: p2sb: Move out of X86_PLATFORM_DEVICES dependency
The P2SB library is used for various drivers, including server platforms. That's why the dependency on X86_PLATFORM_DEVICES seems superfluous.
---
drivers/platform/x86/Kconfig | 12 ++++++++++++
drivers/platform/x86/Makefile | 4 ++++
drivers/platform/x86/intel/Kconfig | 12 ------------
drivers/platform/x86/intel/Makefile | 2 --
drivers/platform/x86/{intel => }/p2sb.c | 0
5 files changed, 16 insertions(+), 14 deletions(-)
rename drivers/platform/x86/{intel => }/p2sb.c (100%)drivers/platform/x86/Kconfig +12 -0
@@ -1164,6 +1164,18 @@ config WINMATE_FM07_KEYS endif # X86_PLATFORM_DEVICES +config P2SB + bool "Primary to Sideband (P2SB) bridge access support" + depends on PCI + help + The Primary to Sideband (P2SB) bridge is an interface to some + PCI devices connected through it. In particular, SPI NOR controller + in Intel Apollo Lake SoC is one of such devices. + + The main purpose of this library is to unhide P2SB device in case + firmware kept it hidden on some platforms in order to access devices + behind it. + config PMC_ATOM def_bool y depends on PCI
drivers/platform/x86/Makefile +4 -0
@@ -120,6 +120,10 @@ obj-$(CONFIG_X86_ANDROID_TABLETS) += x86-android-tablets.o # Intel uncore drivers obj-$(CONFIG_INTEL_IPS) += intel_ips.o +# Intel miscellaneous drivers +intel_p2sb-y := p2sb.o +obj-$(CONFIG_P2SB) += intel_p2sb.o + # Intel PMIC / PMC / P-Unit devices obj-$(CONFIG_INTEL_SCU_IPC) += intel_scu_ipc.o obj-$(CONFIG_INTEL_SCU_PCI) += intel_scu_pcidrv.o
drivers/platform/x86/intel/Kconfig +0 -12
@@ -70,18 +70,6 @@ config INTEL_OAKTRAIL enable/disable the Camera, WiFi, BT etc. devices. If in doubt, say Y here; it will only load on supported platforms. -config P2SB - bool "Primary to Sideband (P2SB) bridge access support" - depends on PCI - help - The Primary to Sideband (P2SB) bridge is an interface to some - PCI devices connected through it. In particular, SPI NOR controller - in Intel Apollo Lake SoC is one of such devices. - - The main purpose of this library is to unhide P2SB device in case - firmware kept it hidden on some platforms in order to access devices - behind it. - config INTEL_BXTWC_PMIC_TMU tristate "Intel Broxton Whiskey Cove TMU Driver" depends on INTEL_SOC_PMIC_BXTWC
drivers/platform/x86/intel/Makefile +0 -2
@@ -28,8 +28,6 @@ intel_int0002_vgpio-y := int0002_vgpio.o obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o intel_oaktrail-y := oaktrail.o obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o -intel_p2sb-y := p2sb.o -obj-$(CONFIG_P2SB) += intel_p2sb.o intel_sdsi-y := sdsi.o obj-$(CONFIG_INTEL_SDSI) += intel_sdsi.o intel_vsec-y := vsec.o
drivers/platform/x86/p2sb.c renamed from drivers/platform/x86/intel/p2sb.c +0 -0
Signature · 1 line
2.35.1
Hi,
Quoted 20 lines · Andy Shevchenko
The P2SB library is used for various drivers, including server platforms. That's why the dependency on
X86_PLATFORM_DEVICESseems superfluous.Reported-by kernel test robot <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>--- drivers/platform/x86/Kconfig | 12 ++++++++++++ drivers/platform/x86/Makefile | 4 ++++ drivers/platform/x86/intel/Kconfig | 12 ------------ drivers/platform/x86/intel/Makefile | 2 -- drivers/platform/x86/{intel => }/p2sb.c | 0 5 files changed, 16 insertions(+), 14 deletions(-) rename drivers/platform/x86/{intel => }/p2sb.c (100%)drivers/platform/x86/Kconfig +0
-0
drivers/platform/x86/Kconfig config WINMATE_FM07_KEYS · line 1169
Quoted 6 lines
drivers/platform/x86/Kconfig +3
-0@@ -1164,6 +1164,18 @@ config WINMATE_FM07_KEYS endif # X86_PLATFORM_DEVICES +config P2SB + bool "Primary to Sideband (P2SB) bridge access support" + depends on PCI
This needs to become "PCI && X86" to avoid this possible getting enabled on other platforms.
With that added you may add my:
and this also counts as my ack for merging this through Lee's MFD tree together with the rest of the series.
Regards,
Hans
Quoted 67 lines
drivers/platform/x86/Kconfig +9
-0+ help + The Primary to Sideband (P2SB) bridge is an interface to some + PCI devices connected through it. In particular, SPI NOR controller + in Intel Apollo Lake SoC is one of such devices. + + The main purpose of this library is to unhide P2SB device in case + firmware kept it hidden on some platforms in order to access devices + behind it. + config PMC_ATOM def_bool y depends on PCIdrivers/platform/x86/Makefile +4
-0@@ -120,6 +120,10 @@ obj-$(CONFIG_X86_ANDROID_TABLETS) += x86-android-tablets.o # Intel uncore drivers obj-$(CONFIG_INTEL_IPS) += intel_ips.o +# Intel miscellaneous drivers +intel_p2sb-y := p2sb.o +obj-$(CONFIG_P2SB) += intel_p2sb.o + # Intel PMIC / PMC / P-Unit devices obj-$(CONFIG_INTEL_SCU_IPC) += intel_scu_ipc.o obj-$(CONFIG_INTEL_SCU_PCI) += intel_scu_pcidrv.odrivers/platform/x86/intel/Kconfig +0
-12@@ -70,18 +70,6 @@ config INTEL_OAKTRAIL enable/disable the Camera, WiFi, BT etc. devices. If in doubt, say Y here; it will only load on supported platforms. -config P2SB - bool "Primary to Sideband (P2SB) bridge access support" - depends on PCI - help - The Primary to Sideband (P2SB) bridge is an interface to some - PCI devices connected through it. In particular, SPI NOR controller - in Intel Apollo Lake SoC is one of such devices. - - The main purpose of this library is to unhide P2SB device in case - firmware kept it hidden on some platforms in order to access devices - behind it. - config INTEL_BXTWC_PMIC_TMU tristate "Intel Broxton Whiskey Cove TMU Driver" depends on INTEL_SOC_PMIC_BXTWCdrivers/platform/x86/intel/Makefile +0
-2@@ -28,8 +28,6 @@ intel_int0002_vgpio-y := int0002_vgpio.o obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o intel_oaktrail-y := oaktrail.o obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o -intel_p2sb-y := p2sb.o -obj-$(CONFIG_P2SB) += intel_p2sb.o intel_sdsi-y := sdsi.o obj-$(CONFIG_INTEL_SDSI) += intel_sdsi.o intel_vsec-y := vsec.odrivers/platform/x86/p2sb.c renamed from drivers/platform/x86/intel/p2sb.c +0
-0
Quoted 1 line · Hans de Goede
On 7/18/22 13:47, Andy Shevchenko wrote:
...
Quoted 8 lines
drivers/platform/x86/Kconfig config WINMATE_FM07_KEYS · line 1169
Quoted 5 lines
endif #
X86_PLATFORM_DEVICESdrivers/platform/x86/Kconfig +3
-0+config P2SB + bool "Primary to Sideband (P2SB) bridge access support" + depends on PCIThis needs to become "PCI && X86" to avoid this possible getting enabled on other platforms.
Indeed.
Quoted 3 lines
With that added you may add my:
Reviewed-by Hans de Goede <[email protected]>
Thanks!
Amended and sent a v2.
Quoted 2 lines
and this also counts as my ack for merging this through Lee's MFD tree together with the rest of the series.
Signature · 2 lines
With Best Regards, Andy Shevchenko