* [PATCH v2 05/67] media: platform: move platform menu dependencies to drivers
[not found] <cover.1647274406.git.mchehab@kernel.org>
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 06/67] media: platform: place Aspeed driver on a separate dir Mauro Carvalho Chehab
` (30 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Alexandre Belloni, Geert Uytterhoeven, linux-kernel,
Mirela Rabulea, Ludovic Desroches, Laurent Pinchart,
Dmitry Osipenko, Fabio Estevam, linux-samsung-soc,
Krzysztof Kozlowski, Michal Simek, Jernej Skrabec, Chen-Yu Tsai,
NXP Linux Team, linux-sunxi, linux-media, Jacopo Mondi,
Sascha Hauer, Maxime Ripard, Rui Miguel Silva,
Mauro Carvalho Chehab, linux-arm-kernel, Niklas Söderlund,
Hyun Kwon, Pengutronix Kernel Team, Hans Verkuil, Eugen Hristev,
Shawn Guo, Ming Qian
Right now, platform dependencies are organized by the type of
the platform driver. Yet, things tend to become very messy with
time. The better seems to organize the drivers per manufacturer,
as other Kernel subsystems are doing.
As a preparation for such purpose, get rid of menuconfigs,
moving the per-menu dependencies to be at the driver-specifig
config entires.
This shoud give flexibility to reorganize the platform drivers
per manufacturer and re-sort them.
This patch removes all "if..endif" options from the platform
Kconfig, converting them into depends on.
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
drivers/media/platform/Kconfig | 119 +++++++++++-------
drivers/media/platform/am437x/Kconfig | 1 +
drivers/media/platform/atmel/Kconfig | 4 +
drivers/media/platform/cadence/Kconfig | 1 +
drivers/media/platform/davinci/Kconfig | 6 +
drivers/media/platform/exynos4-is/Kconfig | 1 +
drivers/media/platform/imx-jpeg/Kconfig | 1 +
drivers/media/platform/imx/Kconfig | 1 +
drivers/media/platform/marvell-ccic/Kconfig | 2 +
drivers/media/platform/omap/Kconfig | 1 +
drivers/media/platform/rcar-vin/Kconfig | 2 +
drivers/media/platform/sti/c8sectpfe/Kconfig | 1 +
.../media/platform/sunxi/sun4i-csi/Kconfig | 1 +
.../media/platform/sunxi/sun6i-csi/Kconfig | 1 +
drivers/media/platform/xilinx/Kconfig | 1 +
15 files changed, 98 insertions(+), 45 deletions(-)
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 4843fabb8bb2..1446a99159c5 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -3,17 +3,39 @@
# Platform drivers
# Most drivers here are currently for webcam support
-menuconfig V4L_PLATFORM_DRIVERS
+config V4L_PLATFORM_DRIVERS
bool "V4L platform devices"
help
Say Y here to enable support for platform-specific V4L drivers.
-if V4L_PLATFORM_DRIVERS
+config SDR_PLATFORM_DRIVERS
+ bool "SDR platform devices"
+ depends on MEDIA_SDR_SUPPORT
+ help
+ Say Y here to enable support for platform-specific SDR Drivers.
+
+config DVB_PLATFORM_DRIVERS
+ bool "DVB platform devices"
+ depends on MEDIA_DIGITAL_TV_SUPPORT
+ help
+ Say Y here to enable support for platform-specific Digital TV drivers.
+
+config V4L_MEM2MEM_DRIVERS
+ bool "Memory-to-memory multimedia devices"
+ depends on VIDEO_V4L2
+ help
+ Say Y here to enable selecting drivers for V4L devices that
+ use system memory for both source and destination buffers, as opposed
+ to capture and output drivers, which use memory buffers for just
+ one of those.
+
+# V4L platform drivers
source "drivers/media/platform/marvell-ccic/Kconfig"
config VIDEO_VIA_CAMERA
tristate "VIAFB camera controller support"
+ depends on V4L_PLATFORM_DRIVERS
depends on FB_VIA && VIDEO_V4L2
select VIDEOBUF2_DMA_SG
select VIDEO_OV7670
@@ -22,9 +44,6 @@ config VIDEO_VIA_CAMERA
Chrome9 chipsets. Currently only tested on OLPC xo-1.5 systems
with ov7670 sensors.
-#
-# Platform multimedia device configuration
-#
source "drivers/media/platform/cadence/Kconfig"
source "drivers/media/platform/davinci/Kconfig"
@@ -33,6 +52,7 @@ source "drivers/media/platform/omap/Kconfig"
config VIDEO_ASPEED
tristate "Aspeed AST2400 and AST2500 Video Engine driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2
select VIDEOBUF2_DMA_CONTIG
help
@@ -42,6 +62,7 @@ config VIDEO_ASPEED
config VIDEO_SH_VOU
tristate "SuperH VOU video output driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_DEV && I2C
depends on ARCH_SHMOBILE || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG
@@ -50,6 +71,7 @@ config VIDEO_SH_VOU
config VIDEO_VIU
tristate "Freescale VIU Video Driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && (PPC_MPC512x || COMPILE_TEST) && I2C
select VIDEOBUF_DMA_CONTIG
default y
@@ -62,6 +84,7 @@ config VIDEO_VIU
config VIDEO_MUX
tristate "Video Multiplexer"
+ depends on V4L_PLATFORM_DRIVERS
select MULTIPLEXER
depends on VIDEO_V4L2 && OF
select MEDIA_CONTROLLER
@@ -73,6 +96,7 @@ config VIDEO_MUX
config VIDEO_OMAP3
tristate "OMAP 3 Camera support"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && I2C
depends on (ARCH_OMAP3 && OMAP_IOMMU) || COMPILE_TEST
depends on COMMON_CLK && OF
@@ -93,6 +117,7 @@ config VIDEO_OMAP3_DEBUG
config VIDEO_PXA27x
tristate "PXA27x Quick Capture Interface driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on PXA27x || COMPILE_TEST
select VIDEOBUF2_DMA_SG
@@ -103,6 +128,7 @@ config VIDEO_PXA27x
config VIDEO_QCOM_CAMSS
tristate "Qualcomm V4L2 Camera Subsystem driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2
depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST
select MEDIA_CONTROLLER
@@ -112,6 +138,7 @@ config VIDEO_QCOM_CAMSS
config VIDEO_S3C_CAMIF
tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && I2C && PM
depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST
select MEDIA_CONTROLLER
@@ -126,6 +153,7 @@ config VIDEO_S3C_CAMIF
config VIDEO_STM32_DCMI
tristate "STM32 Digital Camera Memory Interface (DCMI) support"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && OF
depends on ARCH_STM32 || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG
@@ -140,6 +168,7 @@ config VIDEO_STM32_DCMI
config VIDEO_RENESAS_CEU
tristate "Renesas Capture Engine Unit (CEU) driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_SHMOBILE || ARCH_R7S72100 || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG
@@ -149,6 +178,7 @@ config VIDEO_RENESAS_CEU
config VIDEO_ROCKCHIP_ISP1
tristate "Rockchip Image Signal Processing v1 Unit driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && OF
depends on ARCH_ROCKCHIP || COMPILE_TEST
select MEDIA_CONTROLLER
@@ -175,6 +205,7 @@ source "drivers/media/platform/imx/Kconfig"
config VIDEO_TI_CAL
tristate "TI CAL (Camera Adaptation Layer) driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
select MEDIA_CONTROLLER
select VIDEO_V4L2_SUBDEV_API
@@ -187,10 +218,9 @@ config VIDEO_TI_CAL
In TI Technical Reference Manual this module is referred as
Camera Interface Subsystem (CAMSS).
-if VIDEO_TI_CAL
-
config VIDEO_TI_CAL_MC
bool "Media Controller centric mode by default"
+ depends on VIDEO_TI_CAL
default n
help
Enables Media Controller centric mode by default.
@@ -199,10 +229,9 @@ config VIDEO_TI_CAL_MC
default. Note that this behavior can be overridden via
module parameter 'mc_api'.
-endif # VIDEO_TI_CAL
-
config VIDEO_RCAR_ISP
tristate "R-Car Image Signal Processor (ISP)"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && OF
depends on ARCH_RENESAS || COMPILE_TEST
select MEDIA_CONTROLLER
@@ -217,21 +246,11 @@ config VIDEO_RCAR_ISP
To compile this driver as a module, choose M here: the
module will be called rcar-isp.
-endif # V4L_PLATFORM_DRIVERS
-
-menuconfig V4L_MEM2MEM_DRIVERS
- bool "Memory-to-memory multimedia devices"
- depends on VIDEO_V4L2
- help
- Say Y here to enable selecting drivers for V4L devices that
- use system memory for both source and destination buffers, as opposed
- to capture and output drivers, which use memory buffers for just
- one of those.
-
-if V4L_MEM2MEM_DRIVERS
+# Mem2mem drivers
config VIDEO_ALLEGRO_DVT
tristate "Allegro DVT Video IP Core"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_ZYNQMP || COMPILE_TEST
select V4L2_MEM2MEM_DEV
@@ -247,6 +266,7 @@ config VIDEO_ALLEGRO_DVT
config VIDEO_CODA
tristate "Chips&Media Coda multi-standard codec IP"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2 && OF && (ARCH_MXC || COMPILE_TEST)
select SRAM
select VIDEOBUF2_DMA_CONTIG
@@ -263,6 +283,7 @@ config VIDEO_IMX_VDOA
config VIDEO_IMX_PXP
tristate "i.MX Pixel Pipeline (PXP)"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST)
select VIDEOBUF2_DMA_CONTIG
select V4L2_MEM2MEM_DEV
@@ -274,6 +295,7 @@ source "drivers/media/platform/imx-jpeg/Kconfig"
config VIDEO_MEDIATEK_JPEG
tristate "Mediatek JPEG Codec driver"
+ depends on V4L_MEM2MEM_DRIVERS
depends on MTK_IOMMU_V1 || MTK_IOMMU || COMPILE_TEST
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_MEDIATEK || COMPILE_TEST
@@ -289,6 +311,7 @@ config VIDEO_MEDIATEK_JPEG
config VIDEO_MEDIATEK_VPU
tristate "Mediatek Video Processor Unit"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_MEDIATEK || COMPILE_TEST
help
@@ -302,6 +325,7 @@ config VIDEO_MEDIATEK_VPU
config VIDEO_MEDIATEK_MDP
tristate "Mediatek MDP driver"
+ depends on V4L_MEM2MEM_DRIVERS
depends on MTK_IOMMU || COMPILE_TEST
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_MEDIATEK || COMPILE_TEST
@@ -318,6 +342,7 @@ config VIDEO_MEDIATEK_MDP
config VIDEO_MEDIATEK_VCODEC
tristate "Mediatek Video Codec driver"
+ depends on V4L_MEM2MEM_DRIVERS
depends on MTK_IOMMU || COMPILE_TEST
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_MEDIATEK || COMPILE_TEST
@@ -353,6 +378,7 @@ config VIDEO_MEDIATEK_VCODEC_SCP
config VIDEO_MEM2MEM_DEINTERLACE
tristate "Deinterlace support"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on HAS_DMA
select VIDEOBUF2_DMA_CONTIG
@@ -362,6 +388,7 @@ config VIDEO_MEM2MEM_DEINTERLACE
config VIDEO_MESON_GE2D
tristate "Amlogic 2D Graphic Acceleration Unit"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_MESON || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG
@@ -375,6 +402,7 @@ config VIDEO_MESON_GE2D
config VIDEO_SAMSUNG_S5P_G2D
tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG
@@ -385,6 +413,7 @@ config VIDEO_SAMSUNG_S5P_G2D
config VIDEO_SAMSUNG_S5P_JPEG
tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG
@@ -395,6 +424,7 @@ config VIDEO_SAMSUNG_S5P_JPEG
config VIDEO_SAMSUNG_S5P_MFC
tristate "Samsung S5P MFC Video Codec"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG
@@ -403,6 +433,7 @@ config VIDEO_SAMSUNG_S5P_MFC
config VIDEO_MX2_EMMAPRP
tristate "MX2 eMMa-PrP support"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on SOC_IMX27 || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG
@@ -414,6 +445,7 @@ config VIDEO_MX2_EMMAPRP
config VIDEO_SAMSUNG_EXYNOS_GSC
tristate "Samsung Exynos G-Scaler driver"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_EXYNOS || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG
@@ -423,6 +455,7 @@ config VIDEO_SAMSUNG_EXYNOS_GSC
config VIDEO_STI_BDISP
tristate "STMicroelectronics BDISP 2D blitter driver"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_STI || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG
@@ -432,6 +465,7 @@ config VIDEO_STI_BDISP
config VIDEO_STI_HVA
tristate "STMicroelectronics HVA multi-format video encoder V4L2 driver"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_STI || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG
@@ -446,6 +480,7 @@ config VIDEO_STI_HVA
config VIDEO_STI_HVA_DEBUGFS
bool "Export STMicroelectronics HVA internals in debugfs"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_STI_HVA
depends on DEBUG_FS
help
@@ -457,6 +492,7 @@ config VIDEO_STI_HVA_DEBUGFS
config VIDEO_STI_DELTA
tristate "STMicroelectronics DELTA multi-format video decoder V4L2 driver"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_STI || COMPILE_TEST
help
@@ -471,11 +507,10 @@ config VIDEO_STI_DELTA
Please notice that the driver will only be built if
at least one of the DELTA decoder below is selected.
-if VIDEO_STI_DELTA
-
config VIDEO_STI_DELTA_MJPEG
bool "STMicroelectronics DELTA MJPEG support"
default y
+ depends on VIDEO_STI_DELTA
help
Enables DELTA MJPEG hardware support.
@@ -491,10 +526,9 @@ config VIDEO_STI_DELTA_DRIVER
select V4L2_MEM2MEM_DEV
select RPMSG
-endif # VIDEO_STI_DELTA
-
config VIDEO_STM32_DMA2D
tristate "STM32 Chrom-Art Accelerator (DMA2D)"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_STM32 || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG
@@ -507,6 +541,7 @@ config VIDEO_STM32_DMA2D
config VIDEO_RENESAS_FDP1
tristate "Renesas Fine Display Processor"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_RENESAS || COMPILE_TEST
depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP
@@ -521,6 +556,7 @@ config VIDEO_RENESAS_FDP1
config VIDEO_RENESAS_JPU
tristate "Renesas JPEG Processing Unit"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_RENESAS || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG
@@ -533,6 +569,7 @@ config VIDEO_RENESAS_JPU
config VIDEO_RENESAS_FCP
tristate "Renesas Frame Compression Processor"
+ depends on V4L_MEM2MEM_DRIVERS
depends on ARCH_RENESAS || COMPILE_TEST
depends on OF
help
@@ -546,6 +583,7 @@ config VIDEO_RENESAS_FCP
config VIDEO_RENESAS_VSP1
tristate "Renesas VSP1 Video Processing Engine"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_V4L2
depends on ARCH_RENESAS || COMPILE_TEST
depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP
@@ -561,6 +599,7 @@ config VIDEO_RENESAS_VSP1
config VIDEO_ROCKCHIP_RGA
tristate "Rockchip Raster 2d Graphic Acceleration Unit"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_ROCKCHIP || COMPILE_TEST
select VIDEOBUF2_DMA_SG
@@ -575,6 +614,7 @@ config VIDEO_ROCKCHIP_RGA
config VIDEO_TI_VPE
tristate "TI VPE (Video Processing Engine) driver"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on SOC_DRA7XX || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG
@@ -588,12 +628,14 @@ config VIDEO_TI_VPE
config VIDEO_TI_VPE_DEBUG
bool "VPE debug messages"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_TI_VPE
help
Enable debug messages on VPE driver.
config VIDEO_QCOM_VENUS
tristate "Qualcomm Venus V4L2 encoder/decoder driver"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2 && QCOM_SMEM
depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST
select QCOM_MDT_LOADER if ARCH_QCOM
@@ -608,6 +650,7 @@ config VIDEO_QCOM_VENUS
config VIDEO_SUN8I_DEINTERLACE
tristate "Allwinner Deinterlace driver"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_SUNXI || COMPILE_TEST
depends on COMMON_CLK && OF
@@ -621,6 +664,7 @@ config VIDEO_SUN8I_DEINTERLACE
config VIDEO_SUN8I_ROTATE
tristate "Allwinner DE2 rotation driver"
+ depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on ARCH_SUNXI || COMPILE_TEST
depends on COMMON_CLK && OF
@@ -633,6 +677,7 @@ config VIDEO_SUN8I_ROTATE
config VIDEO_TEGRA_VDE
tristate "NVIDIA Tegra Video Decoder Engine driver"
+ depends on V4L_MEM2MEM_DRIVERS
depends on ARCH_TEGRA || COMPILE_TEST
depends on VIDEO_DEV && VIDEO_V4L2
select DMA_SHARED_BUFFER
@@ -650,6 +695,7 @@ config VIDEO_TEGRA_VDE
config VIDEO_AMPHION_VPU
tristate "Amphion VPU (Video Processing Unit) Codec IP"
+ depends on V4L_MEM2MEM_DRIVERS
depends on ARCH_MXC || COMPILE_TEST
depends on MEDIA_SUPPORT
depends on VIDEO_DEV
@@ -667,8 +713,6 @@ config VIDEO_AMPHION_VPU
various NXP SoCs.
To compile this driver as a module choose m here.
-endif # V4L_MEM2MEM_DRIVERS
-
# TI VIDEO PORT Helper Modules
# These will be selected by VPE and VIP
config VIDEO_TI_VPDMA
@@ -680,26 +724,13 @@ config VIDEO_TI_SC
config VIDEO_TI_CSC
tristate
-menuconfig DVB_PLATFORM_DRIVERS
- bool "DVB platform devices"
- depends on MEDIA_DIGITAL_TV_SUPPORT
- help
- Say Y here to enable support for platform-specific Digital TV drivers.
-
-if DVB_PLATFORM_DRIVERS
+# DVB platform drivers
source "drivers/media/platform/sti/c8sectpfe/Kconfig"
-endif #DVB_PLATFORM_DRIVERS
-
-menuconfig SDR_PLATFORM_DRIVERS
- bool "SDR platform devices"
- depends on MEDIA_SDR_SUPPORT
- help
- Say Y here to enable support for platform-specific SDR Drivers.
-
-if SDR_PLATFORM_DRIVERS
+# SDR platform drivers
config VIDEO_RCAR_DRIF
tristate "Renesas Digital Radio Interface (DRIF)"
+ depends on SDR_PLATFORM_DRIVERS
depends on VIDEO_V4L2
depends on ARCH_RENESAS || COMPILE_TEST
select VIDEOBUF2_VMALLOC
@@ -712,5 +743,3 @@ config VIDEO_RCAR_DRIF
To compile this driver as a module, choose M here; the module
will be called rcar_drif.
-
-endif # SDR_PLATFORM_DRIVERS
diff --git a/drivers/media/platform/am437x/Kconfig b/drivers/media/platform/am437x/Kconfig
index 9ef898f512de..619cefca7590 100644
--- a/drivers/media/platform/am437x/Kconfig
+++ b/drivers/media/platform/am437x/Kconfig
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
config VIDEO_AM437X_VPFE
tristate "TI AM437x VPFE video capture driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2
depends on SOC_AM43XX || COMPILE_TEST
select MEDIA_CONTROLLER
diff --git a/drivers/media/platform/atmel/Kconfig b/drivers/media/platform/atmel/Kconfig
index f83bee373d82..5122290729ae 100644
--- a/drivers/media/platform/atmel/Kconfig
+++ b/drivers/media/platform/atmel/Kconfig
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
config VIDEO_ATMEL_ISC
tristate "ATMEL Image Sensor Controller (ISC) support"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && COMMON_CLK
depends on ARCH_AT91 || COMPILE_TEST
select MEDIA_CONTROLLER
@@ -15,6 +16,7 @@ config VIDEO_ATMEL_ISC
config VIDEO_ATMEL_XISC
tristate "ATMEL eXtended Image Sensor Controller (XISC) support"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && COMMON_CLK && VIDEO_V4L2_SUBDEV_API
depends on ARCH_AT91 || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG
@@ -33,6 +35,7 @@ config VIDEO_ATMEL_ISC_BASE
config VIDEO_ATMEL_ISI
tristate "ATMEL Image Sensor Interface (ISI) support"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && OF
depends on ARCH_AT91 || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG
@@ -43,6 +46,7 @@ config VIDEO_ATMEL_ISI
config VIDEO_MICROCHIP_CSI2DC
tristate "Microchip CSI2 Demux Controller"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && COMMON_CLK && OF
depends on ARCH_AT91 || COMPILE_TEST
select MEDIA_CONTROLLER
diff --git a/drivers/media/platform/cadence/Kconfig b/drivers/media/platform/cadence/Kconfig
index 80cf601323ce..79a7e9fb2575 100644
--- a/drivers/media/platform/cadence/Kconfig
+++ b/drivers/media/platform/cadence/Kconfig
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
config VIDEO_CADENCE
bool "Cadence Video Devices"
+ depends on V4L_PLATFORM_DRIVERS
help
If you have a media device designed by Cadence, say Y.
diff --git a/drivers/media/platform/davinci/Kconfig b/drivers/media/platform/davinci/Kconfig
index 9d2a9eeb3499..7e5f92b0082a 100644
--- a/drivers/media/platform/davinci/Kconfig
+++ b/drivers/media/platform/davinci/Kconfig
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
config VIDEO_DAVINCI_VPIF_DISPLAY
tristate "TI DaVinci VPIF V4L2-Display driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2
depends on ARCH_DAVINCI || COMPILE_TEST
depends on I2C
@@ -17,6 +18,7 @@ config VIDEO_DAVINCI_VPIF_DISPLAY
config VIDEO_DAVINCI_VPIF_CAPTURE
tristate "TI DaVinci VPIF video capture driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2
depends on ARCH_DAVINCI || COMPILE_TEST
depends on I2C
@@ -32,6 +34,7 @@ config VIDEO_DAVINCI_VPIF_CAPTURE
config VIDEO_DM6446_CCDC
tristate "TI DM6446 CCDC video capture driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2
depends on ARCH_DAVINCI || COMPILE_TEST
depends on I2C
@@ -48,6 +51,7 @@ config VIDEO_DM6446_CCDC
config VIDEO_DM355_CCDC
tristate "TI DM355 CCDC video capture driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2
depends on ARCH_DAVINCI || COMPILE_TEST
depends on I2C
@@ -64,6 +68,7 @@ config VIDEO_DM355_CCDC
config VIDEO_DM365_ISIF
tristate "TI DM365 ISIF video capture driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2
depends on ARCH_DAVINCI || COMPILE_TEST
depends on I2C
@@ -78,6 +83,7 @@ config VIDEO_DM365_ISIF
config VIDEO_DAVINCI_VPBE_DISPLAY
tristate "TI DaVinci VPBE V4L2-Display driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2
depends on ARCH_DAVINCI || COMPILE_TEST
depends on I2C
diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/exynos4-is/Kconfig
index 136d3b2a0fbb..868bb86c7699 100644
--- a/drivers/media/platform/exynos4-is/Kconfig
+++ b/drivers/media/platform/exynos4-is/Kconfig
@@ -2,6 +2,7 @@
config VIDEO_SAMSUNG_EXYNOS4_IS
tristate "Samsung S5P/EXYNOS4 SoC series Camera Subsystem driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && OF && COMMON_CLK
depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
select MEDIA_CONTROLLER
diff --git a/drivers/media/platform/imx-jpeg/Kconfig b/drivers/media/platform/imx-jpeg/Kconfig
index 2fdd648cda80..cbf6101a8b1d 100644
--- a/drivers/media/platform/imx-jpeg/Kconfig
+++ b/drivers/media/platform/imx-jpeg/Kconfig
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
config VIDEO_IMX8_JPEG
tristate "IMX8 JPEG Encoder/Decoder"
+ depends on V4L_MEM2MEM_DRIVERS
depends on ARCH_MXC || COMPILE_TEST
depends on VIDEO_DEV && VIDEO_V4L2
select VIDEOBUF2_DMA_CONTIG
diff --git a/drivers/media/platform/imx/Kconfig b/drivers/media/platform/imx/Kconfig
index 683863572c20..7cd0617c9b1b 100644
--- a/drivers/media/platform/imx/Kconfig
+++ b/drivers/media/platform/imx/Kconfig
@@ -2,6 +2,7 @@
menuconfig VIDEO_IMX
bool "V4L2 capture drivers for NXP i.MX devices"
+ depends on V4L_PLATFORM_DRIVERS
depends on ARCH_MXC || COMPILE_TEST
depends on VIDEO_DEV && VIDEO_V4L2
help
diff --git a/drivers/media/platform/marvell-ccic/Kconfig b/drivers/media/platform/marvell-ccic/Kconfig
index 3e3f86264762..bfe655b2cedd 100644
--- a/drivers/media/platform/marvell-ccic/Kconfig
+++ b/drivers/media/platform/marvell-ccic/Kconfig
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
config VIDEO_CAFE_CCIC
tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"
+ depends on V4L_PLATFORM_DRIVERS
depends on PCI && I2C && VIDEO_V4L2
depends on COMMON_CLK
select VIDEO_OV7670
@@ -14,6 +15,7 @@ config VIDEO_CAFE_CCIC
config VIDEO_MMP_CAMERA
tristate "Marvell Armada 610 integrated camera controller support"
+ depends on V4L_PLATFORM_DRIVERS
depends on I2C && VIDEO_V4L2
depends on ARCH_MMP || COMPILE_TEST
depends on COMMON_CLK
diff --git a/drivers/media/platform/omap/Kconfig b/drivers/media/platform/omap/Kconfig
index de16de46c0f4..789d5e5686c7 100644
--- a/drivers/media/platform/omap/Kconfig
+++ b/drivers/media/platform/omap/Kconfig
@@ -6,6 +6,7 @@ config VIDEO_OMAP2_VOUT_VRFB
config VIDEO_OMAP2_VOUT
tristate "OMAP2/OMAP3 V4L2-Display driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on MMU
depends on FB_OMAP2 || (COMPILE_TEST && FB_OMAP2=n)
depends on ARCH_OMAP2 || ARCH_OMAP3 || COMPILE_TEST
diff --git a/drivers/media/platform/rcar-vin/Kconfig b/drivers/media/platform/rcar-vin/Kconfig
index 030312d862e7..34b7ea6f1246 100644
--- a/drivers/media/platform/rcar-vin/Kconfig
+++ b/drivers/media/platform/rcar-vin/Kconfig
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
config VIDEO_RCAR_CSI2
tristate "R-Car MIPI CSI-2 Receiver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && OF
depends on ARCH_RENESAS || COMPILE_TEST
select MEDIA_CONTROLLER
@@ -16,6 +17,7 @@ config VIDEO_RCAR_CSI2
config VIDEO_RCAR_VIN
tristate "R-Car Video Input (VIN) Driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && OF
depends on ARCH_RENESAS || COMPILE_TEST
select MEDIA_CONTROLLER
diff --git a/drivers/media/platform/sti/c8sectpfe/Kconfig b/drivers/media/platform/sti/c8sectpfe/Kconfig
index 369509e03071..702b910509c9 100644
--- a/drivers/media/platform/sti/c8sectpfe/Kconfig
+++ b/drivers/media/platform/sti/c8sectpfe/Kconfig
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
config DVB_C8SECTPFE
tristate "STMicroelectronics C8SECTPFE DVB support"
+ depends on DVB_PLATFORM_DRIVERS
depends on PINCTRL && DVB_CORE && I2C
depends on ARCH_STI || ARCH_MULTIPLATFORM || COMPILE_TEST
select FW_LOADER
diff --git a/drivers/media/platform/sunxi/sun4i-csi/Kconfig b/drivers/media/platform/sunxi/sun4i-csi/Kconfig
index 903c6152f6e8..43ad2dd7da5d 100644
--- a/drivers/media/platform/sunxi/sun4i-csi/Kconfig
+++ b/drivers/media/platform/sunxi/sun4i-csi/Kconfig
@@ -2,6 +2,7 @@
config VIDEO_SUN4I_CSI
tristate "Allwinner A10 CMOS Sensor Interface Support"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && COMMON_CLK && HAS_DMA
depends on ARCH_SUNXI || COMPILE_TEST
select MEDIA_CONTROLLER
diff --git a/drivers/media/platform/sunxi/sun6i-csi/Kconfig b/drivers/media/platform/sunxi/sun6i-csi/Kconfig
index 586e3fb3a80d..6d9cf1963c41 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/Kconfig
+++ b/drivers/media/platform/sunxi/sun6i-csi/Kconfig
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
config VIDEO_SUN6I_CSI
tristate "Allwinner V3s Camera Sensor Interface driver"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && COMMON_CLK && HAS_DMA
depends on ARCH_SUNXI || COMPILE_TEST
select MEDIA_CONTROLLER
diff --git a/drivers/media/platform/xilinx/Kconfig b/drivers/media/platform/xilinx/Kconfig
index 44587dccacf1..a9531d5efd50 100644
--- a/drivers/media/platform/xilinx/Kconfig
+++ b/drivers/media/platform/xilinx/Kconfig
@@ -2,6 +2,7 @@
config VIDEO_XILINX
tristate "Xilinx Video IP (EXPERIMENTAL)"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && OF && HAS_DMA
select MEDIA_CONTROLLER
select VIDEO_V4L2_SUBDEV_API
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 06/67] media: platform: place Aspeed driver on a separate dir
[not found] <cover.1647274406.git.mchehab@kernel.org>
2022-03-14 16:34 ` [PATCH v2 05/67] media: platform: move platform menu dependencies to drivers Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 07/67] media: platform: place NXP drivers " Mauro Carvalho Chehab
` (29 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Andrew Jeffery,
Dmitry Osipenko, Eddie James, Eugen Hristev, Hans Verkuil,
Jacopo Mondi, Jammy Huang, Jernej Skrabec, Joel Stanley,
Laurent Pinchart, Ming Qian, Paul Menzel, Yang Li, Zev Weiss,
linux-arm-kernel, linux-aspeed, linux-kernel, linux-media,
openbmc
In order to cleanup the main platform media directory, move Aspeed
driver to its own directory.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 10 +---------
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/aspeed/Kconfig | 10 ++++++++++
drivers/media/platform/aspeed/Makefile | 2 ++
drivers/media/platform/{ => aspeed}/aspeed-video.c | 0
6 files changed, 15 insertions(+), 11 deletions(-)
create mode 100644 drivers/media/platform/aspeed/Kconfig
create mode 100644 drivers/media/platform/aspeed/Makefile
rename drivers/media/platform/{ => aspeed}/aspeed-video.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 1a9fb0615925..1b6f48a660de 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3026,7 +3026,7 @@ L: linux-media@vger.kernel.org
L: openbmc@lists.ozlabs.org (moderated for non-subscribers)
S: Maintained
F: Documentation/devicetree/bindings/media/aspeed-video.txt
-F: drivers/media/platform/aspeed-video.c
+F: drivers/media/platform/aspeed/
ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
M: Corentin Chary <corentin.chary@gmail.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 1446a99159c5..10f453ff2717 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -50,15 +50,7 @@ source "drivers/media/platform/davinci/Kconfig"
source "drivers/media/platform/omap/Kconfig"
-config VIDEO_ASPEED
- tristate "Aspeed AST2400 and AST2500 Video Engine driver"
- depends on V4L_PLATFORM_DRIVERS
- depends on VIDEO_V4L2
- select VIDEOBUF2_DMA_CONTIG
- help
- Support for the Aspeed Video Engine (VE) embedded in the Aspeed
- AST2400 and AST2500 SOCs. The VE can capture and compress video data
- from digital or analog sources.
+source "drivers/media/platform/aspeed/Kconfig"
config VIDEO_SH_VOU
tristate "SuperH VOU video output driver"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index e319044c57e9..18ec3d208483 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -6,6 +6,7 @@
# Place here, alphabetically sorted by directory
# (e. g. LC_ALL=C sort Makefile)
obj-y += allegro-dvt/
+obj-y += aspeed/
obj-y += am437x/
obj-y += amphion/
obj-y += atmel/
@@ -47,7 +48,6 @@ obj-y += xilinx/
# Please place here only ancillary drivers that aren't SoC-specific
# Please keep it alphabetically sorted by Kconfig name
# (e. g. LC_ALL=C sort Makefile)
-obj-$(CONFIG_VIDEO_ASPEED) += aspeed-video.o
obj-$(CONFIG_VIDEO_IMX_PXP) += imx-pxp.o
obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o
obj-$(CONFIG_VIDEO_MUX) += video-mux.o
diff --git a/drivers/media/platform/aspeed/Kconfig b/drivers/media/platform/aspeed/Kconfig
new file mode 100644
index 000000000000..5025e892844c
--- /dev/null
+++ b/drivers/media/platform/aspeed/Kconfig
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_ASPEED
+ tristate "Aspeed AST2400 and AST2500 Video Engine driver"
+ depends on V4L_PLATFORM_DRIVERS
+ depends on VIDEO_V4L2
+ select VIDEOBUF2_DMA_CONTIG
+ help
+ Support for the Aspeed Video Engine (VE) embedded in the Aspeed
+ AST2400 and AST2500 SOCs. The VE can capture and compress video data
+ from digital or analog sources.
diff --git a/drivers/media/platform/aspeed/Makefile b/drivers/media/platform/aspeed/Makefile
new file mode 100644
index 000000000000..1979af63dadd
--- /dev/null
+++ b/drivers/media/platform/aspeed/Makefile
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-$(CONFIG_VIDEO_ASPEED) += aspeed-video.o
diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed/aspeed-video.c
similarity index 100%
rename from drivers/media/platform/aspeed-video.c
rename to drivers/media/platform/aspeed/aspeed-video.c
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 07/67] media: platform: place NXP drivers on a separate dir
[not found] <cover.1647274406.git.mchehab@kernel.org>
2022-03-14 16:34 ` [PATCH v2 05/67] media: platform: move platform menu dependencies to drivers Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 06/67] media: platform: place Aspeed driver on a separate dir Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 14/67] media: platform: exynos-gsc: move config to its own file Mauro Carvalho Chehab
` (28 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Cai Huoqing,
Colin Ian King, Dmitry Osipenko, Eugen Hristev, Fabio Estevam,
Geert Uytterhoeven, Hans Verkuil, Jacopo Mondi, Jernej Skrabec,
Julia Lawall, Laurent Pinchart, Laurentiu Palcu, Ming Qian,
Mirela Rabulea, NXP Linux Team, Pengutronix Kernel Team,
Philipp Zabel, Rikard Falkeborn, Rui Miguel Silva, Sakari Ailus,
Sascha Hauer, Shawn Guo, Wei Yongjun, Yang Yingliang,
linux-arm-kernel, linux-kernel, linux-media
In order to cleanup the main platform media directory, move NXP
drivers to their own directory.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 40 +----------
drivers/media/platform/Makefile | 6 +-
drivers/media/platform/imx/Kconfig | 25 -------
drivers/media/platform/imx/Makefile | 1 -
drivers/media/platform/nxp/Kconfig | 66 +++++++++++++++++++
drivers/media/platform/nxp/Makefile | 8 +++
drivers/media/platform/{ => nxp}/fsl-viu.c | 0
.../media/platform/{ => nxp}/imx-jpeg/Kconfig | 0
.../platform/{ => nxp}/imx-jpeg/Makefile | 0
.../platform/{ => nxp}/imx-jpeg/mxc-jpeg-hw.c | 0
.../platform/{ => nxp}/imx-jpeg/mxc-jpeg-hw.h | 0
.../platform/{ => nxp}/imx-jpeg/mxc-jpeg.c | 0
.../platform/{ => nxp}/imx-jpeg/mxc-jpeg.h | 0
.../platform/{imx => nxp}/imx-mipi-csis.c | 0
drivers/media/platform/{ => nxp}/imx-pxp.c | 0
drivers/media/platform/{ => nxp}/imx-pxp.h | 0
.../media/platform/{ => nxp}/mx2_emmaprp.c | 0
18 files changed, 78 insertions(+), 70 deletions(-)
delete mode 100644 drivers/media/platform/imx/Kconfig
delete mode 100644 drivers/media/platform/imx/Makefile
create mode 100644 drivers/media/platform/nxp/Kconfig
create mode 100644 drivers/media/platform/nxp/Makefile
rename drivers/media/platform/{ => nxp}/fsl-viu.c (100%)
rename drivers/media/platform/{ => nxp}/imx-jpeg/Kconfig (100%)
rename drivers/media/platform/{ => nxp}/imx-jpeg/Makefile (100%)
rename drivers/media/platform/{ => nxp}/imx-jpeg/mxc-jpeg-hw.c (100%)
rename drivers/media/platform/{ => nxp}/imx-jpeg/mxc-jpeg-hw.h (100%)
rename drivers/media/platform/{ => nxp}/imx-jpeg/mxc-jpeg.c (100%)
rename drivers/media/platform/{ => nxp}/imx-jpeg/mxc-jpeg.h (100%)
rename drivers/media/platform/{imx => nxp}/imx-mipi-csis.c (100%)
rename drivers/media/platform/{ => nxp}/imx-pxp.c (100%)
rename drivers/media/platform/{ => nxp}/imx-pxp.h (100%)
rename drivers/media/platform/{ => nxp}/mx2_emmaprp.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 1b6f48a660de..780ef2ef3362 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11841,7 +11841,7 @@ M: Philipp Zabel <p.zabel@pengutronix.de>
L: linux-media@vger.kernel.org
S: Maintained
T: git git://linuxtv.org/media_tree.git
-F: drivers/media/platform/imx-pxp.[ch]
+F: drivers/media/platform/nxp/imx-pxp.[ch]
MEDIA DRIVERS FOR ASCOT2E
M: Sergey Kozlov <serjk@netup.ru>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 10f453ff2717..711b6ab9370b 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -29,6 +29,8 @@ config V4L_MEM2MEM_DRIVERS
to capture and output drivers, which use memory buffers for just
one of those.
+source "drivers/media/platform/nxp/Kconfig"
+
# V4L platform drivers
source "drivers/media/platform/marvell-ccic/Kconfig"
@@ -61,19 +63,6 @@ config VIDEO_SH_VOU
help
Support for the Video Output Unit (VOU) on SuperH SoCs.
-config VIDEO_VIU
- tristate "Freescale VIU Video Driver"
- depends on V4L_PLATFORM_DRIVERS
- depends on VIDEO_V4L2 && (PPC_MPC512x || COMPILE_TEST) && I2C
- select VIDEOBUF_DMA_CONTIG
- default y
- help
- Support for Freescale VIU video driver. This device captures
- video data, or overlays video on DIU frame buffer.
-
- Say Y here if you want to enable VIU device on MPC5121e Rev2+.
- In doubt, say N.
-
config VIDEO_MUX
tristate "Video Multiplexer"
depends on V4L_PLATFORM_DRIVERS
@@ -193,7 +182,6 @@ source "drivers/media/platform/xilinx/Kconfig"
source "drivers/media/platform/rcar-vin/Kconfig"
source "drivers/media/platform/atmel/Kconfig"
source "drivers/media/platform/sunxi/Kconfig"
-source "drivers/media/platform/imx/Kconfig"
config VIDEO_TI_CAL
tristate "TI CAL (Camera Adaptation Layer) driver"
@@ -273,18 +261,6 @@ config VIDEO_CODA
config VIDEO_IMX_VDOA
def_tristate VIDEO_CODA if SOC_IMX6Q || COMPILE_TEST
-config VIDEO_IMX_PXP
- tristate "i.MX Pixel Pipeline (PXP)"
- depends on V4L_MEM2MEM_DRIVERS
- depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST)
- select VIDEOBUF2_DMA_CONTIG
- select V4L2_MEM2MEM_DEV
- help
- The i.MX Pixel Pipeline is a memory-to-memory engine for scaling,
- color space conversion, and rotation.
-
-source "drivers/media/platform/imx-jpeg/Kconfig"
-
config VIDEO_MEDIATEK_JPEG
tristate "Mediatek JPEG Codec driver"
depends on V4L_MEM2MEM_DRIVERS
@@ -423,18 +399,6 @@ config VIDEO_SAMSUNG_S5P_MFC
help
MFC 5.1 and 6.x driver for V4L2
-config VIDEO_MX2_EMMAPRP
- tristate "MX2 eMMa-PrP support"
- depends on V4L_MEM2MEM_DRIVERS
- depends on VIDEO_DEV && VIDEO_V4L2
- depends on SOC_IMX27 || COMPILE_TEST
- select VIDEOBUF2_DMA_CONTIG
- select V4L2_MEM2MEM_DEV
- help
- MX2X chips have a PrP that can be used to process buffers from
- memory to memory. Operations include resizing and format
- conversion.
-
config VIDEO_SAMSUNG_EXYNOS_GSC
tristate "Samsung Exynos G-Scaler driver"
depends on V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 18ec3d208483..4458690c1965 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -15,14 +15,13 @@ obj-y += coda/
obj-y += davinci/
obj-y += exynos-gsc/
obj-y += exynos4-is/
-obj-y += imx/
-obj-y += imx-jpeg/
obj-y += marvell-ccic/
obj-y += meson/ge2d/
obj-y += mtk-jpeg/
obj-y += mtk-mdp/
obj-y += mtk-vcodec/
obj-y += mtk-vpu/
+obj-y += nxp/
obj-y += omap/
obj-y += omap3isp/
obj-y += qcom/camss/
@@ -48,10 +47,8 @@ obj-y += xilinx/
# Please place here only ancillary drivers that aren't SoC-specific
# Please keep it alphabetically sorted by Kconfig name
# (e. g. LC_ALL=C sort Makefile)
-obj-$(CONFIG_VIDEO_IMX_PXP) += imx-pxp.o
obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o
obj-$(CONFIG_VIDEO_MUX) += video-mux.o
-obj-$(CONFIG_VIDEO_MX2_EMMAPRP) += mx2_emmaprp.o
obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o
obj-$(CONFIG_VIDEO_RCAR_DRIF) += rcar_drif.o
obj-$(CONFIG_VIDEO_RCAR_ISP) += rcar-isp.o
@@ -61,4 +58,3 @@ obj-$(CONFIG_VIDEO_RENESAS_FDP1) += rcar_fdp1.o
obj-$(CONFIG_VIDEO_RENESAS_JPU) += rcar_jpu.o
obj-$(CONFIG_VIDEO_SH_VOU) += sh_vou.o
obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
-obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o
diff --git a/drivers/media/platform/imx/Kconfig b/drivers/media/platform/imx/Kconfig
deleted file mode 100644
index 7cd0617c9b1b..000000000000
--- a/drivers/media/platform/imx/Kconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-
-menuconfig VIDEO_IMX
- bool "V4L2 capture drivers for NXP i.MX devices"
- depends on V4L_PLATFORM_DRIVERS
- depends on ARCH_MXC || COMPILE_TEST
- depends on VIDEO_DEV && VIDEO_V4L2
- help
- Say yes here to enable support for capture drivers on i.MX SoCs.
- Support for the single SoC features are selectable in the sub-menu
- options.
-
-if VIDEO_IMX
-
-config VIDEO_IMX_MIPI_CSIS
- tristate "MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models"
- select MEDIA_CONTROLLER
- select V4L2_FWNODE
- select VIDEO_V4L2_SUBDEV_API
- default n
- help
- Video4Linux2 sub-device driver for the MIPI CSI-2 CSIS receiver
- v3.3/v3.6.3 found on some i.MX7 and i.MX8 SoCs.
-
-endif # VIDEO_IMX
diff --git a/drivers/media/platform/imx/Makefile b/drivers/media/platform/imx/Makefile
deleted file mode 100644
index f72bdbe8e6ef..000000000000
--- a/drivers/media/platform/imx/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx-mipi-csis.o
diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nxp/Kconfig
new file mode 100644
index 000000000000..df52d32ebe50
--- /dev/null
+++ b/drivers/media/platform/nxp/Kconfig
@@ -0,0 +1,66 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+# V4L drivers
+
+menuconfig VIDEO_IMX
+ bool "V4L2 capture drivers for NXP i.MX devices"
+ depends on V4L_PLATFORM_DRIVERS
+ depends on ARCH_MXC || COMPILE_TEST
+ depends on VIDEO_DEV && VIDEO_V4L2
+ help
+ Say yes here to enable support for capture drivers on i.MX SoCs.
+ Support for the single SoC features are selectable in the sub-menu
+ options.
+
+if VIDEO_IMX
+
+config VIDEO_IMX_MIPI_CSIS
+ tristate "MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models"
+ select MEDIA_CONTROLLER
+ select V4L2_FWNODE
+ select VIDEO_V4L2_SUBDEV_API
+ default n
+ help
+ Video4Linux2 sub-device driver for the MIPI CSI-2 CSIS receiver
+ v3.3/v3.6.3 found on some i.MX7 and i.MX8 SoCs.
+
+endif # VIDEO_IMX
+
+config VIDEO_VIU
+ tristate "Freescale/NXP VIU Video Driver"
+ depends on V4L_PLATFORM_DRIVERS
+ depends on VIDEO_V4L2 && (PPC_MPC512x || COMPILE_TEST) && I2C
+ select VIDEOBUF_DMA_CONTIG
+ default y
+ help
+ Support for Freescale VIU video driver. This device captures
+ video data, or overlays video on DIU frame buffer.
+
+ Say Y here if you want to enable VIU device on MPC5121e Rev2+.
+ In doubt, say N.
+
+# mem2mem drivers
+
+config VIDEO_IMX_PXP
+ tristate "i.MX Pixel Pipeline (PXP)"
+ depends on V4L_MEM2MEM_DRIVERS
+ depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST)
+ select VIDEOBUF2_DMA_CONTIG
+ select V4L2_MEM2MEM_DEV
+ help
+ The i.MX Pixel Pipeline is a memory-to-memory engine for scaling,
+ color space conversion, and rotation.
+
+config VIDEO_MX2_EMMAPRP
+ tristate "Freescale/NXP MX2 eMMa-PrP support"
+ depends on V4L_MEM2MEM_DRIVERS
+ depends on VIDEO_DEV && VIDEO_V4L2
+ depends on SOC_IMX27 || COMPILE_TEST
+ select VIDEOBUF2_DMA_CONTIG
+ select V4L2_MEM2MEM_DEV
+ help
+ MX2X chips have a PrP that can be used to process buffers from
+ memory to memory. Operations include resizing and format
+ conversion.
+
+source "drivers/media/platform/nxp/imx-jpeg/Kconfig"
diff --git a/drivers/media/platform/nxp/Makefile b/drivers/media/platform/nxp/Makefile
new file mode 100644
index 000000000000..efc38c6578ce
--- /dev/null
+++ b/drivers/media/platform/nxp/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-y += imx-jpeg/
+
+obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx-mipi-csis.o
+obj-$(CONFIG_VIDEO_IMX_PXP) += imx-pxp.o
+obj-$(CONFIG_VIDEO_MX2_EMMAPRP) += mx2_emmaprp.o
+obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/nxp/fsl-viu.c
similarity index 100%
rename from drivers/media/platform/fsl-viu.c
rename to drivers/media/platform/nxp/fsl-viu.c
diff --git a/drivers/media/platform/imx-jpeg/Kconfig b/drivers/media/platform/nxp/imx-jpeg/Kconfig
similarity index 100%
rename from drivers/media/platform/imx-jpeg/Kconfig
rename to drivers/media/platform/nxp/imx-jpeg/Kconfig
diff --git a/drivers/media/platform/imx-jpeg/Makefile b/drivers/media/platform/nxp/imx-jpeg/Makefile
similarity index 100%
rename from drivers/media/platform/imx-jpeg/Makefile
rename to drivers/media/platform/nxp/imx-jpeg/Makefile
diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg-hw.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c
similarity index 100%
rename from drivers/media/platform/imx-jpeg/mxc-jpeg-hw.c
rename to drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c
diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg-hw.h b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h
similarity index 100%
rename from drivers/media/platform/imx-jpeg/mxc-jpeg-hw.h
rename to drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h
diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
similarity index 100%
rename from drivers/media/platform/imx-jpeg/mxc-jpeg.c
rename to drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.h b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h
similarity index 100%
rename from drivers/media/platform/imx-jpeg/mxc-jpeg.h
rename to drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h
diff --git a/drivers/media/platform/imx/imx-mipi-csis.c b/drivers/media/platform/nxp/imx-mipi-csis.c
similarity index 100%
rename from drivers/media/platform/imx/imx-mipi-csis.c
rename to drivers/media/platform/nxp/imx-mipi-csis.c
diff --git a/drivers/media/platform/imx-pxp.c b/drivers/media/platform/nxp/imx-pxp.c
similarity index 100%
rename from drivers/media/platform/imx-pxp.c
rename to drivers/media/platform/nxp/imx-pxp.c
diff --git a/drivers/media/platform/imx-pxp.h b/drivers/media/platform/nxp/imx-pxp.h
similarity index 100%
rename from drivers/media/platform/imx-pxp.h
rename to drivers/media/platform/nxp/imx-pxp.h
diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/nxp/mx2_emmaprp.c
similarity index 100%
rename from drivers/media/platform/mx2_emmaprp.c
rename to drivers/media/platform/nxp/mx2_emmaprp.c
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 14/67] media: platform: exynos-gsc: move config to its own file
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (2 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 07/67] media: platform: place NXP drivers " Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 15/67] media: platform: ge2d: " Mauro Carvalho Chehab
` (27 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Dmitry Osipenko,
Hans Verkuil, Jernej Skrabec, Krzysztof Kozlowski,
Laurent Pinchart, Ming Qian, linux-arm-kernel, linux-kernel,
linux-media, linux-samsung-soc
In order to better organize the platform/Kconfig, place
exynos-gsc-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
drivers/media/platform/Kconfig | 11 +----------
drivers/media/platform/exynos-gsc/Kconfig | 10 ++++++++++
2 files changed, 11 insertions(+), 10 deletions(-)
create mode 100644 drivers/media/platform/exynos-gsc/Kconfig
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 0bf9dd5da845..57ca2426a83b 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -46,6 +46,7 @@ source "drivers/media/platform/cadence/Kconfig"
source "drivers/media/platform/coda/Kconfig"
source "drivers/media/platform/davinci/Kconfig"
+source "drivers/media/platform/exynos-gsc/Kconfig"
source "drivers/media/platform/omap/Kconfig"
source "drivers/media/platform/aspeed/Kconfig"
@@ -317,16 +318,6 @@ config VIDEO_SAMSUNG_S5P_MFC
help
MFC 5.1 and 6.x driver for V4L2
-config VIDEO_SAMSUNG_EXYNOS_GSC
- tristate "Samsung Exynos G-Scaler driver"
- depends on V4L_MEM2MEM_DRIVERS
- depends on VIDEO_DEV && VIDEO_V4L2
- depends on ARCH_EXYNOS || COMPILE_TEST
- select VIDEOBUF2_DMA_CONTIG
- select V4L2_MEM2MEM_DEV
- help
- This is a v4l2 driver for Samsung EXYNOS5 SoC G-Scaler.
-
config VIDEO_STI_BDISP
tristate "STMicroelectronics BDISP 2D blitter driver"
depends on V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/platform/exynos-gsc/Kconfig b/drivers/media/platform/exynos-gsc/Kconfig
new file mode 100644
index 000000000000..f9bdffe915b4
--- /dev/null
+++ b/drivers/media/platform/exynos-gsc/Kconfig
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_SAMSUNG_EXYNOS_GSC
+ tristate "Samsung Exynos G-Scaler driver"
+ depends on V4L_MEM2MEM_DRIVERS
+ depends on VIDEO_DEV && VIDEO_V4L2
+ depends on ARCH_EXYNOS || COMPILE_TEST
+ select VIDEOBUF2_DMA_CONTIG
+ select V4L2_MEM2MEM_DEV
+ help
+ This is a v4l2 driver for Samsung EXYNOS5 SoC G-Scaler.
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 15/67] media: platform: ge2d: move config to its own file
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (3 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 14/67] media: platform: exynos-gsc: move config to its own file Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 16/67] media: platform: mtk-jpeg: " Mauro Carvalho Chehab
` (26 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Dmitry Osipenko,
Hans Verkuil, Jernej Skrabec, Jerome Brunet, Kevin Hilman,
Laurent Pinchart, Martin Blumenstingl, Ming Qian, Neil Armstrong,
linux-amlogic, linux-arm-kernel, linux-kernel, linux-media
In order to better organize the platform/Kconfig, place
ge2d-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
drivers/media/platform/Kconfig | 15 +--------------
drivers/media/platform/meson/ge2d/Kconfig | 14 ++++++++++++++
2 files changed, 15 insertions(+), 14 deletions(-)
create mode 100644 drivers/media/platform/meson/ge2d/Kconfig
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 57ca2426a83b..d3b7bef19237 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -47,6 +47,7 @@ source "drivers/media/platform/coda/Kconfig"
source "drivers/media/platform/davinci/Kconfig"
source "drivers/media/platform/exynos-gsc/Kconfig"
+source "drivers/media/platform/meson/ge2d/Kconfig"
source "drivers/media/platform/omap/Kconfig"
source "drivers/media/platform/aspeed/Kconfig"
@@ -273,20 +274,6 @@ config VIDEO_MEM2MEM_DEINTERLACE
help
Generic deinterlacing V4L2 driver.
-config VIDEO_MESON_GE2D
- tristate "Amlogic 2D Graphic Acceleration Unit"
- depends on V4L_MEM2MEM_DRIVERS
- depends on VIDEO_DEV && VIDEO_V4L2
- depends on ARCH_MESON || COMPILE_TEST
- select VIDEOBUF2_DMA_CONTIG
- select V4L2_MEM2MEM_DEV
- help
- This is a v4l2 driver for Amlogic GE2D 2D graphics accelerator.
- GE2D is a standalone 2D graphic acceleration unit, with color converter,
- image scaling, BitBLT & alpha blending operations.
-
- To compile this driver as a module choose m here.
-
config VIDEO_SAMSUNG_S5P_G2D
tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"
depends on V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/platform/meson/ge2d/Kconfig b/drivers/media/platform/meson/ge2d/Kconfig
new file mode 100644
index 000000000000..8c3f3b1b6b05
--- /dev/null
+++ b/drivers/media/platform/meson/ge2d/Kconfig
@@ -0,0 +1,14 @@
+config VIDEO_MESON_GE2D
+ tristate "Amlogic 2D Graphic Acceleration Unit"
+ depends on V4L_MEM2MEM_DRIVERS
+ depends on VIDEO_DEV && VIDEO_V4L2
+ depends on ARCH_MESON || COMPILE_TEST
+ select VIDEOBUF2_DMA_CONTIG
+ select V4L2_MEM2MEM_DEV
+ help
+ This is a v4l2 driver for Amlogic GE2D 2D graphics accelerator.
+ GE2D is a standalone 2D graphic acceleration unit, with color converter,
+ image scaling, BitBLT & alpha blending operations.
+
+ To compile this driver as a module choose m here.
+
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 16/67] media: platform: mtk-jpeg: move config to its own file
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (4 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 15/67] media: platform: ge2d: " Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 17/67] media: platform: mtk-mdp: " Mauro Carvalho Chehab
` (25 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Dmitry Osipenko,
Hans Verkuil, Jernej Skrabec, Laurent Pinchart, Matthias Brugger,
Ming Qian, linux-arm-kernel, linux-kernel, linux-media,
linux-mediatek
In order to better organize the platform/Kconfig, place
mtk-jpeg-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
drivers/media/platform/Kconfig | 17 +----------------
drivers/media/platform/mtk-jpeg/Kconfig | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 16 deletions(-)
create mode 100644 drivers/media/platform/mtk-jpeg/Kconfig
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index d3b7bef19237..f517aa951460 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -48,6 +48,7 @@ source "drivers/media/platform/davinci/Kconfig"
source "drivers/media/platform/exynos-gsc/Kconfig"
source "drivers/media/platform/meson/ge2d/Kconfig"
+source "drivers/media/platform/mtk-jpeg/Kconfig"
source "drivers/media/platform/omap/Kconfig"
source "drivers/media/platform/aspeed/Kconfig"
@@ -181,22 +182,6 @@ config VIDEO_TI_CAL_MC
# Mem2mem drivers
-config VIDEO_MEDIATEK_JPEG
- tristate "Mediatek JPEG Codec driver"
- depends on V4L_MEM2MEM_DRIVERS
- depends on MTK_IOMMU_V1 || MTK_IOMMU || COMPILE_TEST
- depends on VIDEO_DEV && VIDEO_V4L2
- depends on ARCH_MEDIATEK || COMPILE_TEST
- depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n)
- select VIDEOBUF2_DMA_CONTIG
- select V4L2_MEM2MEM_DEV
- help
- Mediatek jpeg codec driver provides HW capability to decode
- JPEG format
-
- To compile this driver as a module, choose M here: the
- module will be called mtk-jpeg
-
config VIDEO_MEDIATEK_VPU
tristate "Mediatek Video Processor Unit"
depends on V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/platform/mtk-jpeg/Kconfig b/drivers/media/platform/mtk-jpeg/Kconfig
new file mode 100644
index 000000000000..72ed920b011a
--- /dev/null
+++ b/drivers/media/platform/mtk-jpeg/Kconfig
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_MEDIATEK_JPEG
+ tristate "Mediatek JPEG Codec driver"
+ depends on V4L_MEM2MEM_DRIVERS
+ depends on MTK_IOMMU_V1 || MTK_IOMMU || COMPILE_TEST
+ depends on VIDEO_DEV && VIDEO_V4L2
+ depends on ARCH_MEDIATEK || COMPILE_TEST
+ depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n)
+ select VIDEOBUF2_DMA_CONTIG
+ select V4L2_MEM2MEM_DEV
+ help
+ Mediatek jpeg codec driver provides HW capability to decode
+ JPEG format
+
+ To compile this driver as a module, choose M here: the
+ module will be called mtk-jpeg
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 17/67] media: platform: mtk-mdp: move config to its own file
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (5 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 16/67] media: platform: mtk-jpeg: " Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 18/67] media: platform: mtk-vcodec: " Mauro Carvalho Chehab
` (24 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Dmitry Osipenko,
Hans Verkuil, Jernej Skrabec, Laurent Pinchart, Matthias Brugger,
Ming Qian, linux-arm-kernel, linux-kernel, linux-media,
linux-mediatek
In order to better organize the platform/Kconfig, place
mtk-mdp-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
drivers/media/platform/Kconfig | 18 +-----------------
drivers/media/platform/mtk-mdp/Kconfig | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 17 deletions(-)
create mode 100644 drivers/media/platform/mtk-mdp/Kconfig
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index f517aa951460..3b3d7af47ca1 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -49,6 +49,7 @@ source "drivers/media/platform/davinci/Kconfig"
source "drivers/media/platform/exynos-gsc/Kconfig"
source "drivers/media/platform/meson/ge2d/Kconfig"
source "drivers/media/platform/mtk-jpeg/Kconfig"
+source "drivers/media/platform/mtk-mdp/Kconfig"
source "drivers/media/platform/omap/Kconfig"
source "drivers/media/platform/aspeed/Kconfig"
@@ -196,23 +197,6 @@ config VIDEO_MEDIATEK_VPU
To compile this driver as a module, choose M here: the
module will be called mtk-vpu.
-config VIDEO_MEDIATEK_MDP
- tristate "Mediatek MDP driver"
- depends on V4L_MEM2MEM_DRIVERS
- depends on MTK_IOMMU || COMPILE_TEST
- depends on VIDEO_DEV && VIDEO_V4L2
- depends on ARCH_MEDIATEK || COMPILE_TEST
- depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n)
- select VIDEOBUF2_DMA_CONTIG
- select V4L2_MEM2MEM_DEV
- select VIDEO_MEDIATEK_VPU
- help
- It is a v4l2 driver and present in Mediatek MT8173 SoCs.
- The driver supports for scaling and color space conversion.
-
- To compile this driver as a module, choose M here: the
- module will be called mtk-mdp.
-
config VIDEO_MEDIATEK_VCODEC
tristate "Mediatek Video Codec driver"
depends on V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/platform/mtk-mdp/Kconfig b/drivers/media/platform/mtk-mdp/Kconfig
new file mode 100644
index 000000000000..0cc743165a1a
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp/Kconfig
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_MEDIATEK_MDP
+ tristate "Mediatek MDP driver"
+ depends on V4L_MEM2MEM_DRIVERS
+ depends on MTK_IOMMU || COMPILE_TEST
+ depends on VIDEO_DEV && VIDEO_V4L2
+ depends on ARCH_MEDIATEK || COMPILE_TEST
+ depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n)
+ select VIDEOBUF2_DMA_CONTIG
+ select V4L2_MEM2MEM_DEV
+ select VIDEO_MEDIATEK_VPU
+ help
+ It is a v4l2 driver and present in Mediatek MT8173 SoCs.
+ The driver supports for scaling and color space conversion.
+
+ To compile this driver as a module, choose M here: the
+ module will be called mtk-mdp.
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 18/67] media: platform: mtk-vcodec: move config to its own file
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (6 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 17/67] media: platform: mtk-mdp: " Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 19/67] media: platform: mtk-vpu: " Mauro Carvalho Chehab
` (23 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Dmitry Osipenko,
Hans Verkuil, Jernej Skrabec, Laurent Pinchart, Matthias Brugger,
Ming Qian, Nicolas Dufresne, linux-arm-kernel, linux-kernel,
linux-media, linux-mediatek
In order to better organize the platform/Kconfig, place
mtk-vcodec-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
drivers/media/platform/Kconfig | 37 +----------------------
drivers/media/platform/mtk-vcodec/Kconfig | 36 ++++++++++++++++++++++
2 files changed, 37 insertions(+), 36 deletions(-)
create mode 100644 drivers/media/platform/mtk-vcodec/Kconfig
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 3b3d7af47ca1..ab7c85613625 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -50,6 +50,7 @@ source "drivers/media/platform/exynos-gsc/Kconfig"
source "drivers/media/platform/meson/ge2d/Kconfig"
source "drivers/media/platform/mtk-jpeg/Kconfig"
source "drivers/media/platform/mtk-mdp/Kconfig"
+source "drivers/media/platform/mtk-vcodec/Kconfig"
source "drivers/media/platform/omap/Kconfig"
source "drivers/media/platform/aspeed/Kconfig"
@@ -197,42 +198,6 @@ config VIDEO_MEDIATEK_VPU
To compile this driver as a module, choose M here: the
module will be called mtk-vpu.
-config VIDEO_MEDIATEK_VCODEC
- tristate "Mediatek Video Codec driver"
- depends on V4L_MEM2MEM_DRIVERS
- depends on MTK_IOMMU || COMPILE_TEST
- depends on VIDEO_DEV && VIDEO_V4L2
- depends on ARCH_MEDIATEK || COMPILE_TEST
- depends on VIDEO_MEDIATEK_VPU || MTK_SCP
- # The two following lines ensure we have the same state ("m" or "y") as
- # our dependencies, to avoid missing symbols during link.
- depends on VIDEO_MEDIATEK_VPU || !VIDEO_MEDIATEK_VPU
- depends on MTK_SCP || !MTK_SCP
- depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n)
- select VIDEOBUF2_DMA_CONTIG
- select V4L2_MEM2MEM_DEV
- select VIDEO_MEDIATEK_VCODEC_VPU if VIDEO_MEDIATEK_VPU
- select VIDEO_MEDIATEK_VCODEC_SCP if MTK_SCP
- select V4L2_H264
- select MEDIA_CONTROLLER
- select MEDIA_CONTROLLER_REQUEST_API
- help
- Mediatek video codec driver provides HW capability to
- encode and decode in a range of video formats on MT8173
- and MT8183.
-
- Note that support for MT8173 requires VIDEO_MEDIATEK_VPU to
- also be selected. Support for MT8183 depends on MTK_SCP.
-
- To compile this driver as modules, choose M here: the
- modules will be called mtk-vcodec-dec and mtk-vcodec-enc.
-
-config VIDEO_MEDIATEK_VCODEC_VPU
- bool
-
-config VIDEO_MEDIATEK_VCODEC_SCP
- bool
-
config VIDEO_MEM2MEM_DEINTERLACE
tristate "Deinterlace support"
depends on V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/platform/mtk-vcodec/Kconfig b/drivers/media/platform/mtk-vcodec/Kconfig
new file mode 100644
index 000000000000..635801a19d55
--- /dev/null
+++ b/drivers/media/platform/mtk-vcodec/Kconfig
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_MEDIATEK_VCODEC_SCP
+ bool
+
+config VIDEO_MEDIATEK_VCODEC_VPU
+ bool
+
+config VIDEO_MEDIATEK_VCODEC
+ tristate "Mediatek Video Codec driver"
+ depends on V4L_MEM2MEM_DRIVERS
+ depends on MTK_IOMMU || COMPILE_TEST
+ depends on VIDEO_DEV && VIDEO_V4L2
+ depends on ARCH_MEDIATEK || COMPILE_TEST
+ depends on VIDEO_MEDIATEK_VPU || MTK_SCP
+ # The two following lines ensure we have the same state ("m" or "y") as
+ # our dependencies, to avoid missing symbols during link.
+ depends on VIDEO_MEDIATEK_VPU || !VIDEO_MEDIATEK_VPU
+ depends on MTK_SCP || !MTK_SCP
+ depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n)
+ select VIDEOBUF2_DMA_CONTIG
+ select V4L2_MEM2MEM_DEV
+ select VIDEO_MEDIATEK_VCODEC_VPU if VIDEO_MEDIATEK_VPU
+ select VIDEO_MEDIATEK_VCODEC_SCP if MTK_SCP
+ select V4L2_H264
+ select MEDIA_CONTROLLER
+ select MEDIA_CONTROLLER_REQUEST_API
+ help
+ Mediatek video codec driver provides HW capability to
+ encode and decode in a range of video formats on MT8173
+ and MT8183.
+
+ Note that support for MT8173 requires VIDEO_MEDIATEK_VPU to
+ also be selected. Support for MT8183 depends on MTK_SCP.
+
+ To compile this driver as modules, choose M here: the
+ modules will be called mtk-vcodec-dec and mtk-vcodec-enc.
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 19/67] media: platform: mtk-vpu: move config to its own file
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (7 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 18/67] media: platform: mtk-vcodec: " Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 23/67] media: platform: rga: " Mauro Carvalho Chehab
` (22 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Dmitry Osipenko,
Hans Verkuil, Jernej Skrabec, Laurent Pinchart, Matthias Brugger,
Ming Qian, linux-arm-kernel, linux-kernel, linux-media,
linux-mediatek
In order to better organize the platform/Kconfig, place
mtk-vpu-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
drivers/media/platform/Kconfig | 15 +--------------
drivers/media/platform/mtk-vpu/Kconfig | 15 +++++++++++++++
2 files changed, 16 insertions(+), 14 deletions(-)
create mode 100644 drivers/media/platform/mtk-vpu/Kconfig
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index ab7c85613625..39bf4c57e044 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -51,6 +51,7 @@ source "drivers/media/platform/meson/ge2d/Kconfig"
source "drivers/media/platform/mtk-jpeg/Kconfig"
source "drivers/media/platform/mtk-mdp/Kconfig"
source "drivers/media/platform/mtk-vcodec/Kconfig"
+source "drivers/media/platform/mtk-vpu/Kconfig"
source "drivers/media/platform/omap/Kconfig"
source "drivers/media/platform/aspeed/Kconfig"
@@ -184,20 +185,6 @@ config VIDEO_TI_CAL_MC
# Mem2mem drivers
-config VIDEO_MEDIATEK_VPU
- tristate "Mediatek Video Processor Unit"
- depends on V4L_MEM2MEM_DRIVERS
- depends on VIDEO_DEV && VIDEO_V4L2
- depends on ARCH_MEDIATEK || COMPILE_TEST
- help
- This driver provides downloading VPU firmware and
- communicating with VPU. This driver for hw video
- codec embedded in Mediatek's MT8173 SOCs. It is able
- to handle video decoding/encoding in a range of formats.
-
- To compile this driver as a module, choose M here: the
- module will be called mtk-vpu.
-
config VIDEO_MEM2MEM_DEINTERLACE
tristate "Deinterlace support"
depends on V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/platform/mtk-vpu/Kconfig b/drivers/media/platform/mtk-vpu/Kconfig
new file mode 100644
index 000000000000..df679ea79ed0
--- /dev/null
+++ b/drivers/media/platform/mtk-vpu/Kconfig
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config VIDEO_MEDIATEK_VPU
+ tristate "Mediatek Video Processor Unit"
+ depends on V4L_MEM2MEM_DRIVERS
+ depends on VIDEO_DEV && VIDEO_V4L2
+ depends on ARCH_MEDIATEK || COMPILE_TEST
+ help
+ This driver provides downloading VPU firmware and
+ communicating with VPU. This driver for hw video
+ codec embedded in Mediatek's MT8173 SOCs. It is able
+ to handle video decoding/encoding in a range of formats.
+
+ To compile this driver as a module, choose M here: the
+ module will be called mtk-vpu.
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 23/67] media: platform: rga: move config to its own file
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (8 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 19/67] media: platform: mtk-vpu: " Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 27/67] media: platform: stm32: " Mauro Carvalho Chehab
` (21 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Dmitry Osipenko,
Ezequiel Garcia, Hans Verkuil, Heiko Stuebner, Jacob Chen,
Jernej Skrabec, Laurent Pinchart, Ming Qian, linux-arm-kernel,
linux-kernel, linux-media, linux-rockchip
In order to better organize the platform/Kconfig, place
rga-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
drivers/media/platform/Kconfig | 16 +---------------
drivers/media/platform/rockchip/rga/Kconfig | 14 ++++++++++++++
2 files changed, 15 insertions(+), 15 deletions(-)
create mode 100644 drivers/media/platform/rockchip/rga/Kconfig
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 5a8495338fd4..314e25dd7ca1 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -58,6 +58,7 @@ source "drivers/media/platform/qcom/camss/Kconfig"
source "drivers/media/platform/qcom/venus/Kconfig"
source "drivers/media/platform/aspeed/Kconfig"
+source "drivers/media/platform/rockchip/rga/Kconfig"
config VIDEO_MUX
tristate "Video Multiplexer"
@@ -284,21 +285,6 @@ config VIDEO_STM32_DMA2D
The STM32 DMA2D is a memory-to-memory engine for pixel conversion
and specialized DMA dedicated to image manipulation.
-config VIDEO_ROCKCHIP_RGA
- tristate "Rockchip Raster 2d Graphic Acceleration Unit"
- depends on V4L_MEM2MEM_DRIVERS
- depends on VIDEO_DEV && VIDEO_V4L2
- depends on ARCH_ROCKCHIP || COMPILE_TEST
- select VIDEOBUF2_DMA_SG
- select V4L2_MEM2MEM_DEV
- help
- This is a v4l2 driver for Rockchip SOC RGA 2d graphics accelerator.
- Rockchip RGA is a separate 2D raster graphic acceleration unit.
- It accelerates 2D graphics operations, such as point/line drawing,
- image scaling, rotation, BitBLT, alpha blending and image blur/sharpness.
-
- To compile this driver as a module choose m here.
-
config VIDEO_TI_VPE
tristate "TI VPE (Video Processing Engine) driver"
depends on V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/platform/rockchip/rga/Kconfig b/drivers/media/platform/rockchip/rga/Kconfig
new file mode 100644
index 000000000000..0106cc8a93a7
--- /dev/null
+++ b/drivers/media/platform/rockchip/rga/Kconfig
@@ -0,0 +1,14 @@
+config VIDEO_ROCKCHIP_RGA
+ tristate "Rockchip Raster 2d Graphic Acceleration Unit"
+ depends on V4L_MEM2MEM_DRIVERS
+ depends on VIDEO_DEV && VIDEO_V4L2
+ depends on ARCH_ROCKCHIP || COMPILE_TEST
+ select VIDEOBUF2_DMA_SG
+ select V4L2_MEM2MEM_DEV
+ help
+ This is a v4l2 driver for Rockchip SOC RGA 2d graphics accelerator.
+ Rockchip RGA is a separate 2D raster graphic acceleration unit.
+ It accelerates 2D graphics operations, such as point/line drawing,
+ image scaling, rotation, BitBLT, alpha blending and image blur/sharpness.
+
+ To compile this driver as a module choose m here.
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 27/67] media: platform: stm32: move config to its own file
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (9 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 23/67] media: platform: rga: " Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 28/67] media: platform: sun8i-di: " Mauro Carvalho Chehab
` (20 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Alexandre Torgue,
Dmitry Osipenko, Hans Verkuil, Jernej Skrabec, Laurent Pinchart,
Maxime Coquelin, Ming Qian, linux-arm-kernel, linux-kernel,
linux-media, linux-stm32
In order to better organize the platform/Kconfig, place
stm32-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
drivers/media/platform/Kconfig | 29 +-------------------------
drivers/media/platform/stm32/Kconfig | 31 ++++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 28 deletions(-)
create mode 100644 drivers/media/platform/stm32/Kconfig
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 9408096a365e..b14a0fc78f41 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -62,6 +62,7 @@ source "drivers/media/platform/rockchip/rga/Kconfig"
source "drivers/media/platform/s3c-camif/Kconfig"
source "drivers/media/platform/s5p-g2d/Kconfig"
source "drivers/media/platform/sti/hva/Kconfig"
+source "drivers/media/platform/stm32/Kconfig"
config VIDEO_MUX
tristate "Video Multiplexer"
@@ -77,21 +78,6 @@ config VIDEO_MUX
source "drivers/media/platform/intel/Kconfig"
-config VIDEO_STM32_DCMI
- tristate "STM32 Digital Camera Memory Interface (DCMI) support"
- depends on V4L_PLATFORM_DRIVERS
- depends on VIDEO_V4L2 && OF
- depends on ARCH_STM32 || COMPILE_TEST
- select VIDEOBUF2_DMA_CONTIG
- select MEDIA_CONTROLLER
- select V4L2_FWNODE
- help
- This module makes the STM32 Digital Camera Memory Interface (DCMI)
- available as a v4l2 device.
-
- To compile this driver as a module, choose M here: the module
- will be called stm32-dcmi.
-
config VIDEO_ROCKCHIP_ISP1
tristate "Rockchip Image Signal Processing v1 Unit driver"
depends on V4L_PLATFORM_DRIVERS
@@ -223,19 +209,6 @@ config VIDEO_STI_DELTA_DRIVER
select V4L2_MEM2MEM_DEV
select RPMSG
-config VIDEO_STM32_DMA2D
- tristate "STM32 Chrom-Art Accelerator (DMA2D)"
- depends on V4L_MEM2MEM_DRIVERS
- depends on VIDEO_DEV && VIDEO_V4L2
- depends on ARCH_STM32 || COMPILE_TEST
- select VIDEOBUF2_DMA_CONTIG
- select V4L2_MEM2MEM_DEV
- help
- Enables DMA2D hardware support on stm32.
-
- The STM32 DMA2D is a memory-to-memory engine for pixel conversion
- and specialized DMA dedicated to image manipulation.
-
config VIDEO_TI_VPE
tristate "TI VPE (Video Processing Engine) driver"
depends on V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/platform/stm32/Kconfig b/drivers/media/platform/stm32/Kconfig
new file mode 100644
index 000000000000..60b87e403c7c
--- /dev/null
+++ b/drivers/media/platform/stm32/Kconfig
@@ -0,0 +1,31 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+# V4L drivers
+config VIDEO_STM32_DCMI
+ tristate "STM32 Digital Camera Memory Interface (DCMI) support"
+ depends on V4L_PLATFORM_DRIVERS
+ depends on VIDEO_V4L2 && OF
+ depends on ARCH_STM32 || COMPILE_TEST
+ select VIDEOBUF2_DMA_CONTIG
+ select MEDIA_CONTROLLER
+ select V4L2_FWNODE
+ help
+ This module makes the STM32 Digital Camera Memory Interface (DCMI)
+ available as a v4l2 device.
+
+ To compile this driver as a module, choose M here: the module
+ will be called stm32-dcmi.
+
+# Mem2mem drivers
+config VIDEO_STM32_DMA2D
+ tristate "STM32 Chrom-Art Accelerator (DMA2D)"
+ depends on V4L_MEM2MEM_DRIVERS
+ depends on VIDEO_DEV && VIDEO_V4L2
+ depends on ARCH_STM32 || COMPILE_TEST
+ select VIDEOBUF2_DMA_CONTIG
+ select V4L2_MEM2MEM_DEV
+ help
+ Enables DMA2D hardware support on stm32.
+
+ The STM32 DMA2D is a memory-to-memory engine for pixel conversion
+ and specialized DMA dedicated to image manipulation.
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 28/67] media: platform: sun8i-di: move config to its own file
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (10 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 27/67] media: platform: stm32: " Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 29/67] media: platform: sun8i-rotate: " Mauro Carvalho Chehab
` (19 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Chen-Yu Tsai,
Dmitry Osipenko, Hans Verkuil, Jernej Skrabec, Laurent Pinchart,
Maxime Ripard, Ming Qian, linux-arm-kernel, linux-kernel,
linux-media, linux-sunxi
In order to better organize the platform/Kconfig, place
sun8i-di-specific config stuff on a separate Kconfig file.
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
drivers/media/platform/Kconfig | 15 +--------------
drivers/media/platform/sunxi/sun8i-di/Kconfig | 14 ++++++++++++++
2 files changed, 15 insertions(+), 14 deletions(-)
create mode 100644 drivers/media/platform/sunxi/sun8i-di/Kconfig
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index b14a0fc78f41..61f8a8fae109 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -63,6 +63,7 @@ source "drivers/media/platform/s3c-camif/Kconfig"
source "drivers/media/platform/s5p-g2d/Kconfig"
source "drivers/media/platform/sti/hva/Kconfig"
source "drivers/media/platform/stm32/Kconfig"
+source "drivers/media/platform/sunxi/sun8i-di/Kconfig"
config VIDEO_MUX
tristate "Video Multiplexer"
@@ -230,20 +231,6 @@ config VIDEO_TI_VPE_DEBUG
help
Enable debug messages on VPE driver.
-config VIDEO_SUN8I_DEINTERLACE
- tristate "Allwinner Deinterlace driver"
- depends on V4L_MEM2MEM_DRIVERS
- depends on VIDEO_DEV && VIDEO_V4L2
- depends on ARCH_SUNXI || COMPILE_TEST
- depends on COMMON_CLK && OF
- depends on PM
- select VIDEOBUF2_DMA_CONTIG
- select V4L2_MEM2MEM_DEV
- help
- Support for the Allwinner deinterlace unit with scaling
- capability found on some SoCs, like H3.
- To compile this driver as a module choose m here.
-
config VIDEO_SUN8I_ROTATE
tristate "Allwinner DE2 rotation driver"
depends on V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/platform/sunxi/sun8i-di/Kconfig b/drivers/media/platform/sunxi/sun8i-di/Kconfig
new file mode 100644
index 000000000000..8d762e664d45
--- /dev/null
+++ b/drivers/media/platform/sunxi/sun8i-di/Kconfig
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_SUN8I_DEINTERLACE
+ tristate "Allwinner Deinterlace driver"
+ depends on V4L_MEM2MEM_DRIVERS
+ depends on VIDEO_DEV && VIDEO_V4L2
+ depends on ARCH_SUNXI || COMPILE_TEST
+ depends on COMMON_CLK && OF
+ depends on PM
+ select VIDEOBUF2_DMA_CONTIG
+ select V4L2_MEM2MEM_DEV
+ help
+ Support for the Allwinner deinterlace unit with scaling
+ capability found on some SoCs, like H3.
+ To compile this driver as a module choose m here.
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 29/67] media: platform: sun8i-rotate: move config to its own file
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (11 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 28/67] media: platform: sun8i-di: " Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 32/67] media: platform: rkisp1: " Mauro Carvalho Chehab
` (18 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Chen-Yu Tsai,
Dmitry Osipenko, Hans Verkuil, Jernej Skrabec, Laurent Pinchart,
Maxime Ripard, Ming Qian, linux-arm-kernel, linux-kernel,
linux-media, linux-sunxi
In order to better organize the platform/Kconfig, place
sun8i-rotate-specific config stuff on a separate Kconfig file.
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
drivers/media/platform/Kconfig | 14 +-------------
drivers/media/platform/sunxi/sun8i-rotate/Kconfig | 14 ++++++++++++++
2 files changed, 15 insertions(+), 13 deletions(-)
create mode 100644 drivers/media/platform/sunxi/sun8i-rotate/Kconfig
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 61f8a8fae109..224ebe4f5348 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -64,6 +64,7 @@ source "drivers/media/platform/s5p-g2d/Kconfig"
source "drivers/media/platform/sti/hva/Kconfig"
source "drivers/media/platform/stm32/Kconfig"
source "drivers/media/platform/sunxi/sun8i-di/Kconfig"
+source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig"
config VIDEO_MUX
tristate "Video Multiplexer"
@@ -231,19 +232,6 @@ config VIDEO_TI_VPE_DEBUG
help
Enable debug messages on VPE driver.
-config VIDEO_SUN8I_ROTATE
- tristate "Allwinner DE2 rotation driver"
- depends on V4L_MEM2MEM_DRIVERS
- depends on VIDEO_DEV && VIDEO_V4L2
- depends on ARCH_SUNXI || COMPILE_TEST
- depends on COMMON_CLK && OF
- depends on PM
- select VIDEOBUF2_DMA_CONTIG
- select V4L2_MEM2MEM_DEV
- help
- Support for the Allwinner DE2 rotation unit.
- To compile this driver as a module choose m here.
-
config VIDEO_TEGRA_VDE
tristate "NVIDIA Tegra Video Decoder Engine driver"
depends on V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/platform/sunxi/sun8i-rotate/Kconfig b/drivers/media/platform/sunxi/sun8i-rotate/Kconfig
new file mode 100644
index 000000000000..64a8ea76e917
--- /dev/null
+++ b/drivers/media/platform/sunxi/sun8i-rotate/Kconfig
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config VIDEO_SUN8I_ROTATE
+ tristate "Allwinner DE2 rotation driver"
+ depends on V4L_MEM2MEM_DRIVERS
+ depends on VIDEO_DEV && VIDEO_V4L2
+ depends on ARCH_SUNXI || COMPILE_TEST
+ depends on COMMON_CLK && OF
+ depends on PM
+ select VIDEOBUF2_DMA_CONTIG
+ select V4L2_MEM2MEM_DEV
+ help
+ Support for the Allwinner DE2 rotation unit.
+ To compile this driver as a module choose m here.
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 32/67] media: platform: rkisp1: move config to its own file
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (12 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 29/67] media: platform: sun8i-rotate: " Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 38/67] media: platform: move some manufacturer entries Mauro Carvalho Chehab
` (17 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Dafna Hirschfeld,
Dmitry Osipenko, Hans Verkuil, Heiko Stuebner, Jernej Skrabec,
Laurent Pinchart, Ming Qian, linux-arm-kernel, linux-kernel,
linux-media, linux-rockchip
In order to better organize the platform/Kconfig, place
rkisp1-specific config stuff on a separate Kconfig file.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
drivers/media/platform/Kconfig | 20 +------------------
.../media/platform/rockchip/rkisp1/Kconfig | 19 ++++++++++++++++++
2 files changed, 20 insertions(+), 19 deletions(-)
create mode 100644 drivers/media/platform/rockchip/rkisp1/Kconfig
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 228881ae0d22..29afef26cbe4 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -59,6 +59,7 @@ source "drivers/media/platform/qcom/venus/Kconfig"
source "drivers/media/platform/aspeed/Kconfig"
source "drivers/media/platform/rockchip/rga/Kconfig"
+source "drivers/media/platform/rockchip/rkisp1/Kconfig"
source "drivers/media/platform/s3c-camif/Kconfig"
source "drivers/media/platform/s5p-g2d/Kconfig"
source "drivers/media/platform/sti/hva/Kconfig"
@@ -82,25 +83,6 @@ config VIDEO_MUX
source "drivers/media/platform/intel/Kconfig"
-config VIDEO_ROCKCHIP_ISP1
- tristate "Rockchip Image Signal Processing v1 Unit driver"
- depends on V4L_PLATFORM_DRIVERS
- depends on VIDEO_V4L2 && OF
- depends on ARCH_ROCKCHIP || COMPILE_TEST
- select MEDIA_CONTROLLER
- select VIDEO_V4L2_SUBDEV_API
- select VIDEOBUF2_DMA_CONTIG
- select VIDEOBUF2_VMALLOC
- select V4L2_FWNODE
- select GENERIC_PHY_MIPI_DPHY
- default n
- help
- Enable this to support the Image Signal Processing (ISP) module
- present in RK3399 SoCs.
-
- To compile this driver as a module, choose M here: the module
- will be called rockchip-isp1.
-
source "drivers/media/platform/exynos4-is/Kconfig"
source "drivers/media/platform/am437x/Kconfig"
source "drivers/media/platform/xilinx/Kconfig"
diff --git a/drivers/media/platform/rockchip/rkisp1/Kconfig b/drivers/media/platform/rockchip/rkisp1/Kconfig
new file mode 100644
index 000000000000..c2e464317929
--- /dev/null
+++ b/drivers/media/platform/rockchip/rkisp1/Kconfig
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_ROCKCHIP_ISP1
+ tristate "Rockchip Image Signal Processing v1 Unit driver"
+ depends on V4L_PLATFORM_DRIVERS
+ depends on VIDEO_V4L2 && OF
+ depends on ARCH_ROCKCHIP || COMPILE_TEST
+ select MEDIA_CONTROLLER
+ select VIDEO_V4L2_SUBDEV_API
+ select VIDEOBUF2_DMA_CONTIG
+ select VIDEOBUF2_VMALLOC
+ select V4L2_FWNODE
+ select GENERIC_PHY_MIPI_DPHY
+ default n
+ help
+ Enable this to support the Image Signal Processing (ISP) module
+ present in RK3399 SoCs.
+
+ To compile this driver as a module, choose M here: the module
+ will be called rockchip-isp1.
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 38/67] media: platform: move some manufacturer entries
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (13 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 32/67] media: platform: rkisp1: " Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 40/67] media: platform: rename coda/ to chips-media/ Mauro Carvalho Chehab
` (16 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Andy Gross,
Bjorn Andersson, Chen-Yu Tsai, Dmitry Osipenko, Hans Verkuil,
Heiko Stuebner, Jernej Skrabec, Laurent Pinchart, Maxime Ripard,
Ming Qian, Robert Foss, linux-arm-kernel, linux-arm-msm,
linux-kernel, linux-media, linux-rockchip, linux-sunxi
As there are 4 manufacturer's directories with multiple sources
(qcom, rockchip, sti and sunxi), move the sources from
platform/Kconfig to their specific Konfig files.
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Reviewed-by: Robert Foss <robert.foss@linaro.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
drivers/media/platform/Kconfig | 13 +++----------
drivers/media/platform/qcom/Kconfig | 4 ++++
drivers/media/platform/rockchip/Kconfig | 3 +++
drivers/media/platform/sti/Kconfig | 5 +++++
drivers/media/platform/sunxi/Kconfig | 2 ++
5 files changed, 17 insertions(+), 10 deletions(-)
create mode 100644 drivers/media/platform/qcom/Kconfig
create mode 100644 drivers/media/platform/rockchip/Kconfig
create mode 100644 drivers/media/platform/sti/Kconfig
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index b7c60969c974..e3316fa37a8f 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -77,23 +77,16 @@ source "drivers/media/platform/mtk-vpu/Kconfig"
source "drivers/media/platform/nxp/Kconfig"
source "drivers/media/platform/omap/Kconfig"
source "drivers/media/platform/omap3isp/Kconfig"
-source "drivers/media/platform/qcom/camss/Kconfig"
-source "drivers/media/platform/qcom/venus/Kconfig"
+source "drivers/media/platform/qcom/Kconfig"
source "drivers/media/platform/renesas/Kconfig"
-source "drivers/media/platform/rockchip/rga/Kconfig"
-source "drivers/media/platform/rockchip/rkisp1/Kconfig"
+source "drivers/media/platform/rockchip/Kconfig"
source "drivers/media/platform/s3c-camif/Kconfig"
source "drivers/media/platform/s5p-g2d/Kconfig"
source "drivers/media/platform/s5p-jpeg/Kconfig"
source "drivers/media/platform/s5p-mfc/Kconfig"
-source "drivers/media/platform/sti/bdisp/Kconfig"
-source "drivers/media/platform/sti/c8sectpfe/Kconfig"
-source "drivers/media/platform/sti/delta/Kconfig"
-source "drivers/media/platform/sti/hva/Kconfig"
+source "drivers/media/platform/sti/Kconfig"
source "drivers/media/platform/stm32/Kconfig"
source "drivers/media/platform/sunxi/Kconfig"
-source "drivers/media/platform/sunxi/sun8i-di/Kconfig"
-source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig"
source "drivers/media/platform/tegra/vde/Kconfig"
source "drivers/media/platform/ti-vpe/Kconfig"
source "drivers/media/platform/via/Kconfig"
diff --git a/drivers/media/platform/qcom/Kconfig b/drivers/media/platform/qcom/Kconfig
new file mode 100644
index 000000000000..9f6c91cc95ca
--- /dev/null
+++ b/drivers/media/platform/qcom/Kconfig
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+source "drivers/media/platform/qcom/camss/Kconfig"
+source "drivers/media/platform/qcom/venus/Kconfig"
diff --git a/drivers/media/platform/rockchip/Kconfig b/drivers/media/platform/rockchip/Kconfig
new file mode 100644
index 000000000000..2f97c0e0268a
--- /dev/null
+++ b/drivers/media/platform/rockchip/Kconfig
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0-only
+source "drivers/media/platform/rockchip/rga/Kconfig"
+source "drivers/media/platform/rockchip/rkisp1/Kconfig"
diff --git a/drivers/media/platform/sti/Kconfig b/drivers/media/platform/sti/Kconfig
new file mode 100644
index 000000000000..9fb5e78a92cf
--- /dev/null
+++ b/drivers/media/platform/sti/Kconfig
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+source "drivers/media/platform/sti/bdisp/Kconfig"
+source "drivers/media/platform/sti/c8sectpfe/Kconfig"
+source "drivers/media/platform/sti/delta/Kconfig"
+source "drivers/media/platform/sti/hva/Kconfig"
diff --git a/drivers/media/platform/sunxi/Kconfig b/drivers/media/platform/sunxi/Kconfig
index 7151cc249afa..a10032215b08 100644
--- a/drivers/media/platform/sunxi/Kconfig
+++ b/drivers/media/platform/sunxi/Kconfig
@@ -2,3 +2,5 @@
source "drivers/media/platform/sunxi/sun4i-csi/Kconfig"
source "drivers/media/platform/sunxi/sun6i-csi/Kconfig"
+source "drivers/media/platform/sunxi/sun8i-di/Kconfig"
+source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig"
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 40/67] media: platform: rename coda/ to chips-media/
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (14 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 38/67] media: platform: move some manufacturer entries Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 42/67] media: platform: rename meson/ge2d/ to amlogic/meson-ge2d/ Mauro Carvalho Chehab
` (15 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Cai Huoqing,
Dmitry Osipenko, Eugen Hristev, Fabio Estevam, Hans Verkuil,
Jacopo Mondi, Jernej Skrabec, Jiasheng Jiang, Lad Prabhakar,
Laurent Pinchart, Marco Felsch, Martin Weber, Miaoqian Lin,
Ming Qian, NXP Linux Team, Pengutronix Kernel Team,
Philipp Zabel, Sascha Hauer, Shawn Guo, Wolfram Sang,
linux-arm-kernel, linux-kernel, linux-media
As the end goal is to have platform drivers split by vendor,
rename coda/ to chips-media/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 4 ++--
drivers/media/platform/{coda => chips-media}/Kconfig | 0
drivers/media/platform/{coda => chips-media}/Makefile | 0
drivers/media/platform/{coda => chips-media}/coda-bit.c | 0
drivers/media/platform/{coda => chips-media}/coda-common.c | 0
drivers/media/platform/{coda => chips-media}/coda-gdi.c | 0
drivers/media/platform/{coda => chips-media}/coda-h264.c | 0
drivers/media/platform/{coda => chips-media}/coda-jpeg.c | 0
drivers/media/platform/{coda => chips-media}/coda-mpeg2.c | 0
drivers/media/platform/{coda => chips-media}/coda-mpeg4.c | 0
drivers/media/platform/{coda => chips-media}/coda.h | 0
drivers/media/platform/{coda => chips-media}/coda_regs.h | 2 +-
drivers/media/platform/{coda => chips-media}/imx-vdoa.c | 0
drivers/media/platform/{coda => chips-media}/imx-vdoa.h | 0
drivers/media/platform/{coda => chips-media}/trace.h | 2 +-
17 files changed, 6 insertions(+), 6 deletions(-)
rename drivers/media/platform/{coda => chips-media}/Kconfig (100%)
rename drivers/media/platform/{coda => chips-media}/Makefile (100%)
rename drivers/media/platform/{coda => chips-media}/coda-bit.c (100%)
rename drivers/media/platform/{coda => chips-media}/coda-common.c (100%)
rename drivers/media/platform/{coda => chips-media}/coda-gdi.c (100%)
rename drivers/media/platform/{coda => chips-media}/coda-h264.c (100%)
rename drivers/media/platform/{coda => chips-media}/coda-jpeg.c (100%)
rename drivers/media/platform/{coda => chips-media}/coda-mpeg2.c (100%)
rename drivers/media/platform/{coda => chips-media}/coda-mpeg4.c (100%)
rename drivers/media/platform/{coda => chips-media}/coda.h (100%)
rename drivers/media/platform/{coda => chips-media}/coda_regs.h (99%)
rename drivers/media/platform/{coda => chips-media}/imx-vdoa.c (100%)
rename drivers/media/platform/{coda => chips-media}/imx-vdoa.h (100%)
rename drivers/media/platform/{coda => chips-media}/trace.h (98%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 848640546398..84bc106acc57 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4771,7 +4771,7 @@ M: Philipp Zabel <p.zabel@pengutronix.de>
L: linux-media@vger.kernel.org
S: Maintained
F: Documentation/devicetree/bindings/media/coda.yaml
-F: drivers/media/platform/coda/
+F: drivers/media/platform/chips-media/
CODE OF CONDUCT
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 721f27ef0130..24a43cef18de 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -71,7 +71,7 @@ source "drivers/media/platform/amphion/Kconfig"
source "drivers/media/platform/aspeed/Kconfig"
source "drivers/media/platform/atmel/Kconfig"
source "drivers/media/platform/cadence/Kconfig"
-source "drivers/media/platform/coda/Kconfig"
+source "drivers/media/platform/chips-media/Kconfig"
source "drivers/media/platform/davinci/Kconfig"
source "drivers/media/platform/exynos-gsc/Kconfig"
source "drivers/media/platform/exynos4-is/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 20b07ae3ebf1..8d6e15fad0b1 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -6,12 +6,12 @@
# Place here, alphabetically sorted by directory
# (e. g. LC_ALL=C sort Makefile)
obj-y += allegro-dvt/
-obj-y += aspeed/
obj-y += am437x/
obj-y += amphion/
+obj-y += aspeed/
obj-y += atmel/
obj-y += cadence/
-obj-y += coda/
+obj-y += chips-media/
obj-y += davinci/
obj-y += exynos-gsc/
obj-y += exynos4-is/
diff --git a/drivers/media/platform/coda/Kconfig b/drivers/media/platform/chips-media/Kconfig
similarity index 100%
rename from drivers/media/platform/coda/Kconfig
rename to drivers/media/platform/chips-media/Kconfig
diff --git a/drivers/media/platform/coda/Makefile b/drivers/media/platform/chips-media/Makefile
similarity index 100%
rename from drivers/media/platform/coda/Makefile
rename to drivers/media/platform/chips-media/Makefile
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/chips-media/coda-bit.c
similarity index 100%
rename from drivers/media/platform/coda/coda-bit.c
rename to drivers/media/platform/chips-media/coda-bit.c
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/chips-media/coda-common.c
similarity index 100%
rename from drivers/media/platform/coda/coda-common.c
rename to drivers/media/platform/chips-media/coda-common.c
diff --git a/drivers/media/platform/coda/coda-gdi.c b/drivers/media/platform/chips-media/coda-gdi.c
similarity index 100%
rename from drivers/media/platform/coda/coda-gdi.c
rename to drivers/media/platform/chips-media/coda-gdi.c
diff --git a/drivers/media/platform/coda/coda-h264.c b/drivers/media/platform/chips-media/coda-h264.c
similarity index 100%
rename from drivers/media/platform/coda/coda-h264.c
rename to drivers/media/platform/chips-media/coda-h264.c
diff --git a/drivers/media/platform/coda/coda-jpeg.c b/drivers/media/platform/chips-media/coda-jpeg.c
similarity index 100%
rename from drivers/media/platform/coda/coda-jpeg.c
rename to drivers/media/platform/chips-media/coda-jpeg.c
diff --git a/drivers/media/platform/coda/coda-mpeg2.c b/drivers/media/platform/chips-media/coda-mpeg2.c
similarity index 100%
rename from drivers/media/platform/coda/coda-mpeg2.c
rename to drivers/media/platform/chips-media/coda-mpeg2.c
diff --git a/drivers/media/platform/coda/coda-mpeg4.c b/drivers/media/platform/chips-media/coda-mpeg4.c
similarity index 100%
rename from drivers/media/platform/coda/coda-mpeg4.c
rename to drivers/media/platform/chips-media/coda-mpeg4.c
diff --git a/drivers/media/platform/coda/coda.h b/drivers/media/platform/chips-media/coda.h
similarity index 100%
rename from drivers/media/platform/coda/coda.h
rename to drivers/media/platform/chips-media/coda.h
diff --git a/drivers/media/platform/coda/coda_regs.h b/drivers/media/platform/chips-media/coda_regs.h
similarity index 99%
rename from drivers/media/platform/coda/coda_regs.h
rename to drivers/media/platform/chips-media/coda_regs.h
index da5bb3212528..db81a904cf3f 100644
--- a/drivers/media/platform/coda/coda_regs.h
+++ b/drivers/media/platform/chips-media/coda_regs.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
- * linux/drivers/media/platform/coda/coda_regs.h
+ * linux/drivers/media/platform/chips-media/coda_regs.h
*
* Copyright (C) 2012 Vista Silicon SL
* Javier Martin <javier.martin@vista-silicon.com>
diff --git a/drivers/media/platform/coda/imx-vdoa.c b/drivers/media/platform/chips-media/imx-vdoa.c
similarity index 100%
rename from drivers/media/platform/coda/imx-vdoa.c
rename to drivers/media/platform/chips-media/imx-vdoa.c
diff --git a/drivers/media/platform/coda/imx-vdoa.h b/drivers/media/platform/chips-media/imx-vdoa.h
similarity index 100%
rename from drivers/media/platform/coda/imx-vdoa.h
rename to drivers/media/platform/chips-media/imx-vdoa.h
diff --git a/drivers/media/platform/coda/trace.h b/drivers/media/platform/chips-media/trace.h
similarity index 98%
rename from drivers/media/platform/coda/trace.h
rename to drivers/media/platform/chips-media/trace.h
index c0791c847f7c..19f98e6dafb9 100644
--- a/drivers/media/platform/coda/trace.h
+++ b/drivers/media/platform/chips-media/trace.h
@@ -167,7 +167,7 @@ DEFINE_EVENT(coda_buf_class, coda_jpeg_done,
#endif /* __CODA_TRACE_H__ */
#undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH ../../drivers/media/platform/coda
+#define TRACE_INCLUDE_PATH ../../drivers/media/platform/chips-media
#undef TRACE_INCLUDE_FILE
#define TRACE_INCLUDE_FILE trace
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 42/67] media: platform: rename meson/ge2d/ to amlogic/meson-ge2d/
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (15 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 40/67] media: platform: rename coda/ to chips-media/ Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 43/67] media: platform: rename mtk-jpeg/ to mediatek/mtk-jpeg/ Mauro Carvalho Chehab
` (14 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Cai Huoqing,
Christophe JAILLET, Dmitry Osipenko, Eugen Hristev, Hans Verkuil,
Jacopo Mondi, Jernej Skrabec, Jerome Brunet, Kevin Hilman,
Laurent Pinchart, Martin Blumenstingl, Ming Qian, Neil Armstrong,
linux-amlogic, linux-arm-kernel, linux-kernel, linux-media
As the end goal is to have platform drivers split by vendor,
rename meson/ge2d/ to amlogic/meson-ge2d/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
.../media/platform/{meson/ge2d => amlogic/meson-ge2d}/Kconfig | 0
.../media/platform/{meson/ge2d => amlogic/meson-ge2d}/Makefile | 0
.../platform/{meson/ge2d => amlogic/meson-ge2d}/ge2d-regs.h | 0
.../media/platform/{meson/ge2d => amlogic/meson-ge2d}/ge2d.c | 0
7 files changed, 3 insertions(+), 3 deletions(-)
rename drivers/media/platform/{meson/ge2d => amlogic/meson-ge2d}/Kconfig (100%)
rename drivers/media/platform/{meson/ge2d => amlogic/meson-ge2d}/Makefile (100%)
rename drivers/media/platform/{meson/ge2d => amlogic/meson-ge2d}/ge2d-regs.h (100%)
rename drivers/media/platform/{meson/ge2d => amlogic/meson-ge2d}/ge2d.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index b83cf0eb99ce..09b0e60da4e9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12523,7 +12523,7 @@ L: linux-amlogic@lists.infradead.org
S: Supported
T: git git://linuxtv.org/media_tree.git
F: Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
-F: drivers/media/platform/meson/ge2d/
+F: drivers/media/platform/amlogic/meson-ge2d/
MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
M: Liang Yang <liang.yang@amlogic.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 0a4260627a00..b4faee0a1b63 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -67,6 +67,7 @@ config VIDEO_MUX
source "drivers/media/platform/allegro-dvt/Kconfig"
source "drivers/media/platform/am437x/Kconfig"
+source "drivers/media/platform/amlogic/meson-ge2d/Kconfig"
source "drivers/media/platform/amphion/Kconfig"
source "drivers/media/platform/aspeed/Kconfig"
source "drivers/media/platform/atmel/Kconfig"
@@ -77,7 +78,6 @@ source "drivers/media/platform/exynos-gsc/Kconfig"
source "drivers/media/platform/exynos4-is/Kconfig"
source "drivers/media/platform/intel/Kconfig"
source "drivers/media/platform/marvell/Kconfig"
-source "drivers/media/platform/meson/ge2d/Kconfig"
source "drivers/media/platform/mtk-jpeg/Kconfig"
source "drivers/media/platform/mtk-mdp/Kconfig"
source "drivers/media/platform/mtk-vcodec/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 8b2deba4b62c..48531f93d92f 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -7,6 +7,7 @@
# (e. g. LC_ALL=C sort Makefile)
obj-y += allegro-dvt/
obj-y += am437x/
+obj-y += amlogic/meson-ge2d/
obj-y += amphion/
obj-y += aspeed/
obj-y += atmel/
@@ -17,7 +18,6 @@ obj-y += exynos-gsc/
obj-y += exynos4-is/
obj-y += intel/
obj-y += marvell/
-obj-y += meson/ge2d/
obj-y += mtk-jpeg/
obj-y += mtk-mdp/
obj-y += mtk-vcodec/
diff --git a/drivers/media/platform/meson/ge2d/Kconfig b/drivers/media/platform/amlogic/meson-ge2d/Kconfig
similarity index 100%
rename from drivers/media/platform/meson/ge2d/Kconfig
rename to drivers/media/platform/amlogic/meson-ge2d/Kconfig
diff --git a/drivers/media/platform/meson/ge2d/Makefile b/drivers/media/platform/amlogic/meson-ge2d/Makefile
similarity index 100%
rename from drivers/media/platform/meson/ge2d/Makefile
rename to drivers/media/platform/amlogic/meson-ge2d/Makefile
diff --git a/drivers/media/platform/meson/ge2d/ge2d-regs.h b/drivers/media/platform/amlogic/meson-ge2d/ge2d-regs.h
similarity index 100%
rename from drivers/media/platform/meson/ge2d/ge2d-regs.h
rename to drivers/media/platform/amlogic/meson-ge2d/ge2d-regs.h
diff --git a/drivers/media/platform/meson/ge2d/ge2d.c b/drivers/media/platform/amlogic/meson-ge2d/ge2d.c
similarity index 100%
rename from drivers/media/platform/meson/ge2d/ge2d.c
rename to drivers/media/platform/amlogic/meson-ge2d/ge2d.c
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 43/67] media: platform: rename mtk-jpeg/ to mediatek/mtk-jpeg/
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (16 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 42/67] media: platform: rename meson/ge2d/ to amlogic/meson-ge2d/ Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 44/67] media: platform: rename mtk-mdp/ to mediatek/mtk-mdp/ Mauro Carvalho Chehab
` (13 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund,
AngeloGioacchino Del Regno, Cai Huoqing, Colin Ian King,
Dafna Hirschfeld, Dan Carpenter, Dmitry Osipenko, Eugen Hristev,
Evan Green, Hans Verkuil, Jacopo Mondi, Jernej Skrabec,
Kieran Bingham, Laurent Pinchart, Matthias Brugger, Ming Qian,
Rick Chang, Sakari Ailus, Xu Wang, Yong Wu, linux-arm-kernel,
linux-kernel, linux-media, linux-mediatek
As the end goal is to have platform drivers split by vendor,
rename mtk-jpeg/ to mediatek/mtk-jpeg/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/{ => mediatek}/mtk-jpeg/Kconfig | 0
drivers/media/platform/{ => mediatek}/mtk-jpeg/Makefile | 0
drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.c | 0
drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.h | 0
.../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.c | 0
.../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.h | 0
.../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.c | 0
.../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.h | 0
.../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_reg.h | 0
.../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.c | 0
.../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.h | 0
14 files changed, 3 insertions(+), 3 deletions(-)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/Kconfig (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/Makefile (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_reg.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 09b0e60da4e9..fa0a3de3865f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12130,7 +12130,7 @@ M: Rick Chang <rick.chang@mediatek.com>
M: Bin Liu <bin.liu@mediatek.com>
S: Supported
F: Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
-F: drivers/media/platform/mtk-jpeg/
+F: drivers/media/platform/mediatek/mtk-jpeg/
MEDIATEK MDP DRIVER
M: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index b4faee0a1b63..f1746529e763 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -78,7 +78,7 @@ source "drivers/media/platform/exynos-gsc/Kconfig"
source "drivers/media/platform/exynos4-is/Kconfig"
source "drivers/media/platform/intel/Kconfig"
source "drivers/media/platform/marvell/Kconfig"
-source "drivers/media/platform/mtk-jpeg/Kconfig"
+source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
source "drivers/media/platform/mtk-mdp/Kconfig"
source "drivers/media/platform/mtk-vcodec/Kconfig"
source "drivers/media/platform/mtk-vpu/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 48531f93d92f..c792f6216918 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -18,7 +18,7 @@ obj-y += exynos-gsc/
obj-y += exynos4-is/
obj-y += intel/
obj-y += marvell/
-obj-y += mtk-jpeg/
+obj-y += mediatek/mtk-jpeg/
obj-y += mtk-mdp/
obj-y += mtk-vcodec/
obj-y += mtk-vpu/
diff --git a/drivers/media/platform/mtk-jpeg/Kconfig b/drivers/media/platform/mediatek/mtk-jpeg/Kconfig
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/Kconfig
rename to drivers/media/platform/mediatek/mtk-jpeg/Kconfig
diff --git a/drivers/media/platform/mtk-jpeg/Makefile b/drivers/media/platform/mediatek/mtk-jpeg/Makefile
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/Makefile
rename to drivers/media/platform/mediatek/mtk-jpeg/Makefile
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.c
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.c
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.h
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.h
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.c
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.c
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.h
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.h
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.c
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.c
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.c
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.h
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.h
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.h
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_reg.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_reg.h
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_reg.h
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_reg.h
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.c
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.c
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.h
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.h
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 44/67] media: platform: rename mtk-mdp/ to mediatek/mtk-mdp/
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (17 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 43/67] media: platform: rename mtk-jpeg/ to mediatek/mtk-jpeg/ Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 45/67] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/ Mauro Carvalho Chehab
` (12 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund,
AngeloGioacchino Del Regno, Arnd Bergmann, Dafna Hirschfeld,
Dmitry Osipenko, Eugen Hristev, Evan Green, Hans Verkuil,
Houlong Wei, Jacopo Mondi, Jernej Skrabec, Jonathan Cameron,
Laurent Pinchart, Matthias Brugger, Ming Qian, Xu Wang, Yong Wu,
linux-arm-kernel, linux-kernel, linux-media, linux-mediatek
As the end goal is to have platform drivers split by vendor,
rename mtk-mdp/ to mediatek/mtk-mdp/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/{ => mediatek}/mtk-mdp/Kconfig | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/Makefile | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.c | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.h | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.c | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.h | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_ipi.h | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.c | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.h | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.c | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.h | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.c | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.h | 0
16 files changed, 3 insertions(+), 3 deletions(-)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/Kconfig (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/Makefile (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_ipi.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index fa0a3de3865f..2203d98bbcf1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12138,7 +12138,7 @@ M: Houlong Wei <houlong.wei@mediatek.com>
M: Andrew-CT Chen <andrew-ct.chen@mediatek.com>
S: Supported
F: Documentation/devicetree/bindings/media/mediatek-mdp.txt
-F: drivers/media/platform/mtk-mdp/
+F: drivers/media/platform/mediatek/mtk-mdp/
F: drivers/media/platform/mtk-vpu/
MEDIATEK MEDIA DRIVER
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index f1746529e763..8a7ac0b8e09f 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -79,7 +79,7 @@ source "drivers/media/platform/exynos4-is/Kconfig"
source "drivers/media/platform/intel/Kconfig"
source "drivers/media/platform/marvell/Kconfig"
source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
-source "drivers/media/platform/mtk-mdp/Kconfig"
+source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
source "drivers/media/platform/mtk-vcodec/Kconfig"
source "drivers/media/platform/mtk-vpu/Kconfig"
source "drivers/media/platform/nxp/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index c792f6216918..6f5d09cd8f9b 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -19,7 +19,7 @@ obj-y += exynos4-is/
obj-y += intel/
obj-y += marvell/
obj-y += mediatek/mtk-jpeg/
-obj-y += mtk-mdp/
+obj-y += mediatek/mtk-mdp/
obj-y += mtk-vcodec/
obj-y += mtk-vpu/
obj-y += nxp/
diff --git a/drivers/media/platform/mtk-mdp/Kconfig b/drivers/media/platform/mediatek/mtk-mdp/Kconfig
similarity index 100%
rename from drivers/media/platform/mtk-mdp/Kconfig
rename to drivers/media/platform/mediatek/mtk-mdp/Kconfig
diff --git a/drivers/media/platform/mtk-mdp/Makefile b/drivers/media/platform/mediatek/mtk-mdp/Makefile
similarity index 100%
rename from drivers/media/platform/mtk-mdp/Makefile
rename to drivers/media/platform/mediatek/mtk-mdp/Makefile
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_core.c
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_core.h
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_regs.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_regs.c
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_regs.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_regs.h
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 45/67] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (18 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 44/67] media: platform: rename mtk-mdp/ to mediatek/mtk-mdp/ Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 46/67] media: platform: rename mtk-vpu/ to mediatek/mtk-vpu/ Mauro Carvalho Chehab
` (11 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Alexandre Courbot,
AngeloGioacchino Del Regno, Benjamin Gaignard,
Christophe JAILLET, Dafna Hirschfeld, Dmitry Osipenko,
Eugen Hristev, Hans Verkuil, Hirokazu Honda, Hsin-Yi Wang,
Irui Wang, Jacopo Mondi, Jernej Skrabec, Jiasheng Jiang,
Laurent Pinchart, Maoguang Meng, Matthias Brugger, Ming Qian,
Nicolas Dufresne, Steve Cho, Tiffany Lin, Tzung-Bi Shih, Yong Wu,
Yunfei Dong, linux-arm-kernel, linux-kernel, linux-media,
linux-mediatek
As the end goal is to have platform drivers split by vendor,
rename mtk-vcodec/ to mediatek/mtk-vcodec/.
Acked-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h | 0
.../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c | 0
.../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h | 0
.../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c | 0
.../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h | 0
.../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h | 0
.../platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h | 0
49 files changed, 3 insertions(+), 3 deletions(-)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 2203d98bbcf1..bfe014870a77 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12147,7 +12147,7 @@ M: Andrew-CT Chen <andrew-ct.chen@mediatek.com>
S: Supported
F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt
F: Documentation/devicetree/bindings/media/mediatek-vpu.txt
-F: drivers/media/platform/mtk-vcodec/
+F: drivers/media/platform/mediatek/mtk-vcodec/
F: drivers/media/platform/mtk-vpu/
MEDIATEK MMC/SD/SDIO DRIVER
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 8a7ac0b8e09f..10055af0c7f8 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -80,7 +80,7 @@ source "drivers/media/platform/intel/Kconfig"
source "drivers/media/platform/marvell/Kconfig"
source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
-source "drivers/media/platform/mtk-vcodec/Kconfig"
+source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
source "drivers/media/platform/mtk-vpu/Kconfig"
source "drivers/media/platform/nxp/Kconfig"
source "drivers/media/platform/omap/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 6f5d09cd8f9b..637a3a7ac036 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -20,7 +20,7 @@ obj-y += intel/
obj-y += marvell/
obj-y += mediatek/mtk-jpeg/
obj-y += mediatek/mtk-mdp/
-obj-y += mtk-vcodec/
+obj-y += mediatek/mtk-vcodec/
obj-y += mtk-vpu/
obj-y += nxp/
obj-y += omap/
diff --git a/drivers/media/platform/mtk-vcodec/Kconfig b/drivers/media/platform/mediatek/mtk-vcodec/Kconfig
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Kconfig
rename to drivers/media/platform/mediatek/mtk-vcodec/Kconfig
diff --git a/drivers/media/platform/mtk-vcodec/Makefile b/drivers/media/platform/mediatek/mtk-vcodec/Makefile
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Makefile
rename to drivers/media/platform/mediatek/mtk-vcodec/Makefile
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h
diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c
diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c
diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c
diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c
diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec_drv_base.h
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h
diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c
diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.h
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h
diff --git a/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h
diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.c
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c
diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.h
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h
diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c
diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.h
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h
diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c
diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c
diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/venc_drv_base.h
rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h
diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/venc_drv_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c
diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/venc_drv_if.h
rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h
diff --git a/drivers/media/platform/mtk-vcodec/venc_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/venc_ipi_msg.h
rename to drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h
diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c
diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.h
rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 46/67] media: platform: rename mtk-vpu/ to mediatek/mtk-vpu/
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (19 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 45/67] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/ Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/ Mauro Carvalho Chehab
` (10 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Christophe JAILLET,
Dafna Hirschfeld, Ding Senjie, Dmitry Osipenko, Eugen Hristev,
Hans Verkuil, Houlong Wei, Jacopo Mondi, Jernej Skrabec,
Lad Prabhakar, Laurent Pinchart, Matthias Brugger, Ming Qian,
Sakari Ailus, linux-arm-kernel, linux-kernel, linux-media,
linux-mediatek
As the end goal is to have platform drivers split by vendor,
rename mtk-vpu/ to mediatek/mtk-vpu/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
MAINTAINERS | 4 ++--
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/mediatek/mtk-mdp/Makefile | 2 +-
drivers/media/platform/{ => mediatek}/mtk-vpu/Kconfig | 0
drivers/media/platform/{ => mediatek}/mtk-vpu/Makefile | 0
drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.c | 0
drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.h | 0
8 files changed, 5 insertions(+), 5 deletions(-)
rename drivers/media/platform/{ => mediatek}/mtk-vpu/Kconfig (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vpu/Makefile (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index bfe014870a77..58e0d42b1278 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12139,7 +12139,7 @@ M: Andrew-CT Chen <andrew-ct.chen@mediatek.com>
S: Supported
F: Documentation/devicetree/bindings/media/mediatek-mdp.txt
F: drivers/media/platform/mediatek/mtk-mdp/
-F: drivers/media/platform/mtk-vpu/
+F: drivers/media/platform/mediatek/mtk-vpu/
MEDIATEK MEDIA DRIVER
M: Tiffany Lin <tiffany.lin@mediatek.com>
@@ -12148,7 +12148,7 @@ S: Supported
F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt
F: Documentation/devicetree/bindings/media/mediatek-vpu.txt
F: drivers/media/platform/mediatek/mtk-vcodec/
-F: drivers/media/platform/mtk-vpu/
+F: drivers/media/platform/mediatek/mtk-vpu/
MEDIATEK MMC/SD/SDIO DRIVER
M: Chaotian Jing <chaotian.jing@mediatek.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 10055af0c7f8..a9ad0c3bd0cc 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -81,7 +81,7 @@ source "drivers/media/platform/marvell/Kconfig"
source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
-source "drivers/media/platform/mtk-vpu/Kconfig"
+source "drivers/media/platform/mediatek/mtk-vpu/Kconfig"
source "drivers/media/platform/nxp/Kconfig"
source "drivers/media/platform/omap/Kconfig"
source "drivers/media/platform/omap3isp/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 637a3a7ac036..954ad8f2cde1 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -21,7 +21,7 @@ obj-y += marvell/
obj-y += mediatek/mtk-jpeg/
obj-y += mediatek/mtk-mdp/
obj-y += mediatek/mtk-vcodec/
-obj-y += mtk-vpu/
+obj-y += mediatek/mtk-vpu/
obj-y += nxp/
obj-y += omap/
obj-y += omap3isp/
diff --git a/drivers/media/platform/mediatek/mtk-mdp/Makefile b/drivers/media/platform/mediatek/mtk-mdp/Makefile
index 5982d65c9971..eab6f984aeea 100644
--- a/drivers/media/platform/mediatek/mtk-mdp/Makefile
+++ b/drivers/media/platform/mediatek/mtk-mdp/Makefile
@@ -7,4 +7,4 @@ mtk-mdp-y += mtk_mdp_vpu.o
obj-$(CONFIG_VIDEO_MEDIATEK_MDP) += mtk-mdp.o
-ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vpu
+ccflags-y += -I$(srctree)/drivers/media/platform/mediatek/mtk-vpu
diff --git a/drivers/media/platform/mtk-vpu/Kconfig b/drivers/media/platform/mediatek/mtk-vpu/Kconfig
similarity index 100%
rename from drivers/media/platform/mtk-vpu/Kconfig
rename to drivers/media/platform/mediatek/mtk-vpu/Kconfig
diff --git a/drivers/media/platform/mtk-vpu/Makefile b/drivers/media/platform/mediatek/mtk-vpu/Makefile
similarity index 100%
rename from drivers/media/platform/mtk-vpu/Makefile
rename to drivers/media/platform/mediatek/mtk-vpu/Makefile
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c
similarity index 100%
rename from drivers/media/platform/mtk-vpu/mtk_vpu.c
rename to drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.h b/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h
similarity index 100%
rename from drivers/media/platform/mtk-vpu/mtk_vpu.h
rename to drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (20 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 46/67] media: platform: rename mtk-vpu/ to mediatek/mtk-vpu/ Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 17:22 ` Jernej Škrabec
2022-03-14 16:34 ` [PATCH v2 49/67] media: platform: rename exynos4-is/ to samsung/exynos4-is/ Mauro Carvalho Chehab
` (9 subsequent siblings)
31 siblings, 1 reply; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Cai Huoqing,
Chen-Yu Tsai, Dinghao Liu, Dmitry Osipenko, Eugen Hristev,
Ezequiel Garcia, Hans Verkuil, Jacopo Mondi, Jernej Skrabec,
Jia-Ju Bai, Jonathan Cameron, Laurent Pinchart, Maxime Ripard,
Mikhail Rudenko, Ming Qian, Ondrej Jirman, Robert Foss,
Sakari Ailus, Tomi Valkeinen, Yong Deng, linux-arm-kernel,
linux-kernel, linux-media, linux-sunxi
As the end goal is to have platform drivers split by vendor,
rename sunxi/ to allwinner/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
MAINTAINERS | 8 ++++----
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/allwinner/Kconfig | 6 ++++++
drivers/media/platform/{sunxi => allwinner}/Makefile | 0
.../media/platform/{sunxi => allwinner}/sun4i-csi/Kconfig | 0
.../platform/{sunxi => allwinner}/sun4i-csi/Makefile | 0
.../platform/{sunxi => allwinner}/sun4i-csi/sun4i_csi.c | 0
.../platform/{sunxi => allwinner}/sun4i-csi/sun4i_csi.h | 0
.../platform/{sunxi => allwinner}/sun4i-csi/sun4i_dma.c | 0
.../platform/{sunxi => allwinner}/sun4i-csi/sun4i_v4l2.c | 0
.../media/platform/{sunxi => allwinner}/sun6i-csi/Kconfig | 0
.../platform/{sunxi => allwinner}/sun6i-csi/Makefile | 0
.../platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi.c | 0
.../platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi.h | 0
.../{sunxi => allwinner}/sun6i-csi/sun6i_csi_reg.h | 0
.../platform/{sunxi => allwinner}/sun6i-csi/sun6i_video.c | 0
.../platform/{sunxi => allwinner}/sun6i-csi/sun6i_video.h | 0
.../media/platform/{sunxi => allwinner}/sun8i-di/Kconfig | 0
.../media/platform/{sunxi => allwinner}/sun8i-di/Makefile | 0
.../platform/{sunxi => allwinner}/sun8i-di/sun8i-di.c | 0
.../platform/{sunxi => allwinner}/sun8i-di/sun8i-di.h | 0
.../platform/{sunxi => allwinner}/sun8i-rotate/Kconfig | 0
.../platform/{sunxi => allwinner}/sun8i-rotate/Makefile | 0
.../{sunxi => allwinner}/sun8i-rotate/sun8i-formats.h | 0
.../{sunxi => allwinner}/sun8i-rotate/sun8i-rotate.h | 0
.../{sunxi => allwinner}/sun8i-rotate/sun8i_formats.c | 0
.../{sunxi => allwinner}/sun8i-rotate/sun8i_rotate.c | 0
drivers/media/platform/sunxi/Kconfig | 6 ------
29 files changed, 12 insertions(+), 12 deletions(-)
create mode 100644 drivers/media/platform/allwinner/Kconfig
rename drivers/media/platform/{sunxi => allwinner}/Makefile (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/Kconfig (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/Makefile (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/sun4i_csi.c (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/sun4i_csi.h (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/sun4i_dma.c (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/sun4i_v4l2.c (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/Kconfig (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/Makefile (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi.c (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi.h (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi_reg.h (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_video.c (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_video.h (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-di/Kconfig (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-di/Makefile (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-di/sun8i-di.c (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-di/sun8i-di.h (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/Kconfig (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/Makefile (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/sun8i-formats.h (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/sun8i-rotate.h (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/sun8i_formats.c (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/sun8i_rotate.c (100%)
delete mode 100644 drivers/media/platform/sunxi/Kconfig
diff --git a/MAINTAINERS b/MAINTAINERS
index 58e0d42b1278..f29195850c16 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -750,7 +750,7 @@ L: linux-media@vger.kernel.org
S: Maintained
T: git git://linuxtv.org/media_tree.git
F: Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
-F: drivers/media/platform/sunxi/sun4i-csi/
+F: drivers/media/platform/allwinner/sun4i-csi/
ALLWINNER CPUFREQ DRIVER
M: Yangtao Li <tiny.windzz@gmail.com>
@@ -5114,7 +5114,7 @@ L: linux-media@vger.kernel.org
S: Maintained
T: git git://linuxtv.org/media_tree.git
F: Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml
-F: drivers/media/platform/sunxi/sun6i-csi/
+F: drivers/media/platform/allwinner/sun6i-csi/
CW1200 WLAN driver
M: Solomon Peachy <pizza@shaftnet.org>
@@ -5391,7 +5391,7 @@ L: linux-media@vger.kernel.org
S: Maintained
T: git git://linuxtv.org/media_tree.git
F: Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml
-F: drivers/media/platform/sunxi/sun8i-di/
+F: drivers/media/platform/allwinner/sun8i-di/
DELL LAPTOP DRIVER
M: Matthew Garrett <mjg59@srcf.ucam.org>
@@ -16746,7 +16746,7 @@ L: linux-media@vger.kernel.org
S: Maintained
T: git git://linuxtv.org/media_tree.git
F: Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml
-F: drivers/media/platform/sunxi/sun8i-rotate/
+F: drivers/media/platform/allwinner/sun8i-rotate/
RPMSG TTY DRIVER
M: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index a9ad0c3bd0cc..61240f8226bb 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -66,6 +66,7 @@ config VIDEO_MUX
# TODO: create per-manufacturer directories
source "drivers/media/platform/allegro-dvt/Kconfig"
+source "drivers/media/platform/allwinner/Kconfig"
source "drivers/media/platform/am437x/Kconfig"
source "drivers/media/platform/amlogic/meson-ge2d/Kconfig"
source "drivers/media/platform/amphion/Kconfig"
@@ -94,7 +95,6 @@ source "drivers/media/platform/s5p-jpeg/Kconfig"
source "drivers/media/platform/s5p-mfc/Kconfig"
source "drivers/media/platform/sti/Kconfig"
source "drivers/media/platform/stm32/Kconfig"
-source "drivers/media/platform/sunxi/Kconfig"
source "drivers/media/platform/tegra/vde/Kconfig"
source "drivers/media/platform/ti-vpe/Kconfig"
source "drivers/media/platform/via/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 954ad8f2cde1..88519e902919 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -6,6 +6,7 @@
# Place here, alphabetically sorted by directory
# (e. g. LC_ALL=C sort Makefile)
obj-y += allegro-dvt/
+obj-y += allwinner/
obj-y += am437x/
obj-y += amlogic/meson-ge2d/
obj-y += amphion/
@@ -39,7 +40,6 @@ obj-y += sti/c8sectpfe/
obj-y += sti/delta/
obj-y += sti/hva/
obj-y += stm32/
-obj-y += sunxi/
obj-y += tegra/vde/
obj-y += ti-vpe/
obj-y += via/
diff --git a/drivers/media/platform/allwinner/Kconfig b/drivers/media/platform/allwinner/Kconfig
new file mode 100644
index 000000000000..95a671d87e85
--- /dev/null
+++ b/drivers/media/platform/allwinner/Kconfig
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+source "drivers/media/platform/allwinner/sun4i-csi/Kconfig"
+source "drivers/media/platform/allwinner/sun6i-csi/Kconfig"
+source "drivers/media/platform/allwinner/sun8i-di/Kconfig"
+source "drivers/media/platform/allwinner/sun8i-rotate/Kconfig"
diff --git a/drivers/media/platform/sunxi/Makefile b/drivers/media/platform/allwinner/Makefile
similarity index 100%
rename from drivers/media/platform/sunxi/Makefile
rename to drivers/media/platform/allwinner/Makefile
diff --git a/drivers/media/platform/sunxi/sun4i-csi/Kconfig b/drivers/media/platform/allwinner/sun4i-csi/Kconfig
similarity index 100%
rename from drivers/media/platform/sunxi/sun4i-csi/Kconfig
rename to drivers/media/platform/allwinner/sun4i-csi/Kconfig
diff --git a/drivers/media/platform/sunxi/sun4i-csi/Makefile b/drivers/media/platform/allwinner/sun4i-csi/Makefile
similarity index 100%
rename from drivers/media/platform/sunxi/sun4i-csi/Makefile
rename to drivers/media/platform/allwinner/sun4i-csi/Makefile
diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c b/drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.c
similarity index 100%
rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.c
diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h b/drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.h
similarity index 100%
rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h
rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.h
diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c b/drivers/media/platform/allwinner/sun4i-csi/sun4i_dma.c
similarity index 100%
rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c
rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_dma.c
diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c b/drivers/media/platform/allwinner/sun4i-csi/sun4i_v4l2.c
similarity index 100%
rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_v4l2.c
diff --git a/drivers/media/platform/sunxi/sun6i-csi/Kconfig b/drivers/media/platform/allwinner/sun6i-csi/Kconfig
similarity index 100%
rename from drivers/media/platform/sunxi/sun6i-csi/Kconfig
rename to drivers/media/platform/allwinner/sun6i-csi/Kconfig
diff --git a/drivers/media/platform/sunxi/sun6i-csi/Makefile b/drivers/media/platform/allwinner/sun6i-csi/Makefile
similarity index 100%
rename from drivers/media/platform/sunxi/sun6i-csi/Makefile
rename to drivers/media/platform/allwinner/sun6i-csi/Makefile
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.c
similarity index 100%
rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.c
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h b/drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.h
similarity index 100%
rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.h
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h b/drivers/media/platform/allwinner/sun6i-csi/sun6i_csi_reg.h
similarity index 100%
rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h
rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_csi_reg.h
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c b/drivers/media/platform/allwinner/sun6i-csi/sun6i_video.c
similarity index 100%
rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c
rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_video.c
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h b/drivers/media/platform/allwinner/sun6i-csi/sun6i_video.h
similarity index 100%
rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h
rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_video.h
diff --git a/drivers/media/platform/sunxi/sun8i-di/Kconfig b/drivers/media/platform/allwinner/sun8i-di/Kconfig
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-di/Kconfig
rename to drivers/media/platform/allwinner/sun8i-di/Kconfig
diff --git a/drivers/media/platform/sunxi/sun8i-di/Makefile b/drivers/media/platform/allwinner/sun8i-di/Makefile
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-di/Makefile
rename to drivers/media/platform/allwinner/sun8i-di/Makefile
diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c b/drivers/media/platform/allwinner/sun8i-di/sun8i-di.c
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
rename to drivers/media/platform/allwinner/sun8i-di/sun8i-di.c
diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.h b/drivers/media/platform/allwinner/sun8i-di/sun8i-di.h
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-di/sun8i-di.h
rename to drivers/media/platform/allwinner/sun8i-di/sun8i-di.h
diff --git a/drivers/media/platform/sunxi/sun8i-rotate/Kconfig b/drivers/media/platform/allwinner/sun8i-rotate/Kconfig
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-rotate/Kconfig
rename to drivers/media/platform/allwinner/sun8i-rotate/Kconfig
diff --git a/drivers/media/platform/sunxi/sun8i-rotate/Makefile b/drivers/media/platform/allwinner/sun8i-rotate/Makefile
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-rotate/Makefile
rename to drivers/media/platform/allwinner/sun8i-rotate/Makefile
diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i-formats.h b/drivers/media/platform/allwinner/sun8i-rotate/sun8i-formats.h
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i-formats.h
rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i-formats.h
diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i-rotate.h b/drivers/media/platform/allwinner/sun8i-rotate/sun8i-rotate.h
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i-rotate.h
rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i-rotate.h
diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_formats.c b/drivers/media/platform/allwinner/sun8i-rotate/sun8i_formats.c
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i_formats.c
rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i_formats.c
diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c b/drivers/media/platform/allwinner/sun8i-rotate/sun8i_rotate.c
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c
rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i_rotate.c
diff --git a/drivers/media/platform/sunxi/Kconfig b/drivers/media/platform/sunxi/Kconfig
deleted file mode 100644
index a10032215b08..000000000000
--- a/drivers/media/platform/sunxi/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-
-source "drivers/media/platform/sunxi/sun4i-csi/Kconfig"
-source "drivers/media/platform/sunxi/sun6i-csi/Kconfig"
-source "drivers/media/platform/sunxi/sun8i-di/Kconfig"
-source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig"
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* Re: [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/
2022-03-14 16:34 ` [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/ Mauro Carvalho Chehab
@ 2022-03-14 17:22 ` Jernej Škrabec
2022-03-15 5:40 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 41+ messages in thread
From: Jernej Škrabec @ 2022-03-14 17:22 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Cai Huoqing,
Chen-Yu Tsai, Dinghao Liu, Dmitry Osipenko, Eugen Hristev,
Ezequiel Garcia, Hans Verkuil, Jacopo Mondi, Jia-Ju Bai,
Jonathan Cameron, Laurent Pinchart, Maxime Ripard,
Mikhail Rudenko, Ming Qian, Ondrej Jirman, Robert Foss,
Sakari Ailus, Tomi Valkeinen, Yong Deng, linux-arm-kernel,
linux-kernel, linux-media, linux-sunxi
Dne ponedeljek, 14. marec 2022 ob 17:34:42 CET je Mauro Carvalho Chehab
napisal(a):
> As the end goal is to have platform drivers split by vendor,
> rename sunxi/ to allwinner/.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
I would rather not do that. Everything related to Allwinner is called sunxi,
albeit there are a few outliers. This is similar to Amlogic/meson situation.
Best regards,
Jernej
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/
2022-03-14 17:22 ` Jernej Škrabec
@ 2022-03-15 5:40 ` Mauro Carvalho Chehab
2022-03-15 6:54 ` Laurent Pinchart
0 siblings, 1 reply; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-15 5:40 UTC (permalink / raw)
To: Jernej Škrabec
Cc: Niklas Söderlund, Cai Huoqing, Chen-Yu Tsai, Dinghao Liu,
Dmitry Osipenko, Eugen Hristev, Ezequiel Garcia, Hans Verkuil,
Jacopo Mondi, Jia-Ju Bai, Jonathan Cameron, Laurent Pinchart,
Maxime Ripard, Mikhail Rudenko, Ming Qian, Ondrej Jirman,
Robert Foss, Sakari Ailus, Tomi Valkeinen, Yong Deng,
linux-arm-kernel, linux-kernel, linux-media, linux-sunxi
Em Mon, 14 Mar 2022 18:22:20 +0100
Jernej Škrabec <jernej.skrabec@gmail.com> escreveu:
> Dne ponedeljek, 14. marec 2022 ob 17:34:42 CET je Mauro Carvalho Chehab
> napisal(a):
> > As the end goal is to have platform drivers split by vendor,
> > rename sunxi/ to allwinner/.
> >
> > Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
>
> I would rather not do that. Everything related to Allwinner is called sunxi,
> albeit there are a few outliers. This is similar to Amlogic/meson situation.
The rationale of having one directory per manufacturer is that, if drivers
for newer platforms with different names from the same manufacturers are
added, those will still fit under allwinner/ and amlogic/.
The Kconfig names for sunxi and meson didn't change, nor the driver's name.
Also, the directories under allwinner preserve sun<x>i name on them:
drivers/media/platform/allwinner/
├── sun4i-csi
├── sun6i-csi
├── sun8i-di
└── sun8i-rotate
and so the directory under amlogic/:
drivers/media/platform/amlogic/
└── meson-ge2d
Now, if Allinner decides to release a new platforms named after another star,
let's say, "Vega" and "Rigel", it would be just a matter of adding
"vega/" and "rigel/" directories under allwinner. No need to touch
media/platform/Kconfig and media/platform/Makefile. Everything will happen
on much more smaller vendor-specific Kconfig/Makefile.
See for instance, TI. We had initially a single driver, and everywhere it
was called "omap", which was had gained different versions (omap2, omap3,
...). Then, TI decided to use other names for newer IP (davinci, am437x),
and now the current development is at cal and vpe.
If we had placed a ti/ directory by the time omap were added (and the
same for the other vendors), we would have avoided the need of this
reorg.
Thanks,
Mauro
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/
2022-03-15 5:40 ` Mauro Carvalho Chehab
@ 2022-03-15 6:54 ` Laurent Pinchart
2022-03-15 8:27 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 41+ messages in thread
From: Laurent Pinchart @ 2022-03-15 6:54 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Jernej Škrabec, Niklas Söderlund, Cai Huoqing,
Chen-Yu Tsai, Dinghao Liu, Dmitry Osipenko, Eugen Hristev,
Ezequiel Garcia, Hans Verkuil, Jacopo Mondi, Jia-Ju Bai,
Jonathan Cameron, Maxime Ripard, Mikhail Rudenko, Ming Qian,
Ondrej Jirman, Robert Foss, Sakari Ailus, Tomi Valkeinen,
Yong Deng, linux-arm-kernel, linux-kernel, linux-media,
linux-sunxi
Hi Mauro,
On Tue, Mar 15, 2022 at 06:40:05AM +0100, Mauro Carvalho Chehab wrote:
> Em Mon, 14 Mar 2022 18:22:20 +0100 Jernej Škrabec escreveu:
>
> > Dne ponedeljek, 14. marec 2022 ob 17:34:42 CET je Mauro Carvalho Chehab
> > napisal(a):
> > > As the end goal is to have platform drivers split by vendor,
> > > rename sunxi/ to allwinner/.
> > >
> > > Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> >
> > I would rather not do that. Everything related to Allwinner is called sunxi,
> > albeit there are a few outliers. This is similar to Amlogic/meson situation.
>
> The rationale of having one directory per manufacturer is that, if drivers
> for newer platforms with different names from the same manufacturers are
> added, those will still fit under allwinner/ and amlogic/.
>
> The Kconfig names for sunxi and meson didn't change, nor the driver's name.
> Also, the directories under allwinner preserve sun<x>i name on them:
>
> drivers/media/platform/allwinner/
> ├── sun4i-csi
> ├── sun6i-csi
> ├── sun8i-di
> └── sun8i-rotate
>
> and so the directory under amlogic/:
>
> drivers/media/platform/amlogic/
> └── meson-ge2d
>
> Now, if Allinner decides to release a new platforms named after another star,
> let's say, "Vega" and "Rigel", it would be just a matter of adding
> "vega/" and "rigel/" directories under allwinner. No need to touch
> media/platform/Kconfig and media/platform/Makefile. Everything will happen
> on much more smaller vendor-specific Kconfig/Makefile.
But the day Allwinner changes its name to Noloser, we'll have a similar
problem. Thnk about Freescale vs. NXP, or Altera bought by Intel. No
naming scheme is totally future-proof. If the accepted standard through
the kernel is to use sunxi to refer to Allwinner SoCs, I don't think
it's a bit idea to go with that.
> See for instance, TI. We had initially a single driver, and everywhere it
> was called "omap", which was had gained different versions (omap2, omap3,
> ...). Then, TI decided to use other names for newer IP (davinci, am437x),
> and now the current development is at cal and vpe.
>
> If we had placed a ti/ directory by the time omap were added (and the
> same for the other vendors), we would have avoided the need of this
> reorg.
--
Regards,
Laurent Pinchart
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/
2022-03-15 6:54 ` Laurent Pinchart
@ 2022-03-15 8:27 ` Mauro Carvalho Chehab
2022-03-15 8:35 ` Laurent Pinchart
0 siblings, 1 reply; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-15 8:27 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Jernej Škrabec, Niklas Söderlund, Cai Huoqing,
Chen-Yu Tsai, Dinghao Liu, Dmitry Osipenko, Eugen Hristev,
Ezequiel Garcia, Hans Verkuil, Jacopo Mondi, Jia-Ju Bai,
Jonathan Cameron, Maxime Ripard, Mikhail Rudenko, Ming Qian,
Ondrej Jirman, Robert Foss, Sakari Ailus, Tomi Valkeinen,
Yong Deng, linux-arm-kernel, linux-kernel, linux-media,
linux-sunxi
Em Tue, 15 Mar 2022 08:54:25 +0200
Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu:
> Hi Mauro,
>
> On Tue, Mar 15, 2022 at 06:40:05AM +0100, Mauro Carvalho Chehab wrote:
> > Em Mon, 14 Mar 2022 18:22:20 +0100 Jernej Škrabec escreveu:
> >
> > > Dne ponedeljek, 14. marec 2022 ob 17:34:42 CET je Mauro Carvalho Chehab
> > > napisal(a):
> > > > As the end goal is to have platform drivers split by vendor,
> > > > rename sunxi/ to allwinner/.
> > > >
> > > > Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> > >
> > > I would rather not do that. Everything related to Allwinner is called sunxi,
> > > albeit there are a few outliers. This is similar to Amlogic/meson situation.
> >
> > The rationale of having one directory per manufacturer is that, if drivers
> > for newer platforms with different names from the same manufacturers are
> > added, those will still fit under allwinner/ and amlogic/.
> >
> > The Kconfig names for sunxi and meson didn't change, nor the driver's name.
> > Also, the directories under allwinner preserve sun<x>i name on them:
> >
> > drivers/media/platform/allwinner/
> > ├── sun4i-csi
> > ├── sun6i-csi
> > ├── sun8i-di
> > └── sun8i-rotate
> >
> > and so the directory under amlogic/:
> >
> > drivers/media/platform/amlogic/
> > └── meson-ge2d
> >
> > Now, if Allinner decides to release a new platforms named after another star,
> > let's say, "Vega" and "Rigel", it would be just a matter of adding
> > "vega/" and "rigel/" directories under allwinner. No need to touch
> > media/platform/Kconfig and media/platform/Makefile. Everything will happen
> > on much more smaller vendor-specific Kconfig/Makefile.
>
> But the day Allwinner changes its name to Noloser, we'll have a similar
> problem.
Not really. It will still be a single directory per vendor (whatever
name it is).
> Thnk about Freescale vs. NXP, or Altera bought by Intel.
Yeah, when some drivers move from one vendor to another one that
already exists there, we should probably move the directories, in
order to keep things well organized.
The worse case scenario is really if, let's say, TI decides to sell their
omap architecture to NXP, keeping the rest. On such case, the best would
be to move platform/ti/omap* to the directory of its newer owner.
That's said, when things like that happen, there are usually a change
at MAINTAINERS, as e-mails, mailing lists and contact people will
likely change. So, this will very likely generate patches anyway.
> No
> naming scheme is totally future-proof. If the accepted standard through
> the kernel is to use sunxi to refer to Allwinner SoCs, I don't think
> it's a bit idea to go with that.
I'm not too concerned about the name here, but rather about the
process. Needing to do reorg like this is painful, as it causes
all pending work to fail merging against upstream, requiring rebases.
So, we should avoid needing to re-do it by trying our best to avoid
the need of another global change like that in the future.
By organizing entries per vendor, while we may need to do puntual
per-vendor adjustments when they rename and change IP with other
vendors, the global platform Kconfig/Make will contain a single entry
per vendor. I can't foresee any need to change this in the future,
if we take care of keeping the entries there properly sorted.
With regards to naming the per-vendor directory, while I do prefer to have
the directories named after the vendor, and not after a vendor's nick
name, It should also be ok to use a vendor's nick name, provided that
such name is meant to be used by all their current and future IP.
Not sure if "sunxi" is actually a vendor's nick name. It sounds
much likely that it is, instead, a brand name that covers their
current media-related SoC.
Can someone from the vendor shed a light on it?
Thanks,
Mauro
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/
2022-03-15 8:27 ` Mauro Carvalho Chehab
@ 2022-03-15 8:35 ` Laurent Pinchart
2022-03-15 18:04 ` Jernej Škrabec
2022-03-16 13:10 ` Mauro Carvalho Chehab
0 siblings, 2 replies; 41+ messages in thread
From: Laurent Pinchart @ 2022-03-15 8:35 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Jernej Škrabec, Niklas Söderlund, Cai Huoqing,
Chen-Yu Tsai, Dinghao Liu, Dmitry Osipenko, Eugen Hristev,
Ezequiel Garcia, Hans Verkuil, Jacopo Mondi, Jia-Ju Bai,
Jonathan Cameron, Maxime Ripard, Mikhail Rudenko, Ming Qian,
Ondrej Jirman, Robert Foss, Sakari Ailus, Tomi Valkeinen,
Yong Deng, linux-arm-kernel, linux-kernel, linux-media,
linux-sunxi
On Tue, Mar 15, 2022 at 09:27:36AM +0100, Mauro Carvalho Chehab wrote:
> Em Tue, 15 Mar 2022 08:54:25 +0200
> Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu:
>
> > Hi Mauro,
> >
> > On Tue, Mar 15, 2022 at 06:40:05AM +0100, Mauro Carvalho Chehab wrote:
> > > Em Mon, 14 Mar 2022 18:22:20 +0100 Jernej Škrabec escreveu:
> > >
> > > > Dne ponedeljek, 14. marec 2022 ob 17:34:42 CET je Mauro Carvalho Chehab
> > > > napisal(a):
> > > > > As the end goal is to have platform drivers split by vendor,
> > > > > rename sunxi/ to allwinner/.
> > > > >
> > > > > Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> > > >
> > > > I would rather not do that. Everything related to Allwinner is called sunxi,
> > > > albeit there are a few outliers. This is similar to Amlogic/meson situation.
> > >
> > > The rationale of having one directory per manufacturer is that, if drivers
> > > for newer platforms with different names from the same manufacturers are
> > > added, those will still fit under allwinner/ and amlogic/.
> > >
> > > The Kconfig names for sunxi and meson didn't change, nor the driver's name.
> > > Also, the directories under allwinner preserve sun<x>i name on them:
> > >
> > > drivers/media/platform/allwinner/
> > > ├── sun4i-csi
> > > ├── sun6i-csi
> > > ├── sun8i-di
> > > └── sun8i-rotate
> > >
> > > and so the directory under amlogic/:
> > >
> > > drivers/media/platform/amlogic/
> > > └── meson-ge2d
> > >
> > > Now, if Allinner decides to release a new platforms named after another star,
> > > let's say, "Vega" and "Rigel", it would be just a matter of adding
> > > "vega/" and "rigel/" directories under allwinner. No need to touch
> > > media/platform/Kconfig and media/platform/Makefile. Everything will happen
> > > on much more smaller vendor-specific Kconfig/Makefile.
> >
> > But the day Allwinner changes its name to Noloser, we'll have a similar
> > problem.
>
> Not really. It will still be a single directory per vendor (whatever
> name it is).
>
> > Thnk about Freescale vs. NXP, or Altera bought by Intel.
>
> Yeah, when some drivers move from one vendor to another one that
> already exists there, we should probably move the directories, in
> order to keep things well organized.
I'm not sure we should. We still have arch/arm64/boot/dts/freescale/ for
instance. We can answer that question later though, when confronted with
the situation.
> The worse case scenario is really if, let's say, TI decides to sell their
> omap architecture to NXP, keeping the rest. On such case, the best would
> be to move platform/ti/omap* to the directory of its newer owner.
>
> That's said, when things like that happen, there are usually a change
> at MAINTAINERS, as e-mails, mailing lists and contact people will
> likely change. So, this will very likely generate patches anyway.
>
> > No
> > naming scheme is totally future-proof. If the accepted standard through
> > the kernel is to use sunxi to refer to Allwinner SoCs, I don't think
> > it's a bit idea to go with that.
>
> I'm not too concerned about the name here, but rather about the
> process. Needing to do reorg like this is painful, as it causes
> all pending work to fail merging against upstream, requiring rebases.
> So, we should avoid needing to re-do it by trying our best to avoid
> the need of another global change like that in the future.
Most of the pain we'll go through in the immediate future comes from the
fact that we never really cared about this. I think renames (of vendors
or product lines) will be infrequent enough that picking sunxi for
Allwinner drivers wouldn't be an issue.
There's a similar think with Renesas, which had an SH product line and
then moved to ARM, creating R-Mobile and R-Car (among other product
liens). That's why we still have drivers/dma/sh/ for Renesas DMA
drivers.
> By organizing entries per vendor, while we may need to do puntual
> per-vendor adjustments when they rename and change IP with other
> vendors, the global platform Kconfig/Make will contain a single entry
> per vendor. I can't foresee any need to change this in the future,
> if we take care of keeping the entries there properly sorted.
>
> With regards to naming the per-vendor directory, while I do prefer to have
> the directories named after the vendor, and not after a vendor's nick
> name, It should also be ok to use a vendor's nick name, provided that
> such name is meant to be used by all their current and future IP.
>
> Not sure if "sunxi" is actually a vendor's nick name. It sounds
> much likely that it is, instead, a brand name that covers their
> current media-related SoC.
>
> Can someone from the vendor shed a light on it?
Maybe we can let the Allwinner upstream community tell us what name to
pick ? I'm sure they know better than us :-)
--
Regards,
Laurent Pinchart
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: Re: [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/
2022-03-15 8:35 ` Laurent Pinchart
@ 2022-03-15 18:04 ` Jernej Škrabec
2022-03-16 13:13 ` Mauro Carvalho Chehab
2022-03-16 13:10 ` Mauro Carvalho Chehab
1 sibling, 1 reply; 41+ messages in thread
From: Jernej Škrabec @ 2022-03-15 18:04 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Laurent Pinchart
Cc: Niklas Söderlund, Cai Huoqing, Chen-Yu Tsai, Dinghao Liu,
Dmitry Osipenko, Eugen Hristev, Ezequiel Garcia, Hans Verkuil,
Jacopo Mondi, Jia-Ju Bai, Jonathan Cameron, Maxime Ripard,
Mikhail Rudenko, Ming Qian, Ondrej Jirman, Robert Foss,
Sakari Ailus, Tomi Valkeinen, Yong Deng, linux-arm-kernel,
linux-kernel, linux-media, linux-sunxi
Dne torek, 15. marec 2022 ob 09:35:05 CET je Laurent Pinchart napisal(a):
> On Tue, Mar 15, 2022 at 09:27:36AM +0100, Mauro Carvalho Chehab wrote:
> > Em Tue, 15 Mar 2022 08:54:25 +0200
> > Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu:
> >
> > > Hi Mauro,
> > >
> > > On Tue, Mar 15, 2022 at 06:40:05AM +0100, Mauro Carvalho Chehab wrote:
> > > > Em Mon, 14 Mar 2022 18:22:20 +0100 Jernej Škrabec escreveu:
> > > >
> > > > > Dne ponedeljek, 14. marec 2022 ob 17:34:42 CET je Mauro Carvalho
Chehab
> > > > > napisal(a):
> > > > > > As the end goal is to have platform drivers split by vendor,
> > > > > > rename sunxi/ to allwinner/.
> > > > > >
> > > > > > Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> > > > >
> > > > > I would rather not do that. Everything related to Allwinner is
called sunxi,
> > > > > albeit there are a few outliers. This is similar to Amlogic/meson
situation.
> > > >
> > > > The rationale of having one directory per manufacturer is that, if
drivers
> > > > for newer platforms with different names from the same manufacturers
are
> > > > added, those will still fit under allwinner/ and amlogic/.
> > > >
> > > > The Kconfig names for sunxi and meson didn't change, nor the driver's
name.
> > > > Also, the directories under allwinner preserve sun<x>i name on them:
> > > >
> > > > drivers/media/platform/allwinner/
> > > > ├── sun4i-csi
> > > > ├── sun6i-csi
> > > > ├── sun8i-di
> > > > └── sun8i-rotate
> > > >
> > > > and so the directory under amlogic/:
> > > >
> > > > drivers/media/platform/amlogic/
> > > > └── meson-ge2d
> > > >
> > > > Now, if Allinner decides to release a new platforms named after
another star,
> > > > let's say, "Vega" and "Rigel", it would be just a matter of adding
> > > > "vega/" and "rigel/" directories under allwinner. No need to touch
> > > > media/platform/Kconfig and media/platform/Makefile. Everything will
happen
> > > > on much more smaller vendor-specific Kconfig/Makefile.
> > >
> > > But the day Allwinner changes its name to Noloser, we'll have a similar
> > > problem.
> >
> > Not really. It will still be a single directory per vendor (whatever
> > name it is).
> >
> > > Thnk about Freescale vs. NXP, or Altera bought by Intel.
> >
> > Yeah, when some drivers move from one vendor to another one that
> > already exists there, we should probably move the directories, in
> > order to keep things well organized.
>
> I'm not sure we should. We still have arch/arm64/boot/dts/freescale/ for
> instance. We can answer that question later though, when confronted with
> the situation.
>
> > The worse case scenario is really if, let's say, TI decides to sell their
> > omap architecture to NXP, keeping the rest. On such case, the best would
> > be to move platform/ti/omap* to the directory of its newer owner.
> >
> > That's said, when things like that happen, there are usually a change
> > at MAINTAINERS, as e-mails, mailing lists and contact people will
> > likely change. So, this will very likely generate patches anyway.
> >
> > > No
> > > naming scheme is totally future-proof. If the accepted standard through
> > > the kernel is to use sunxi to refer to Allwinner SoCs, I don't think
> > > it's a bit idea to go with that.
> >
> > I'm not too concerned about the name here, but rather about the
> > process. Needing to do reorg like this is painful, as it causes
> > all pending work to fail merging against upstream, requiring rebases.
> > So, we should avoid needing to re-do it by trying our best to avoid
> > the need of another global change like that in the future.
>
> Most of the pain we'll go through in the immediate future comes from the
> fact that we never really cared about this. I think renames (of vendors
> or product lines) will be infrequent enough that picking sunxi for
> Allwinner drivers wouldn't be an issue.
>
> There's a similar think with Renesas, which had an SH product line and
> then moved to ARM, creating R-Mobile and R-Car (among other product
> liens). That's why we still have drivers/dma/sh/ for Renesas DMA
> drivers.
>
> > By organizing entries per vendor, while we may need to do puntual
> > per-vendor adjustments when they rename and change IP with other
> > vendors, the global platform Kconfig/Make will contain a single entry
> > per vendor. I can't foresee any need to change this in the future,
> > if we take care of keeping the entries there properly sorted.
> >
> > With regards to naming the per-vendor directory, while I do prefer to have
> > the directories named after the vendor, and not after a vendor's nick
> > name, It should also be ok to use a vendor's nick name, provided that
> > such name is meant to be used by all their current and future IP.
> >
> > Not sure if "sunxi" is actually a vendor's nick name. It sounds
> > much likely that it is, instead, a brand name that covers their
> > current media-related SoC.
> >
> > Can someone from the vendor shed a light on it?
Allwinner (as a company) isn't directly involved in maintaining upstream Linux
support. Drivers are provided by linux-sunxi community, sometimes by cleaning
up vendor drivers or more often by writing them from scratch.
That being said, "sunxi" is extensively used in vendor kernel, most often it's
directory name containing vendor specific driver. It's derived from SoC family
name, like sun4i, sun5i, sun5i, sun50i, etc. where number is replaced with X.
sunxi is synonym for Allwinner basically from the start. Community build
around these SoCs is called linux-sunxi and even entry in MAINTAINERS contains
both names: "ARM/Allwinner sunXi SoC support". Note that sunxi is not limited
to ARM SoCs. RISC-V family is called sun20i.
Hope this helps.
Best regards,
Jernej
>
> Maybe we can let the Allwinner upstream community tell us what name to
> pick ? I'm sure they know better than us :-)
>
> --
> Regards,
>
> Laurent Pinchart
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/
2022-03-15 18:04 ` Jernej Škrabec
@ 2022-03-16 13:13 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-16 13:13 UTC (permalink / raw)
To: Jernej Škrabec
Cc: Laurent Pinchart, Niklas Söderlund, Cai Huoqing,
Chen-Yu Tsai, Dinghao Liu, Dmitry Osipenko, Eugen Hristev,
Ezequiel Garcia, Hans Verkuil, Jacopo Mondi, Jia-Ju Bai,
Jonathan Cameron, Maxime Ripard, Mikhail Rudenko, Ming Qian,
Ondrej Jirman, Robert Foss, Sakari Ailus, Tomi Valkeinen,
Yong Deng, linux-arm-kernel, linux-kernel, linux-media,
linux-sunxi
Em Tue, 15 Mar 2022 19:04:05 +0100
Jernej Škrabec <jernej.skrabec@gmail.com> escreveu:
> > > By organizing entries per vendor, while we may need to do puntual
> > > per-vendor adjustments when they rename and change IP with other
> > > vendors, the global platform Kconfig/Make will contain a single entry
> > > per vendor. I can't foresee any need to change this in the future,
> > > if we take care of keeping the entries there properly sorted.
> > >
> > > With regards to naming the per-vendor directory, while I do prefer to have
> > > the directories named after the vendor, and not after a vendor's nick
> > > name, It should also be ok to use a vendor's nick name, provided that
> > > such name is meant to be used by all their current and future IP.
> > >
> > > Not sure if "sunxi" is actually a vendor's nick name. It sounds
> > > much likely that it is, instead, a brand name that covers their
> > > current media-related SoC.
> > >
> > > Can someone from the vendor shed a light on it?
>
> Allwinner (as a company) isn't directly involved in maintaining upstream Linux
> support. Drivers are provided by linux-sunxi community, sometimes by cleaning
> up vendor drivers or more often by writing them from scratch.
>
> That being said, "sunxi" is extensively used in vendor kernel, most often it's
> directory name containing vendor specific driver. It's derived from SoC family
> name, like sun4i, sun5i, sun5i, sun50i, etc. where number is replaced with X.
>
> sunxi is synonym for Allwinner basically from the start. Community build
> around these SoCs is called linux-sunxi and even entry in MAINTAINERS contains
> both names: "ARM/Allwinner sunXi SoC support". Note that sunxi is not limited
> to ARM SoCs. RISC-V family is called sun20i.
>
> Hope this helps.
Ok, so let's then keep it named as "sunxi", and place all drivers from
Allwinner there.
Thanks,
Mauro
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/
2022-03-15 8:35 ` Laurent Pinchart
2022-03-15 18:04 ` Jernej Škrabec
@ 2022-03-16 13:10 ` Mauro Carvalho Chehab
1 sibling, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-16 13:10 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Jernej Škrabec, Niklas Söderlund, Cai Huoqing,
Chen-Yu Tsai, Dinghao Liu, Dmitry Osipenko, Eugen Hristev,
Ezequiel Garcia, Hans Verkuil, Jacopo Mondi, Jia-Ju Bai,
Jonathan Cameron, Maxime Ripard, Mikhail Rudenko, Ming Qian,
Ondrej Jirman, Robert Foss, Sakari Ailus, Tomi Valkeinen,
Yong Deng, linux-arm-kernel, linux-kernel, linux-media,
linux-sunxi
Em Tue, 15 Mar 2022 10:35:05 +0200
Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu:
> On Tue, Mar 15, 2022 at 09:27:36AM +0100, Mauro Carvalho Chehab wrote:
> > Em Tue, 15 Mar 2022 08:54:25 +0200
> > Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu:
> >
> > > Hi Mauro,
> > >
> > > On Tue, Mar 15, 2022 at 06:40:05AM +0100, Mauro Carvalho Chehab wrote:
> > > > Em Mon, 14 Mar 2022 18:22:20 +0100 Jernej Škrabec escreveu:
> > > >
> > > > > Dne ponedeljek, 14. marec 2022 ob 17:34:42 CET je Mauro Carvalho Chehab
> > > > > napisal(a):
> > > > > > As the end goal is to have platform drivers split by vendor,
> > > > > > rename sunxi/ to allwinner/.
> > > > > >
> > > > > > Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> > > > >
> > > > > I would rather not do that. Everything related to Allwinner is called sunxi,
> > > > > albeit there are a few outliers. This is similar to Amlogic/meson situation.
> > > >
> > > > The rationale of having one directory per manufacturer is that, if drivers
> > > > for newer platforms with different names from the same manufacturers are
> > > > added, those will still fit under allwinner/ and amlogic/.
> > > >
> > > > The Kconfig names for sunxi and meson didn't change, nor the driver's name.
> > > > Also, the directories under allwinner preserve sun<x>i name on them:
> > > >
> > > > drivers/media/platform/allwinner/
> > > > ├── sun4i-csi
> > > > ├── sun6i-csi
> > > > ├── sun8i-di
> > > > └── sun8i-rotate
> > > >
> > > > and so the directory under amlogic/:
> > > >
> > > > drivers/media/platform/amlogic/
> > > > └── meson-ge2d
> > > >
> > > > Now, if Allinner decides to release a new platforms named after another star,
> > > > let's say, "Vega" and "Rigel", it would be just a matter of adding
> > > > "vega/" and "rigel/" directories under allwinner. No need to touch
> > > > media/platform/Kconfig and media/platform/Makefile. Everything will happen
> > > > on much more smaller vendor-specific Kconfig/Makefile.
> > >
> > > But the day Allwinner changes its name to Noloser, we'll have a similar
> > > problem.
> >
> > Not really. It will still be a single directory per vendor (whatever
> > name it is).
> >
> > > Thnk about Freescale vs. NXP, or Altera bought by Intel.
> >
> > Yeah, when some drivers move from one vendor to another one that
> > already exists there, we should probably move the directories, in
> > order to keep things well organized.
>
> I'm not sure we should. We still have arch/arm64/boot/dts/freescale/ for
> instance. We can answer that question later though, when confronted with
> the situation.
It would be messy if some drivers under a
media/platform/vendor_a/
directory would actually belong to vendor_b, which also has its own
media/platform/vendor_b/ directory.
On such case, I do think we should move stuff. Now, if everything
under a "media/platform/vendor_a/" directory are now property of
a vendor_c which doesn't have yet any directory there, I don't see
and problems on not renaming - and even adding new drivers there
that would belong to vendor_c.
>
> > The worse case scenario is really if, let's say, TI decides to sell their
> > omap architecture to NXP, keeping the rest. On such case, the best would
> > be to move platform/ti/omap* to the directory of its newer owner.
> >
> > That's said, when things like that happen, there are usually a change
> > at MAINTAINERS, as e-mails, mailing lists and contact people will
> > likely change. So, this will very likely generate patches anyway.
> >
> > > No
> > > naming scheme is totally future-proof. If the accepted standard through
> > > the kernel is to use sunxi to refer to Allwinner SoCs, I don't think
> > > it's a bit idea to go with that.
> >
> > I'm not too concerned about the name here, but rather about the
> > process. Needing to do reorg like this is painful, as it causes
> > all pending work to fail merging against upstream, requiring rebases.
> > So, we should avoid needing to re-do it by trying our best to avoid
> > the need of another global change like that in the future.
>
> Most of the pain we'll go through in the immediate future comes from the
> fact that we never really cared about this.
Nah, we had other reorgs in the past, also trying to better organize
stuff, like splitting M2M from V4L and DVB platform drivers.
The thing is that the number of entries at platform/ increased
a lot, and that justifies a major change.
> I think renames (of vendors
> or product lines) will be infrequent enough that picking sunxi for
> Allwinner drivers wouldn't be an issue.
Agreed.
> There's a similar think with Renesas, which had an SH product line and
> then moved to ARM, creating R-Mobile and R-Car (among other product
> liens). That's why we still have drivers/dma/sh/ for Renesas DMA
> drivers.
>
> > By organizing entries per vendor, while we may need to do puntual
> > per-vendor adjustments when they rename and change IP with other
> > vendors, the global platform Kconfig/Make will contain a single entry
> > per vendor. I can't foresee any need to change this in the future,
> > if we take care of keeping the entries there properly sorted.
> >
> > With regards to naming the per-vendor directory, while I do prefer to have
> > the directories named after the vendor, and not after a vendor's nick
> > name, It should also be ok to use a vendor's nick name, provided that
> > such name is meant to be used by all their current and future IP.
> >
> > Not sure if "sunxi" is actually a vendor's nick name. It sounds
> > much likely that it is, instead, a brand name that covers their
> > current media-related SoC.
> >
> > Can someone from the vendor shed a light on it?
>
> Maybe we can let the Allwinner upstream community tell us what name to
> pick ? I'm sure they know better than us :-)
Works for me.
Thanks,
Mauro
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH v2 49/67] media: platform: rename exynos4-is/ to samsung/exynos4-is/
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (21 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/ Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 50/67] media: platform: rename exynos-gsc/ to samsung/exynos-gsc/ Mauro Carvalho Chehab
` (8 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Cai Huoqing,
Dmitry Osipenko, Eugen Hristev, Greg Kroah-Hartman, Hans Verkuil,
Jacopo Mondi, Jernej Skrabec, Krzysztof Kozlowski, Lad Prabhakar,
Laurent Pinchart, Lee Jones, Lv Yunlong, Ming Qian,
Rui Miguel Silva, Sakari Ailus, Shawn Guo, Sylwester Nawrocki,
Tomi Valkeinen, Yang Li, Zhen Lei, linux-arm-kernel,
linux-kernel, linux-media, linux-samsung-soc
As the end goal is to have platform drivers split by vendor,
rename exynos4-is/ to samsung/exynos4-is/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
Documentation/admin-guide/media/fimc.rst | 2 +-
.../driver-api/media/drivers/fimc-devel.rst | 14 +++++++-------
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
.../platform/{ => samsung}/exynos4-is/Kconfig | 0
.../platform/{ => samsung}/exynos4-is/Makefile | 0
.../platform/{ => samsung}/exynos4-is/common.c | 0
.../platform/{ => samsung}/exynos4-is/common.h | 0
.../{ => samsung}/exynos4-is/fimc-capture.c | 0
.../platform/{ => samsung}/exynos4-is/fimc-core.c | 0
.../platform/{ => samsung}/exynos4-is/fimc-core.h | 0
.../{ => samsung}/exynos4-is/fimc-is-command.h | 0
.../{ => samsung}/exynos4-is/fimc-is-errno.c | 0
.../{ => samsung}/exynos4-is/fimc-is-errno.h | 0
.../{ => samsung}/exynos4-is/fimc-is-i2c.c | 0
.../{ => samsung}/exynos4-is/fimc-is-i2c.h | 0
.../{ => samsung}/exynos4-is/fimc-is-param.c | 0
.../{ => samsung}/exynos4-is/fimc-is-param.h | 0
.../{ => samsung}/exynos4-is/fimc-is-regs.c | 0
.../{ => samsung}/exynos4-is/fimc-is-regs.h | 0
.../{ => samsung}/exynos4-is/fimc-is-sensor.c | 0
.../{ => samsung}/exynos4-is/fimc-is-sensor.h | 0
.../platform/{ => samsung}/exynos4-is/fimc-is.c | 0
.../platform/{ => samsung}/exynos4-is/fimc-is.h | 0
.../{ => samsung}/exynos4-is/fimc-isp-video.c | 0
.../{ => samsung}/exynos4-is/fimc-isp-video.h | 0
.../platform/{ => samsung}/exynos4-is/fimc-isp.c | 0
.../platform/{ => samsung}/exynos4-is/fimc-isp.h | 0
.../{ => samsung}/exynos4-is/fimc-lite-reg.c | 0
.../{ => samsung}/exynos4-is/fimc-lite-reg.h | 0
.../platform/{ => samsung}/exynos4-is/fimc-lite.c | 0
.../platform/{ => samsung}/exynos4-is/fimc-lite.h | 0
.../platform/{ => samsung}/exynos4-is/fimc-m2m.c | 0
.../platform/{ => samsung}/exynos4-is/fimc-reg.c | 0
.../platform/{ => samsung}/exynos4-is/fimc-reg.h | 0
.../platform/{ => samsung}/exynos4-is/media-dev.c | 0
.../platform/{ => samsung}/exynos4-is/media-dev.h | 0
.../platform/{ => samsung}/exynos4-is/mipi-csis.c | 0
.../platform/{ => samsung}/exynos4-is/mipi-csis.h | 0
40 files changed, 11 insertions(+), 11 deletions(-)
rename drivers/media/platform/{ => samsung}/exynos4-is/Kconfig (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/Makefile (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/common.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/common.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-capture.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-core.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-core.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-command.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-errno.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-errno.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-i2c.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-i2c.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-param.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-param.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-regs.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-regs.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-sensor.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-sensor.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-isp-video.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-isp-video.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-isp.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-isp.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-lite-reg.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-lite-reg.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-lite.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-lite.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-m2m.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-reg.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-reg.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/media-dev.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/media-dev.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/mipi-csis.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/mipi-csis.h (100%)
diff --git a/Documentation/admin-guide/media/fimc.rst b/Documentation/admin-guide/media/fimc.rst
index 56b149d9a527..267ef52fe387 100644
--- a/Documentation/admin-guide/media/fimc.rst
+++ b/Documentation/admin-guide/media/fimc.rst
@@ -14,7 +14,7 @@ data from LCD controller (FIMD) through the SoC internal writeback data
path. There are multiple FIMC instances in the SoCs (up to 4), having
slightly different capabilities, like pixel alignment constraints, rotator
availability, LCD writeback support, etc. The driver is located at
-drivers/media/platform/exynos4-is directory.
+drivers/media/platform/samsung/exynos4-is directory.
Supported SoCs
--------------
diff --git a/Documentation/driver-api/media/drivers/fimc-devel.rst b/Documentation/driver-api/media/drivers/fimc-devel.rst
index 956e3a9901f8..4c6b7c8be19f 100644
--- a/Documentation/driver-api/media/drivers/fimc-devel.rst
+++ b/Documentation/driver-api/media/drivers/fimc-devel.rst
@@ -12,22 +12,22 @@ Files partitioning
- media device driver
- drivers/media/platform/exynos4-is/media-dev.[ch]
+ drivers/media/platform/samsung/exynos4-is/media-dev.[ch]
- camera capture video device driver
- drivers/media/platform/exynos4-is/fimc-capture.c
+ drivers/media/platform/samsung/exynos4-is/fimc-capture.c
- MIPI-CSI2 receiver subdev
- drivers/media/platform/exynos4-is/mipi-csis.[ch]
+ drivers/media/platform/samsung/exynos4-is/mipi-csis.[ch]
- video post-processor (mem-to-mem)
- drivers/media/platform/exynos4-is/fimc-core.c
+ drivers/media/platform/samsung/exynos4-is/fimc-core.c
- common files
- drivers/media/platform/exynos4-is/fimc-core.h
- drivers/media/platform/exynos4-is/fimc-reg.h
- drivers/media/platform/exynos4-is/regs-fimc.h
+ drivers/media/platform/samsung/exynos4-is/fimc-core.h
+ drivers/media/platform/samsung/exynos4-is/fimc-reg.h
+ drivers/media/platform/samsung/exynos4-is/regs-fimc.h
diff --git a/MAINTAINERS b/MAINTAINERS
index c9333d46047e..13dd4693b898 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17103,7 +17103,7 @@ M: Sylwester Nawrocki <s.nawrocki@samsung.com>
L: linux-media@vger.kernel.org
S: Supported
Q: https://patchwork.linuxtv.org/project/linux-media/list/
-F: drivers/media/platform/exynos4-is/
+F: drivers/media/platform/samsung/exynos4-is/
SAMSUNG SOC CLOCK DRIVERS
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 13d8f3e59116..3d0f431c167d 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -76,7 +76,6 @@ source "drivers/media/platform/cadence/Kconfig"
source "drivers/media/platform/chips-media/Kconfig"
source "drivers/media/platform/davinci/Kconfig"
source "drivers/media/platform/exynos-gsc/Kconfig"
-source "drivers/media/platform/exynos4-is/Kconfig"
source "drivers/media/platform/intel/Kconfig"
source "drivers/media/platform/marvell/Kconfig"
source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
@@ -94,6 +93,7 @@ source "drivers/media/platform/s3c-camif/Kconfig"
source "drivers/media/platform/s5p-g2d/Kconfig"
source "drivers/media/platform/s5p-jpeg/Kconfig"
source "drivers/media/platform/s5p-mfc/Kconfig"
+source "drivers/media/platform/samsung/exynos4-is/Kconfig"
source "drivers/media/platform/sti/Kconfig"
source "drivers/media/platform/stm32/Kconfig"
source "drivers/media/platform/ti-vpe/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index ce9909534218..6ef541bdb225 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -16,7 +16,6 @@ obj-y += cadence/
obj-y += chips-media/
obj-y += davinci/
obj-y += exynos-gsc/
-obj-y += exynos4-is/
obj-y += intel/
obj-y += marvell/
obj-y += mediatek/mtk-jpeg/
@@ -36,6 +35,7 @@ obj-y += s3c-camif/
obj-y += s5p-g2d/
obj-y += s5p-jpeg/
obj-y += s5p-mfc/
+obj-y += samsung/exynos4-is/
obj-y += sti/bdisp/
obj-y += sti/c8sectpfe/
obj-y += sti/delta/
diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/samsung/exynos4-is/Kconfig
similarity index 100%
rename from drivers/media/platform/exynos4-is/Kconfig
rename to drivers/media/platform/samsung/exynos4-is/Kconfig
diff --git a/drivers/media/platform/exynos4-is/Makefile b/drivers/media/platform/samsung/exynos4-is/Makefile
similarity index 100%
rename from drivers/media/platform/exynos4-is/Makefile
rename to drivers/media/platform/samsung/exynos4-is/Makefile
diff --git a/drivers/media/platform/exynos4-is/common.c b/drivers/media/platform/samsung/exynos4-is/common.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/common.c
rename to drivers/media/platform/samsung/exynos4-is/common.c
diff --git a/drivers/media/platform/exynos4-is/common.h b/drivers/media/platform/samsung/exynos4-is/common.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/common.h
rename to drivers/media/platform/samsung/exynos4-is/common.h
diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/samsung/exynos4-is/fimc-capture.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-capture.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-capture.c
diff --git a/drivers/media/platform/exynos4-is/fimc-core.c b/drivers/media/platform/samsung/exynos4-is/fimc-core.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-core.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-core.c
diff --git a/drivers/media/platform/exynos4-is/fimc-core.h b/drivers/media/platform/samsung/exynos4-is/fimc-core.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-core.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-core.h
diff --git a/drivers/media/platform/exynos4-is/fimc-is-command.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-command.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-command.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-command.h
diff --git a/drivers/media/platform/exynos4-is/fimc-is-errno.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-errno.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-errno.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-errno.c
diff --git a/drivers/media/platform/exynos4-is/fimc-is-errno.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-errno.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-errno.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-errno.h
diff --git a/drivers/media/platform/exynos4-is/fimc-is-i2c.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-i2c.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.c
diff --git a/drivers/media/platform/exynos4-is/fimc-is-i2c.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-i2c.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.h
diff --git a/drivers/media/platform/exynos4-is/fimc-is-param.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-param.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-param.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-param.c
diff --git a/drivers/media/platform/exynos4-is/fimc-is-param.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-param.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-param.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-param.h
diff --git a/drivers/media/platform/exynos4-is/fimc-is-regs.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-regs.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-regs.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-regs.c
diff --git a/drivers/media/platform/exynos4-is/fimc-is-regs.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-regs.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-regs.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-regs.h
diff --git a/drivers/media/platform/exynos4-is/fimc-is-sensor.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-sensor.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.c
diff --git a/drivers/media/platform/exynos4-is/fimc-is-sensor.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-sensor.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.h
diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/samsung/exynos4-is/fimc-is.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-is.c
diff --git a/drivers/media/platform/exynos4-is/fimc-is.h b/drivers/media/platform/samsung/exynos4-is/fimc-is.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-is.h
diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/samsung/exynos4-is/fimc-isp-video.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-isp-video.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-isp-video.c
diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.h b/drivers/media/platform/samsung/exynos4-is/fimc-isp-video.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-isp-video.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-isp-video.h
diff --git a/drivers/media/platform/exynos4-is/fimc-isp.c b/drivers/media/platform/samsung/exynos4-is/fimc-isp.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-isp.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-isp.c
diff --git a/drivers/media/platform/exynos4-is/fimc-isp.h b/drivers/media/platform/samsung/exynos4-is/fimc-isp.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-isp.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-isp.h
diff --git a/drivers/media/platform/exynos4-is/fimc-lite-reg.c b/drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-lite-reg.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.c
diff --git a/drivers/media/platform/exynos4-is/fimc-lite-reg.h b/drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-lite-reg.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.h
diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/samsung/exynos4-is/fimc-lite.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-lite.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-lite.c
diff --git a/drivers/media/platform/exynos4-is/fimc-lite.h b/drivers/media/platform/samsung/exynos4-is/fimc-lite.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-lite.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-lite.h
diff --git a/drivers/media/platform/exynos4-is/fimc-m2m.c b/drivers/media/platform/samsung/exynos4-is/fimc-m2m.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-m2m.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-m2m.c
diff --git a/drivers/media/platform/exynos4-is/fimc-reg.c b/drivers/media/platform/samsung/exynos4-is/fimc-reg.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-reg.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-reg.c
diff --git a/drivers/media/platform/exynos4-is/fimc-reg.h b/drivers/media/platform/samsung/exynos4-is/fimc-reg.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-reg.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-reg.h
diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/samsung/exynos4-is/media-dev.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/media-dev.c
rename to drivers/media/platform/samsung/exynos4-is/media-dev.c
diff --git a/drivers/media/platform/exynos4-is/media-dev.h b/drivers/media/platform/samsung/exynos4-is/media-dev.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/media-dev.h
rename to drivers/media/platform/samsung/exynos4-is/media-dev.h
diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/samsung/exynos4-is/mipi-csis.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/mipi-csis.c
rename to drivers/media/platform/samsung/exynos4-is/mipi-csis.c
diff --git a/drivers/media/platform/exynos4-is/mipi-csis.h b/drivers/media/platform/samsung/exynos4-is/mipi-csis.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/mipi-csis.h
rename to drivers/media/platform/samsung/exynos4-is/mipi-csis.h
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 50/67] media: platform: rename exynos-gsc/ to samsung/exynos-gsc/
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (22 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 49/67] media: platform: rename exynos4-is/ to samsung/exynos4-is/ Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 52/67] media: platform: rename s5p-g2d/ to samsung/s5p-g2d/ Mauro Carvalho Chehab
` (7 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Cai Huoqing,
Dmitry Osipenko, Eugen Hristev, Hans Verkuil, Jacopo Mondi,
Jernej Skrabec, Jonathan Cameron, Krzysztof Kozlowski,
Lad Prabhakar, Laurent Pinchart, Ming Qian, Sakari Ailus,
Sylwester Nawrocki, linux-arm-kernel, linux-kernel, linux-media,
linux-samsung-soc
As the end goal is to have platform drivers split by vendor,
rename exynos-gsc/ to samsung/exynos-gsc/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/{ => samsung}/exynos-gsc/Kconfig | 0
drivers/media/platform/{ => samsung}/exynos-gsc/Makefile | 0
drivers/media/platform/{ => samsung}/exynos-gsc/gsc-core.c | 0
drivers/media/platform/{ => samsung}/exynos-gsc/gsc-core.h | 0
drivers/media/platform/{ => samsung}/exynos-gsc/gsc-m2m.c | 0
drivers/media/platform/{ => samsung}/exynos-gsc/gsc-regs.c | 0
drivers/media/platform/{ => samsung}/exynos-gsc/gsc-regs.h | 0
9 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/media/platform/{ => samsung}/exynos-gsc/Kconfig (100%)
rename drivers/media/platform/{ => samsung}/exynos-gsc/Makefile (100%)
rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-core.c (100%)
rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-core.h (100%)
rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-m2m.c (100%)
rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-regs.c (100%)
rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-regs.h (100%)
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 3d0f431c167d..0a05ef7304c0 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -75,7 +75,6 @@ source "drivers/media/platform/atmel/Kconfig"
source "drivers/media/platform/cadence/Kconfig"
source "drivers/media/platform/chips-media/Kconfig"
source "drivers/media/platform/davinci/Kconfig"
-source "drivers/media/platform/exynos-gsc/Kconfig"
source "drivers/media/platform/intel/Kconfig"
source "drivers/media/platform/marvell/Kconfig"
source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
@@ -93,6 +92,7 @@ source "drivers/media/platform/s3c-camif/Kconfig"
source "drivers/media/platform/s5p-g2d/Kconfig"
source "drivers/media/platform/s5p-jpeg/Kconfig"
source "drivers/media/platform/s5p-mfc/Kconfig"
+source "drivers/media/platform/samsung/exynos-gsc/Kconfig"
source "drivers/media/platform/samsung/exynos4-is/Kconfig"
source "drivers/media/platform/sti/Kconfig"
source "drivers/media/platform/stm32/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 6ef541bdb225..996ec99be08f 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -15,7 +15,6 @@ obj-y += atmel/
obj-y += cadence/
obj-y += chips-media/
obj-y += davinci/
-obj-y += exynos-gsc/
obj-y += intel/
obj-y += marvell/
obj-y += mediatek/mtk-jpeg/
@@ -35,6 +34,7 @@ obj-y += s3c-camif/
obj-y += s5p-g2d/
obj-y += s5p-jpeg/
obj-y += s5p-mfc/
+obj-y += samsung/exynos-gsc/
obj-y += samsung/exynos4-is/
obj-y += sti/bdisp/
obj-y += sti/c8sectpfe/
diff --git a/drivers/media/platform/exynos-gsc/Kconfig b/drivers/media/platform/samsung/exynos-gsc/Kconfig
similarity index 100%
rename from drivers/media/platform/exynos-gsc/Kconfig
rename to drivers/media/platform/samsung/exynos-gsc/Kconfig
diff --git a/drivers/media/platform/exynos-gsc/Makefile b/drivers/media/platform/samsung/exynos-gsc/Makefile
similarity index 100%
rename from drivers/media/platform/exynos-gsc/Makefile
rename to drivers/media/platform/samsung/exynos-gsc/Makefile
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/samsung/exynos-gsc/gsc-core.c
similarity index 100%
rename from drivers/media/platform/exynos-gsc/gsc-core.c
rename to drivers/media/platform/samsung/exynos-gsc/gsc-core.c
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.h b/drivers/media/platform/samsung/exynos-gsc/gsc-core.h
similarity index 100%
rename from drivers/media/platform/exynos-gsc/gsc-core.h
rename to drivers/media/platform/samsung/exynos-gsc/gsc-core.h
diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c
similarity index 100%
rename from drivers/media/platform/exynos-gsc/gsc-m2m.c
rename to drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c
diff --git a/drivers/media/platform/exynos-gsc/gsc-regs.c b/drivers/media/platform/samsung/exynos-gsc/gsc-regs.c
similarity index 100%
rename from drivers/media/platform/exynos-gsc/gsc-regs.c
rename to drivers/media/platform/samsung/exynos-gsc/gsc-regs.c
diff --git a/drivers/media/platform/exynos-gsc/gsc-regs.h b/drivers/media/platform/samsung/exynos-gsc/gsc-regs.h
similarity index 100%
rename from drivers/media/platform/exynos-gsc/gsc-regs.h
rename to drivers/media/platform/samsung/exynos-gsc/gsc-regs.h
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 52/67] media: platform: rename s5p-g2d/ to samsung/s5p-g2d/
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (23 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 50/67] media: platform: rename exynos-gsc/ to samsung/exynos-gsc/ Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
[not found] ` <CGME20220317191357eucas1p1abc9a313ef2f320bda365388e72e0327@eucas1p1.samsung.com>
2022-03-14 16:34 ` [PATCH v2 53/67] media: platform: rename s5p-jpeg/ to samsung/s5p-jpeg/ Mauro Carvalho Chehab
` (6 subsequent siblings)
31 siblings, 1 reply; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund,
Łukasz Stelmach, Cai Huoqing, Dillon Min, Dmitry Osipenko,
Eugen Hristev, Hans Verkuil, Jacopo Mondi, Jernej Skrabec,
Lad Prabhakar, Laurent Pinchart, Ming Qian, Sakari Ailus,
linux-arm-kernel, linux-kernel, linux-media
As the end goal is to have platform drivers split by vendor,
rename s5p-g2d/ to samsung/s5p-g2d/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/{ => samsung}/s5p-g2d/Kconfig | 0
drivers/media/platform/{ => samsung}/s5p-g2d/Makefile | 0
drivers/media/platform/{ => samsung}/s5p-g2d/g2d-hw.c | 0
drivers/media/platform/{ => samsung}/s5p-g2d/g2d-regs.h | 0
drivers/media/platform/{ => samsung}/s5p-g2d/g2d.c | 0
drivers/media/platform/{ => samsung}/s5p-g2d/g2d.h | 0
9 files changed, 3 insertions(+), 3 deletions(-)
rename drivers/media/platform/{ => samsung}/s5p-g2d/Kconfig (100%)
rename drivers/media/platform/{ => samsung}/s5p-g2d/Makefile (100%)
rename drivers/media/platform/{ => samsung}/s5p-g2d/g2d-hw.c (100%)
rename drivers/media/platform/{ => samsung}/s5p-g2d/g2d-regs.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-g2d/g2d.c (100%)
rename drivers/media/platform/{ => samsung}/s5p-g2d/g2d.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 80f2a0eea3f7..4b03db9ee31e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2616,7 +2616,7 @@ M: Łukasz Stelmach <l.stelmach@samsung.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L: linux-media@vger.kernel.org
S: Maintained
-F: drivers/media/platform/s5p-g2d/
+F: drivers/media/platform/samsung/s5p-g2d/
ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT
M: Marek Szyprowski <m.szyprowski@samsung.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index aed4394ddd05..8dd178e1a359 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -88,12 +88,12 @@ source "drivers/media/platform/omap3isp/Kconfig"
source "drivers/media/platform/qcom/Kconfig"
source "drivers/media/platform/renesas/Kconfig"
source "drivers/media/platform/rockchip/Kconfig"
-source "drivers/media/platform/s5p-g2d/Kconfig"
source "drivers/media/platform/s5p-jpeg/Kconfig"
source "drivers/media/platform/s5p-mfc/Kconfig"
source "drivers/media/platform/samsung/exynos-gsc/Kconfig"
source "drivers/media/platform/samsung/exynos4-is/Kconfig"
source "drivers/media/platform/samsung/s3c-camif/Kconfig"
+source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
source "drivers/media/platform/sti/Kconfig"
source "drivers/media/platform/stm32/Kconfig"
source "drivers/media/platform/ti-vpe/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index cb5e6d1df248..aa822365d8d0 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -30,12 +30,12 @@ obj-y += qcom/venus/
obj-y += renesas/
obj-y += rockchip/rga/
obj-y += rockchip/rkisp1/
-obj-y += s5p-g2d/
obj-y += s5p-jpeg/
obj-y += s5p-mfc/
obj-y += samsung/exynos-gsc/
obj-y += samsung/exynos4-is/
obj-y += samsung/s3c-camif/
+obj-y += samsung/s5p-g2d/
obj-y += sti/bdisp/
obj-y += sti/c8sectpfe/
obj-y += sti/delta/
diff --git a/drivers/media/platform/s5p-g2d/Kconfig b/drivers/media/platform/samsung/s5p-g2d/Kconfig
similarity index 100%
rename from drivers/media/platform/s5p-g2d/Kconfig
rename to drivers/media/platform/samsung/s5p-g2d/Kconfig
diff --git a/drivers/media/platform/s5p-g2d/Makefile b/drivers/media/platform/samsung/s5p-g2d/Makefile
similarity index 100%
rename from drivers/media/platform/s5p-g2d/Makefile
rename to drivers/media/platform/samsung/s5p-g2d/Makefile
diff --git a/drivers/media/platform/s5p-g2d/g2d-hw.c b/drivers/media/platform/samsung/s5p-g2d/g2d-hw.c
similarity index 100%
rename from drivers/media/platform/s5p-g2d/g2d-hw.c
rename to drivers/media/platform/samsung/s5p-g2d/g2d-hw.c
diff --git a/drivers/media/platform/s5p-g2d/g2d-regs.h b/drivers/media/platform/samsung/s5p-g2d/g2d-regs.h
similarity index 100%
rename from drivers/media/platform/s5p-g2d/g2d-regs.h
rename to drivers/media/platform/samsung/s5p-g2d/g2d-regs.h
diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/samsung/s5p-g2d/g2d.c
similarity index 100%
rename from drivers/media/platform/s5p-g2d/g2d.c
rename to drivers/media/platform/samsung/s5p-g2d/g2d.c
diff --git a/drivers/media/platform/s5p-g2d/g2d.h b/drivers/media/platform/samsung/s5p-g2d/g2d.h
similarity index 100%
rename from drivers/media/platform/s5p-g2d/g2d.h
rename to drivers/media/platform/samsung/s5p-g2d/g2d.h
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 53/67] media: platform: rename s5p-jpeg/ to samsung/s5p-jpeg/
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (24 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 52/67] media: platform: rename s5p-g2d/ to samsung/s5p-g2d/ Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 54/67] media: platform: rename s5p-mfc/ to samsung/s5p-mfc/ Mauro Carvalho Chehab
` (5 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund,
Andrzej Pietrasiewicz, Cai Huoqing, Colin Ian King,
Dmitry Osipenko, Eugen Hristev, Fabio Estevam, Hans Verkuil,
Jacek Anaszewski, Jacopo Mondi, Jernej Skrabec,
Krzysztof Kozlowski, Laurent Pinchart, Laurentiu Palcu,
Mikhail Ulyanov, Ming Qian, Mirela Rabulea, NXP Linux Team,
Pengutronix Kernel Team, Randy Dunlap, Rikard Falkeborn,
Sakari Ailus, Sascha Hauer, Shawn Guo, Sylwester Nawrocki,
linux-arm-kernel, linux-kernel, linux-media, linux-renesas-soc,
linux-samsung-soc
As the end goal is to have platform drivers split by vendor,
rename s5p-jpeg/ to samsung/s5p-jpeg/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 2 +-
drivers/media/platform/renesas/rcar_jpu.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-jpeg/Kconfig | 0
drivers/media/platform/{ => samsung}/s5p-jpeg/Makefile | 0
drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.h | 2 +-
.../media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.c | 0
.../media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.c | 0
drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.h | 0
drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-regs.h | 2 +-
16 files changed, 11 insertions(+), 11 deletions(-)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/Kconfig (100%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/Makefile (100%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.c (99%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.h (99%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.c (100%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.h (97%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.c (100%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.c (99%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.h (97%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-regs.h (99%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 4b03db9ee31e..e01013c68fc1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2633,7 +2633,7 @@ M: Sylwester Nawrocki <s.nawrocki@samsung.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L: linux-media@vger.kernel.org
S: Maintained
-F: drivers/media/platform/s5p-jpeg/
+F: drivers/media/platform/samsung/s5p-jpeg/
ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
M: Marek Szyprowski <m.szyprowski@samsung.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 8dd178e1a359..df67690c8f3a 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -88,12 +88,12 @@ source "drivers/media/platform/omap3isp/Kconfig"
source "drivers/media/platform/qcom/Kconfig"
source "drivers/media/platform/renesas/Kconfig"
source "drivers/media/platform/rockchip/Kconfig"
-source "drivers/media/platform/s5p-jpeg/Kconfig"
source "drivers/media/platform/s5p-mfc/Kconfig"
source "drivers/media/platform/samsung/exynos-gsc/Kconfig"
source "drivers/media/platform/samsung/exynos4-is/Kconfig"
source "drivers/media/platform/samsung/s3c-camif/Kconfig"
source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
+source "drivers/media/platform/samsung/s5p-jpeg/Kconfig"
source "drivers/media/platform/sti/Kconfig"
source "drivers/media/platform/stm32/Kconfig"
source "drivers/media/platform/ti-vpe/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index aa822365d8d0..9c6c272797cd 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -30,12 +30,12 @@ obj-y += qcom/venus/
obj-y += renesas/
obj-y += rockchip/rga/
obj-y += rockchip/rkisp1/
-obj-y += s5p-jpeg/
obj-y += s5p-mfc/
obj-y += samsung/exynos-gsc/
obj-y += samsung/exynos4-is/
obj-y += samsung/s3c-camif/
obj-y += samsung/s5p-g2d/
+obj-y += samsung/s5p-jpeg/
obj-y += sti/bdisp/
obj-y += sti/c8sectpfe/
obj-y += sti/delta/
diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
index 3b892c5792b4..d1ec1f4b506b 100644
--- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
@@ -35,7 +35,7 @@
* it, enable dynamic debug for this module and:
* echo 1 > /sys/module/mxc_jpeg_encdec/parameters/jpeg_tracing
*
- * This is inspired by the drivers/media/platform/s5p-jpeg driver
+ * This is inspired by the drivers/media/platform/samsung/s5p-jpeg driver
*
* Copyright 2018-2019 NXP
*/
diff --git a/drivers/media/platform/renesas/rcar_jpu.c b/drivers/media/platform/renesas/rcar_jpu.c
index 56bb464629ed..293beba131e2 100644
--- a/drivers/media/platform/renesas/rcar_jpu.c
+++ b/drivers/media/platform/renesas/rcar_jpu.c
@@ -4,7 +4,7 @@
* Copyright (C) 2014-2015 Cogent Embedded, Inc. <source@cogentembedded.com>
* Copyright (C) 2014-2015 Renesas Electronics Corporation
*
- * This is based on the drivers/media/platform/s5p-jpeg driver by
+ * This is based on the drivers/media/platform/samsung/s5p-jpeg driver by
* Andrzej Pietrasiewicz and Jacek Anaszewski.
* Some portions of code inspired by VSP1 driver by Laurent Pinchart.
*
diff --git a/drivers/media/platform/s5p-jpeg/Kconfig b/drivers/media/platform/samsung/s5p-jpeg/Kconfig
similarity index 100%
rename from drivers/media/platform/s5p-jpeg/Kconfig
rename to drivers/media/platform/samsung/s5p-jpeg/Kconfig
diff --git a/drivers/media/platform/s5p-jpeg/Makefile b/drivers/media/platform/samsung/s5p-jpeg/Makefile
similarity index 100%
rename from drivers/media/platform/s5p-jpeg/Makefile
rename to drivers/media/platform/samsung/s5p-jpeg/Makefile
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
similarity index 99%
rename from drivers/media/platform/s5p-jpeg/jpeg-core.c
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
index a8d9159d5ed8..5479bc8d474d 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only
-/* linux/drivers/media/platform/s5p-jpeg/jpeg-core.c
+/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
*
* Copyright (c) 2011-2014 Samsung Electronics Co., Ltd.
* http://www.samsung.com
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h
similarity index 99%
rename from drivers/media/platform/s5p-jpeg/jpeg-core.h
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h
index 4a5fb1b15455..5570c79f122f 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.h
+++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-/* linux/drivers/media/platform/s5p-jpeg/jpeg-core.h
+/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h
*
* Copyright (c) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.c
similarity index 100%
rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.c
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h
similarity index 97%
rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h
index 68160befce39..15af928fad76 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h
+++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h
+/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h
*
* Copyright (c) 2014 Samsung Electronics Co., Ltd.
* http://www.samsung.com
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.c
similarity index 100%
rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.c
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.h
similarity index 100%
rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.h
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c
similarity index 99%
rename from drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c
index 491e9248286c..01b47b3df1e7 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c
+++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only
-/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw.h
+/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw.h
*
* Copyright (c) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h
similarity index 97%
rename from drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h
index 98ddf7097562..f068d52c66b7 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h
+++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw.h
+/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw.h
*
* Copyright (c) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-regs.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h
similarity index 99%
rename from drivers/media/platform/s5p-jpeg/jpeg-regs.h
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h
index 86f376b50581..c2298b680022 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-regs.h
+++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-/* linux/drivers/media/platform/s5p-jpeg/jpeg-regs.h
+/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h
*
* Register definition file for Samsung JPEG codec driver
*
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 54/67] media: platform: rename s5p-mfc/ to samsung/s5p-mfc/
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (25 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 53/67] media: platform: rename s5p-jpeg/ to samsung/s5p-jpeg/ Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 55/67] media: platform: rename stm32/ to stm/stm32/ Mauro Carvalho Chehab
` (4 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Andrzej Hajda,
Cai Huoqing, Christophe JAILLET, Dmitry Osipenko, Eugen Hristev,
Hans Verkuil, Herman, Jacopo Mondi, Jernej Skrabec,
Lad Prabhakar, Laurent Pinchart, Marek Szyprowski,
Maxime Jourdan, Ming Qian, Nadezda Lutovinova, Paul Kocialkowski,
Stanimir Varbanov, Sylwester Nawrocki, Tuo Li, linux-arm-kernel,
linux-kernel, linux-media
As the end goal is to have platform drivers split by vendor,
rename s5p-mfc/ to samsung/s5p-mfc/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/Kconfig | 0
drivers/media/platform/{ => samsung}/s5p-mfc/Makefile | 0
drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v10.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v6.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v7.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v8.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc.c | 0
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_common.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_ctrl.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_ctrl.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_debug.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_dec.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_dec.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_enc.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_enc.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_intr.c | 0
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_intr.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_iommu.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.c | 0
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_pm.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_pm.h | 2 +-
36 files changed, 22 insertions(+), 22 deletions(-)
rename drivers/media/platform/{ => samsung}/s5p-mfc/Kconfig (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/Makefile (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v10.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v6.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v7.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v8.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc.c (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd.c (89%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd.h (92%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.c (98%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.h (82%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.c (98%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.h (82%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_common.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_ctrl.c (99%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_ctrl.h (92%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_debug.h (95%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_dec.c (99%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_dec.h (90%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_enc.c (99%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_enc.h (90%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_intr.c (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_intr.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_iommu.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr.c (98%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr.h (99%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.c (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.c (99%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.h (96%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_pm.c (97%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_pm.h (87%)
diff --git a/MAINTAINERS b/MAINTAINERS
index e01013c68fc1..a0cfe84b8192 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2641,7 +2641,7 @@ M: Andrzej Hajda <andrzej.hajda@intel.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L: linux-media@vger.kernel.org
S: Maintained
-F: drivers/media/platform/s5p-mfc/
+F: drivers/media/platform/samsung/s5p-mfc/
ARM/SHMOBILE ARM ARCHITECTURE
M: Geert Uytterhoeven <geert+renesas@glider.be>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index df67690c8f3a..6b05afa218b3 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -88,12 +88,12 @@ source "drivers/media/platform/omap3isp/Kconfig"
source "drivers/media/platform/qcom/Kconfig"
source "drivers/media/platform/renesas/Kconfig"
source "drivers/media/platform/rockchip/Kconfig"
-source "drivers/media/platform/s5p-mfc/Kconfig"
source "drivers/media/platform/samsung/exynos-gsc/Kconfig"
source "drivers/media/platform/samsung/exynos4-is/Kconfig"
source "drivers/media/platform/samsung/s3c-camif/Kconfig"
source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
source "drivers/media/platform/samsung/s5p-jpeg/Kconfig"
+source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
source "drivers/media/platform/sti/Kconfig"
source "drivers/media/platform/stm32/Kconfig"
source "drivers/media/platform/ti-vpe/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 9c6c272797cd..97aa99d8fac8 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -30,12 +30,12 @@ obj-y += qcom/venus/
obj-y += renesas/
obj-y += rockchip/rga/
obj-y += rockchip/rkisp1/
-obj-y += s5p-mfc/
obj-y += samsung/exynos-gsc/
obj-y += samsung/exynos4-is/
obj-y += samsung/s3c-camif/
obj-y += samsung/s5p-g2d/
obj-y += samsung/s5p-jpeg/
+obj-y += samsung/s5p-mfc/
obj-y += sti/bdisp/
obj-y += sti/c8sectpfe/
obj-y += sti/delta/
diff --git a/drivers/media/platform/s5p-mfc/Kconfig b/drivers/media/platform/samsung/s5p-mfc/Kconfig
similarity index 100%
rename from drivers/media/platform/s5p-mfc/Kconfig
rename to drivers/media/platform/samsung/s5p-mfc/Kconfig
diff --git a/drivers/media/platform/s5p-mfc/Makefile b/drivers/media/platform/samsung/s5p-mfc/Makefile
similarity index 100%
rename from drivers/media/platform/s5p-mfc/Makefile
rename to drivers/media/platform/samsung/s5p-mfc/Makefile
diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v10.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/regs-mfc-v10.h
rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v10.h
diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v6.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v6.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/regs-mfc-v6.h
rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v6.h
diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v7.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v7.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/regs-mfc-v7.h
rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v7.h
diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v8.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v8.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/regs-mfc-v8.h
rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v8.h
diff --git a/drivers/media/platform/s5p-mfc/regs-mfc.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/regs-mfc.h
rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc.h
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
similarity index 100%
rename from drivers/media/platform/s5p-mfc/s5p_mfc.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c
similarity index 89%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c
index 0e88c28f4ad3..774c573dc075 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c
*
* Copyright (C) 2012 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h
similarity index 92%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h
index ed4e32a12552..945d12fdceb7 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h
*
* Copyright (C) 2012 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c
similarity index 98%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c
index 1ea4eda9c8e0..327e54e70611 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c
*
* Copyright (C) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h
similarity index 82%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h
index 917854bffe9f..6eafa514aebc 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h
*
* Copyright (C) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c
similarity index 98%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c
index 1f42130cc865..f8588e52dfc8 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c
*
* Copyright (c) 2012 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h
similarity index 82%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h
index c19884ea2bfc..9dc44460cc38 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h
*
* Copyright (C) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_common.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c
similarity index 99%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c
index da138c314963..72d70984e99a 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h
similarity index 92%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h
index 7f32ef8a6b61..653ba5f3d048 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h
similarity index 95%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_debug.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h
index 752bbe4fe48e..bba5dad6dbff 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
- * drivers/media/platform/s5p-mfc/s5p_mfc_debug.h
+ * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h
*
* Header file for Samsung MFC (Multi Function Codec - FIMV) driver
* This file contains debug macros
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c
similarity index 99%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c
index c0798811755c..4b89df8bfd18 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c
*
* Copyright (C) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h
similarity index 90%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_dec.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h
index 0e9a0e3bbbe7..0c52ab46cff7 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h
*
* Copyright (C) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
similarity index 99%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
index 1fad99edb091..a8877d805b29 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
*
* Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h
similarity index 90%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_enc.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h
index cacd1ca43e19..3f1b1a037a4f 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h
*
* Copyright (C) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_intr.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.c
similarity index 100%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_intr.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.c
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_intr.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_intr.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.h
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_iommu.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_iommu.h
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c
similarity index 98%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c
index bb65671eea91..673962301173 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
+ * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c
*
* Samsung MFC (Multi Function Codec - FIMV) driver
* This file contains hw related functions.
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h
similarity index 99%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h
index 1c5d2d4c0543..b9831275f3ab 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
- * drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
+ * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h
*
* Header file for Samsung MFC (Multi Function Codec - FIMV) driver
* Contains declarations of hw related functions.
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.c
similarity index 100%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.c
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.h
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
similarity index 99%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
index a1453053e31a..8227004f6746 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+ * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
*
* Samsung MFC (Multi Function Codec - FIMV) driver
* This file contains hw related functions.
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h
similarity index 96%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h
index 8ca514bf5e37..e4dd03c5454c 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
- * drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
+ * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h
*
* Header file for Samsung MFC (Multi Function Codec - FIMV) driver
* Contains declarations of hw related functions.
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c
similarity index 97%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c
index 88b7d33c9197..72a901e99450 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h
similarity index 87%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_pm.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h
index 3d26443189a2..4159d2364e87 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h
*
* Copyright (C) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 55/67] media: platform: rename stm32/ to stm/stm32/
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (26 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 54/67] media: platform: rename s5p-mfc/ to samsung/s5p-mfc/ Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 56/67] media: platform: rename sti/ to stm/sti/ Mauro Carvalho Chehab
` (3 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Alain Volmat,
Alexandre Torgue, Dillon Min, Dmitriy Ulitin, Dmitry Osipenko,
Eugen Hristev, Hans Verkuil, Hugues Fruchet, Jacopo Mondi,
Jernej Skrabec, Lad Prabhakar, Laurent Pinchart, Maxime Coquelin,
Ming Qian, Sakari Ailus, Tomi Valkeinen, linux-arm-kernel,
linux-kernel, linux-media, linux-stm32
As the end goal is to have platform drivers split by vendor,
rename stm32/ to stm/stm32/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/{ => stm}/stm32/Kconfig | 0
drivers/media/platform/{ => stm}/stm32/Makefile | 0
drivers/media/platform/{ => stm}/stm32/dma2d/dma2d-hw.c | 0
drivers/media/platform/{ => stm}/stm32/dma2d/dma2d-regs.h | 0
drivers/media/platform/{ => stm}/stm32/dma2d/dma2d.c | 0
drivers/media/platform/{ => stm}/stm32/dma2d/dma2d.h | 0
drivers/media/platform/{ => stm}/stm32/stm32-dcmi.c | 0
10 files changed, 3 insertions(+), 3 deletions(-)
rename drivers/media/platform/{ => stm}/stm32/Kconfig (100%)
rename drivers/media/platform/{ => stm}/stm32/Makefile (100%)
rename drivers/media/platform/{ => stm}/stm32/dma2d/dma2d-hw.c (100%)
rename drivers/media/platform/{ => stm}/stm32/dma2d/dma2d-regs.h (100%)
rename drivers/media/platform/{ => stm}/stm32/dma2d/dma2d.c (100%)
rename drivers/media/platform/{ => stm}/stm32/dma2d/dma2d.h (100%)
rename drivers/media/platform/{ => stm}/stm32/stm32-dcmi.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index a0cfe84b8192..4cf03d253bc8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12046,7 +12046,7 @@ L: linux-media@vger.kernel.org
S: Supported
T: git git://linuxtv.org/media_tree.git
F: Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
-F: drivers/media/platform/stm32/stm32-dcmi.c
+F: drivers/media/platform/stm/stm32/stm32-dcmi.c
MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
M: Mauro Carvalho Chehab <mchehab@kernel.org>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 6b05afa218b3..c308de1a42a4 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -95,7 +95,7 @@ source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
source "drivers/media/platform/samsung/s5p-jpeg/Kconfig"
source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
source "drivers/media/platform/sti/Kconfig"
-source "drivers/media/platform/stm32/Kconfig"
+source "drivers/media/platform/stm/stm32/Kconfig"
source "drivers/media/platform/ti-vpe/Kconfig"
source "drivers/media/platform/via/Kconfig"
source "drivers/media/platform/xilinx/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 97aa99d8fac8..7f077c9a416d 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -40,7 +40,7 @@ obj-y += sti/bdisp/
obj-y += sti/c8sectpfe/
obj-y += sti/delta/
obj-y += sti/hva/
-obj-y += stm32/
+obj-y += stm/stm32/
obj-y += ti-vpe/
obj-y += via/
obj-y += xilinx/
diff --git a/drivers/media/platform/stm32/Kconfig b/drivers/media/platform/stm/stm32/Kconfig
similarity index 100%
rename from drivers/media/platform/stm32/Kconfig
rename to drivers/media/platform/stm/stm32/Kconfig
diff --git a/drivers/media/platform/stm32/Makefile b/drivers/media/platform/stm/stm32/Makefile
similarity index 100%
rename from drivers/media/platform/stm32/Makefile
rename to drivers/media/platform/stm/stm32/Makefile
diff --git a/drivers/media/platform/stm32/dma2d/dma2d-hw.c b/drivers/media/platform/stm/stm32/dma2d/dma2d-hw.c
similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d-hw.c
rename to drivers/media/platform/stm/stm32/dma2d/dma2d-hw.c
diff --git a/drivers/media/platform/stm32/dma2d/dma2d-regs.h b/drivers/media/platform/stm/stm32/dma2d/dma2d-regs.h
similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d-regs.h
rename to drivers/media/platform/stm/stm32/dma2d/dma2d-regs.h
diff --git a/drivers/media/platform/stm32/dma2d/dma2d.c b/drivers/media/platform/stm/stm32/dma2d/dma2d.c
similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d.c
rename to drivers/media/platform/stm/stm32/dma2d/dma2d.c
diff --git a/drivers/media/platform/stm32/dma2d/dma2d.h b/drivers/media/platform/stm/stm32/dma2d/dma2d.h
similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d.h
rename to drivers/media/platform/stm/stm32/dma2d/dma2d.h
diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm/stm32/stm32-dcmi.c
similarity index 100%
rename from drivers/media/platform/stm32/stm32-dcmi.c
rename to drivers/media/platform/stm/stm32/stm32-dcmi.c
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 56/67] media: platform: rename sti/ to stm/sti/
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (27 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 55/67] media: platform: rename stm32/ to stm/stm32/ Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 63/67] media: platform: Create vendor/{Makefile, Kconfig} files Mauro Carvalho Chehab
` (2 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Alexandre Torgue,
Cai Huoqing, Colin Ian King, Dan Carpenter, Dinghao Liu,
Dmitry Osipenko, Dongliang Mu, Eugen Hristev, Evgeny Novikov,
Fabien Dessenne, Hans Verkuil, Hugues Fruchet, Jacopo Mondi,
Jean-Christophe Trotin, Jernej Skrabec, Jiapeng Chong,
Jonathan Cameron, Lad Prabhakar, Laurent Pinchart,
Maxime Coquelin, Ming Qian, Patrice Chotard, Randy Dunlap,
Robert Foss, Sakari Ailus, Sean Young, Xiaofeng Cao,
Yang Yingliang, linux-arm-kernel, linux-kernel, linux-media,
linux-stm32
As the end goal is to have platform drivers split by vendor,
rename sti/ to stm/sti/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
MAINTAINERS | 8 ++++----
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 8 ++++----
drivers/media/platform/sti/Kconfig | 5 -----
drivers/media/platform/stm/sti/Kconfig | 5 +++++
drivers/media/platform/{ => stm}/sti/bdisp/Kconfig | 0
drivers/media/platform/{ => stm}/sti/bdisp/Makefile | 0
drivers/media/platform/{ => stm}/sti/bdisp/bdisp-debug.c | 0
drivers/media/platform/{ => stm}/sti/bdisp/bdisp-filter.h | 0
drivers/media/platform/{ => stm}/sti/bdisp/bdisp-hw.c | 0
drivers/media/platform/{ => stm}/sti/bdisp/bdisp-reg.h | 0
drivers/media/platform/{ => stm}/sti/bdisp/bdisp-v4l2.c | 0
drivers/media/platform/{ => stm}/sti/bdisp/bdisp.h | 0
drivers/media/platform/{ => stm}/sti/c8sectpfe/Kconfig | 0
drivers/media/platform/{ => stm}/sti/c8sectpfe/Makefile | 0
.../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-common.c | 0
.../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-common.h | 0
.../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-core.c | 0
.../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-core.h | 0
.../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-debugfs.c | 0
.../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-debugfs.h | 0
.../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-dvb.c | 0
.../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-dvb.h | 0
drivers/media/platform/{ => stm}/sti/delta/Kconfig | 0
drivers/media/platform/{ => stm}/sti/delta/Makefile | 0
drivers/media/platform/{ => stm}/sti/delta/delta-cfg.h | 0
drivers/media/platform/{ => stm}/sti/delta/delta-debug.c | 0
drivers/media/platform/{ => stm}/sti/delta/delta-debug.h | 0
drivers/media/platform/{ => stm}/sti/delta/delta-ipc.c | 0
drivers/media/platform/{ => stm}/sti/delta/delta-ipc.h | 0
drivers/media/platform/{ => stm}/sti/delta/delta-mem.c | 0
drivers/media/platform/{ => stm}/sti/delta/delta-mem.h | 0
.../media/platform/{ => stm}/sti/delta/delta-mjpeg-dec.c | 0
.../media/platform/{ => stm}/sti/delta/delta-mjpeg-fw.h | 0
.../media/platform/{ => stm}/sti/delta/delta-mjpeg-hdr.c | 0
drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg.h | 0
drivers/media/platform/{ => stm}/sti/delta/delta-v4l2.c | 0
drivers/media/platform/{ => stm}/sti/delta/delta.h | 0
drivers/media/platform/{ => stm}/sti/hva/Kconfig | 0
drivers/media/platform/{ => stm}/sti/hva/Makefile | 0
drivers/media/platform/{ => stm}/sti/hva/hva-debugfs.c | 0
drivers/media/platform/{ => stm}/sti/hva/hva-h264.c | 0
drivers/media/platform/{ => stm}/sti/hva/hva-hw.c | 0
drivers/media/platform/{ => stm}/sti/hva/hva-hw.h | 0
drivers/media/platform/{ => stm}/sti/hva/hva-mem.c | 0
drivers/media/platform/{ => stm}/sti/hva/hva-mem.h | 0
drivers/media/platform/{ => stm}/sti/hva/hva-v4l2.c | 0
drivers/media/platform/{ => stm}/sti/hva/hva.h | 0
48 files changed, 14 insertions(+), 14 deletions(-)
delete mode 100644 drivers/media/platform/sti/Kconfig
create mode 100644 drivers/media/platform/stm/sti/Kconfig
rename drivers/media/platform/{ => stm}/sti/bdisp/Kconfig (100%)
rename drivers/media/platform/{ => stm}/sti/bdisp/Makefile (100%)
rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-debug.c (100%)
rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-filter.h (100%)
rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-hw.c (100%)
rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-reg.h (100%)
rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-v4l2.c (100%)
rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp.h (100%)
rename drivers/media/platform/{ => stm}/sti/c8sectpfe/Kconfig (100%)
rename drivers/media/platform/{ => stm}/sti/c8sectpfe/Makefile (100%)
rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-common.c (100%)
rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-common.h (100%)
rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-core.c (100%)
rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-core.h (100%)
rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-debugfs.c (100%)
rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-debugfs.h (100%)
rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-dvb.c (100%)
rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-dvb.h (100%)
rename drivers/media/platform/{ => stm}/sti/delta/Kconfig (100%)
rename drivers/media/platform/{ => stm}/sti/delta/Makefile (100%)
rename drivers/media/platform/{ => stm}/sti/delta/delta-cfg.h (100%)
rename drivers/media/platform/{ => stm}/sti/delta/delta-debug.c (100%)
rename drivers/media/platform/{ => stm}/sti/delta/delta-debug.h (100%)
rename drivers/media/platform/{ => stm}/sti/delta/delta-ipc.c (100%)
rename drivers/media/platform/{ => stm}/sti/delta/delta-ipc.h (100%)
rename drivers/media/platform/{ => stm}/sti/delta/delta-mem.c (100%)
rename drivers/media/platform/{ => stm}/sti/delta/delta-mem.h (100%)
rename drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg-dec.c (100%)
rename drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg-fw.h (100%)
rename drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg-hdr.c (100%)
rename drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg.h (100%)
rename drivers/media/platform/{ => stm}/sti/delta/delta-v4l2.c (100%)
rename drivers/media/platform/{ => stm}/sti/delta/delta.h (100%)
rename drivers/media/platform/{ => stm}/sti/hva/Kconfig (100%)
rename drivers/media/platform/{ => stm}/sti/hva/Makefile (100%)
rename drivers/media/platform/{ => stm}/sti/hva/hva-debugfs.c (100%)
rename drivers/media/platform/{ => stm}/sti/hva/hva-h264.c (100%)
rename drivers/media/platform/{ => stm}/sti/hva/hva-hw.c (100%)
rename drivers/media/platform/{ => stm}/sti/hva/hva-hw.h (100%)
rename drivers/media/platform/{ => stm}/sti/hva/hva-mem.c (100%)
rename drivers/media/platform/{ => stm}/sti/hva/hva-mem.h (100%)
rename drivers/media/platform/{ => stm}/sti/hva/hva-v4l2.c (100%)
rename drivers/media/platform/{ => stm}/sti/hva/hva.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 4cf03d253bc8..6c1055c27c65 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2710,7 +2710,7 @@ F: drivers/clocksource/clksrc_st_lpc.c
F: drivers/cpufreq/sti-cpufreq.c
F: drivers/dma/st_fdma*
F: drivers/i2c/busses/i2c-st.c
-F: drivers/media/platform/sti/c8sectpfe/
+F: drivers/media/platform/stm/sti/c8sectpfe/
F: drivers/media/rc/st_rc.c
F: drivers/mmc/host/sdhci-st.c
F: drivers/phy/st/phy-miphy28lp.c
@@ -3383,7 +3383,7 @@ L: linux-media@vger.kernel.org
S: Supported
W: https://linuxtv.org
T: git git://linuxtv.org/media_tree.git
-F: drivers/media/platform/sti/bdisp
+F: drivers/media/platform/stm/sti/bdisp
BECKHOFF CX5020 ETHERCAT MASTER DRIVER
M: Dariusz Marcinkiewicz <reksio@newterm.pl>
@@ -5482,7 +5482,7 @@ L: linux-media@vger.kernel.org
S: Supported
W: https://linuxtv.org
T: git git://linuxtv.org/media_tree.git
-F: drivers/media/platform/sti/delta
+F: drivers/media/platform/stm/sti/delta
DELTA AHE-50DC FAN CONTROL MODULE DRIVER
M: Zev Weiss <zev@bewilderbeest.net>
@@ -8870,7 +8870,7 @@ L: linux-media@vger.kernel.org
S: Supported
W: https://linuxtv.org
T: git git://linuxtv.org/media_tree.git
-F: drivers/media/platform/sti/hva
+F: drivers/media/platform/stm/sti/hva
HWPOISON MEMORY FAILURE HANDLING
M: Naoya Horiguchi <naoya.horiguchi@nec.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index c308de1a42a4..2ad5fde02543 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -94,7 +94,7 @@ source "drivers/media/platform/samsung/s3c-camif/Kconfig"
source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
source "drivers/media/platform/samsung/s5p-jpeg/Kconfig"
source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
-source "drivers/media/platform/sti/Kconfig"
+source "drivers/media/platform/stm/sti/Kconfig"
source "drivers/media/platform/stm/stm32/Kconfig"
source "drivers/media/platform/ti-vpe/Kconfig"
source "drivers/media/platform/via/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 7f077c9a416d..f20f1287c665 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -36,10 +36,10 @@ obj-y += samsung/s3c-camif/
obj-y += samsung/s5p-g2d/
obj-y += samsung/s5p-jpeg/
obj-y += samsung/s5p-mfc/
-obj-y += sti/bdisp/
-obj-y += sti/c8sectpfe/
-obj-y += sti/delta/
-obj-y += sti/hva/
+obj-y += stm/sti/bdisp/
+obj-y += stm/sti/c8sectpfe/
+obj-y += stm/sti/delta/
+obj-y += stm/sti/hva/
obj-y += stm/stm32/
obj-y += ti-vpe/
obj-y += via/
diff --git a/drivers/media/platform/sti/Kconfig b/drivers/media/platform/sti/Kconfig
deleted file mode 100644
index 9fb5e78a92cf..000000000000
--- a/drivers/media/platform/sti/Kconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-source "drivers/media/platform/sti/bdisp/Kconfig"
-source "drivers/media/platform/sti/c8sectpfe/Kconfig"
-source "drivers/media/platform/sti/delta/Kconfig"
-source "drivers/media/platform/sti/hva/Kconfig"
diff --git a/drivers/media/platform/stm/sti/Kconfig b/drivers/media/platform/stm/sti/Kconfig
new file mode 100644
index 000000000000..311930644281
--- /dev/null
+++ b/drivers/media/platform/stm/sti/Kconfig
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+source "drivers/media/platform/stm/sti/bdisp/Kconfig"
+source "drivers/media/platform/stm/sti/c8sectpfe/Kconfig"
+source "drivers/media/platform/stm/sti/delta/Kconfig"
+source "drivers/media/platform/stm/sti/hva/Kconfig"
diff --git a/drivers/media/platform/sti/bdisp/Kconfig b/drivers/media/platform/stm/sti/bdisp/Kconfig
similarity index 100%
rename from drivers/media/platform/sti/bdisp/Kconfig
rename to drivers/media/platform/stm/sti/bdisp/Kconfig
diff --git a/drivers/media/platform/sti/bdisp/Makefile b/drivers/media/platform/stm/sti/bdisp/Makefile
similarity index 100%
rename from drivers/media/platform/sti/bdisp/Makefile
rename to drivers/media/platform/stm/sti/bdisp/Makefile
diff --git a/drivers/media/platform/sti/bdisp/bdisp-debug.c b/drivers/media/platform/stm/sti/bdisp/bdisp-debug.c
similarity index 100%
rename from drivers/media/platform/sti/bdisp/bdisp-debug.c
rename to drivers/media/platform/stm/sti/bdisp/bdisp-debug.c
diff --git a/drivers/media/platform/sti/bdisp/bdisp-filter.h b/drivers/media/platform/stm/sti/bdisp/bdisp-filter.h
similarity index 100%
rename from drivers/media/platform/sti/bdisp/bdisp-filter.h
rename to drivers/media/platform/stm/sti/bdisp/bdisp-filter.h
diff --git a/drivers/media/platform/sti/bdisp/bdisp-hw.c b/drivers/media/platform/stm/sti/bdisp/bdisp-hw.c
similarity index 100%
rename from drivers/media/platform/sti/bdisp/bdisp-hw.c
rename to drivers/media/platform/stm/sti/bdisp/bdisp-hw.c
diff --git a/drivers/media/platform/sti/bdisp/bdisp-reg.h b/drivers/media/platform/stm/sti/bdisp/bdisp-reg.h
similarity index 100%
rename from drivers/media/platform/sti/bdisp/bdisp-reg.h
rename to drivers/media/platform/stm/sti/bdisp/bdisp-reg.h
diff --git a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c b/drivers/media/platform/stm/sti/bdisp/bdisp-v4l2.c
similarity index 100%
rename from drivers/media/platform/sti/bdisp/bdisp-v4l2.c
rename to drivers/media/platform/stm/sti/bdisp/bdisp-v4l2.c
diff --git a/drivers/media/platform/sti/bdisp/bdisp.h b/drivers/media/platform/stm/sti/bdisp/bdisp.h
similarity index 100%
rename from drivers/media/platform/sti/bdisp/bdisp.h
rename to drivers/media/platform/stm/sti/bdisp/bdisp.h
diff --git a/drivers/media/platform/sti/c8sectpfe/Kconfig b/drivers/media/platform/stm/sti/c8sectpfe/Kconfig
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/Kconfig
rename to drivers/media/platform/stm/sti/c8sectpfe/Kconfig
diff --git a/drivers/media/platform/sti/c8sectpfe/Makefile b/drivers/media/platform/stm/sti/c8sectpfe/Makefile
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/Makefile
rename to drivers/media/platform/stm/sti/c8sectpfe/Makefile
diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-common.c b/drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-common.c
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-common.c
rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-common.c
diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-common.h b/drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-common.h
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-common.h
rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-common.h
diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-core.c
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-core.c
diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.h b/drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-core.h
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.h
rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-core.h
diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-debugfs.c b/drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-debugfs.c
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-debugfs.c
rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-debugfs.c
diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-debugfs.h b/drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-debugfs.h
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-debugfs.h
rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-debugfs.h
diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.c b/drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-dvb.c
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.c
rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-dvb.c
diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.h b/drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-dvb.h
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.h
rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-dvb.h
diff --git a/drivers/media/platform/sti/delta/Kconfig b/drivers/media/platform/stm/sti/delta/Kconfig
similarity index 100%
rename from drivers/media/platform/sti/delta/Kconfig
rename to drivers/media/platform/stm/sti/delta/Kconfig
diff --git a/drivers/media/platform/sti/delta/Makefile b/drivers/media/platform/stm/sti/delta/Makefile
similarity index 100%
rename from drivers/media/platform/sti/delta/Makefile
rename to drivers/media/platform/stm/sti/delta/Makefile
diff --git a/drivers/media/platform/sti/delta/delta-cfg.h b/drivers/media/platform/stm/sti/delta/delta-cfg.h
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-cfg.h
rename to drivers/media/platform/stm/sti/delta/delta-cfg.h
diff --git a/drivers/media/platform/sti/delta/delta-debug.c b/drivers/media/platform/stm/sti/delta/delta-debug.c
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-debug.c
rename to drivers/media/platform/stm/sti/delta/delta-debug.c
diff --git a/drivers/media/platform/sti/delta/delta-debug.h b/drivers/media/platform/stm/sti/delta/delta-debug.h
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-debug.h
rename to drivers/media/platform/stm/sti/delta/delta-debug.h
diff --git a/drivers/media/platform/sti/delta/delta-ipc.c b/drivers/media/platform/stm/sti/delta/delta-ipc.c
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-ipc.c
rename to drivers/media/platform/stm/sti/delta/delta-ipc.c
diff --git a/drivers/media/platform/sti/delta/delta-ipc.h b/drivers/media/platform/stm/sti/delta/delta-ipc.h
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-ipc.h
rename to drivers/media/platform/stm/sti/delta/delta-ipc.h
diff --git a/drivers/media/platform/sti/delta/delta-mem.c b/drivers/media/platform/stm/sti/delta/delta-mem.c
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-mem.c
rename to drivers/media/platform/stm/sti/delta/delta-mem.c
diff --git a/drivers/media/platform/sti/delta/delta-mem.h b/drivers/media/platform/stm/sti/delta/delta-mem.h
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-mem.h
rename to drivers/media/platform/stm/sti/delta/delta-mem.h
diff --git a/drivers/media/platform/sti/delta/delta-mjpeg-dec.c b/drivers/media/platform/stm/sti/delta/delta-mjpeg-dec.c
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-mjpeg-dec.c
rename to drivers/media/platform/stm/sti/delta/delta-mjpeg-dec.c
diff --git a/drivers/media/platform/sti/delta/delta-mjpeg-fw.h b/drivers/media/platform/stm/sti/delta/delta-mjpeg-fw.h
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-mjpeg-fw.h
rename to drivers/media/platform/stm/sti/delta/delta-mjpeg-fw.h
diff --git a/drivers/media/platform/sti/delta/delta-mjpeg-hdr.c b/drivers/media/platform/stm/sti/delta/delta-mjpeg-hdr.c
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-mjpeg-hdr.c
rename to drivers/media/platform/stm/sti/delta/delta-mjpeg-hdr.c
diff --git a/drivers/media/platform/sti/delta/delta-mjpeg.h b/drivers/media/platform/stm/sti/delta/delta-mjpeg.h
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-mjpeg.h
rename to drivers/media/platform/stm/sti/delta/delta-mjpeg.h
diff --git a/drivers/media/platform/sti/delta/delta-v4l2.c b/drivers/media/platform/stm/sti/delta/delta-v4l2.c
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-v4l2.c
rename to drivers/media/platform/stm/sti/delta/delta-v4l2.c
diff --git a/drivers/media/platform/sti/delta/delta.h b/drivers/media/platform/stm/sti/delta/delta.h
similarity index 100%
rename from drivers/media/platform/sti/delta/delta.h
rename to drivers/media/platform/stm/sti/delta/delta.h
diff --git a/drivers/media/platform/sti/hva/Kconfig b/drivers/media/platform/stm/sti/hva/Kconfig
similarity index 100%
rename from drivers/media/platform/sti/hva/Kconfig
rename to drivers/media/platform/stm/sti/hva/Kconfig
diff --git a/drivers/media/platform/sti/hva/Makefile b/drivers/media/platform/stm/sti/hva/Makefile
similarity index 100%
rename from drivers/media/platform/sti/hva/Makefile
rename to drivers/media/platform/stm/sti/hva/Makefile
diff --git a/drivers/media/platform/sti/hva/hva-debugfs.c b/drivers/media/platform/stm/sti/hva/hva-debugfs.c
similarity index 100%
rename from drivers/media/platform/sti/hva/hva-debugfs.c
rename to drivers/media/platform/stm/sti/hva/hva-debugfs.c
diff --git a/drivers/media/platform/sti/hva/hva-h264.c b/drivers/media/platform/stm/sti/hva/hva-h264.c
similarity index 100%
rename from drivers/media/platform/sti/hva/hva-h264.c
rename to drivers/media/platform/stm/sti/hva/hva-h264.c
diff --git a/drivers/media/platform/sti/hva/hva-hw.c b/drivers/media/platform/stm/sti/hva/hva-hw.c
similarity index 100%
rename from drivers/media/platform/sti/hva/hva-hw.c
rename to drivers/media/platform/stm/sti/hva/hva-hw.c
diff --git a/drivers/media/platform/sti/hva/hva-hw.h b/drivers/media/platform/stm/sti/hva/hva-hw.h
similarity index 100%
rename from drivers/media/platform/sti/hva/hva-hw.h
rename to drivers/media/platform/stm/sti/hva/hva-hw.h
diff --git a/drivers/media/platform/sti/hva/hva-mem.c b/drivers/media/platform/stm/sti/hva/hva-mem.c
similarity index 100%
rename from drivers/media/platform/sti/hva/hva-mem.c
rename to drivers/media/platform/stm/sti/hva/hva-mem.c
diff --git a/drivers/media/platform/sti/hva/hva-mem.h b/drivers/media/platform/stm/sti/hva/hva-mem.h
similarity index 100%
rename from drivers/media/platform/sti/hva/hva-mem.h
rename to drivers/media/platform/stm/sti/hva/hva-mem.h
diff --git a/drivers/media/platform/sti/hva/hva-v4l2.c b/drivers/media/platform/stm/sti/hva/hva-v4l2.c
similarity index 100%
rename from drivers/media/platform/sti/hva/hva-v4l2.c
rename to drivers/media/platform/stm/sti/hva/hva-v4l2.c
diff --git a/drivers/media/platform/sti/hva/hva.h b/drivers/media/platform/stm/sti/hva/hva.h
similarity index 100%
rename from drivers/media/platform/sti/hva/hva.h
rename to drivers/media/platform/stm/sti/hva/hva.h
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 63/67] media: platform: Create vendor/{Makefile, Kconfig} files
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (28 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 56/67] media: platform: rename sti/ to stm/sti/ Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:34 ` [PATCH v2 64/67] media: platform/*/Kconfig: make manufacturer menus more uniform Mauro Carvalho Chehab
2022-03-14 16:35 ` [PATCH v2 67/67] media: platform: rename mediatek/mtk-jpeg/ to mediatek/jpeg/ Mauro Carvalho Chehab
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Alexandre Torgue,
Andy Gross, Bjorn Andersson, Dmitry Osipenko, Eugen Hristev,
Hans Verkuil, Heiko Stuebner, Jacopo Mondi, Jernej Skrabec,
Laurent Pinchart, Matthias Brugger, Maxime Coquelin, Ming Qian,
Pratyush Yadav, Sakari Ailus, Shijie Qin, Tomi Valkeinen,
Zhou Peng, linux-arm-kernel, linux-arm-msm, linux-kernel,
linux-media, linux-mediatek, linux-rockchip, linux-stm32
Instead of placing multiple per-vendor entries at the
platform/{Makefile,Kconfig}, create them at the per-vendor
directories.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
drivers/media/platform/Kconfig | 28 +++++-------------------
drivers/media/platform/Makefile | 28 ++++++------------------
drivers/media/platform/amlogic/Kconfig | 2 ++
drivers/media/platform/amlogic/Makefile | 2 ++
drivers/media/platform/amphion/Kconfig | 3 +++
drivers/media/platform/mediatek/Kconfig | 5 +++++
drivers/media/platform/mediatek/Makefile | 5 +++++
drivers/media/platform/nvidia/Kconfig | 2 ++
drivers/media/platform/qcom/Makefile | 3 +++
drivers/media/platform/rockchip/Makefile | 3 +++
drivers/media/platform/samsung/Kconfig | 7 ++++++
drivers/media/platform/samsung/Makefile | 7 ++++++
drivers/media/platform/stm/Kconfig | 4 ++++
drivers/media/platform/stm/Makefile | 7 ++++++
drivers/media/platform/stm/sti/Makefile | 6 +++++
drivers/media/platform/ti/Kconfig | 5 +++++
drivers/media/platform/ti/Makefile | 6 ++++-
17 files changed, 79 insertions(+), 44 deletions(-)
create mode 100644 drivers/media/platform/amlogic/Kconfig
create mode 100644 drivers/media/platform/amlogic/Makefile
create mode 100644 drivers/media/platform/mediatek/Kconfig
create mode 100644 drivers/media/platform/mediatek/Makefile
create mode 100644 drivers/media/platform/nvidia/Kconfig
create mode 100644 drivers/media/platform/qcom/Makefile
create mode 100644 drivers/media/platform/rockchip/Makefile
create mode 100644 drivers/media/platform/samsung/Kconfig
create mode 100644 drivers/media/platform/samsung/Makefile
create mode 100644 drivers/media/platform/stm/Kconfig
create mode 100644 drivers/media/platform/stm/Makefile
create mode 100644 drivers/media/platform/stm/sti/Makefile
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 43a654e87613..3a5211d8e59a 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -62,12 +62,9 @@ config VIDEO_MUX
This driver provides support for N:1 video bus multiplexers.
# Platform drivers - Please keep it alphabetically sorted
-
-# TODO: create per-manufacturer directories
-
source "drivers/media/platform/allegro-dvt/Kconfig"
source "drivers/media/platform/allwinner/Kconfig"
-source "drivers/media/platform/amlogic/meson-ge2d/Kconfig"
+source "drivers/media/platform/amlogic/Kconfig"
source "drivers/media/platform/amphion/Kconfig"
source "drivers/media/platform/aspeed/Kconfig"
source "drivers/media/platform/atmel/Kconfig"
@@ -75,28 +72,15 @@ source "drivers/media/platform/cadence/Kconfig"
source "drivers/media/platform/chips-media/Kconfig"
source "drivers/media/platform/intel/Kconfig"
source "drivers/media/platform/marvell/Kconfig"
-source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
-source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
-source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
-source "drivers/media/platform/mediatek/mtk-vpu/Kconfig"
-source "drivers/media/platform/nvidia/tegra-vde/Kconfig"
+source "drivers/media/platform/mediatek/Kconfig"
+source "drivers/media/platform/nvidia/Kconfig"
source "drivers/media/platform/nxp/Kconfig"
source "drivers/media/platform/qcom/Kconfig"
source "drivers/media/platform/renesas/Kconfig"
source "drivers/media/platform/rockchip/Kconfig"
-source "drivers/media/platform/samsung/exynos-gsc/Kconfig"
-source "drivers/media/platform/samsung/exynos4-is/Kconfig"
-source "drivers/media/platform/samsung/s3c-camif/Kconfig"
-source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
-source "drivers/media/platform/samsung/s5p-jpeg/Kconfig"
-source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
-source "drivers/media/platform/stm/sti/Kconfig"
-source "drivers/media/platform/stm/stm32/Kconfig"
-source "drivers/media/platform/ti-vpe/Kconfig"
-source "drivers/media/platform/ti/am437x/Kconfig"
-source "drivers/media/platform/ti/davinci/Kconfig"
-source "drivers/media/platform/ti/omap/Kconfig"
-source "drivers/media/platform/ti/omap3isp/Kconfig"
+source "drivers/media/platform/samsung/Kconfig"
+source "drivers/media/platform/stm/Kconfig"
+source "drivers/media/platform/ti/Kconfig"
source "drivers/media/platform/via/Kconfig"
source "drivers/media/platform/xilinx/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 2c5713ddac09..e5060cb891de 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -7,7 +7,7 @@
# (e. g. LC_ALL=C sort Makefile)
obj-y += allegro-dvt/
obj-y += allwinner/
-obj-y += amlogic/meson-ge2d/
+obj-y += amlogic/
obj-y += amphion/
obj-y += aspeed/
obj-y += atmel/
@@ -15,28 +15,14 @@ obj-y += cadence/
obj-y += chips-media/
obj-y += intel/
obj-y += marvell/
-obj-y += mediatek/mtk-jpeg/
-obj-y += mediatek/mtk-mdp/
-obj-y += mediatek/mtk-vcodec/
-obj-y += mediatek/mtk-vpu/
-obj-y += nvidia/tegra-vde/
+obj-y += mediatek/
+obj-y += nvidia/
obj-y += nxp/
-obj-y += qcom/camss/
-obj-y += qcom/venus/
+obj-y += qcom/
obj-y += renesas/
-obj-y += rockchip/rga/
-obj-y += rockchip/rkisp1/
-obj-y += samsung/exynos-gsc/
-obj-y += samsung/exynos4-is/
-obj-y += samsung/s3c-camif/
-obj-y += samsung/s5p-g2d/
-obj-y += samsung/s5p-jpeg/
-obj-y += samsung/s5p-mfc/
-obj-y += stm/sti/bdisp/
-obj-y += stm/sti/c8sectpfe/
-obj-y += stm/sti/delta/
-obj-y += stm/sti/hva/
-obj-y += stm/stm32/
+obj-y += rockchip/
+obj-y += samsung/
+obj-y += stm/
obj-y += ti/
obj-y += via/
obj-y += xilinx/
diff --git a/drivers/media/platform/amlogic/Kconfig b/drivers/media/platform/amlogic/Kconfig
new file mode 100644
index 000000000000..c67e00df6202
--- /dev/null
+++ b/drivers/media/platform/amlogic/Kconfig
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
+source "drivers/media/platform/amlogic/meson-ge2d/Kconfig"
diff --git a/drivers/media/platform/amlogic/Makefile b/drivers/media/platform/amlogic/Makefile
new file mode 100644
index 000000000000..d3cdb8fa4ddb
--- /dev/null
+++ b/drivers/media/platform/amlogic/Makefile
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-y += meson-ge2d/
diff --git a/drivers/media/platform/amphion/Kconfig b/drivers/media/platform/amphion/Kconfig
index 13899649f766..e0e8098965bd 100644
--- a/drivers/media/platform/amphion/Kconfig
+++ b/drivers/media/platform/amphion/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Amphion drivers"
+
config VIDEO_AMPHION_VPU
tristate "Amphion VPU (Video Processing Unit) Codec IP"
depends on V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/platform/mediatek/Kconfig b/drivers/media/platform/mediatek/Kconfig
new file mode 100644
index 000000000000..6d74839df3d6
--- /dev/null
+++ b/drivers/media/platform/mediatek/Kconfig
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
+source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
+source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
+source "drivers/media/platform/mediatek/mtk-vpu/Kconfig"
diff --git a/drivers/media/platform/mediatek/Makefile b/drivers/media/platform/mediatek/Makefile
new file mode 100644
index 000000000000..403d5ecd2b10
--- /dev/null
+++ b/drivers/media/platform/mediatek/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-y += mtk-jpeg/
+obj-y += mtk-mdp/
+obj-y += mtk-vcodec/
+obj-y += mtk-vpu/
diff --git a/drivers/media/platform/nvidia/Kconfig b/drivers/media/platform/nvidia/Kconfig
new file mode 100644
index 000000000000..1162e272b5f9
--- /dev/null
+++ b/drivers/media/platform/nvidia/Kconfig
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
+source "drivers/media/platform/nvidia/tegra-vde/Kconfig"
diff --git a/drivers/media/platform/qcom/Makefile b/drivers/media/platform/qcom/Makefile
new file mode 100644
index 000000000000..4f055c396e04
--- /dev/null
+++ b/drivers/media/platform/qcom/Makefile
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-y += camss/
+obj-y += venus/
diff --git a/drivers/media/platform/rockchip/Makefile b/drivers/media/platform/rockchip/Makefile
new file mode 100644
index 000000000000..4f782b876ac9
--- /dev/null
+++ b/drivers/media/platform/rockchip/Makefile
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-y += rga/
+obj-y += rkisp1/
diff --git a/drivers/media/platform/samsung/Kconfig b/drivers/media/platform/samsung/Kconfig
new file mode 100644
index 000000000000..94f30c1bca9b
--- /dev/null
+++ b/drivers/media/platform/samsung/Kconfig
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-only
+source "drivers/media/platform/samsung/exynos-gsc/Kconfig"
+source "drivers/media/platform/samsung/exynos4-is/Kconfig"
+source "drivers/media/platform/samsung/s3c-camif/Kconfig"
+source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
+source "drivers/media/platform/samsung/s5p-jpeg/Kconfig"
+source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
diff --git a/drivers/media/platform/samsung/Makefile b/drivers/media/platform/samsung/Makefile
new file mode 100644
index 000000000000..21fea3330e4b
--- /dev/null
+++ b/drivers/media/platform/samsung/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-y += exynos-gsc/
+obj-y += exynos4-is/
+obj-y += s3c-camif/
+obj-y += s5p-g2d/
+obj-y += s5p-jpeg/
+obj-y += s5p-mfc/
diff --git a/drivers/media/platform/stm/Kconfig b/drivers/media/platform/stm/Kconfig
new file mode 100644
index 000000000000..27942626a630
--- /dev/null
+++ b/drivers/media/platform/stm/Kconfig
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+source "drivers/media/platform/stm/sti/Kconfig"
+source "drivers/media/platform/stm/stm32/Kconfig"
diff --git a/drivers/media/platform/stm/Makefile b/drivers/media/platform/stm/Makefile
new file mode 100644
index 000000000000..a1f75b2a8225
--- /dev/null
+++ b/drivers/media/platform/stm/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-y += sti/bdisp/
+obj-y += sti/c8sectpfe/
+obj-y += sti/delta/
+obj-y += sti/hva/
+obj-y += stm32/
diff --git a/drivers/media/platform/stm/sti/Makefile b/drivers/media/platform/stm/sti/Makefile
new file mode 100644
index 000000000000..f9ce8169b040
--- /dev/null
+++ b/drivers/media/platform/stm/sti/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-y += bdisp/
+obj-y += c8sectpfe/
+obj-y += delta/
+obj-y += hva/
+obj-y += stm32/
diff --git a/drivers/media/platform/ti/Kconfig b/drivers/media/platform/ti/Kconfig
index 82e285c2de64..e1ab56c3be1f 100644
--- a/drivers/media/platform/ti/Kconfig
+++ b/drivers/media/platform/ti/Kconfig
@@ -62,3 +62,8 @@ config VIDEO_TI_VPE_DEBUG
depends on VIDEO_TI_VPE
help
Enable debug messages on VPE driver.
+
+source "drivers/media/platform/ti/am437x/Kconfig"
+source "drivers/media/platform/ti/davinci/Kconfig"
+source "drivers/media/platform/ti/omap/Kconfig"
+source "drivers/media/platform/ti/omap3isp/Kconfig"
diff --git a/drivers/media/platform/ti/Makefile b/drivers/media/platform/ti/Makefile
index bbc737ccbbea..98c5fe5c40d6 100644
--- a/drivers/media/platform/ti/Makefile
+++ b/drivers/media/platform/ti/Makefile
@@ -1,3 +1,7 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
+obj-y += am437x/
obj-y += cal/
obj-y += vpe/
+obj-y += davinci/
+obj-y += omap/
+obj-y += omap3isp/
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 64/67] media: platform/*/Kconfig: make manufacturer menus more uniform
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (29 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 63/67] media: platform: Create vendor/{Makefile, Kconfig} files Mauro Carvalho Chehab
@ 2022-03-14 16:34 ` Mauro Carvalho Chehab
2022-03-14 16:35 ` [PATCH v2 67/67] media: platform: rename mediatek/mtk-jpeg/ to mediatek/jpeg/ Mauro Carvalho Chehab
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:34 UTC (permalink / raw)
Cc: Alexandre Belloni, Heiko Stuebner, linux-aspeed, Eddie James,
Alexandre Torgue, Bjorn Andersson, Laurent Pinchart, linux-stm32,
Michael Tretter, openbmc, Michal Simek, Jernej Skrabec,
linux-rockchip, Ludovic Desroches, Andy Gross, Joel Stanley,
Philipp Zabel, linux-media, Jacopo Mondi, Maxime Coquelin,
linux-arm-msm, linux-mediatek, Matthias Brugger,
Mauro Carvalho Chehab, linux-arm-kernel, Hyun Kwon,
Andrew Jeffery, Robert Foss, linux-kernel,
Pengutronix Kernel Team, Hans Verkuil, Eugen Hristev
Do some adjustments at the per-vendor Kconfig, adding a comment at
the beginning in order to identify the manufacturer, and adjust
a few entries to make them look more uniform.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
drivers/media/platform/allegro-dvt/Kconfig | 3 +++
drivers/media/platform/amlogic/Kconfig | 3 +++
drivers/media/platform/aspeed/Kconfig | 3 +++
drivers/media/platform/atmel/Kconfig | 3 +++
drivers/media/platform/cadence/Kconfig | 13 +------------
drivers/media/platform/chips-media/Kconfig | 3 +++
drivers/media/platform/intel/Kconfig | 3 +++
drivers/media/platform/marvell/Kconfig | 3 +++
drivers/media/platform/mediatek/Kconfig | 3 +++
drivers/media/platform/nvidia/Kconfig | 3 +++
drivers/media/platform/nxp/Kconfig | 22 +++++-----------------
drivers/media/platform/qcom/Kconfig | 2 ++
drivers/media/platform/renesas/Kconfig | 2 ++
drivers/media/platform/rockchip/Kconfig | 3 +++
drivers/media/platform/samsung/Kconfig | 3 +++
drivers/media/platform/stm/Kconfig | 2 ++
drivers/media/platform/via/Kconfig | 3 +++
drivers/media/platform/xilinx/Kconfig | 7 +++----
18 files changed, 51 insertions(+), 33 deletions(-)
diff --git a/drivers/media/platform/allegro-dvt/Kconfig b/drivers/media/platform/allegro-dvt/Kconfig
index dd528e9d0958..674d234be5de 100644
--- a/drivers/media/platform/allegro-dvt/Kconfig
+++ b/drivers/media/platform/allegro-dvt/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Allegro DVT drivers"
+
config VIDEO_ALLEGRO_DVT
tristate "Allegro DVT Video IP Core"
depends on V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/platform/amlogic/Kconfig b/drivers/media/platform/amlogic/Kconfig
index c67e00df6202..c1376ec1fe23 100644
--- a/drivers/media/platform/amlogic/Kconfig
+++ b/drivers/media/platform/amlogic/Kconfig
@@ -1,2 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Amlogic drivers"
+
source "drivers/media/platform/amlogic/meson-ge2d/Kconfig"
diff --git a/drivers/media/platform/aspeed/Kconfig b/drivers/media/platform/aspeed/Kconfig
index 5025e892844c..153e3e5381d5 100644
--- a/drivers/media/platform/aspeed/Kconfig
+++ b/drivers/media/platform/aspeed/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Aspeed drivers"
+
config VIDEO_ASPEED
tristate "Aspeed AST2400 and AST2500 Video Engine driver"
depends on V4L_PLATFORM_DRIVERS
diff --git a/drivers/media/platform/atmel/Kconfig b/drivers/media/platform/atmel/Kconfig
index 5122290729ae..cef12629f4ef 100644
--- a/drivers/media/platform/atmel/Kconfig
+++ b/drivers/media/platform/atmel/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Atmel drivers"
+
config VIDEO_ATMEL_ISC
tristate "ATMEL Image Sensor Controller (ISC) support"
depends on V4L_PLATFORM_DRIVERS
diff --git a/drivers/media/platform/cadence/Kconfig b/drivers/media/platform/cadence/Kconfig
index 79a7e9fb2575..3ae6f4e51eec 100644
--- a/drivers/media/platform/cadence/Kconfig
+++ b/drivers/media/platform/cadence/Kconfig
@@ -1,15 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
-config VIDEO_CADENCE
- bool "Cadence Video Devices"
- depends on V4L_PLATFORM_DRIVERS
- help
- If you have a media device designed by Cadence, say Y.
- Note that this option doesn't include new drivers in the kernel:
- saying N will just cause Kconfig to skip all the questions about
- Cadence media devices.
-
-if VIDEO_CADENCE
+comment "Cadence drivers"
config VIDEO_CADENCE_CSI2RX
tristate "Cadence MIPI-CSI2 RX Controller"
@@ -34,5 +25,3 @@ config VIDEO_CADENCE_CSI2TX
To compile this driver as a module, choose M here: the module will be
called cdns-csi2tx.
-
-endif
diff --git a/drivers/media/platform/chips-media/Kconfig b/drivers/media/platform/chips-media/Kconfig
index ae495fd7b25a..adf466a05699 100644
--- a/drivers/media/platform/chips-media/Kconfig
+++ b/drivers/media/platform/chips-media/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Chips&Media drivers"
+
config VIDEO_CODA
tristate "Chips&Media Coda multi-standard codec IP"
depends on V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/platform/intel/Kconfig b/drivers/media/platform/intel/Kconfig
index aeda421f7248..8a730d9bcf52 100644
--- a/drivers/media/platform/intel/Kconfig
+++ b/drivers/media/platform/intel/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Intel drivers"
+
config VIDEO_PXA27x
tristate "PXA27x Quick Capture Interface driver"
depends on V4L_PLATFORM_DRIVERS
diff --git a/drivers/media/platform/marvell/Kconfig b/drivers/media/platform/marvell/Kconfig
index bfe655b2cedd..626e0673f12c 100644
--- a/drivers/media/platform/marvell/Kconfig
+++ b/drivers/media/platform/marvell/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Marvell drivers"
+
config VIDEO_CAFE_CCIC
tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"
depends on V4L_PLATFORM_DRIVERS
diff --git a/drivers/media/platform/mediatek/Kconfig b/drivers/media/platform/mediatek/Kconfig
index 6d74839df3d6..aa79626088ec 100644
--- a/drivers/media/platform/mediatek/Kconfig
+++ b/drivers/media/platform/mediatek/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Mediatek drivers"
+
source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
diff --git a/drivers/media/platform/nvidia/Kconfig b/drivers/media/platform/nvidia/Kconfig
index 1162e272b5f9..597402090680 100644
--- a/drivers/media/platform/nvidia/Kconfig
+++ b/drivers/media/platform/nvidia/Kconfig
@@ -1,2 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "NVidia drivers"
+
source "drivers/media/platform/nvidia/tegra-vde/Kconfig"
diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nxp/Kconfig
index df52d32ebe50..44a0d7c38936 100644
--- a/drivers/media/platform/nxp/Kconfig
+++ b/drivers/media/platform/nxp/Kconfig
@@ -2,20 +2,10 @@
# V4L drivers
-menuconfig VIDEO_IMX
- bool "V4L2 capture drivers for NXP i.MX devices"
- depends on V4L_PLATFORM_DRIVERS
- depends on ARCH_MXC || COMPILE_TEST
- depends on VIDEO_DEV && VIDEO_V4L2
- help
- Say yes here to enable support for capture drivers on i.MX SoCs.
- Support for the single SoC features are selectable in the sub-menu
- options.
-
-if VIDEO_IMX
+comment "NXP drivers"
config VIDEO_IMX_MIPI_CSIS
- tristate "MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models"
+ tristate "NXP MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models"
select MEDIA_CONTROLLER
select V4L2_FWNODE
select VIDEO_V4L2_SUBDEV_API
@@ -24,10 +14,8 @@ config VIDEO_IMX_MIPI_CSIS
Video4Linux2 sub-device driver for the MIPI CSI-2 CSIS receiver
v3.3/v3.6.3 found on some i.MX7 and i.MX8 SoCs.
-endif # VIDEO_IMX
-
config VIDEO_VIU
- tristate "Freescale/NXP VIU Video Driver"
+ tristate "NXP VIU Video Driver"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && (PPC_MPC512x || COMPILE_TEST) && I2C
select VIDEOBUF_DMA_CONTIG
@@ -42,7 +30,7 @@ config VIDEO_VIU
# mem2mem drivers
config VIDEO_IMX_PXP
- tristate "i.MX Pixel Pipeline (PXP)"
+ tristate "NXP i.MX Pixel Pipeline (PXP)"
depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST)
select VIDEOBUF2_DMA_CONTIG
@@ -52,7 +40,7 @@ config VIDEO_IMX_PXP
color space conversion, and rotation.
config VIDEO_MX2_EMMAPRP
- tristate "Freescale/NXP MX2 eMMa-PrP support"
+ tristate "NXP MX2 eMMa-PrP support"
depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && VIDEO_V4L2
depends on SOC_IMX27 || COMPILE_TEST
diff --git a/drivers/media/platform/qcom/Kconfig b/drivers/media/platform/qcom/Kconfig
index 9f6c91cc95ca..4a89587e932d 100644
--- a/drivers/media/platform/qcom/Kconfig
+++ b/drivers/media/platform/qcom/Kconfig
@@ -1,4 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
+comment "Qualcomm drivers"
+
source "drivers/media/platform/qcom/camss/Kconfig"
source "drivers/media/platform/qcom/venus/Kconfig"
diff --git a/drivers/media/platform/renesas/Kconfig b/drivers/media/platform/renesas/Kconfig
index 3f35f1b5106d..2e3a66ea95bd 100644
--- a/drivers/media/platform/renesas/Kconfig
+++ b/drivers/media/platform/renesas/Kconfig
@@ -1,5 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+comment "Renesas drivers"
+
# V4L drivers
config VIDEO_RCAR_ISP
diff --git a/drivers/media/platform/rockchip/Kconfig b/drivers/media/platform/rockchip/Kconfig
index 2f97c0e0268a..4351e3258d14 100644
--- a/drivers/media/platform/rockchip/Kconfig
+++ b/drivers/media/platform/rockchip/Kconfig
@@ -1,3 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Rockchip drivers"
+
source "drivers/media/platform/rockchip/rga/Kconfig"
source "drivers/media/platform/rockchip/rkisp1/Kconfig"
diff --git a/drivers/media/platform/samsung/Kconfig b/drivers/media/platform/samsung/Kconfig
index 94f30c1bca9b..c187cefbec5a 100644
--- a/drivers/media/platform/samsung/Kconfig
+++ b/drivers/media/platform/samsung/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Samsung drivers"
+
source "drivers/media/platform/samsung/exynos-gsc/Kconfig"
source "drivers/media/platform/samsung/exynos4-is/Kconfig"
source "drivers/media/platform/samsung/s3c-camif/Kconfig"
diff --git a/drivers/media/platform/stm/Kconfig b/drivers/media/platform/stm/Kconfig
index 27942626a630..58cbb6b888bf 100644
--- a/drivers/media/platform/stm/Kconfig
+++ b/drivers/media/platform/stm/Kconfig
@@ -1,4 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
+comment "STMicroelectronics drivers"
+
source "drivers/media/platform/stm/sti/Kconfig"
source "drivers/media/platform/stm/stm32/Kconfig"
diff --git a/drivers/media/platform/via/Kconfig b/drivers/media/platform/via/Kconfig
index 1dcf789dce96..f4f4293cf25c 100644
--- a/drivers/media/platform/via/Kconfig
+++ b/drivers/media/platform/via/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "VIA drivers"
+
config VIDEO_VIA_CAMERA
tristate "VIAFB camera controller support"
depends on V4L_PLATFORM_DRIVERS
diff --git a/drivers/media/platform/xilinx/Kconfig b/drivers/media/platform/xilinx/Kconfig
index a9531d5efd50..47f1eeb5d669 100644
--- a/drivers/media/platform/xilinx/Kconfig
+++ b/drivers/media/platform/xilinx/Kconfig
@@ -1,5 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
+comment "Xilinx drivers"
+
config VIDEO_XILINX
tristate "Xilinx Video IP (EXPERIMENTAL)"
depends on V4L_PLATFORM_DRIVERS
@@ -11,9 +13,8 @@ config VIDEO_XILINX
help
Driver for Xilinx Video IP Pipelines
-if VIDEO_XILINX
-
config VIDEO_XILINX_CSI2RXSS
+ depends on VIDEO_XILINX
tristate "Xilinx CSI-2 Rx Subsystem"
help
Driver for Xilinx MIPI CSI-2 Rx Subsystem. This is a V4L sub-device
@@ -32,5 +33,3 @@ config VIDEO_XILINX_VTC
depends on VIDEO_XILINX
help
Driver for the Xilinx Video Timing Controller
-
-endif #VIDEO_XILINX
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PATCH v2 67/67] media: platform: rename mediatek/mtk-jpeg/ to mediatek/jpeg/
[not found] <cover.1647274406.git.mchehab@kernel.org>
` (30 preceding siblings ...)
2022-03-14 16:34 ` [PATCH v2 64/67] media: platform/*/Kconfig: make manufacturer menus more uniform Mauro Carvalho Chehab
@ 2022-03-14 16:35 ` Mauro Carvalho Chehab
31 siblings, 0 replies; 41+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 16:35 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Alexandre Courbot, Andrew-CT Chen,
AngeloGioacchino Del Regno, Arnd Bergmann, Bin Liu, Cai Huoqing,
Christophe JAILLET, Colin Ian King, Dafna Hirschfeld,
Ding Senjie, Evan Green, Hans Verkuil, Hirokazu Honda,
Houlong Wei, Irui Wang, Jacopo Mondi, Jiasheng Jiang,
Jonathan Cameron, Kieran Bingham, Lad Prabhakar,
Laurent Pinchart, Maoguang Meng, Matthias Brugger, Minghsiu Tsai,
Nicolas Dufresne, Rick Chang, Steve Cho, Tiffany Lin,
Tzung-Bi Shih, Xu Wang, Yong Wu, Yunfei Dong, linux-arm-kernel,
linux-kernel, linux-media, linux-mediatek
As the end goal is to have platform drivers split by vendor,
rename mediatek/mtk-jpeg/ to mediatek/jpeg/.
Requested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab@kernel.org/
MAINTAINERS | 10 +++++-----
drivers/media/platform/mediatek/Kconfig | 8 ++++----
drivers/media/platform/mediatek/Makefile | 8 ++++----
.../media/platform/mediatek/{mtk-jpeg => jpeg}/Kconfig | 0
.../platform/mediatek/{mtk-jpeg => jpeg}/Makefile | 0
.../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_core.c | 0
.../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_core.h | 0
.../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_hw.c | 0
.../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_hw.h | 0
.../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_parse.c | 0
.../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_parse.h | 0
.../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_reg.h | 0
.../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_enc_hw.c | 0
.../mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_enc_hw.h | 0
.../media/platform/mediatek/{mtk-mdp => mdp}/Kconfig | 0
.../media/platform/mediatek/{mtk-mdp => mdp}/Makefile | 2 +-
.../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_comp.c | 0
.../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_comp.h | 0
.../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_core.c | 0
.../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_core.h | 0
.../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_ipi.h | 0
.../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_m2m.c | 0
.../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_m2m.h | 0
.../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_regs.c | 0
.../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_regs.h | 0
.../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_vpu.c | 0
.../platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_vpu.h | 0
.../platform/mediatek/{mtk-vcodec => vcodec}/Kconfig | 0
.../platform/mediatek/{mtk-vcodec => vcodec}/Makefile | 0
.../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec.c | 0
.../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec.h | 0
.../{mtk-vcodec => vcodec}/mtk_vcodec_dec_drv.c | 0
.../{mtk-vcodec => vcodec}/mtk_vcodec_dec_hw.c | 0
.../{mtk-vcodec => vcodec}/mtk_vcodec_dec_hw.h | 0
.../{mtk-vcodec => vcodec}/mtk_vcodec_dec_pm.c | 0
.../{mtk-vcodec => vcodec}/mtk_vcodec_dec_pm.h | 0
.../{mtk-vcodec => vcodec}/mtk_vcodec_dec_stateful.c | 0
.../{mtk-vcodec => vcodec}/mtk_vcodec_dec_stateless.c | 0
.../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_drv.h | 0
.../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_enc.c | 0
.../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_enc.h | 0
.../{mtk-vcodec => vcodec}/mtk_vcodec_enc_drv.c | 0
.../{mtk-vcodec => vcodec}/mtk_vcodec_enc_pm.c | 0
.../{mtk-vcodec => vcodec}/mtk_vcodec_enc_pm.h | 0
.../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_fw.c | 0
.../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_fw.h | 2 +-
.../{mtk-vcodec => vcodec}/mtk_vcodec_fw_priv.h | 0
.../{mtk-vcodec => vcodec}/mtk_vcodec_fw_scp.c | 0
.../{mtk-vcodec => vcodec}/mtk_vcodec_fw_vpu.c | 0
.../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_intr.c | 0
.../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_intr.h | 0
.../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_util.c | 0
.../mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_util.h | 0
.../{mtk-vcodec => vcodec}/vdec/vdec_h264_if.c | 0
.../{mtk-vcodec => vcodec}/vdec/vdec_h264_req_if.c | 0
.../mediatek/{mtk-vcodec => vcodec}/vdec/vdec_vp8_if.c | 0
.../mediatek/{mtk-vcodec => vcodec}/vdec/vdec_vp9_if.c | 0
.../mediatek/{mtk-vcodec => vcodec}/vdec_drv_base.h | 0
.../mediatek/{mtk-vcodec => vcodec}/vdec_drv_if.c | 0
.../mediatek/{mtk-vcodec => vcodec}/vdec_drv_if.h | 0
.../mediatek/{mtk-vcodec => vcodec}/vdec_ipi_msg.h | 0
.../mediatek/{mtk-vcodec => vcodec}/vdec_msg_queue.c | 0
.../mediatek/{mtk-vcodec => vcodec}/vdec_msg_queue.h | 0
.../mediatek/{mtk-vcodec => vcodec}/vdec_vpu_if.c | 0
.../mediatek/{mtk-vcodec => vcodec}/vdec_vpu_if.h | 0
.../{mtk-vcodec => vcodec}/venc/venc_h264_if.c | 0
.../mediatek/{mtk-vcodec => vcodec}/venc/venc_vp8_if.c | 0
.../mediatek/{mtk-vcodec => vcodec}/venc_drv_base.h | 0
.../mediatek/{mtk-vcodec => vcodec}/venc_drv_if.c | 0
.../mediatek/{mtk-vcodec => vcodec}/venc_drv_if.h | 0
.../mediatek/{mtk-vcodec => vcodec}/venc_ipi_msg.h | 0
.../mediatek/{mtk-vcodec => vcodec}/venc_vpu_if.c | 0
.../mediatek/{mtk-vcodec => vcodec}/venc_vpu_if.h | 0
.../media/platform/mediatek/{mtk-vpu => vpu}/Kconfig | 0
.../media/platform/mediatek/{mtk-vpu => vpu}/Makefile | 0
.../media/platform/mediatek/{mtk-vpu => vpu}/mtk_vpu.c | 0
.../media/platform/mediatek/{mtk-vpu => vpu}/mtk_vpu.h | 0
77 files changed, 15 insertions(+), 15 deletions(-)
rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/Kconfig (100%)
rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/Makefile (100%)
rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_core.c (100%)
rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_core.h (100%)
rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_hw.c (100%)
rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_hw.h (100%)
rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_parse.c (100%)
rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_parse.h (100%)
rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_dec_reg.h (100%)
rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_enc_hw.c (100%)
rename drivers/media/platform/mediatek/{mtk-jpeg => jpeg}/mtk_jpeg_enc_hw.h (100%)
rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/Kconfig (100%)
rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/Makefile (77%)
rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_comp.c (100%)
rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_comp.h (100%)
rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_core.c (100%)
rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_core.h (100%)
rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_ipi.h (100%)
rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_m2m.c (100%)
rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_m2m.h (100%)
rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_regs.c (100%)
rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_regs.h (100%)
rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_vpu.c (100%)
rename drivers/media/platform/mediatek/{mtk-mdp => mdp}/mtk_mdp_vpu.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/Kconfig (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/Makefile (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec_drv.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec_hw.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec_hw.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec_pm.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec_pm.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec_stateful.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_dec_stateless.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_drv.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_enc.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_enc.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_enc_drv.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_enc_pm.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_enc_pm.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_fw.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_fw.h (97%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_fw_priv.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_fw_scp.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_fw_vpu.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_intr.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_intr.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_util.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/mtk_vcodec_util.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec/vdec_h264_if.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec/vdec_h264_req_if.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec/vdec_vp8_if.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec/vdec_vp9_if.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec_drv_base.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec_drv_if.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec_drv_if.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec_ipi_msg.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec_msg_queue.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec_msg_queue.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec_vpu_if.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/vdec_vpu_if.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/venc/venc_h264_if.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/venc/venc_vp8_if.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/venc_drv_base.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/venc_drv_if.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/venc_drv_if.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/venc_ipi_msg.h (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/venc_vpu_if.c (100%)
rename drivers/media/platform/mediatek/{mtk-vcodec => vcodec}/venc_vpu_if.h (100%)
rename drivers/media/platform/mediatek/{mtk-vpu => vpu}/Kconfig (100%)
rename drivers/media/platform/mediatek/{mtk-vpu => vpu}/Makefile (100%)
rename drivers/media/platform/mediatek/{mtk-vpu => vpu}/mtk_vpu.c (100%)
rename drivers/media/platform/mediatek/{mtk-vpu => vpu}/mtk_vpu.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 81ce7b4e2b2a..152fef3163e5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12130,7 +12130,7 @@ M: Rick Chang <rick.chang@mediatek.com>
M: Bin Liu <bin.liu@mediatek.com>
S: Supported
F: Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
-F: drivers/media/platform/mediatek/mtk-jpeg/
+F: drivers/media/platform/mediatek/jpeg/
MEDIATEK MDP DRIVER
M: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
@@ -12138,8 +12138,8 @@ M: Houlong Wei <houlong.wei@mediatek.com>
M: Andrew-CT Chen <andrew-ct.chen@mediatek.com>
S: Supported
F: Documentation/devicetree/bindings/media/mediatek-mdp.txt
-F: drivers/media/platform/mediatek/mtk-mdp/
-F: drivers/media/platform/mediatek/mtk-vpu/
+F: drivers/media/platform/mediatek/mdp/
+F: drivers/media/platform/mediatek/vpu/
MEDIATEK MEDIA DRIVER
M: Tiffany Lin <tiffany.lin@mediatek.com>
@@ -12147,8 +12147,8 @@ M: Andrew-CT Chen <andrew-ct.chen@mediatek.com>
S: Supported
F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt
F: Documentation/devicetree/bindings/media/mediatek-vpu.txt
-F: drivers/media/platform/mediatek/mtk-vcodec/
-F: drivers/media/platform/mediatek/mtk-vpu/
+F: drivers/media/platform/mediatek/vcodec/
+F: drivers/media/platform/mediatek/vpu/
MEDIATEK MMC/SD/SDIO DRIVER
M: Chaotian Jing <chaotian.jing@mediatek.com>
diff --git a/drivers/media/platform/mediatek/Kconfig b/drivers/media/platform/mediatek/Kconfig
index aa79626088ec..122eb94ed430 100644
--- a/drivers/media/platform/mediatek/Kconfig
+++ b/drivers/media/platform/mediatek/Kconfig
@@ -2,7 +2,7 @@
comment "Mediatek drivers"
-source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
-source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
-source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
-source "drivers/media/platform/mediatek/mtk-vpu/Kconfig"
+source "drivers/media/platform/mediatek/jpeg/Kconfig"
+source "drivers/media/platform/mediatek/mdp/Kconfig"
+source "drivers/media/platform/mediatek/vcodec/Kconfig"
+source "drivers/media/platform/mediatek/vpu/Kconfig"
diff --git a/drivers/media/platform/mediatek/Makefile b/drivers/media/platform/mediatek/Makefile
index 403d5ecd2b10..d3850a13f128 100644
--- a/drivers/media/platform/mediatek/Makefile
+++ b/drivers/media/platform/mediatek/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
-obj-y += mtk-jpeg/
-obj-y += mtk-mdp/
-obj-y += mtk-vcodec/
-obj-y += mtk-vpu/
+obj-y += jpeg/
+obj-y += mdp/
+obj-y += vcodec/
+obj-y += vpu/
diff --git a/drivers/media/platform/mediatek/mtk-jpeg/Kconfig b/drivers/media/platform/mediatek/jpeg/Kconfig
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-jpeg/Kconfig
rename to drivers/media/platform/mediatek/jpeg/Kconfig
diff --git a/drivers/media/platform/mediatek/mtk-jpeg/Makefile b/drivers/media/platform/mediatek/jpeg/Makefile
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-jpeg/Makefile
rename to drivers/media/platform/mediatek/jpeg/Makefile
diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.c
rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.h
rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.c
rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.h
rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h
diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.c
rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c
diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.h
rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.h
diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_reg.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_reg.h
rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h
diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.c
rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
diff --git a/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.h
rename to drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.h
diff --git a/drivers/media/platform/mediatek/mtk-mdp/Kconfig b/drivers/media/platform/mediatek/mdp/Kconfig
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-mdp/Kconfig
rename to drivers/media/platform/mediatek/mdp/Kconfig
diff --git a/drivers/media/platform/mediatek/mtk-mdp/Makefile b/drivers/media/platform/mediatek/mdp/Makefile
similarity index 77%
rename from drivers/media/platform/mediatek/mtk-mdp/Makefile
rename to drivers/media/platform/mediatek/mdp/Makefile
index eab6f984aeea..b7c16ebecc80 100644
--- a/drivers/media/platform/mediatek/mtk-mdp/Makefile
+++ b/drivers/media/platform/mediatek/mdp/Makefile
@@ -7,4 +7,4 @@ mtk-mdp-y += mtk_mdp_vpu.o
obj-$(CONFIG_VIDEO_MEDIATEK_MDP) += mtk-mdp.o
-ccflags-y += -I$(srctree)/drivers/media/platform/mediatek/mtk-vpu
+ccflags-y += -I$(srctree)/drivers/media/platform/mediatek/vpu
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c
rename to drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mediatek/mdp/mtk_mdp_comp.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h
rename to drivers/media/platform/mediatek/mdp/mtk_mdp_comp.h
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mediatek/mdp/mtk_mdp_core.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c
rename to drivers/media/platform/mediatek/mdp/mtk_mdp_core.c
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h b/drivers/media/platform/mediatek/mdp/mtk_mdp_core.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h
rename to drivers/media/platform/mediatek/mdp/mtk_mdp_core.h
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h b/drivers/media/platform/mediatek/mdp/mtk_mdp_ipi.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h
rename to drivers/media/platform/mediatek/mdp/mtk_mdp_ipi.h
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c
rename to drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h b/drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h
rename to drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.h
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c b/drivers/media/platform/mediatek/mdp/mtk_mdp_regs.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c
rename to drivers/media/platform/mediatek/mdp/mtk_mdp_regs.c
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h b/drivers/media/platform/mediatek/mdp/mtk_mdp_regs.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h
rename to drivers/media/platform/mediatek/mdp/mtk_mdp_regs.h
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c b/drivers/media/platform/mediatek/mdp/mtk_mdp_vpu.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c
rename to drivers/media/platform/mediatek/mdp/mtk_mdp_vpu.c
diff --git a/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h b/drivers/media/platform/mediatek/mdp/mtk_mdp_vpu.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h
rename to drivers/media/platform/mediatek/mdp/mtk_mdp_vpu.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/Kconfig b/drivers/media/platform/mediatek/vcodec/Kconfig
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/Kconfig
rename to drivers/media/platform/mediatek/vcodec/Kconfig
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/Makefile b/drivers/media/platform/mediatek/vcodec/Makefile
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/Makefile
rename to drivers/media/platform/mediatek/vcodec/Makefile
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_hw.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_hw.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_hw.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_hw.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_pm.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_pm.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_pm.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_pm.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw.h
similarity index 97%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw.h
index 539bb626772c..15ab6b8e3ae2 100644
--- a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw.h
@@ -6,7 +6,7 @@
#include <linux/remoteproc.h>
#include <linux/remoteproc/mtk_scp.h>
-#include "../mtk-vpu/mtk_vpu.h"
+#include "../vpu/mtk_vpu.h"
struct mtk_vcodec_dev;
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_priv.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_priv.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_scp.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_scp.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_vpu.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_vpu.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_intr.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_intr.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_intr.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_intr.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h
rename to drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_if.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c
rename to drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_if.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_if.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c
rename to drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_if.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp8_if.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c
rename to drivers/media/platform/mediatek/vcodec/vdec/vdec_vp8_if.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_if.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c
rename to drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_if.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h b/drivers/media/platform/mediatek/vcodec/vdec_drv_base.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h
rename to drivers/media/platform/mediatek/vcodec/vdec_drv_base.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c b/drivers/media/platform/mediatek/vcodec/vdec_drv_if.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c
rename to drivers/media/platform/mediatek/vcodec/vdec_drv_if.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h b/drivers/media/platform/mediatek/vcodec/vdec_drv_if.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h
rename to drivers/media/platform/mediatek/vcodec/vdec_drv_if.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h b/drivers/media/platform/mediatek/vcodec/vdec_ipi_msg.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h
rename to drivers/media/platform/mediatek/vcodec/vdec_ipi_msg.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c b/drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c
rename to drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h b/drivers/media/platform/mediatek/vcodec/vdec_msg_queue.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h
rename to drivers/media/platform/mediatek/vcodec/vdec_msg_queue.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c b/drivers/media/platform/mediatek/vcodec/vdec_vpu_if.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c
rename to drivers/media/platform/mediatek/vcodec/vdec_vpu_if.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h b/drivers/media/platform/mediatek/vcodec/vdec_vpu_if.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h
rename to drivers/media/platform/mediatek/vcodec/vdec_vpu_if.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mediatek/vcodec/venc/venc_h264_if.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c
rename to drivers/media/platform/mediatek/vcodec/venc/venc_h264_if.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mediatek/vcodec/venc/venc_vp8_if.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c
rename to drivers/media/platform/mediatek/vcodec/venc/venc_vp8_if.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h b/drivers/media/platform/mediatek/vcodec/venc_drv_base.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h
rename to drivers/media/platform/mediatek/vcodec/venc_drv_base.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c b/drivers/media/platform/mediatek/vcodec/venc_drv_if.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c
rename to drivers/media/platform/mediatek/vcodec/venc_drv_if.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h b/drivers/media/platform/mediatek/vcodec/venc_drv_if.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h
rename to drivers/media/platform/mediatek/vcodec/venc_drv_if.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h b/drivers/media/platform/mediatek/vcodec/venc_ipi_msg.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h
rename to drivers/media/platform/mediatek/vcodec/venc_ipi_msg.h
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c b/drivers/media/platform/mediatek/vcodec/venc_vpu_if.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c
rename to drivers/media/platform/mediatek/vcodec/venc_vpu_if.c
diff --git a/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h b/drivers/media/platform/mediatek/vcodec/venc_vpu_if.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
rename to drivers/media/platform/mediatek/vcodec/venc_vpu_if.h
diff --git a/drivers/media/platform/mediatek/mtk-vpu/Kconfig b/drivers/media/platform/mediatek/vpu/Kconfig
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vpu/Kconfig
rename to drivers/media/platform/mediatek/vpu/Kconfig
diff --git a/drivers/media/platform/mediatek/mtk-vpu/Makefile b/drivers/media/platform/mediatek/vpu/Makefile
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vpu/Makefile
rename to drivers/media/platform/mediatek/vpu/Makefile
diff --git a/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mediatek/vpu/mtk_vpu.c
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c
rename to drivers/media/platform/mediatek/vpu/mtk_vpu.c
diff --git a/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h b/drivers/media/platform/mediatek/vpu/mtk_vpu.h
similarity index 100%
rename from drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h
rename to drivers/media/platform/mediatek/vpu/mtk_vpu.h
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 41+ messages in thread