media: platform: Makefile: reorganize its contents

There are lots of inconsistencies here: some directories are
included as-is, and others included using one (or more) symbols
that are inside it. Also, its entries are not sorted.

That makes it harder to maintain.

Reorganize it by placing everything on alphabetic order and
providing some hints about how patches for such file is expected.

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

diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 4032816..e319044 100644 (file)
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -3,94 +3,62 @@
 # Makefile for the video capture/playback device drivers.
 #
 
-obj-$(CONFIG_VIDEO_ALLEGRO_DVT)                += allegro-dvt/
+# Place here, alphabetically sorted by directory
+# (e. g. LC_ALL=C sort Makefile)
+obj-y += allegro-dvt/
+obj-y += am437x/
+obj-y += amphion/
+obj-y += atmel/
+obj-y += cadence/
+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 += omap/
+obj-y += omap3isp/
+obj-y += qcom/camss/
+obj-y += qcom/venus/
+obj-y += rcar-vin/
+obj-y += rockchip/rga/
+obj-y += rockchip/rkisp1/
+obj-y += s3c-camif/
+obj-y += s5p-g2d/
+obj-y += s5p-jpeg/
+obj-y += s5p-mfc/
+obj-y += sti/bdisp/
+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 += vsp1/
+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_CADENCE)            += cadence/
-obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
-obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/
-obj-$(CONFIG_VIDEO_MMP_CAMERA) += marvell-ccic/
-
-obj-$(CONFIG_VIDEO_OMAP3)      += omap3isp/
-obj-$(CONFIG_VIDEO_PXA27x)     += pxa_camera.o
-
-obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o
-
-obj-y  += ti-vpe/
-
-obj-$(CONFIG_VIDEO_MX2_EMMAPRP)                += mx2_emmaprp.o
-obj-$(CONFIG_VIDEO_CODA)               += coda/
-
-obj-$(CONFIG_VIDEO_IMX)                        += imx/
 obj-$(CONFIG_VIDEO_IMX_PXP)            += imx-pxp.o
-obj-$(CONFIG_VIDEO_IMX8_JPEG)          += imx-jpeg/
-
 obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE)        += m2m-deinterlace.o
-
 obj-$(CONFIG_VIDEO_MUX)                        += video-mux.o
-
-obj-$(CONFIG_VIDEO_S3C_CAMIF)          += s3c-camif/
-obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS) += exynos4-is/
-obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG)   += s5p-jpeg/
-obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC)    += s5p-mfc/
-
-obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D)    += s5p-g2d/
-obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/
-
-obj-$(CONFIG_VIDEO_STI_BDISP)          += sti/bdisp/
-obj-$(CONFIG_VIDEO_STI_HVA)            += sti/hva/
-obj-$(CONFIG_DVB_C8SECTPFE)            += sti/c8sectpfe/
-
-obj-$(CONFIG_VIDEO_STI_DELTA)          += sti/delta/
-
-obj-y                                  += stm32/
-
-obj-y                                  += davinci/
-
-obj-$(CONFIG_VIDEO_SH_VOU)             += sh_vou.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
 obj-$(CONFIG_VIDEO_RENESAS_CEU)                += renesas-ceu.o
 obj-$(CONFIG_VIDEO_RENESAS_FCP)                += rcar-fcp.o
 obj-$(CONFIG_VIDEO_RENESAS_FDP1)       += rcar_fdp1.o
 obj-$(CONFIG_VIDEO_RENESAS_JPU)                += rcar_jpu.o
-obj-$(CONFIG_VIDEO_RENESAS_VSP1)       += vsp1/
-
-obj-$(CONFIG_VIDEO_ROCKCHIP_ISP1)      += rockchip/rkisp1/
-obj-$(CONFIG_VIDEO_ROCKCHIP_RGA)       += rockchip/rga/
-
-obj-y  += omap/
-
-obj-$(CONFIG_VIDEO_AM437X_VPFE)                += am437x/
-
-obj-$(CONFIG_VIDEO_XILINX)             += xilinx/
-
-obj-$(CONFIG_VIDEO_RCAR_ISP)           += rcar-isp.o
-obj-$(CONFIG_VIDEO_RCAR_VIN)           += rcar-vin/
-
-obj-$(CONFIG_VIDEO_ATMEL_ISC)          += atmel/
-obj-$(CONFIG_VIDEO_ATMEL_ISI)          += atmel/
-obj-$(CONFIG_VIDEO_ATMEL_XISC)         += atmel/
-obj-$(CONFIG_VIDEO_MICROCHIP_CSI2DC)   += atmel/
-
-obj-$(CONFIG_VIDEO_STM32_DCMI)         += stm32/
-obj-$(CONFIG_VIDEO_STM32_DMA2D)                += stm32/
-
-obj-$(CONFIG_VIDEO_MEDIATEK_VPU)       += mtk-vpu/
-
-obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC)    += mtk-vcodec/
-
-obj-$(CONFIG_VIDEO_MEDIATEK_MDP)       += mtk-mdp/
-
-obj-$(CONFIG_VIDEO_MEDIATEK_JPEG)      += mtk-jpeg/
-
-obj-$(CONFIG_VIDEO_QCOM_CAMSS)         += qcom/camss/
-
-obj-$(CONFIG_VIDEO_QCOM_VENUS)         += qcom/venus/
-
-obj-y                                  += sunxi/
-
-obj-$(CONFIG_VIDEO_MESON_GE2D)         += meson/ge2d/
-
-obj-$(CONFIG_VIDEO_TEGRA_VDE)          += tegra/vde/
-
-obj-$(CONFIG_VIDEO_AMPHION_VPU)                += amphion/
+obj-$(CONFIG_VIDEO_SH_VOU)             += sh_vou.o
+obj-$(CONFIG_VIDEO_VIA_CAMERA)         += via-camera.o
+obj-$(CONFIG_VIDEO_VIU)                        += fsl-viu.o