From: Arnd Bergmann <arnd@arndb.de>
The s3c24xx platform was removed and this driver is no longer
needed.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/dma/Kconfig | 12 -
drivers/dma/Makefile | 1 -
drivers/dma/s3c24xx-dma.c | 1428 ---------------------
include/linux/platform_data/dma-s3c24xx.h | 48 -
4 files changed, 1489 deletions(-)
delete mode 100644 drivers/dma/s3c24xx-dma.c
delete mode 100644 include/linux/platform_data/dma-s3c24xx.h
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index b73fc89ba877..ea81d825575f 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -609,18 +609,6 @@ config SPRD_DMA
help
Enable support for the on-chip DMA controller on Spreadtrum platform.
-config S3C24XX_DMAC
- bool "Samsung S3C24XX DMA support"
- depends on ARCH_S3C24XX || COMPILE_TEST
- select DMA_ENGINE
- select DMA_VIRTUAL_CHANNELS
- help
- Support for the Samsung S3C24XX DMA controller driver. The
- DMA controller is having multiple DMA channels which can be
- configured for different peripherals like audio, UART, SPI.
- The DMA controller can transfer data from memory to peripheral,
- periphal to memory, periphal to periphal and memory to memory.
-
config TXX9_DMAC
tristate "Toshiba TXx9 SoC DMA support"
depends on MACH_TX49XX
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index 5b55ada052a7..a4fd1ce29510 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -70,7 +70,6 @@ obj-$(CONFIG_STM32_DMA) += stm32-dma.o
obj-$(CONFIG_STM32_DMAMUX) += stm32-dmamux.o
obj-$(CONFIG_STM32_MDMA) += stm32-mdma.o
obj-$(CONFIG_SPRD_DMA) += sprd-dma.o
-obj-$(CONFIG_S3C24XX_DMAC) += s3c24xx-dma.o
obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
obj-$(CONFIG_TEGRA186_GPC_DMA) += tegra186-gpc-dma.o
obj-$(CONFIG_TEGRA20_APB_DMA) += tegra20-apb-dma.o
diff --git a/drivers/dma/s3c24xx-dma.c b/drivers/dma/s3c24xx-dma.c
deleted file mode 100644
index a09eeb545f7d..000000000000
diff --git a/include/linux/platform_data/dma-s3c24xx.h b/include/linux/platform_data/dma-s3c24xx.h
deleted file mode 100644
index 96d02dbeea67..000000000000
--
2.29.2On 21-10-22, 22:27, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > The s3c24xx platform was removed and this driver is no longer > needed. Applied, thanks -- ~Vinod
On 21/10/2022 16:27, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > The s3c24xx platform was removed and this driver is no longer > needed. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
The linux/platform_data/dma-s3c24xx.h header file was removed. It didn't
declare or define any symbol needed in devs.c though, so the #include
can just be dropped.
Fixes: cccc46ae3623 ("dmaengine: remove s3c24xx driver")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
arch/arm/mach-s3c/devs.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/mach-s3c/devs.c b/arch/arm/mach-s3c/devs.c
index 9ac07c023adf..a31d1c3038e8 100644
--- a/arch/arm/mach-s3c/devs.c
+++ b/arch/arm/mach-s3c/devs.c
@@ -29,7 +29,6 @@
#include <linux/sizes.h>
#include <linux/platform_data/s3c-hsudc.h>
#include <linux/platform_data/s3c-hsotg.h>
-#include <linux/platform_data/dma-s3c24xx.h>
#include <linux/platform_data/media/s5p_hdmi.h>
--
2.38.1
On 18/11/2022 22:54, Uwe Kleine-König wrote:
> The linux/platform_data/dma-s3c24xx.h header file was removed. It didn't
> declare or define any symbol needed in devs.c though, so the #include
> can just be dropped.
>
> Fixes: cccc46ae3623 ("dmaengine: remove s3c24xx driver")
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
The file was not removed... or it should not have been yet. The s3c24xx
dma driver removal should be part of Arnd series taken via SoC ARM.
Best regards,
Krzysztof
On 20/11/2022 11:31, Krzysztof Kozlowski wrote:
> On 18/11/2022 22:54, Uwe Kleine-König wrote:
>> The linux/platform_data/dma-s3c24xx.h header file was removed. It didn't
>> declare or define any symbol needed in devs.c though, so the #include
>> can just be dropped.
>>
>> Fixes: cccc46ae3623 ("dmaengine: remove s3c24xx driver")
>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
>> ---
>
> The file was not removed... or it should not have been yet. The s3c24xx
> dma driver removal should be part of Arnd series taken via SoC ARM.
Also: I don't think the fix is correct. The header was used in mach-s3c,
so removing the header should still cause broken build.
It also fails in other places:
arch/arm/mach-s3c/s3c24xx.c:21:10: fatal error:
linux/platform_data/dma-s3c24xx.h: No such file or directory
21 | #include <linux/platform_data/dma-s3c24xx.h>
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
I think that commit should be just dropped instead.
Best regards,
Krzysztof
Hello,
On Sun, Nov 20, 2022 at 12:22:31PM +0100, Krzysztof Kozlowski wrote:
> On 20/11/2022 11:31, Krzysztof Kozlowski wrote:
> > On 18/11/2022 22:54, Uwe Kleine-König wrote:
> >> The linux/platform_data/dma-s3c24xx.h header file was removed. It didn't
> >> declare or define any symbol needed in devs.c though, so the #include
> >> can just be dropped.
> >>
> >> Fixes: cccc46ae3623 ("dmaengine: remove s3c24xx driver")
> >> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> >> ---
> >
> > The file was not removed... or it should not have been yet. The s3c24xx
> > dma driver removal should be part of Arnd series taken via SoC ARM.
The patch enters next with the merge of
git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git next
Ah, the patch that became cccc46ae3623 (i.e. patch #14) is part of a
bigger series. Its patch #1 removes s3c24xx.c (which you pointed out to be still
broken) and patch #2 includes the change I suggested here.
> I think that commit should be just dropped instead.
+1
BTW, cccc46ae3623 is included in next since next-20221107 and breaks
(at least) arm/s3c2410_defconfig. So I would consider reverting
cccc46ae3623 a fix. (Added linux-next to Cc:)
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
On 25/11/2022 09:51, Uwe Kleine-König wrote:
> Hello,
>
> On Sun, Nov 20, 2022 at 12:22:31PM +0100, Krzysztof Kozlowski wrote:
>> On 20/11/2022 11:31, Krzysztof Kozlowski wrote:
>>> On 18/11/2022 22:54, Uwe Kleine-König wrote:
>>>> The linux/platform_data/dma-s3c24xx.h header file was removed. It didn't
>>>> declare or define any symbol needed in devs.c though, so the #include
>>>> can just be dropped.
>>>>
>>>> Fixes: cccc46ae3623 ("dmaengine: remove s3c24xx driver")
>>>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
>>>> ---
>>>
>>> The file was not removed... or it should not have been yet. The s3c24xx
>>> dma driver removal should be part of Arnd series taken via SoC ARM.
>
> The patch enters next with the merge of
>
> git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git next
>
> Ah, the patch that became cccc46ae3623 (i.e. patch #14) is part of a
> bigger series. Its patch #1 removes s3c24xx.c (which you pointed out to be still
> broken) and patch #2 includes the change I suggested here.
>
>> I think that commit should be just dropped instead.
>
> +1
>
> BTW, cccc46ae3623 is included in next since next-20221107 and breaks
> (at least) arm/s3c2410_defconfig. So I would consider reverting
> cccc46ae3623 a fix. (Added linux-next to Cc:)
Yes. The build failure of next was reported already by kernel test robot.
Vinod, can we drop this patch?
Best regards,
Krzysztof
Hello,
I made the subject a bit more expressive.
On Fri, Nov 25, 2022 at 09:52:51AM +0100, Krzysztof Kozlowski wrote:
> On 25/11/2022 09:51, Uwe Kleine-König wrote:
> > On Sun, Nov 20, 2022 at 12:22:31PM +0100, Krzysztof Kozlowski wrote:
> >> On 20/11/2022 11:31, Krzysztof Kozlowski wrote:
> >>> On 18/11/2022 22:54, Uwe Kleine-König wrote:
> >>>> The linux/platform_data/dma-s3c24xx.h header file was removed. It didn't
> >>>> declare or define any symbol needed in devs.c though, so the #include
> >>>> can just be dropped.
> >>>>
> >>>> Fixes: cccc46ae3623 ("dmaengine: remove s3c24xx driver")
> >>>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> >>>> ---
> >>>
> >>> The file was not removed... or it should not have been yet. The s3c24xx
> >>> dma driver removal should be part of Arnd series taken via SoC ARM.
> >
> > The patch enters next with the merge of
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git next
> >
> > Ah, the patch that became cccc46ae3623 (i.e. patch #14) is part of a
> > bigger series. Its patch #1 removes s3c24xx.c (which you pointed out to be still
> > broken) and patch #2 includes the change I suggested here.
> >
> >> I think that commit should be just dropped instead.
> >
> > +1
> >
> > BTW, cccc46ae3623 is included in next since next-20221107 and breaks
> > (at least) arm/s3c2410_defconfig. So I would consider reverting
> > cccc46ae3623 a fix. (Added linux-next to Cc:)
>
> Yes. The build failure of next was reported already by kernel test robot.
>
> Vinod, can we drop this patch?
That patch is still contained in the next tags of this week. :-(
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
On 02-12-22, 12:20, Uwe Kleine-König wrote:
> Hello,
>
> I made the subject a bit more expressive.
>
> On Fri, Nov 25, 2022 at 09:52:51AM +0100, Krzysztof Kozlowski wrote:
> > On 25/11/2022 09:51, Uwe Kleine-König wrote:
> > > On Sun, Nov 20, 2022 at 12:22:31PM +0100, Krzysztof Kozlowski wrote:
> > >> On 20/11/2022 11:31, Krzysztof Kozlowski wrote:
> > >>> On 18/11/2022 22:54, Uwe Kleine-König wrote:
> > >>>> The linux/platform_data/dma-s3c24xx.h header file was removed. It didn't
> > >>>> declare or define any symbol needed in devs.c though, so the #include
> > >>>> can just be dropped.
> > >>>>
> > >>>> Fixes: cccc46ae3623 ("dmaengine: remove s3c24xx driver")
> > >>>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > >>>> ---
> > >>>
> > >>> The file was not removed... or it should not have been yet. The s3c24xx
> > >>> dma driver removal should be part of Arnd series taken via SoC ARM.
> > >
> > > The patch enters next with the merge of
> > >
> > > git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git next
> > >
> > > Ah, the patch that became cccc46ae3623 (i.e. patch #14) is part of a
> > > bigger series. Its patch #1 removes s3c24xx.c (which you pointed out to be still
> > > broken) and patch #2 includes the change I suggested here.
> > >
> > >> I think that commit should be just dropped instead.
> > >
> > > +1
> > >
> > > BTW, cccc46ae3623 is included in next since next-20221107 and breaks
> > > (at least) arm/s3c2410_defconfig. So I would consider reverting
> > > cccc46ae3623 a fix. (Added linux-next to Cc:)
> >
> > Yes. The build failure of next was reported already by kernel test robot.
> >
> > Vinod, can we drop this patch?
>
> That patch is still contained in the next tags of this week. :-(
Apologies for delay, I was moving...
I have reverted and pushed now
Thanks for following up!
--
~Vinod
Hello Vinod,
On Fri, Dec 02, 2022 at 05:12:53PM +0530, Vinod Koul wrote:
> On 02-12-22, 12:20, Uwe Kleine-König wrote:
> > I made the subject a bit more expressive.
I wonder what I intended to write there, something like "Regression in
dmaengine/next in arm/s3c2410_defconfig", sorry to make it look as if
you already fixed the regression :-)
> > On Fri, Nov 25, 2022 at 09:52:51AM +0100, Krzysztof Kozlowski wrote:
> > > On 25/11/2022 09:51, Uwe Kleine-König wrote:
> > > > On Sun, Nov 20, 2022 at 12:22:31PM +0100, Krzysztof Kozlowski wrote:
> > > >> On 20/11/2022 11:31, Krzysztof Kozlowski wrote:
> > > >>> On 18/11/2022 22:54, Uwe Kleine-König wrote:
> > > >>>> The linux/platform_data/dma-s3c24xx.h header file was removed. It didn't
> > > >>>> declare or define any symbol needed in devs.c though, so the #include
> > > >>>> can just be dropped.
> > > >>>>
> > > >>>> Fixes: cccc46ae3623 ("dmaengine: remove s3c24xx driver")
> > > >>>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > > >>>> ---
> > > >>>
> > > >>> The file was not removed... or it should not have been yet. The s3c24xx
> > > >>> dma driver removal should be part of Arnd series taken via SoC ARM.
> > > >
> > > > The patch enters next with the merge of
> > > >
> > > > git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git next
> > > >
> > > > Ah, the patch that became cccc46ae3623 (i.e. patch #14) is part of a
> > > > bigger series. Its patch #1 removes s3c24xx.c (which you pointed out to be still
> > > > broken) and patch #2 includes the change I suggested here.
> > > >
> > > >> I think that commit should be just dropped instead.
> > > >
> > > > +1
> > > >
> > > > BTW, cccc46ae3623 is included in next since next-20221107 and breaks
> > > > (at least) arm/s3c2410_defconfig. So I would consider reverting
> > > > cccc46ae3623 a fix. (Added linux-next to Cc:)
> > >
> > > Yes. The build failure of next was reported already by kernel test robot.
> > >
> > > Vinod, can we drop this patch?
> >
> > That patch is still contained in the next tags of this week. :-(
>
> Apologies for delay, I was moving...
>
> I have reverted and pushed now
Thanks!
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
© 2016 - 2026 Red Hat, Inc.