MAINTAINERS | 2 - drivers/staging/media/Kconfig | 18 +------ drivers/staging/media/Makefile | 1 - .../staging/media/deprecated/atmel/Kconfig | 47 ------------------- .../staging/media/deprecated/atmel/Makefile | 8 ---- 5 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 drivers/staging/media/deprecated/atmel/Kconfig delete mode 100644 drivers/staging/media/deprecated/atmel/Makefile
The Atmel ISC and XISC drivers were deprecated and scheduled
for removal by the beginning of 2026. The replacement drivers
(VIDEO_MICROCHIP_ISC and VIDEO_MICROCHIP_XISC) are available
in the main media subsystem.
Remove the Kconfig entries, Makefile rules, MAINTAINERS entries,
and the STAGING_MEDIA_DEPRECATED menuconfig since it is no longer
needed. The source files remain on disk but are no longer compiled
since the build infrastructure is removed.
Signed-off-by: Ashwin Gundarapu <linuxuser509@zohomail.in>
---
v3: Updated MAINTAINERS to remove staging/atmel references.
v2: Removed Kconfig and Makefile to fix Media CI build issues.
---
MAINTAINERS | 2 -
drivers/staging/media/Kconfig | 18 +------
drivers/staging/media/Makefile | 1 -
.../staging/media/deprecated/atmel/Kconfig | 47 -------------------
.../staging/media/deprecated/atmel/Makefile | 8 ----
5 files changed, 1 insertion(+), 75 deletions(-)
delete mode 100644 drivers/staging/media/deprecated/atmel/Kconfig
delete mode 100644 drivers/staging/media/deprecated/atmel/Makefile
diff --git a/MAINTAINERS b/MAINTAINERS
index 27a073f53cea..4290eae8838e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17364,8 +17364,6 @@ F: Documentation/devicetree/bindings/media/atmel,isc.yaml
F: Documentation/devicetree/bindings/media/microchip,xisc.yaml
F: drivers/media/platform/microchip/microchip-isc*
F: drivers/media/platform/microchip/microchip-sama*-isc*
-F: drivers/staging/media/deprecated/atmel/atmel-isc*
-F: drivers/staging/media/deprecated/atmel/atmel-sama*-isc*
F: include/linux/atmel-isc-media.h
MICROCHIP ISI DRIVER
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 1aa31bddf970..52b4aab944f6 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -38,20 +38,4 @@ source "drivers/staging/media/sunxi/Kconfig"
source "drivers/staging/media/tegra-video/Kconfig"
-menuconfig STAGING_MEDIA_DEPRECATED
- bool "Media staging drivers (DEPRECATED)"
- default n
- help
- This option enables deprecated media drivers that are
- scheduled for future removal from the kernel.
-
- If you wish to work on these drivers to prevent their removal,
- then contact the linux-media@vger.kernel.org mailing list.
-
- If in doubt, say N here.
-
-if STAGING_MEDIA_DEPRECATED
-source "drivers/staging/media/deprecated/atmel/Kconfig"
-endif
-
-endif
+endif # STAGING_MEDIA
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 6f78b0edde1e..6fd7179733d8 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_VIDEO_ATMEL_ISC_BASE) += deprecated/atmel/
obj-$(CONFIG_INTEL_ATOMISP) += atomisp/
obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx/
obj-$(CONFIG_VIDEO_MAX96712) += max96712/
diff --git a/drivers/staging/media/deprecated/atmel/Kconfig b/drivers/staging/media/deprecated/atmel/Kconfig
deleted file mode 100644
index 418841ea5a0d..000000000000
--- a/drivers/staging/media/deprecated/atmel/Kconfig
+++ /dev/null
@@ -1,47 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-
-comment "Atmel media platform drivers"
-
-config VIDEO_ATMEL_ISC
- tristate "ATMEL Image Sensor Controller (ISC) support (DEPRECATED)"
- depends on V4L_PLATFORM_DRIVERS
- depends on VIDEO_DEV && COMMON_CLK
- depends on ARCH_AT91 || COMPILE_TEST
- depends on !VIDEO_MICROCHIP_ISC_BASE || COMPILE_TEST
- select MEDIA_CONTROLLER
- select VIDEO_V4L2_SUBDEV_API
- select VIDEOBUF2_DMA_CONTIG
- select REGMAP_MMIO
- select V4L2_FWNODE
- select VIDEO_ATMEL_ISC_BASE
- help
- This module makes the ATMEL Image Sensor Controller available
- as a v4l2 device.
-
- This driver is deprecated and is scheduled for removal by
- the beginning of 2026. See the TODO file for more information.
-
-config VIDEO_ATMEL_XISC
- tristate "ATMEL eXtended Image Sensor Controller (XISC) support (DEPRECATED)"
- depends on V4L_PLATFORM_DRIVERS
- depends on VIDEO_DEV && COMMON_CLK
- depends on ARCH_AT91 || COMPILE_TEST
- depends on !VIDEO_MICROCHIP_ISC_BASE || COMPILE_TEST
- select VIDEOBUF2_DMA_CONTIG
- select REGMAP_MMIO
- select V4L2_FWNODE
- select VIDEO_ATMEL_ISC_BASE
- select MEDIA_CONTROLLER
- select VIDEO_V4L2_SUBDEV_API
- help
- This module makes the ATMEL eXtended Image Sensor Controller
- available as a v4l2 device.
-
- This driver is deprecated and is scheduled for removal by
- the beginning of 2026. See the TODO file for more information.
-
-config VIDEO_ATMEL_ISC_BASE
- tristate
- default n
- help
- ATMEL ISC and XISC common code base.
diff --git a/drivers/staging/media/deprecated/atmel/Makefile b/drivers/staging/media/deprecated/atmel/Makefile
deleted file mode 100644
index 34eaeeac5bba..000000000000
--- a/drivers/staging/media/deprecated/atmel/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-atmel-isc-objs = atmel-sama5d2-isc.o
-atmel-xisc-objs = atmel-sama7g5-isc.o
-atmel-isc-common-objs = atmel-isc-base.o atmel-isc-clk.o
-
-obj-$(CONFIG_VIDEO_ATMEL_ISC_BASE) += atmel-isc-common.o
-obj-$(CONFIG_VIDEO_ATMEL_ISC) += atmel-isc.o
-obj-$(CONFIG_VIDEO_ATMEL_XISC) += atmel-xisc.o
--
2.43.0
On 5/27/26 11:33, Ashwin Gundarapu wrote: > The Atmel ISC and XISC drivers were deprecated and scheduled > for removal by the beginning of 2026. The replacement drivers > (VIDEO_MICROCHIP_ISC and VIDEO_MICROCHIP_XISC) are available > in the main media subsystem. > > Remove the Kconfig entries, Makefile rules, MAINTAINERS entries, > and the STAGING_MEDIA_DEPRECATED menuconfig since it is no longer > needed. The source files remain on disk but are no longer compiled > since the build infrastructure is removed. > > Signed-off-by: Ashwin Gundarapu <linuxuser509@zohomail.in> > --- This is very strange . It comes *right after* I already sent a patch for this. Also, your patch is incomplete. "Source files remain on disk" ?? > v3: Updated MAINTAINERS to remove staging/atmel references. > v2: Removed Kconfig and Makefile to fix Media CI build issues. > --- > MAINTAINERS | 2 - > drivers/staging/media/Kconfig | 18 +------ > drivers/staging/media/Makefile | 1 - > .../staging/media/deprecated/atmel/Kconfig | 47 ------------------- > .../staging/media/deprecated/atmel/Makefile | 8 ---- > 5 files changed, 1 insertion(+), 75 deletions(-) > delete mode 100644 drivers/staging/media/deprecated/atmel/Kconfig > delete mode 100644 drivers/staging/media/deprecated/atmel/Makefile > > diff --git a/MAINTAINERS b/MAINTAINERS > index 27a073f53cea..4290eae8838e 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -17364,8 +17364,6 @@ F: Documentation/devicetree/bindings/media/atmel,isc.yaml > F: Documentation/devicetree/bindings/media/microchip,xisc.yaml > F: drivers/media/platform/microchip/microchip-isc* > F: drivers/media/platform/microchip/microchip-sama*-isc* > -F: drivers/staging/media/deprecated/atmel/atmel-isc* > -F: drivers/staging/media/deprecated/atmel/atmel-sama*-isc* > F: include/linux/atmel-isc-media.h > > MICROCHIP ISI DRIVER > diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig > index 1aa31bddf970..52b4aab944f6 100644 > --- a/drivers/staging/media/Kconfig > +++ b/drivers/staging/media/Kconfig > @@ -38,20 +38,4 @@ source "drivers/staging/media/sunxi/Kconfig" > > source "drivers/staging/media/tegra-video/Kconfig" > > -menuconfig STAGING_MEDIA_DEPRECATED > - bool "Media staging drivers (DEPRECATED)" > - default n > - help > - This option enables deprecated media drivers that are > - scheduled for future removal from the kernel. > - > - If you wish to work on these drivers to prevent their removal, > - then contact the linux-media@vger.kernel.org mailing list. > - > - If in doubt, say N here. > - > -if STAGING_MEDIA_DEPRECATED > -source "drivers/staging/media/deprecated/atmel/Kconfig" > -endif > - > -endif > +endif # STAGING_MEDIA > diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile > index 6f78b0edde1e..6fd7179733d8 100644 > --- a/drivers/staging/media/Makefile > +++ b/drivers/staging/media/Makefile > @@ -1,5 +1,4 @@ > # SPDX-License-Identifier: GPL-2.0 > -obj-$(CONFIG_VIDEO_ATMEL_ISC_BASE) += deprecated/atmel/ > obj-$(CONFIG_INTEL_ATOMISP) += atomisp/ > obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx/ > obj-$(CONFIG_VIDEO_MAX96712) += max96712/ > diff --git a/drivers/staging/media/deprecated/atmel/Kconfig b/drivers/staging/media/deprecated/atmel/Kconfig > deleted file mode 100644 > index 418841ea5a0d..000000000000 > --- a/drivers/staging/media/deprecated/atmel/Kconfig > +++ /dev/null > @@ -1,47 +0,0 @@ > -# SPDX-License-Identifier: GPL-2.0-only > - > -comment "Atmel media platform drivers" > - > -config VIDEO_ATMEL_ISC > - tristate "ATMEL Image Sensor Controller (ISC) support (DEPRECATED)" > - depends on V4L_PLATFORM_DRIVERS > - depends on VIDEO_DEV && COMMON_CLK > - depends on ARCH_AT91 || COMPILE_TEST > - depends on !VIDEO_MICROCHIP_ISC_BASE || COMPILE_TEST > - select MEDIA_CONTROLLER > - select VIDEO_V4L2_SUBDEV_API > - select VIDEOBUF2_DMA_CONTIG > - select REGMAP_MMIO > - select V4L2_FWNODE > - select VIDEO_ATMEL_ISC_BASE > - help > - This module makes the ATMEL Image Sensor Controller available > - as a v4l2 device. > - > - This driver is deprecated and is scheduled for removal by > - the beginning of 2026. See the TODO file for more information. > - > -config VIDEO_ATMEL_XISC > - tristate "ATMEL eXtended Image Sensor Controller (XISC) support (DEPRECATED)" > - depends on V4L_PLATFORM_DRIVERS > - depends on VIDEO_DEV && COMMON_CLK > - depends on ARCH_AT91 || COMPILE_TEST > - depends on !VIDEO_MICROCHIP_ISC_BASE || COMPILE_TEST > - select VIDEOBUF2_DMA_CONTIG > - select REGMAP_MMIO > - select V4L2_FWNODE > - select VIDEO_ATMEL_ISC_BASE > - select MEDIA_CONTROLLER > - select VIDEO_V4L2_SUBDEV_API > - help > - This module makes the ATMEL eXtended Image Sensor Controller > - available as a v4l2 device. > - > - This driver is deprecated and is scheduled for removal by > - the beginning of 2026. See the TODO file for more information. > - > -config VIDEO_ATMEL_ISC_BASE > - tristate > - default n > - help > - ATMEL ISC and XISC common code base. > diff --git a/drivers/staging/media/deprecated/atmel/Makefile b/drivers/staging/media/deprecated/atmel/Makefile > deleted file mode 100644 > index 34eaeeac5bba..000000000000 > --- a/drivers/staging/media/deprecated/atmel/Makefile > +++ /dev/null > @@ -1,8 +0,0 @@ > -# SPDX-License-Identifier: GPL-2.0-only > -atmel-isc-objs = atmel-sama5d2-isc.o > -atmel-xisc-objs = atmel-sama7g5-isc.o > -atmel-isc-common-objs = atmel-isc-base.o atmel-isc-clk.o > - > -obj-$(CONFIG_VIDEO_ATMEL_ISC_BASE) += atmel-isc-common.o > -obj-$(CONFIG_VIDEO_ATMEL_ISC) += atmel-isc.o > -obj-$(CONFIG_VIDEO_ATMEL_XISC) += atmel-xisc.o > -- > 2.43.0 > > >
© 2016 - 2026 Red Hat, Inc.