From patchwork Fri Mar 11 14:07:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 81504 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1nSfwB-003cqj-9o; Fri, 11 Mar 2022 14:08:11 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349104AbiCKOJK (ORCPT + 1 other); Fri, 11 Mar 2022 09:09:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349063AbiCKOJC (ORCPT ); Fri, 11 Mar 2022 09:09:02 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3833466AD6; Fri, 11 Mar 2022 06:07:58 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BA19A61EB0; Fri, 11 Mar 2022 14:07:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05B1DC340F5; Fri, 11 Mar 2022 14:07:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647007676; bh=oxhEMvElWODt6u9CQYS0TOzkW9ZRnJdY8HwZrc0XbnA=; h=From:To:Cc:Subject:Date:From; b=I1IWazuBan229oTPyXer46CT9bijBRhJJ438WpPXOCKnJHuH3LeSiHJtETgwak7Cp RriKkP6rtuas2UOOhvuwjNOEDgPJfjFZhnKcr8zG6zQViko9vb21SdMBmnSKh1PQSc Qy0JIkMVupausOA+J7sYzH1JLhewlQtAO6NFu5t6x5zXy7qvKJh0SGW3PPVYsP8HRT LGlj/1X9iqZK64iYH49dD+0mM5TFOxCzC9kS/v92w1KYH4o34oP4eI8wkIF2V70jO5 6TShJ2I2kNzNWoacqVs4hAwAQiDPtgn4VVvEsv3RJ2XfrO2bKsDhF2zGb3FOd1oouB xG+udw2dDr8EA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nSfvt-000lAX-Ey; Fri, 11 Mar 2022 15:07:53 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , "Lad, Prabhakar" , =?utf-8?q?=C5=81ukasz_Stelmach?= , Alexandre Torgue , Andrew Jeffery , Andrzej Hajda , Andrzej Pietrasiewicz , Andy Gross , Andy Walls , Benoit Parrot , Bjorn Andersson , Chen-Yu Tsai , Dafna Hirschfeld , Dmitry Osipenko , Eddie James , Ezequiel Garcia , Fabio Estevam , Heiko Stuebner , Jacek Anaszewski , Jacob Chen , Jernej Skrabec , Jerome Brunet , Kevin Hilman , Krzysztof Kozlowski , Laurent Pinchart , Marek Szyprowski , Martin Blumenstingl , Matthias Brugger , Maxime Coquelin , Maxime Ripard , Michael Krufky , Michael Tretter , Mikhail Ulyanov , Ming Qian , Mirela Rabulea , NXP Linux Team , Patrice Chotard , Pengutronix Kernel Team , Philipp Zabel , Robert Foss , Sascha Hauer , Shawn Guo , Shijie Qin , Stanimir Varbanov , Stefan Richter , Sylwester Nawrocki , Sylwester Nawrocki , Todor Tomov , Tomasz Figa , Yong Deng , Zhou Peng , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org, linux1394-devel@lists.sourceforge.net, openbmc@lists.ozlabs.org Subject: [PATCH v2 00/38] Sort Makefiles and platform/Kconfig Date: Fri, 11 Mar 2022 15:07:13 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.8 (--) X-LSpam-Report: No, score=-2.8 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_NONE=-0.0001,T_DKIM_INVALID=0.01 autolearn=unavailable autolearn_force=no Entries at Makefiles and Kconfig files end being merged on random order. Sort Makefile entries in alphabetical order. Sorting Kconfig is harder. So, for now, do it only for platform/Kconfig. On platform/Kconfig, there is a mix of: - two ancillary drivers; - per-SoC drivers whose Kconfig/Makefile is on separate files; - per-SoC drivers whose Makefile is on separate files, but the driver is at platform/Makefile; - per-SoC drivers that are specified inside platform/Makefile and platform/Kconfig. Give some order by ensuring that all non-generic drivers will be on subdirectories. The end goal is to have one directory below platform per manufacturer, This series prepare for that. Suggested-by: Laurent Pinchart - v2: - removed some renames at DVB frontend; - added patches for platform/Kconfig sort. Mauro Carvalho Chehab (38): media: xc2028: rename the driver from tuner-xc2028 media: Makefiles: remove extra spaces media: Makefiles: sort entries where it fits media: platform: Makefile: reorganize its contents media: platform: move platform menu dependencies to drivers media: platform: place Aspeed driver on a separate dir media: platform: place NXP drivers on a separate dir media: platform: place Intel drivers on a separate dir media: platform: place Via drivers on a separate dir media: platform: place Renesas drivers on a separate dir media: platform: allegro-dvt: move config to its own file media: platform: amphion: move config to its own file media: platform: coda: move config to its own file media: platform: exynos-gsc: move config to its own file media: platform: ge2d: move config to its own file media: platform: mtk-jpeg: move config to its own file media: platform: mtk-mdp: move config to its own file media: platform: mtk-vcodec: move config to its own file media: platform: mtk-vpu: move config to its own file media: platform: omap3isp: move config to its own file media: platform: camss: move config to its own file media: platform: venus: move config to its own file media: platform: rga: move config to its own file media: platform: s3c-camif: move config to its own file media: platform: s5p-g2d: move config to its own file media: platform: hva: move config to its own file media: platform: stm32: move config to its own file media: platform: sun8i-di: move config to its own file media: platform: sun8i-rotate: move config to its own file media: platform: vde: move config to its own file media: platform: ti-vpe: move config to its own file media: platform: rkisp1: move config to its own file media: platform: delta: move config to its own file media: platform: bdisp: move config to its own file media: platform: s5p-mfc: move config to its own file media: platform: s5p-jpeg: move config to its own file media: platform: Kconfig: sort entries drivers: media: platform: move some manufacturer entries .../admin-guide/media/i2c-cardlist.rst | 2 +- MAINTAINERS | 22 +- drivers/media/Makefile | 4 +- drivers/media/cec/platform/Makefile | 16 +- drivers/media/common/Makefile | 4 +- drivers/media/common/videobuf2/Makefile | 6 +- drivers/media/dvb-frontends/Makefile | 192 ++--- drivers/media/firewire/Makefile | 2 +- drivers/media/i2c/Makefile | 92 +-- drivers/media/pci/Makefile | 18 +- drivers/media/pci/cx18/cx18-driver.c | 2 +- drivers/media/pci/cx18/cx18-dvb.c | 2 +- drivers/media/pci/cx18/cx18-gpio.c | 2 +- drivers/media/pci/cx23885/cx23885-cards.c | 2 +- drivers/media/pci/cx23885/cx23885-dvb.c | 2 +- drivers/media/pci/cx23885/cx23885-video.c | 2 +- drivers/media/pci/cx88/cx88.h | 2 +- drivers/media/pci/ivtv/ivtv-driver.c | 2 +- drivers/media/pci/ivtv/ivtv-gpio.c | 2 +- drivers/media/pci/saa7134/saa7134-cards.c | 2 +- drivers/media/pci/saa7134/saa7134-dvb.c | 2 +- drivers/media/platform/Kconfig | 755 ++---------------- drivers/media/platform/Makefile | 132 +-- drivers/media/platform/allegro-dvt/Kconfig | 16 + drivers/media/platform/am437x/Kconfig | 1 + drivers/media/platform/amphion/Kconfig | 20 + drivers/media/platform/aspeed/Kconfig | 10 + drivers/media/platform/aspeed/Makefile | 1 + .../platform/{ => aspeed}/aspeed-video.c | 0 drivers/media/platform/atmel/Kconfig | 4 + drivers/media/platform/cadence/Kconfig | 1 + drivers/media/platform/coda/Kconfig | 17 + drivers/media/platform/davinci/Kconfig | 6 + drivers/media/platform/exynos-gsc/Kconfig | 10 + drivers/media/platform/exynos4-is/Kconfig | 1 + drivers/media/platform/imx-jpeg/Kconfig | 1 + drivers/media/platform/imx/Kconfig | 1 + drivers/media/platform/intel/Kconfig | 11 + drivers/media/platform/intel/Makefile | 1 + .../media/platform/{ => intel}/pxa_camera.c | 0 drivers/media/platform/marvell-ccic/Kconfig | 2 + drivers/media/platform/meson/ge2d/Kconfig | 14 + drivers/media/platform/mtk-jpeg/Kconfig | 16 + drivers/media/platform/mtk-mdp/Kconfig | 17 + drivers/media/platform/mtk-vcodec/Kconfig | 36 + drivers/media/platform/mtk-vpu/Kconfig | 15 + drivers/media/platform/nxp/Kconfig | 40 + drivers/media/platform/nxp/Makefile | 5 + drivers/media/platform/{ => nxp}/fsl-viu.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 drivers/media/platform/omap/Kconfig | 1 + drivers/media/platform/omap3isp/Kconfig | 21 + drivers/media/platform/qcom/Kconfig | 3 + drivers/media/platform/qcom/camss/Kconfig | 9 + drivers/media/platform/qcom/venus/Kconfig | 14 + drivers/media/platform/renesas/Kconfig | 119 +++ drivers/media/platform/renesas/Makefile | 14 + .../media/platform/{ => renesas}/rcar-fcp.c | 0 .../media/platform/{ => renesas}/rcar-isp.c | 0 .../platform/{ => renesas}/rcar-vin/Kconfig | 2 + .../platform/{ => renesas}/rcar-vin/Makefile | 0 .../{ => renesas}/rcar-vin/rcar-core.c | 0 .../{ => renesas}/rcar-vin/rcar-csi2.c | 0 .../{ => renesas}/rcar-vin/rcar-dma.c | 0 .../{ => renesas}/rcar-vin/rcar-v4l2.c | 0 .../{ => renesas}/rcar-vin/rcar-vin.h | 0 .../media/platform/{ => renesas}/rcar_drif.c | 0 .../media/platform/{ => renesas}/rcar_fdp1.c | 0 .../media/platform/{ => renesas}/rcar_jpu.c | 0 .../platform/{ => renesas}/renesas-ceu.c | 0 drivers/media/platform/{ => renesas}/sh_vou.c | 0 drivers/media/platform/rockchip/Kconfig | 3 + drivers/media/platform/rockchip/rga/Kconfig | 14 + .../media/platform/rockchip/rkisp1/Kconfig | 19 + drivers/media/platform/s3c-camif/Kconfig | 15 + drivers/media/platform/s5p-g2d/Kconfig | 11 + drivers/media/platform/s5p-jpeg/Kconfig | 12 + drivers/media/platform/s5p-mfc/Kconfig | 9 + drivers/media/platform/sti/Kconfig | 5 + drivers/media/platform/sti/bdisp/Kconfig | 10 + drivers/media/platform/sti/c8sectpfe/Kconfig | 1 + drivers/media/platform/sti/delta/Kconfig | 36 + drivers/media/platform/sti/hva/Kconfig | 26 + drivers/media/platform/stm32/Kconfig | 31 + drivers/media/platform/sunxi/Kconfig | 2 + .../media/platform/sunxi/sun4i-csi/Kconfig | 1 + .../media/platform/sunxi/sun6i-csi/Kconfig | 1 + drivers/media/platform/sunxi/sun8i-di/Kconfig | 14 + .../media/platform/sunxi/sun8i-rotate/Kconfig | 14 + drivers/media/platform/tegra/vde/Kconfig | 17 + drivers/media/platform/ti-vpe/Kconfig | 62 ++ drivers/media/platform/via/Kconfig | 11 + drivers/media/platform/via/Makefile | 1 + drivers/media/platform/{ => via}/via-camera.c | 0 drivers/media/platform/{ => via}/via-camera.h | 0 drivers/media/platform/xilinx/Kconfig | 1 + drivers/media/radio/Makefile | 42 +- drivers/media/rc/Makefile | 45 +- drivers/media/rc/keymaps/Makefile | 33 +- drivers/media/spi/Makefile | 5 +- drivers/media/test-drivers/Makefile | 13 +- drivers/media/tuners/Makefile | 66 +- drivers/media/tuners/tuner-types.c | 2 +- .../{tuner-xc2028-types.h => xc2028-types.h} | 6 +- .../media/tuners/{tuner-xc2028.c => xc2028.c} | 6 +- .../media/tuners/{tuner-xc2028.h => xc2028.h} | 2 +- drivers/media/tuners/xc4000.c | 2 +- drivers/media/usb/Makefile | 25 +- drivers/media/usb/dvb-usb/cxusb.c | 2 +- drivers/media/usb/dvb-usb/dib0700_devices.c | 2 +- drivers/media/usb/em28xx/em28xx-i2c.c | 2 +- drivers/media/usb/em28xx/em28xx.h | 2 +- drivers/media/usb/gspca/Makefile | 88 +- drivers/media/usb/tm6000/tm6000-cards.c | 2 +- drivers/media/usb/tm6000/tm6000-dvb.c | 2 +- drivers/media/usb/tm6000/tm6000-i2c.c | 2 +- drivers/media/v4l2-core/Makefile | 29 +- drivers/media/v4l2-core/tuner-core.c | 2 +- 120 files changed, 1248 insertions(+), 1144 deletions(-) create mode 100644 drivers/media/platform/allegro-dvt/Kconfig create mode 100644 drivers/media/platform/amphion/Kconfig 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%) create mode 100644 drivers/media/platform/coda/Kconfig create mode 100644 drivers/media/platform/exynos-gsc/Kconfig create mode 100644 drivers/media/platform/intel/Kconfig create mode 100644 drivers/media/platform/intel/Makefile rename drivers/media/platform/{ => intel}/pxa_camera.c (100%) create mode 100644 drivers/media/platform/meson/ge2d/Kconfig create mode 100644 drivers/media/platform/mtk-jpeg/Kconfig create mode 100644 drivers/media/platform/mtk-mdp/Kconfig create mode 100644 drivers/media/platform/mtk-vcodec/Kconfig create mode 100644 drivers/media/platform/mtk-vpu/Kconfig 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-pxp.c (100%) rename drivers/media/platform/{ => nxp}/imx-pxp.h (100%) rename drivers/media/platform/{ => nxp}/mx2_emmaprp.c (100%) create mode 100644 drivers/media/platform/omap3isp/Kconfig create mode 100644 drivers/media/platform/qcom/Kconfig create mode 100644 drivers/media/platform/qcom/camss/Kconfig create mode 100644 drivers/media/platform/qcom/venus/Kconfig create mode 100644 drivers/media/platform/renesas/Kconfig create mode 100644 drivers/media/platform/renesas/Makefile rename drivers/media/platform/{ => renesas}/rcar-fcp.c (100%) rename drivers/media/platform/{ => renesas}/rcar-isp.c (100%) rename drivers/media/platform/{ => renesas}/rcar-vin/Kconfig (93%) rename drivers/media/platform/{ => renesas}/rcar-vin/Makefile (100%) rename drivers/media/platform/{ => renesas}/rcar-vin/rcar-core.c (100%) rename drivers/media/platform/{ => renesas}/rcar-vin/rcar-csi2.c (100%) rename drivers/media/platform/{ => renesas}/rcar-vin/rcar-dma.c (100%) rename drivers/media/platform/{ => renesas}/rcar-vin/rcar-v4l2.c (100%) rename drivers/media/platform/{ => renesas}/rcar-vin/rcar-vin.h (100%) rename drivers/media/platform/{ => renesas}/rcar_drif.c (100%) rename drivers/media/platform/{ => renesas}/rcar_fdp1.c (100%) rename drivers/media/platform/{ => renesas}/rcar_jpu.c (100%) rename drivers/media/platform/{ => renesas}/renesas-ceu.c (100%) rename drivers/media/platform/{ => renesas}/sh_vou.c (100%) create mode 100644 drivers/media/platform/rockchip/Kconfig create mode 100644 drivers/media/platform/rockchip/rga/Kconfig create mode 100644 drivers/media/platform/rockchip/rkisp1/Kconfig create mode 100644 drivers/media/platform/s3c-camif/Kconfig create mode 100644 drivers/media/platform/s5p-g2d/Kconfig create mode 100644 drivers/media/platform/s5p-jpeg/Kconfig create mode 100644 drivers/media/platform/s5p-mfc/Kconfig create mode 100644 drivers/media/platform/sti/Kconfig create mode 100644 drivers/media/platform/sti/bdisp/Kconfig create mode 100644 drivers/media/platform/sti/delta/Kconfig create mode 100644 drivers/media/platform/sti/hva/Kconfig create mode 100644 drivers/media/platform/stm32/Kconfig create mode 100644 drivers/media/platform/sunxi/sun8i-di/Kconfig create mode 100644 drivers/media/platform/sunxi/sun8i-rotate/Kconfig create mode 100644 drivers/media/platform/tegra/vde/Kconfig create mode 100644 drivers/media/platform/ti-vpe/Kconfig create mode 100644 drivers/media/platform/via/Kconfig create mode 100644 drivers/media/platform/via/Makefile rename drivers/media/platform/{ => via}/via-camera.c (100%) rename drivers/media/platform/{ => via}/via-camera.h (100%) rename drivers/media/tuners/{tuner-xc2028-types.h => xc2028-types.h} (96%) rename drivers/media/tuners/{tuner-xc2028.c => xc2028.c} (99%) rename drivers/media/tuners/{tuner-xc2028.h => xc2028.h} (99%)