| Message ID | 20220927230804.4085579-4-khilman@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | dma/ti: enable udma and psil to be built as modules | expand |
Hi Kevin, On 28/09/2022 02:08, Kevin Hilman wrote: > Combine all the SoC specific files into a single lib that can be > built-in or built as a module. > > Signed-off-by: Kevin Hilman <khilman@baylibre.com> > --- > drivers/dma/ti/Kconfig | 3 ++- > drivers/dma/ti/Makefile | 15 ++++++++------- > drivers/dma/ti/k3-psil.c | 2 ++ > 3 files changed, 12 insertions(+), 8 deletions(-) > > diff --git a/drivers/dma/ti/Kconfig b/drivers/dma/ti/Kconfig > index f196be3b222f..2adc2cca10e9 100644 > --- a/drivers/dma/ti/Kconfig > +++ b/drivers/dma/ti/Kconfig > @@ -56,7 +56,8 @@ config TI_K3_UDMA_GLUE_LAYER > If unsure, say N. > > config TI_K3_PSIL > - bool > + tristate > + default TI_K3_UDMA > > config TI_DMA_CROSSBAR > bool > diff --git a/drivers/dma/ti/Makefile b/drivers/dma/ti/Makefile > index d3a303f0d7c6..383bbd6d12b9 100644 > --- a/drivers/dma/ti/Makefile > +++ b/drivers/dma/ti/Makefile > @@ -4,11 +4,12 @@ obj-$(CONFIG_TI_EDMA) += edma.o > obj-$(CONFIG_DMA_OMAP) += omap-dma.o > obj-$(CONFIG_TI_K3_UDMA) += k3-udma.o > obj-$(CONFIG_TI_K3_UDMA_GLUE_LAYER) += k3-udma-glue.o > -obj-$(CONFIG_TI_K3_PSIL) += k3-psil.o \ > - k3-psil-am654.o \ > - k3-psil-j721e.o \ > - k3-psil-j7200.o \ > - k3-psil-am64.o \ > - k3-psil-j721s2.o \ > - k3-psil-am62.o > +obj-$(CONFIG_TI_K3_PSIL) += k3-psil-lib.o > +k3-psil-lib-objs := k3-psil.o \ > + k3-psil-am654.o \ > + k3-psil-j721e.o \ > + k3-psil-j7200.o \ > + k3-psil-am64.o \ > + k3-psil-j721s2.o \ > + k3-psil-am62.o Can you reverse the order? First declare the objects needed for k3-psil-lib. It is more natural and easier to read. With that change you can add my: Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com> > obj-$(CONFIG_TI_DMA_CROSSBAR) += dma-crossbar.o > diff --git a/drivers/dma/ti/k3-psil.c b/drivers/dma/ti/k3-psil.c > index 761a384093d2..8b6533a1eeeb 100644 > --- a/drivers/dma/ti/k3-psil.c > +++ b/drivers/dma/ti/k3-psil.c > @@ -5,6 +5,7 @@ > */ > > #include <linux/kernel.h> > +#include <linux/module.h> > #include <linux/device.h> > #include <linux/init.h> > #include <linux/mutex.h> > @@ -101,3 +102,4 @@ int psil_set_new_ep_config(struct device *dev, const char *name, > return 0; > } > EXPORT_SYMBOL_GPL(psil_set_new_ep_config); > +MODULE_LICENSE("GPL v2");
diff --git a/drivers/dma/ti/Kconfig b/drivers/dma/ti/Kconfig index f196be3b222f..2adc2cca10e9 100644 --- a/drivers/dma/ti/Kconfig +++ b/drivers/dma/ti/Kconfig @@ -56,7 +56,8 @@ config TI_K3_UDMA_GLUE_LAYER If unsure, say N. config TI_K3_PSIL - bool + tristate + default TI_K3_UDMA config TI_DMA_CROSSBAR bool diff --git a/drivers/dma/ti/Makefile b/drivers/dma/ti/Makefile index d3a303f0d7c6..383bbd6d12b9 100644 --- a/drivers/dma/ti/Makefile +++ b/drivers/dma/ti/Makefile @@ -4,11 +4,12 @@ obj-$(CONFIG_TI_EDMA) += edma.o obj-$(CONFIG_DMA_OMAP) += omap-dma.o obj-$(CONFIG_TI_K3_UDMA) += k3-udma.o obj-$(CONFIG_TI_K3_UDMA_GLUE_LAYER) += k3-udma-glue.o -obj-$(CONFIG_TI_K3_PSIL) += k3-psil.o \ - k3-psil-am654.o \ - k3-psil-j721e.o \ - k3-psil-j7200.o \ - k3-psil-am64.o \ - k3-psil-j721s2.o \ - k3-psil-am62.o +obj-$(CONFIG_TI_K3_PSIL) += k3-psil-lib.o +k3-psil-lib-objs := k3-psil.o \ + k3-psil-am654.o \ + k3-psil-j721e.o \ + k3-psil-j7200.o \ + k3-psil-am64.o \ + k3-psil-j721s2.o \ + k3-psil-am62.o obj-$(CONFIG_TI_DMA_CROSSBAR) += dma-crossbar.o diff --git a/drivers/dma/ti/k3-psil.c b/drivers/dma/ti/k3-psil.c index 761a384093d2..8b6533a1eeeb 100644 --- a/drivers/dma/ti/k3-psil.c +++ b/drivers/dma/ti/k3-psil.c @@ -5,6 +5,7 @@ */ #include <linux/kernel.h> +#include <linux/module.h> #include <linux/device.h> #include <linux/init.h> #include <linux/mutex.h> @@ -101,3 +102,4 @@ int psil_set_new_ep_config(struct device *dev, const char *name, return 0; } EXPORT_SYMBOL_GPL(psil_set_new_ep_config); +MODULE_LICENSE("GPL v2");
Combine all the SoC specific files into a single lib that can be built-in or built as a module. Signed-off-by: Kevin Hilman <khilman@baylibre.com> --- drivers/dma/ti/Kconfig | 3 ++- drivers/dma/ti/Makefile | 15 ++++++++------- drivers/dma/ti/k3-psil.c | 2 ++ 3 files changed, 12 insertions(+), 8 deletions(-)