media: platform: rename davinci/ to ti/davinci/

As the end goal is to have platform drivers split by vendor,
rename davinci/ to ti/davinci/.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst b/Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst
index f096167..4e87bdb 100644 (file)
--- a/Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst
+++ b/Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst
@@ -7,22 +7,22 @@ File partitioning
 -----------------
 
  V4L2 display device driver
-         drivers/media/platform/davinci/vpbe_display.c
-         drivers/media/platform/davinci/vpbe_display.h
+         drivers/media/platform/ti/davinci/vpbe_display.c
+         drivers/media/platform/ti/davinci/vpbe_display.h
 
  VPBE display controller
-         drivers/media/platform/davinci/vpbe.c
-         drivers/media/platform/davinci/vpbe.h
+         drivers/media/platform/ti/davinci/vpbe.c
+         drivers/media/platform/ti/davinci/vpbe.h
 
  VPBE venc sub device driver
-         drivers/media/platform/davinci/vpbe_venc.c
-         drivers/media/platform/davinci/vpbe_venc.h
-         drivers/media/platform/davinci/vpbe_venc_regs.h
+         drivers/media/platform/ti/davinci/vpbe_venc.c
+         drivers/media/platform/ti/davinci/vpbe_venc.h
+         drivers/media/platform/ti/davinci/vpbe_venc_regs.h
 
  VPBE osd driver
-         drivers/media/platform/davinci/vpbe_osd.c
-         drivers/media/platform/davinci/vpbe_osd.h
-         drivers/media/platform/davinci/vpbe_osd_regs.h
+         drivers/media/platform/ti/davinci/vpbe_osd.c
+         drivers/media/platform/ti/davinci/vpbe_osd.h
+         drivers/media/platform/ti/davinci/vpbe_osd_regs.h
 
 To be done
 ----------

diff --git a/MAINTAINERS b/MAINTAINERS
index e56c61a..dafcff4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -19321,7 +19321,7 @@ S:      Maintained
 W:     https://linuxtv.org
 Q:     http://patchwork.linuxtv.org/project/linux-media/list/
 T:     git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
-F:     drivers/media/platform/davinci/
+F:     drivers/media/platform/ti/davinci/
 F:     include/media/davinci/
 
 TI ENHANCED QUADRATURE ENCODER PULSE (eQEP) DRIVER

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index f1a1a08..9873448 100644 (file)
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -73,7 +73,6 @@ source "drivers/media/platform/aspeed/Kconfig"
 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/intel/Kconfig"
 source "drivers/media/platform/marvell/Kconfig"
 source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
@@ -98,6 +97,7 @@ source "drivers/media/platform/st/sti/Kconfig"
 source "drivers/media/platform/st/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/via/Kconfig"
 source "drivers/media/platform/xilinx/Kconfig"
 

diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 2a23f30..d7557b2 100644 (file)
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -13,7 +13,6 @@ obj-y += aspeed/
 obj-y += atmel/
 obj-y += cadence/
 obj-y += chips-media/
-obj-y += davinci/
 obj-y += intel/
 obj-y += marvell/
 obj-y += mediatek/mtk-jpeg/
@@ -43,6 +42,7 @@ obj-y += st/sti/hva/
 obj-y += st/stm32/
 obj-y += ti-vpe/
 obj-y += ti/am437x/
+obj-y += ti/davinci/
 obj-y += via/
 obj-y += xilinx/
 

diff --git a/drivers/media/platform/davinci/Kconfig b/drivers/media/platform/ti/davinci/Kconfig
similarity index 100%
rename from drivers/media/platform/davinci/Kconfig
rename to drivers/media/platform/ti/davinci/Kconfig

diff --git a/drivers/media/platform/davinci/Makefile b/drivers/media/platform/ti/davinci/Makefile
similarity index 100%
rename from drivers/media/platform/davinci/Makefile
rename to drivers/media/platform/ti/davinci/Makefile

diff --git a/drivers/media/platform/davinci/ccdc_hw_device.h b/drivers/media/platform/ti/davinci/ccdc_hw_device.h
similarity index 100%
rename from drivers/media/platform/davinci/ccdc_hw_device.h
rename to drivers/media/platform/ti/davinci/ccdc_hw_device.h

diff --git a/drivers/media/platform/davinci/dm355_ccdc.c b/drivers/media/platform/ti/davinci/dm355_ccdc.c
similarity index 100%
rename from drivers/media/platform/davinci/dm355_ccdc.c
rename to drivers/media/platform/ti/davinci/dm355_ccdc.c

diff --git a/drivers/media/platform/davinci/dm355_ccdc_regs.h b/drivers/media/platform/ti/davinci/dm355_ccdc_regs.h
similarity index 100%
rename from drivers/media/platform/davinci/dm355_ccdc_regs.h
rename to drivers/media/platform/ti/davinci/dm355_ccdc_regs.h

diff --git a/drivers/media/platform/davinci/dm644x_ccdc.c b/drivers/media/platform/ti/davinci/dm644x_ccdc.c
similarity index 100%
rename from drivers/media/platform/davinci/dm644x_ccdc.c
rename to drivers/media/platform/ti/davinci/dm644x_ccdc.c

diff --git a/drivers/media/platform/davinci/dm644x_ccdc_regs.h b/drivers/media/platform/ti/davinci/dm644x_ccdc_regs.h
similarity index 100%
rename from drivers/media/platform/davinci/dm644x_ccdc_regs.h
rename to drivers/media/platform/ti/davinci/dm644x_ccdc_regs.h

diff --git a/drivers/media/platform/davinci/isif.c b/drivers/media/platform/ti/davinci/isif.c
similarity index 100%
rename from drivers/media/platform/davinci/isif.c
rename to drivers/media/platform/ti/davinci/isif.c

diff --git a/drivers/media/platform/davinci/isif_regs.h b/drivers/media/platform/ti/davinci/isif_regs.h
similarity index 100%
rename from drivers/media/platform/davinci/isif_regs.h
rename to drivers/media/platform/ti/davinci/isif_regs.h

diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/ti/davinci/vpbe.c
similarity index 100%
rename from drivers/media/platform/davinci/vpbe.c
rename to drivers/media/platform/ti/davinci/vpbe.c

diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/ti/davinci/vpbe_display.c
similarity index 100%
rename from drivers/media/platform/davinci/vpbe_display.c
rename to drivers/media/platform/ti/davinci/vpbe_display.c

diff --git a/drivers/media/platform/davinci/vpbe_osd.c b/drivers/media/platform/ti/davinci/vpbe_osd.c
similarity index 100%
rename from drivers/media/platform/davinci/vpbe_osd.c
rename to drivers/media/platform/ti/davinci/vpbe_osd.c

diff --git a/drivers/media/platform/davinci/vpbe_osd_regs.h b/drivers/media/platform/ti/davinci/vpbe_osd_regs.h
similarity index 100%
rename from drivers/media/platform/davinci/vpbe_osd_regs.h
rename to drivers/media/platform/ti/davinci/vpbe_osd_regs.h

diff --git a/drivers/media/platform/davinci/vpbe_venc.c b/drivers/media/platform/ti/davinci/vpbe_venc.c
similarity index 100%
rename from drivers/media/platform/davinci/vpbe_venc.c
rename to drivers/media/platform/ti/davinci/vpbe_venc.c

diff --git a/drivers/media/platform/davinci/vpbe_venc_regs.h b/drivers/media/platform/ti/davinci/vpbe_venc_regs.h
similarity index 100%
rename from drivers/media/platform/davinci/vpbe_venc_regs.h
rename to drivers/media/platform/ti/davinci/vpbe_venc_regs.h

diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/ti/davinci/vpfe_capture.c
similarity index 100%
rename from drivers/media/platform/davinci/vpfe_capture.c
rename to drivers/media/platform/ti/davinci/vpfe_capture.c

diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/ti/davinci/vpif.c
similarity index 100%
rename from drivers/media/platform/davinci/vpif.c
rename to drivers/media/platform/ti/davinci/vpif.c

diff --git a/drivers/media/platform/davinci/vpif.h b/drivers/media/platform/ti/davinci/vpif.h
similarity index 100%
rename from drivers/media/platform/davinci/vpif.h
rename to drivers/media/platform/ti/davinci/vpif.h

diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/ti/davinci/vpif_capture.c
similarity index 100%
rename from drivers/media/platform/davinci/vpif_capture.c
rename to drivers/media/platform/ti/davinci/vpif_capture.c

diff --git a/drivers/media/platform/davinci/vpif_capture.h b/drivers/media/platform/ti/davinci/vpif_capture.h
similarity index 100%
rename from drivers/media/platform/davinci/vpif_capture.h
rename to drivers/media/platform/ti/davinci/vpif_capture.h

diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/ti/davinci/vpif_display.c
similarity index 100%
rename from drivers/media/platform/davinci/vpif_display.c
rename to drivers/media/platform/ti/davinci/vpif_display.c

diff --git a/drivers/media/platform/davinci/vpif_display.h b/drivers/media/platform/ti/davinci/vpif_display.h
similarity index 100%
rename from drivers/media/platform/davinci/vpif_display.h
rename to drivers/media/platform/ti/davinci/vpif_display.h

diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/ti/davinci/vpss.c
similarity index 100%
rename from drivers/media/platform/davinci/vpss.c
rename to drivers/media/platform/ti/davinci/vpss.c