* [PATCH v2 1/2] Move ralink-gdma to its own directory [not found] <CACmrr9gHucWaWtz07kQms6AsquLKAHbK+_Q0kF=92RGo6HmAFA@mail.gmail.com> @ 2019-01-11 0:43 ` thirtythreeforty 2019-01-11 0:43 ` [PATCH v2 2/2] Mediatek staging: Use individual config flags in Makefile thirtythreeforty 2019-01-11 1:21 ` [PATCH v2 1/2] Move ralink-gdma to its own directory NeilBrown 0 siblings, 2 replies; 12+ messages in thread From: thirtythreeforty @ 2019-01-11 0:43 UTC (permalink / raw) To: Greg Kroah-Hartman; +Cc: George Hilliard, linux-kernel, devel, Neil Brown From: George Hilliard <thirtythreeforty@gmail.com> This is in preparation to allow it and the mt7621-dma drivers to be built separately. They are completely independent pieces of software, and the Kconfig specifies very different requirements. Cc: linux-kernel@vger.kernel.org Cc: devel@driverdev.osuosl.org Cc: Neil Brown <neil@brown.name> Signed-off-by: George Hilliard <thirtythreeforty@gmail.com> --- drivers/staging/Kconfig | 2 ++ drivers/staging/Makefile | 1 + drivers/staging/mt7621-dma/Kconfig | 6 ------ drivers/staging/mt7621-dma/Makefile | 1 - drivers/staging/ralink-gdma/Kconfig | 6 ++++++ drivers/staging/ralink-gdma/Makefile | 3 +++ drivers/staging/{mt7621-dma => ralink-gdma}/ralink-gdma.c | 0 7 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 drivers/staging/ralink-gdma/Kconfig create mode 100644 drivers/staging/ralink-gdma/Makefile rename drivers/staging/{mt7621-dma => ralink-gdma}/ralink-gdma.c (100%) diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index e4f608815c05..b4cfde38e856 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -110,6 +110,8 @@ source "drivers/staging/mt7621-spi/Kconfig" source "drivers/staging/mt7621-dma/Kconfig" +source "drivers/staging/ralink-gdma/Kconfig" + source "drivers/staging/mt7621-mmc/Kconfig" source "drivers/staging/mt7621-eth/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 5868631e8f1b..e095f427177c 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -45,6 +45,7 @@ obj-$(CONFIG_SOC_MT7621) += mt7621-pci/ obj-$(CONFIG_SOC_MT7621) += mt7621-pinctrl/ obj-$(CONFIG_SOC_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_SOC_MT7621) += mt7621-dts/ diff --git a/drivers/staging/mt7621-dma/Kconfig b/drivers/staging/mt7621-dma/Kconfig index 2423c40099d1..b6e48a682c44 100644 --- a/drivers/staging/mt7621-dma/Kconfig +++ b/drivers/staging/mt7621-dma/Kconfig @@ -1,9 +1,3 @@ -config DMA_RALINK - tristate "RALINK DMA support" - depends on RALINK && !SOC_RT288X - select DMA_ENGINE - select DMA_VIRTUAL_CHANNELS - config MTK_HSDMA tristate "MTK HSDMA support" depends on RALINK && SOC_MT7621 diff --git a/drivers/staging/mt7621-dma/Makefile b/drivers/staging/mt7621-dma/Makefile index d3152d45cf45..c9e3e1619ab0 100644 --- a/drivers/staging/mt7621-dma/Makefile +++ b/drivers/staging/mt7621-dma/Makefile @@ -1,4 +1,3 @@ -obj-$(CONFIG_DMA_RALINK) += ralink-gdma.o obj-$(CONFIG_MTK_HSDMA) += mtk-hsdma.o ccflags-y += -I$(srctree)/drivers/dma diff --git a/drivers/staging/ralink-gdma/Kconfig b/drivers/staging/ralink-gdma/Kconfig new file mode 100644 index 000000000000..a12b2c672d48 --- /dev/null +++ b/drivers/staging/ralink-gdma/Kconfig @@ -0,0 +1,6 @@ +config DMA_RALINK + tristate "RALINK DMA support" + depends on RALINK && !SOC_RT288X + select DMA_ENGINE + select DMA_VIRTUAL_CHANNELS + diff --git a/drivers/staging/ralink-gdma/Makefile b/drivers/staging/ralink-gdma/Makefile new file mode 100644 index 000000000000..5d917e0729bb --- /dev/null +++ b/drivers/staging/ralink-gdma/Makefile @@ -0,0 +1,3 @@ +obj-$(CONFIG_DMA_RALINK) += ralink-gdma.o + +ccflags-y += -I$(srctree)/drivers/dma diff --git a/drivers/staging/mt7621-dma/ralink-gdma.c b/drivers/staging/ralink-gdma/ralink-gdma.c similarity index 100% rename from drivers/staging/mt7621-dma/ralink-gdma.c rename to drivers/staging/ralink-gdma/ralink-gdma.c -- 2.20.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v2 2/2] Mediatek staging: Use individual config flags in Makefile 2019-01-11 0:43 ` [PATCH v2 1/2] Move ralink-gdma to its own directory thirtythreeforty @ 2019-01-11 0:43 ` thirtythreeforty 2019-01-15 15:30 ` [PATCH v2 2/2] staging: Mediatek: " Greg Kroah-Hartman 2019-01-11 1:21 ` [PATCH v2 1/2] Move ralink-gdma to its own directory NeilBrown 1 sibling, 1 reply; 12+ messages in thread From: thirtythreeforty @ 2019-01-11 0:43 UTC (permalink / raw) To: Greg Kroah-Hartman; +Cc: George Hilliard, linux-kernel, devel, NeilBrown From: George Hilliard <thirtythreeforty@gmail.com> These drivers are useful on other MT76xx SoCs, which have compatible peripherals. The drivers are selectable in Kconfig, but they were quietly excluded from the build because the SOC_MT7621 chip was not selected. So, make the main staging Makefile use the same flags as everything else 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> Signed-off-by: George Hilliard <thirtythreeforty@gmail.com> --- drivers/staging/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index e095f427177c..4b78ea2c7848 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -42,12 +42,12 @@ 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-pinctrl/ -obj-$(CONFIG_SOC_MT7621) += mt7621-spi/ +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/ -- 2.20.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v2 2/2] staging: Mediatek: Use individual config flags in Makefile 2019-01-11 0:43 ` [PATCH v2 2/2] Mediatek staging: Use individual config flags in Makefile thirtythreeforty @ 2019-01-15 15:30 ` Greg Kroah-Hartman 2019-01-15 17:02 ` [PATCH v3] " George Hilliard 0 siblings, 1 reply; 12+ messages in thread From: Greg Kroah-Hartman @ 2019-01-15 15:30 UTC (permalink / raw) To: thirtythreeforty; +Cc: devel, NeilBrown, linux-kernel On Thu, Jan 10, 2019 at 05:43:37PM -0700, thirtythreeforty@gmail.com wrote: > From: George Hilliard <thirtythreeforty@gmail.com> > > These drivers are useful on other MT76xx SoCs, which have compatible > peripherals. The drivers are selectable in Kconfig, but they were > quietly excluded from the build because the SOC_MT7621 chip was not > selected. So, make the main staging Makefile use the same flags as > everything else 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> > Signed-off-by: George Hilliard <thirtythreeforty@gmail.com> > --- > drivers/staging/Makefile | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile > index e095f427177c..4b78ea2c7848 100644 > --- a/drivers/staging/Makefile > +++ b/drivers/staging/Makefile > @@ -42,12 +42,12 @@ 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-pinctrl/ > -obj-$(CONFIG_SOC_MT7621) += mt7621-spi/ > +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/ This patch doesn't apply to my tree at all, can you rebase and resend? thanks, greg k-h ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v3] staging: Mediatek: Use individual config flags in Makefile 2019-01-15 15:30 ` [PATCH v2 2/2] staging: Mediatek: " Greg Kroah-Hartman @ 2019-01-15 17:02 ` George Hilliard 2019-01-15 17:20 ` Greg Kroah-Hartman 0 siblings, 1 reply; 12+ messages in thread From: George Hilliard @ 2019-01-15 17:02 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: George Hilliard, linux-kernel, devel, NeilBrown, sergio.paracuellos 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> --- drivers/staging/Makefile | 14 +++++++------- drivers/staging/mt7621-pci-phy/Makefile | 2 +- drivers/staging/mt7621-pci/Makefile | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 4d563ed0bc79..cc5530cc996b 100644 --- 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-pci-phy/Makefile b/drivers/staging/mt7621-pci-phy/Makefile index 2b82ccfc28c6..a970056f05c1 100644 --- 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 607b84bedcc3..d4655a726b61 100644 --- 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 -- 2.20.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v3] staging: Mediatek: Use individual config flags in Makefile 2019-01-15 17:02 ` [PATCH v3] " George Hilliard @ 2019-01-15 17:20 ` Greg Kroah-Hartman 2019-01-15 17:29 ` [PATCH v4] " George Hilliard 2019-01-15 17:32 ` [PATCH v3] " George Hilliard 0 siblings, 2 replies; 12+ messages in thread From: Greg Kroah-Hartman @ 2019-01-15 17:20 UTC (permalink / raw) To: George Hilliard; +Cc: linux-kernel, devel, NeilBrown, sergio.paracuellos On Tue, Jan 15, 2019 at 10:02:21AM -0700, George Hilliard wrote: > 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> > --- > drivers/staging/Makefile | 14 +++++++------- > drivers/staging/mt7621-pci-phy/Makefile | 2 +- > drivers/staging/mt7621-pci/Makefile | 2 +- > 3 files changed, 9 insertions(+), 9 deletions(-) What changed from v2 and v1? That always goes below the --- line. Please fix that up and resend v4. thanks, greg k-h ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v4] staging: Mediatek: Use individual config flags in Makefile 2019-01-15 17:20 ` Greg Kroah-Hartman @ 2019-01-15 17:29 ` George Hilliard 2019-01-15 17:43 ` Greg Kroah-Hartman 2019-01-16 4:43 ` [PATCH v4] " kbuild test robot 2019-01-15 17:32 ` [PATCH v3] " George Hilliard 1 sibling, 2 replies; 12+ messages in thread From: George Hilliard @ 2019-01-15 17:29 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: George Hilliard, linux-kernel, devel, NeilBrown, sergio.paracuellos 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> --- Changes in v2..v4: - Also use individual flags for mt7621-pci and the new mt7621-pci-phy - Slightly revise commit message drivers/staging/Makefile | 14 +++++++------- drivers/staging/mt7621-pci-phy/Makefile | 2 +- drivers/staging/mt7621-pci/Makefile | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 4d563ed0bc79..cc5530cc996b 100644 --- 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-pci-phy/Makefile b/drivers/staging/mt7621-pci-phy/Makefile index 2b82ccfc28c6..a970056f05c1 100644 --- 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 607b84bedcc3..d4655a726b61 100644 --- 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 -- 2.20.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v4] staging: Mediatek: Use individual config flags in Makefile 2019-01-15 17:29 ` [PATCH v4] " George Hilliard @ 2019-01-15 17:43 ` Greg Kroah-Hartman 2019-01-16 6:48 ` [PATCH v5] " George Hilliard 2019-01-16 4:43 ` [PATCH v4] " kbuild test robot 1 sibling, 1 reply; 12+ messages in thread From: Greg Kroah-Hartman @ 2019-01-15 17:43 UTC (permalink / raw) To: George Hilliard; +Cc: devel, NeilBrown, linux-kernel On Tue, Jan 15, 2019 at 10:29:18AM -0700, George Hilliard wrote: > 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> > --- > Changes in v2..v4: > - Also use individual flags for mt7621-pci and the new mt7621-pci-phy > - Slightly revise commit message You also rebased this patch, right? Anyway, applying this patch, I get the following build error: CC [M] drivers/staging/mt7621-mmc/sd.o CC [M] drivers/staging/mt7621-mmc/dbg.o drivers/staging/mt7621-mmc/sd.c:48:10: fatal error: asm/mach-ralink/ralink_regs.h: No such file or directory #include <asm/mach-ralink/ralink_regs.h> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make[3]: *** [scripts/Makefile.build:277: drivers/staging/mt7621-mmc/sd.o] Error 1 make[3]: *** Waiting for unfinished jobs.... drivers/staging/mt7621-mmc/dbg.c: In function ‘msdc_debug_proc_write’: drivers/staging/mt7621-mmc/dbg.c:237:12: warning: unused variable ‘size’ [-Wunused-variable] int mode, size; ^~~~ drivers/staging/mt7621-mmc/dbg.c:237:6: warning: unused variable ‘mode’ [-Wunused-variable] int mode, size; ^~~~ make[2]: *** [scripts/Makefile.build:492: drivers/staging/mt7621-mmc] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [scripts/Makefile.build:492: drivers/staging] Error 2 make[1]: *** Waiting for unfinished jobs.... So I can't take this patch as is, sorry. Please fix. thanks, greg k-h ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v5] staging: Mediatek: Use individual config flags in Makefile 2019-01-15 17:43 ` Greg Kroah-Hartman @ 2019-01-16 6:48 ` George Hilliard 0 siblings, 0 replies; 12+ messages in thread From: George Hilliard @ 2019-01-16 6:48 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: George Hilliard, linux-kernel, devel, NeilBrown, sergio.paracuellos 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> --- Changelog: v2: - Also make the change for skipped/forgotten drivers such as mt7621-eth v3..v4: - Rebase against staging-testing - Also make the change for new PCIe PHY driver - Slightly change commit wording v5: - Fix dependency issue in mt7621-mmc/Kconfig; it now needs to explicitly depend on RALINK because SOC_MT7621 is not required now - Remove check for nonexistent config MTD_NAND_RALINK from mt7621-mmc/Kconfig drivers/staging/Makefile | 14 +++++++------- drivers/staging/mt7621-mmc/Kconfig | 2 +- drivers/staging/mt7621-pci-phy/Makefile | 2 +- drivers/staging/mt7621-pci/Makefile | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 4d563ed0bc79..cc5530cc996b 100644 --- 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 c6dfe8c637dc..1eb79cd6e22f 100644 --- 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 2b82ccfc28c6..a970056f05c1 100644 --- 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 607b84bedcc3..d4655a726b61 100644 --- 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 -- 2.20.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v4] staging: Mediatek: Use individual config flags in Makefile 2019-01-15 17:29 ` [PATCH v4] " George Hilliard 2019-01-15 17:43 ` Greg Kroah-Hartman @ 2019-01-16 4:43 ` kbuild test robot 1 sibling, 0 replies; 12+ messages in thread From: kbuild test robot @ 2019-01-16 4:43 UTC (permalink / raw) To: George Hilliard Cc: kbuild-all, Greg Kroah-Hartman, devel, NeilBrown, George Hilliard, linux-kernel [-- Attachment #1: Type: text/plain, Size: 2339 bytes --] Hi George, Thank you for the patch! Yet something to improve: [auto build test ERROR on staging/staging-testing] [cannot apply to v5.0-rc2 next-20190115] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/George-Hilliard/staging-Mediatek-Use-individual-config-flags-in-Makefile/20190116-084915 config: x86_64-randconfig-e0-201902 (attached as .config) compiler: gcc-8 (Debian 8.2.0-14) 8.2.0 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): In file included from drivers/staging/mt7621-mmc/dbg.c:51: drivers/staging/mt7621-mmc/mt6575_sd.h: In function 'sdr_set_bits': drivers/staging/mt7621-mmc/mt6575_sd.h:459:12: error: implicit declaration of function 'readl'; did you mean 'd_real'? [-Werror=implicit-function-declaration] u32 val = readl(reg); ^~~~~ d_real >> drivers/staging/mt7621-mmc/mt6575_sd.h:462:2: error: implicit declaration of function 'writel'; did you mean 'wrmsrl'? [-Werror=implicit-function-declaration] writel(val, reg); ^~~~~~ wrmsrl cc1: some warnings being treated as errors vim +462 drivers/staging/mt7621-mmc/mt6575_sd.h 8b634a9c John Crispin 2018-03-15 456 0b78f05d Christian Lütke-Stetzkamp 2018-04-24 457 static inline void sdr_set_bits(void __iomem *reg, u32 bs) 0b78f05d Christian Lütke-Stetzkamp 2018-04-24 458 { 0b78f05d Christian Lütke-Stetzkamp 2018-04-24 @459 u32 val = readl(reg); 0b78f05d Christian Lütke-Stetzkamp 2018-04-24 460 0b78f05d Christian Lütke-Stetzkamp 2018-04-24 461 val |= bs; 0b78f05d Christian Lütke-Stetzkamp 2018-04-24 @462 writel(val, reg); 0b78f05d Christian Lütke-Stetzkamp 2018-04-24 463 } 0b78f05d Christian Lütke-Stetzkamp 2018-04-24 464 :::::: The code at line 462 was first introduced by commit :::::: 0b78f05d510b01e353481f5bccb63661d2cb5c32 staging: mt7621-mmc: Correct datatypes for io and sanitize io access :::::: TO: Christian Lütke-Stetzkamp <christian@lkamp.de> :::::: CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 32442 bytes --] ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] staging: Mediatek: Use individual config flags in Makefile 2019-01-15 17:20 ` Greg Kroah-Hartman 2019-01-15 17:29 ` [PATCH v4] " George Hilliard @ 2019-01-15 17:32 ` George Hilliard 1 sibling, 0 replies; 12+ messages in thread From: George Hilliard @ 2019-01-15 17:32 UTC (permalink / raw) To: Greg Kroah-Hartman; +Cc: linux-kernel, devel, NeilBrown, sergio.paracuellos On Tue, Jan 15, 2019 at 10:20 AM Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > What changed from v2 and v1? That always goes below the --- line. > > Please fix that up and resend v4. > Sent. Didn't know to do that - first time contributor here. Sorry about the churn and thanks for your patience! Cheers, George ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 1/2] Move ralink-gdma to its own directory 2019-01-11 0:43 ` [PATCH v2 1/2] Move ralink-gdma to its own directory thirtythreeforty 2019-01-11 0:43 ` [PATCH v2 2/2] Mediatek staging: Use individual config flags in Makefile thirtythreeforty @ 2019-01-11 1:21 ` NeilBrown 2019-01-11 2:13 ` George Hilliard 1 sibling, 1 reply; 12+ messages in thread From: NeilBrown @ 2019-01-11 1:21 UTC (permalink / raw) To: thirtythreeforty, Greg Kroah-Hartman; +Cc: George Hilliard, linux-kernel, devel [-- Attachment #1: Type: text/plain, Size: 4560 bytes --] On Thu, Jan 10 2019, thirtythreeforty@gmail.com wrote: > From: George Hilliard <thirtythreeforty@gmail.com> > > This is in preparation to allow it and the mt7621-dma drivers to be > built separately. They are completely independent pieces of software, > and the Kconfig specifies very different requirements. > > Cc: linux-kernel@vger.kernel.org > Cc: devel@driverdev.osuosl.org > Cc: Neil Brown <neil@brown.name> > Signed-off-by: George Hilliard <thirtythreeforty@gmail.com> Hi, thanks for taking an interest in these drivers. I original submitted this code because I though I needed it for my mt7621 hardware, but I've subsequently realized that neither of these dma drivers are used in this hardware. Consequently I cannot test any changes you make. But maybe you can - which would be excellent! So this is just letting you and Greg know that despite my stated interest, I cannot actually review or test this. Thanks, NeilBrown > --- > drivers/staging/Kconfig | 2 ++ > drivers/staging/Makefile | 1 + > drivers/staging/mt7621-dma/Kconfig | 6 ------ > drivers/staging/mt7621-dma/Makefile | 1 - > drivers/staging/ralink-gdma/Kconfig | 6 ++++++ > drivers/staging/ralink-gdma/Makefile | 3 +++ > drivers/staging/{mt7621-dma => ralink-gdma}/ralink-gdma.c | 0 > 7 files changed, 12 insertions(+), 7 deletions(-) > create mode 100644 drivers/staging/ralink-gdma/Kconfig > create mode 100644 drivers/staging/ralink-gdma/Makefile > rename drivers/staging/{mt7621-dma => ralink-gdma}/ralink-gdma.c (100%) > > diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig > index e4f608815c05..b4cfde38e856 100644 > --- a/drivers/staging/Kconfig > +++ b/drivers/staging/Kconfig > @@ -110,6 +110,8 @@ source "drivers/staging/mt7621-spi/Kconfig" > > source "drivers/staging/mt7621-dma/Kconfig" > > +source "drivers/staging/ralink-gdma/Kconfig" > + > source "drivers/staging/mt7621-mmc/Kconfig" > > source "drivers/staging/mt7621-eth/Kconfig" > diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile > index 5868631e8f1b..e095f427177c 100644 > --- a/drivers/staging/Makefile > +++ b/drivers/staging/Makefile > @@ -45,6 +45,7 @@ obj-$(CONFIG_SOC_MT7621) += mt7621-pci/ > obj-$(CONFIG_SOC_MT7621) += mt7621-pinctrl/ > obj-$(CONFIG_SOC_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_SOC_MT7621) += mt7621-dts/ > diff --git a/drivers/staging/mt7621-dma/Kconfig b/drivers/staging/mt7621-dma/Kconfig > index 2423c40099d1..b6e48a682c44 100644 > --- a/drivers/staging/mt7621-dma/Kconfig > +++ b/drivers/staging/mt7621-dma/Kconfig > @@ -1,9 +1,3 @@ > -config DMA_RALINK > - tristate "RALINK DMA support" > - depends on RALINK && !SOC_RT288X > - select DMA_ENGINE > - select DMA_VIRTUAL_CHANNELS > - > config MTK_HSDMA > tristate "MTK HSDMA support" > depends on RALINK && SOC_MT7621 > diff --git a/drivers/staging/mt7621-dma/Makefile b/drivers/staging/mt7621-dma/Makefile > index d3152d45cf45..c9e3e1619ab0 100644 > --- a/drivers/staging/mt7621-dma/Makefile > +++ b/drivers/staging/mt7621-dma/Makefile > @@ -1,4 +1,3 @@ > -obj-$(CONFIG_DMA_RALINK) += ralink-gdma.o > obj-$(CONFIG_MTK_HSDMA) += mtk-hsdma.o > > ccflags-y += -I$(srctree)/drivers/dma > diff --git a/drivers/staging/ralink-gdma/Kconfig b/drivers/staging/ralink-gdma/Kconfig > new file mode 100644 > index 000000000000..a12b2c672d48 > --- /dev/null > +++ b/drivers/staging/ralink-gdma/Kconfig > @@ -0,0 +1,6 @@ > +config DMA_RALINK > + tristate "RALINK DMA support" > + depends on RALINK && !SOC_RT288X > + select DMA_ENGINE > + select DMA_VIRTUAL_CHANNELS > + > diff --git a/drivers/staging/ralink-gdma/Makefile b/drivers/staging/ralink-gdma/Makefile > new file mode 100644 > index 000000000000..5d917e0729bb > --- /dev/null > +++ b/drivers/staging/ralink-gdma/Makefile > @@ -0,0 +1,3 @@ > +obj-$(CONFIG_DMA_RALINK) += ralink-gdma.o > + > +ccflags-y += -I$(srctree)/drivers/dma > diff --git a/drivers/staging/mt7621-dma/ralink-gdma.c b/drivers/staging/ralink-gdma/ralink-gdma.c > similarity index 100% > rename from drivers/staging/mt7621-dma/ralink-gdma.c > rename to drivers/staging/ralink-gdma/ralink-gdma.c > -- > 2.20.1 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 832 bytes --] ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 1/2] Move ralink-gdma to its own directory 2019-01-11 1:21 ` [PATCH v2 1/2] Move ralink-gdma to its own directory NeilBrown @ 2019-01-11 2:13 ` George Hilliard 0 siblings, 0 replies; 12+ messages in thread From: George Hilliard @ 2019-01-11 2:13 UTC (permalink / raw) To: NeilBrown; +Cc: Greg Kroah-Hartman, linux-kernel, devel On Thu, Jan 10, 2019, 6:21 PM NeilBrown <neil@brown.name wrote: > > On Thu, Jan 10 2019, thirtythreeforty@gmail.com wrote: > > > From: George Hilliard <thirtythreeforty@gmail.com> > > > > This is in preparation to allow it and the mt7621-dma drivers to be > > built separately. They are completely independent pieces of software, > > and the Kconfig specifies very different requirements. > > > > Cc: linux-kernel@vger.kernel.org > > Cc: devel@driverdev.osuosl.org > > Cc: Neil Brown <neil@brown.name> > > Signed-off-by: George Hilliard <thirtythreeforty@gmail.com> > > Hi, > thanks for taking an interest in these drivers. > I original submitted this code because I though I needed it for my > mt7621 hardware, but I've subsequently realized that neither of these > dma drivers are used in this hardware. > Consequently I cannot test any changes you make. > But maybe you can - which would be excellent! > > So this is just letting you and Greg know that despite my stated > interest, I cannot actually review or test this. > > Thanks, > NeilBrown > > Thanks for the heads up. Honestly I am not sure to what extent I can test code changes either, at least with the DMA driver. I'm working with the MT7688, and official docs for it and its cousin the MT7628 are pretty sparse, so I'm currently not even certain that the ralink gdma driver works for my SoC. Onion lists these drivers in their OpenWRT device trees' compatible strings, so they're related. The SPI driver works out of the box at least. The MMC driver wants to work but needs debugging. All the drivers need to be better documented. etc. I hope I can improve them, and I'll make sure I test any actual kernel code I change! George ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-01-16 6:49 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <CACmrr9gHucWaWtz07kQms6AsquLKAHbK+_Q0kF=92RGo6HmAFA@mail.gmail.com>
2019-01-11 0:43 ` [PATCH v2 1/2] Move ralink-gdma to its own directory thirtythreeforty
2019-01-11 0:43 ` [PATCH v2 2/2] Mediatek staging: Use individual config flags in Makefile thirtythreeforty
2019-01-15 15:30 ` [PATCH v2 2/2] staging: Mediatek: " Greg Kroah-Hartman
2019-01-15 17:02 ` [PATCH v3] " George Hilliard
2019-01-15 17:20 ` Greg Kroah-Hartman
2019-01-15 17:29 ` [PATCH v4] " George Hilliard
2019-01-15 17:43 ` Greg Kroah-Hartman
2019-01-16 6:48 ` [PATCH v5] " George Hilliard
2019-01-16 4:43 ` [PATCH v4] " kbuild test robot
2019-01-15 17:32 ` [PATCH v3] " George Hilliard
2019-01-11 1:21 ` [PATCH v2 1/2] Move ralink-gdma to its own directory NeilBrown
2019-01-11 2:13 ` George Hilliard
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).