[linux-yocto] [PATCH 3/3] features: Create mfd-intel-lpss feature and use where appropriate

[California Sullivan]

No need to have these similar configurations spread all around. Also
solves a warning where skylake tried to set MFD_INTEL_LPSS to build as
a module, but MFD_INTEL_LPSS_PCI in broxton hits a select and forces it
to built in.

Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
---
 features/mfd/mfd-intel-lpss.cfg  | 3 +++
 features/mfd/mfd-intel-lpss.scc  | 4 ++++
 features/soc/broxton/broxton.cfg | 4 ----
 features/soc/broxton/broxton.scc | 3 +++
 features/soc/skylake/skylake.cfg | 5 +----
 features/soc/skylake/skylake.scc | 3 +++
 6 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 features/mfd/mfd-intel-lpss.cfg
 create mode 100644 features/mfd/mfd-intel-lpss.scc

diff --git a/features/mfd/mfd-intel-lpss.cfg b/features/mfd/mfd-intel-lpss.cfg
new file mode 100644
index 0000000..ad7e6a5
--- /dev/null
+++ b/features/mfd/mfd-intel-lpss.cfg
@@ -0,0 +1,3 @@
+CONFIG_MFD_INTEL_LPSS=y
+CONFIG_MFD_INTEL_LPSS_PCI=y
+CONFIG_MFD_INTEL_LPSS_ACPI=y
diff --git a/features/mfd/mfd-intel-lpss.scc b/features/mfd/mfd-intel-lpss.scc
new file mode 100644
index 0000000..f1e18b1
--- /dev/null
+++ b/features/mfd/mfd-intel-lpss.scc
@@ -0,0 +1,4 @@
+define KFEATURE_DESCRIPTION "Intel LPSS support for Skylake and Broxton"
+define KFEATURE_COMPATIBILITY board
+
+kconf hardware mfd-intel-lpss.cfg
diff --git a/features/soc/broxton/broxton.cfg b/features/soc/broxton/broxton.cfg
index 0b4e824..446bd54 100644
--- a/features/soc/broxton/broxton.cfg
+++ b/features/soc/broxton/broxton.cfg
@@ -9,10 +9,6 @@ CONFIG_MMC_SDHCI_PCI=y
 CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 
-# Skylake/Broxton LPSS support
-CONFIG_MFD_INTEL_LPSS_ACPI=y
-CONFIG_MFD_INTEL_LPSS_PCI=y
-
 # LPSS DMA support
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_INTEL_IDMA64=y
diff --git a/features/soc/broxton/broxton.scc b/features/soc/broxton/broxton.scc
index 2951b7d..b80ee80 100644
--- a/features/soc/broxton/broxton.scc
+++ b/features/soc/broxton/broxton.scc
@@ -17,4 +17,7 @@ include features/usb/usb-typec.scc
 
 include features/mei/mei-me.scc
 
+# Enable Skylake/Broxton LPSS support
+include features/mfd/mfd-intel-lpss.scc
+
 kconf hardware broxton.cfg
diff --git a/features/soc/skylake/skylake.cfg b/features/soc/skylake/skylake.cfg
index 77f0efa..954c9f8 100644
--- a/features/soc/skylake/skylake.cfg
+++ b/features/soc/skylake/skylake.cfg
@@ -1,7 +1,4 @@
-# Skylake/Broxton LPSS support
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
+# IDMA support for LPSS
 CONFIG_INTEL_IDMA64=m
 
 # Additional power management support
diff --git a/features/soc/skylake/skylake.scc b/features/soc/skylake/skylake.scc
index bc59f22..4961901 100644
--- a/features/soc/skylake/skylake.scc
+++ b/features/soc/skylake/skylake.scc
@@ -9,4 +9,7 @@ include features/i2c/i2c.scc
 # Enable mac 80211 + WLAN support
 include features/mac80211/mac80211.scc
 
+# Enable Skylake/Broxton LPSS support
+include features/mfd/mfd-intel-lpss.scc
+
 kconf hardware skylake.cfg
-- 
2.5.5