lkml.org 
[lkml]   [2022]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 61/67] media: platform: re-structure TI drivers
    Date
    From: Pratyush Yadav <p.yadav@ti.com>

    The ti-vpe/ sub-directory does not only contain the VPE-specific things.
    It also contains the CAL driver, which is a completely different
    subsystem. This is also not a good place to add new drivers for other TI
    platforms since they will all get mixed up.

    Separate the VPE and CAL parts into different sub-directories and rename
    the ti-vpe/ sub-directory to ti/. This is now the place where new TI
    platform drivers can be added.

    [mchehab: rebased to apple on the top of media/platform/Kconfig series]
    Signed-off-by: Pratyush Yadav <p.yadav@ti.com>
    Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
    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 | 3 ++-
    drivers/media/platform/Makefile | 6 +-----
    drivers/media/platform/ti/Makefile | 3 +++
    drivers/media/platform/ti/cal/Makefile | 3 +++
    drivers/media/platform/{ti-vpe => ti/cal}/cal-camerarx.c | 0
    drivers/media/platform/{ti-vpe => ti/cal}/cal-video.c | 0
    drivers/media/platform/{ti-vpe => ti/cal}/cal.c | 0
    drivers/media/platform/{ti-vpe => ti/cal}/cal.h | 0
    drivers/media/platform/{ti-vpe => ti/cal}/cal_regs.h | 0
    drivers/media/platform/{ti-vpe => ti/vpe}/Makefile | 4 ----
    drivers/media/platform/{ti-vpe => ti/vpe}/csc.c | 0
    drivers/media/platform/{ti-vpe => ti/vpe}/csc.h | 0
    drivers/media/platform/{ti-vpe => ti/vpe}/sc.c | 0
    drivers/media/platform/{ti-vpe => ti/vpe}/sc.h | 0
    drivers/media/platform/{ti-vpe => ti/vpe}/sc_coeff.h | 0
    drivers/media/platform/{ti-vpe => ti/vpe}/vpdma.c | 0
    drivers/media/platform/{ti-vpe => ti/vpe}/vpdma.h | 0
    drivers/media/platform/{ti-vpe => ti/vpe}/vpdma_priv.h | 0
    drivers/media/platform/{ti-vpe => ti/vpe}/vpe.c | 0
    drivers/media/platform/{ti-vpe => ti/vpe}/vpe_regs.h | 0
    20 files changed, 9 insertions(+), 10 deletions(-)
    create mode 100644 drivers/media/platform/ti/Makefile
    create mode 100644 drivers/media/platform/ti/cal/Makefile
    rename drivers/media/platform/{ti-vpe => ti/cal}/cal-camerarx.c (100%)
    rename drivers/media/platform/{ti-vpe => ti/cal}/cal-video.c (100%)
    rename drivers/media/platform/{ti-vpe => ti/cal}/cal.c (100%)
    rename drivers/media/platform/{ti-vpe => ti/cal}/cal.h (100%)
    rename drivers/media/platform/{ti-vpe => ti/cal}/cal_regs.h (100%)
    rename drivers/media/platform/{ti-vpe => ti/vpe}/Makefile (78%)
    rename drivers/media/platform/{ti-vpe => ti/vpe}/csc.c (100%)
    rename drivers/media/platform/{ti-vpe => ti/vpe}/csc.h (100%)
    rename drivers/media/platform/{ti-vpe => ti/vpe}/sc.c (100%)
    rename drivers/media/platform/{ti-vpe => ti/vpe}/sc.h (100%)
    rename drivers/media/platform/{ti-vpe => ti/vpe}/sc_coeff.h (100%)
    rename drivers/media/platform/{ti-vpe => ti/vpe}/vpdma.c (100%)
    rename drivers/media/platform/{ti-vpe => ti/vpe}/vpdma.h (100%)
    rename drivers/media/platform/{ti-vpe => ti/vpe}/vpdma_priv.h (100%)
    rename drivers/media/platform/{ti-vpe => ti/vpe}/vpe.c (100%)
    rename drivers/media/platform/{ti-vpe => ti/vpe}/vpe_regs.h (100%)

    diff --git a/MAINTAINERS b/MAINTAINERS
    index 6c892fc9595b..81ce7b4e2b2a 100644
    --- a/MAINTAINERS
    +++ b/MAINTAINERS
    @@ -19407,7 +19407,8 @@ W: http://linuxtv.org/
    Q: http://patchwork.linuxtv.org/project/linux-media/list/
    F: Documentation/devicetree/bindings/media/ti,cal.yaml
    F: Documentation/devicetree/bindings/media/ti,vpe.yaml
    -F: drivers/media/platform/ti-vpe/
    +F: drivers/media/platform/ti/cal/
    +F: drivers/media/platform/ti/vpe/

    TI WILINK WIRELESS DRIVERS
    L: linux-wireless@vger.kernel.org
    diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
    index 39fa6aaad13b..2c5713ddac09 100644
    --- a/drivers/media/platform/Makefile
    +++ b/drivers/media/platform/Makefile
    @@ -37,11 +37,7 @@ 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 += ti/am437x/
    -obj-y += ti/davinci/
    -obj-y += ti/omap/
    -obj-y += ti/omap3isp/
    +obj-y += ti/
    obj-y += via/
    obj-y += xilinx/

    diff --git a/drivers/media/platform/ti/Makefile b/drivers/media/platform/ti/Makefile
    new file mode 100644
    index 000000000000..bbc737ccbbea
    --- /dev/null
    +++ b/drivers/media/platform/ti/Makefile
    @@ -0,0 +1,3 @@
    +# SPDX-License-Identifier: GPL-2.0
    +obj-y += cal/
    +obj-y += vpe/
    diff --git a/drivers/media/platform/ti/cal/Makefile b/drivers/media/platform/ti/cal/Makefile
    new file mode 100644
    index 000000000000..45ac35585f0b
    --- /dev/null
    +++ b/drivers/media/platform/ti/cal/Makefile
    @@ -0,0 +1,3 @@
    +# SPDX-License-Identifier: GPL-2.0
    +obj-$(CONFIG_VIDEO_TI_CAL) += ti-cal.o
    +ti-cal-y := cal.o cal-camerarx.o cal-video.o
    diff --git a/drivers/media/platform/ti-vpe/cal-camerarx.c b/drivers/media/platform/ti/cal/cal-camerarx.c
    similarity index 100%
    rename from drivers/media/platform/ti-vpe/cal-camerarx.c
    rename to drivers/media/platform/ti/cal/cal-camerarx.c
    diff --git a/drivers/media/platform/ti-vpe/cal-video.c b/drivers/media/platform/ti/cal/cal-video.c
    similarity index 100%
    rename from drivers/media/platform/ti-vpe/cal-video.c
    rename to drivers/media/platform/ti/cal/cal-video.c
    diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti/cal/cal.c
    similarity index 100%
    rename from drivers/media/platform/ti-vpe/cal.c
    rename to drivers/media/platform/ti/cal/cal.c
    diff --git a/drivers/media/platform/ti-vpe/cal.h b/drivers/media/platform/ti/cal/cal.h
    similarity index 100%
    rename from drivers/media/platform/ti-vpe/cal.h
    rename to drivers/media/platform/ti/cal/cal.h
    diff --git a/drivers/media/platform/ti-vpe/cal_regs.h b/drivers/media/platform/ti/cal/cal_regs.h
    similarity index 100%
    rename from drivers/media/platform/ti-vpe/cal_regs.h
    rename to drivers/media/platform/ti/cal/cal_regs.h
    diff --git a/drivers/media/platform/ti-vpe/Makefile b/drivers/media/platform/ti/vpe/Makefile
    similarity index 78%
    rename from drivers/media/platform/ti-vpe/Makefile
    rename to drivers/media/platform/ti/vpe/Makefile
    index ad624056e039..3fadfe084f87 100644
    --- a/drivers/media/platform/ti-vpe/Makefile
    +++ b/drivers/media/platform/ti/vpe/Makefile
    @@ -10,7 +10,3 @@ ti-sc-y := sc.o
    ti-csc-y := csc.o

    ccflags-$(CONFIG_VIDEO_TI_VPE_DEBUG) += -DDEBUG
    -
    -obj-$(CONFIG_VIDEO_TI_CAL) += ti-cal.o
    -
    -ti-cal-y := cal.o cal-camerarx.o cal-video.o
    diff --git a/drivers/media/platform/ti-vpe/csc.c b/drivers/media/platform/ti/vpe/csc.c
    similarity index 100%
    rename from drivers/media/platform/ti-vpe/csc.c
    rename to drivers/media/platform/ti/vpe/csc.c
    diff --git a/drivers/media/platform/ti-vpe/csc.h b/drivers/media/platform/ti/vpe/csc.h
    similarity index 100%
    rename from drivers/media/platform/ti-vpe/csc.h
    rename to drivers/media/platform/ti/vpe/csc.h
    diff --git a/drivers/media/platform/ti-vpe/sc.c b/drivers/media/platform/ti/vpe/sc.c
    similarity index 100%
    rename from drivers/media/platform/ti-vpe/sc.c
    rename to drivers/media/platform/ti/vpe/sc.c
    diff --git a/drivers/media/platform/ti-vpe/sc.h b/drivers/media/platform/ti/vpe/sc.h
    similarity index 100%
    rename from drivers/media/platform/ti-vpe/sc.h
    rename to drivers/media/platform/ti/vpe/sc.h
    diff --git a/drivers/media/platform/ti-vpe/sc_coeff.h b/drivers/media/platform/ti/vpe/sc_coeff.h
    similarity index 100%
    rename from drivers/media/platform/ti-vpe/sc_coeff.h
    rename to drivers/media/platform/ti/vpe/sc_coeff.h
    diff --git a/drivers/media/platform/ti-vpe/vpdma.c b/drivers/media/platform/ti/vpe/vpdma.c
    similarity index 100%
    rename from drivers/media/platform/ti-vpe/vpdma.c
    rename to drivers/media/platform/ti/vpe/vpdma.c
    diff --git a/drivers/media/platform/ti-vpe/vpdma.h b/drivers/media/platform/ti/vpe/vpdma.h
    similarity index 100%
    rename from drivers/media/platform/ti-vpe/vpdma.h
    rename to drivers/media/platform/ti/vpe/vpdma.h
    diff --git a/drivers/media/platform/ti-vpe/vpdma_priv.h b/drivers/media/platform/ti/vpe/vpdma_priv.h
    similarity index 100%
    rename from drivers/media/platform/ti-vpe/vpdma_priv.h
    rename to drivers/media/platform/ti/vpe/vpdma_priv.h
    diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/ti/vpe/vpe.c
    similarity index 100%
    rename from drivers/media/platform/ti-vpe/vpe.c
    rename to drivers/media/platform/ti/vpe/vpe.c
    diff --git a/drivers/media/platform/ti-vpe/vpe_regs.h b/drivers/media/platform/ti/vpe/vpe_regs.h
    similarity index 100%
    rename from drivers/media/platform/ti-vpe/vpe_regs.h
    rename to drivers/media/platform/ti/vpe/vpe_regs.h
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-03-14 17:42    [W:2.108 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site