staging: Mediatek: Use individual config flags in Makefile

These drivers can be useful on other MT76xx SoCs, which have compatible
peripherals.  The drivers were selectable in Kconfig, but they were
quietly excluded from the build because the SOC_MT7621 chip was not
selected.  So, make the Makefiles use the same flags as Kconfig for
these drivers.

mt7621-dma and mt7621-dts are left alone because they truly do require
that SoC.

I have personally confirmed that the mt7621-spi driver works on the
MT7688, which was what prompted this change.

Cc: linux-kernel@vger.kernel.org
Cc: devel@driverdev.osuosl.org
Cc: NeilBrown <neil@brown.name>
Cc: sergio.paracuellos@gmail.com
Signed-off-by: George Hilliard <thirtythreeforty@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 4d563ed0bc796e825d84ca02bbbd12615616f615..cc5530cc996be3a56486b2b9eded48a3db7a85f4 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -41,14 +41,14 @@ obj-$(CONFIG_GREYBUS)               += greybus/
 obj-$(CONFIG_BCM2835_VCHIQ)    += vc04_services/
 obj-$(CONFIG_DRM_VBOXVIDEO)    += vboxvideo/
 obj-$(CONFIG_PI433)            += pi433/
-obj-$(CONFIG_SOC_MT7621)       += mt7621-pci/
-obj-$(CONFIG_SOC_MT7621)       += mt7621-pci-phy/
-obj-$(CONFIG_SOC_MT7621)       += mt7621-pinctrl/
-obj-$(CONFIG_SOC_MT7621)       += mt7621-spi/
+obj-$(CONFIG_PCI_MT7621)       += mt7621-pci/
+obj-$(CONFIG_PCI_MT7621_PHY)   += mt7621-pci-phy/
+obj-$(CONFIG_PINCTRL_RT2880)   += mt7621-pinctrl/
+obj-$(CONFIG_SPI_MT7621)       += mt7621-spi/
 obj-$(CONFIG_SOC_MT7621)       += mt7621-dma/
-obj-$(CONFIG_SOC_MT7621)       += ralink-gdma/
-obj-$(CONFIG_SOC_MT7621)       += mt7621-mmc/
-obj-$(CONFIG_SOC_MT7621)       += mt7621-eth/
+obj-$(CONFIG_DMA_RALINK)       += ralink-gdma/
+obj-$(CONFIG_MTK_MMC)          += mt7621-mmc/
+obj-$(CONFIG_NET_MEDIATEK_SOC_STAGING) += mt7621-eth/
 obj-$(CONFIG_SOC_MT7621)       += mt7621-dts/
 obj-$(CONFIG_STAGING_GASKET_FRAMEWORK) += gasket/
 obj-$(CONFIG_XIL_AXIS_FIFO)    += axis-fifo/

diff --git a/drivers/staging/mt7621-mmc/Kconfig b/drivers/staging/mt7621-mmc/Kconfig
index c6dfe8c637dc394f26ad0089a03ae4068400e832..1eb79cd6e22fcf461bcf6b0249e0cede04f46773 100644 (file)
--- a/drivers/staging/mt7621-mmc/Kconfig
+++ b/drivers/staging/mt7621-mmc/Kconfig
@@ -1,6 +1,6 @@
 config MTK_MMC
        tristate "MTK SD/MMC"
-       depends on !MTD_NAND_RALINK && MMC
+       depends on RALINK && MMC
 
 config MTK_AEE_KDUMP
        bool "MTK AEE KDUMP"

diff --git a/drivers/staging/mt7621-pci-phy/Makefile b/drivers/staging/mt7621-pci-phy/Makefile
index 2b82ccfc28c6392eaaf5eb432f83ff1fba1d860b..a970056f05c1f835c17416ef5b625ba21d7f7122 100644 (file)
--- a/drivers/staging/mt7621-pci-phy/Makefile
+++ b/drivers/staging/mt7621-pci-phy/Makefile
@@ -1 +1 @@
-obj-$(CONFIG_SOC_MT7621)       += pci-mt7621-phy.o
+obj-$(CONFIG_PCI_MT7621_PHY)       += pci-mt7621-phy.o

diff --git a/drivers/staging/mt7621-pci/Makefile b/drivers/staging/mt7621-pci/Makefile
index 607b84bedcc3fb3ff7c8e28820ab174536a163a6..d4655a726b61a9ce1929651c7c9e739bea93573f 100644 (file)
--- a/drivers/staging/mt7621-pci/Makefile
+++ b/drivers/staging/mt7621-pci/Makefile
@@ -1 +1 @@
-obj-$(CONFIG_SOC_MT7621)       += pci-mt7621.o
+obj-$(CONFIG_PCI_MT7621)       += pci-mt7621.o