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 <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/[email protected]/
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 74901acf8f06..b1418853d56f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17103,7 +17103,7 @@ M: Sylwester Nawrocki <[email protected]>
L: [email protected]
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 <[email protected]>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 2e3925408aa0..1bbada840723 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -75,7 +75,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 7a28b60dbbe6..613ca6a3efa7 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -15,7 +15,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