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.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20220718145328.14374-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 6a33c862452b494bb23fdcde643ce3044f6ae9b9..f2f98e942cf295e1b6d0769abe6500695f42b005 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1138,3 +1138,15 @@ config WINMATE_FM07_KEYS
          that delivers key events when these buttons are pressed.
 
 endif # X86_PLATFORM_DEVICES
+
+config P2SB
+       bool "Primary to Sideband (P2SB) bridge access support"
+       depends on PCI && X86
+       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.

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index a0e417c34a9bf58092ab169792d81196de252f3d..5a428caa654a742875e46dfb0146c1d1c74db4f9 100644 (file)
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -119,6 +119,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

diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index c9cfbaae436b7ce3c747879a09713f61c6e9057b..794968bda1153dca27f9a3abc96cd5253c745507 100644 (file)
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -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

diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 741a9404db989ab109481a36a7d817db88f82cb8..717933dd0cfdd764e77cb345d887a2772c5bb202 100644 (file)
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -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

diff --git a/drivers/platform/x86/intel/p2sb.c b/drivers/platform/x86/p2sb.c
similarity index 100%
rename from drivers/platform/x86/intel/p2sb.c
rename to drivers/platform/x86/p2sb.c