From patchwork Sun Mar 13 10:51:45 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: 12779177 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 43984C433EF for ; Sun, 13 Mar 2022 10:52:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UaDaAFlsa37XitWbHVXc291C6JPHVBPZuVSL/leg4ag=; b=LLNTC4NC4seZn/ PP/x6uiH6cAdelQsVPsyQ7i+a+R/QxX39fDJIGDDcS+QbQpkKOivaZgWqRoLAm4G602Z7kZ56yP49 eSZtoX2JLZeFJsLnAIsiukn5LhuepdEkafnEu3UR2na7e8ZCFmSA9eULzKJtg+lKFA/RgHU4u4Mp5 6KE1kmpD1kaMBE6fvLx0pASAh9cINLfgpS3pG0Xx1pge//gKRlnaG1jQYpfTUVulSwrT6HtAxX1ui PtrxfHnaEYaAlrM0yF+15tpNm78kR5jsew80MVb8BycktL6GYO3KBjm1KKn94kWsKqpO6LOF9wMFI IvqRshjkbJJE7dIBu4PQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTLq7-002ZcC-Mr; Sun, 13 Mar 2022 10:52:43 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTLpb-002ZMa-9J; Sun, 13 Mar 2022 10:52:15 +0000 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 8D95F61016; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C4E8C340F6; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=kuQsLLv+qQVtZ3MO89AZs58u9elVJ+hwK+IWxbSMv/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KV6SZze7o4rV4F4Txlqkh3maE5DLk7jQJN7FJOmjtaGAk8FhYXkZNHNKUL5WCkl/t S0KRtY2ksH1k7Uib3pufKaleJHxFra7nP2+0fRB/Db7JsGF3pCyQBsLJ8FPtGCmyjC axV5C7Ft/3SN5UaW2OE3GfXZf5BCQ57mYiuf+VK1EEtTYBdwK9AVdaRBb87YvUBOD5 wV2MN99soEITO8oFiw3p/omOK4BXMkWE3+QCBLIBrDv0Tw7JrXrRmpKE1qzq7Gdmh/ BwpzVIbCbPFh6NcNCpBqNmGd30No2d+Xtcqx/MThmwVpChW4YOTumEMHSLYv3Opp0d JzXBHdQxa3zAA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpW-001I1U-SL; Sun, 13 Mar 2022 11:52:06 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , AngeloGioacchino Del Regno , Bin Liu , Cai Huoqing , Colin Ian King , Dafna Hirschfeld , Dmitry Osipenko , Eugen Hristev , Evan Green , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Laurent Pinchart , Matthias Brugger , Ming Qian , Rick Chang , Sakari Ailus , Xu Wang , Yong Wu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH 04/24] media: platform: rename mtk-jpeg/ to mediatek/mtk-jpeg/ Date: Sun, 13 Mar 2022 11:51:45 +0100 Message-Id: <3c8f6cd0c95b7be3ddcea487028ebef8ae92ad68.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220313_035211_446734_FAA6C17F X-CRM114-Status: GOOD ( 10.97 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org As the end goal is to have platform drivers split by vendor, rename mtk-jpeg/ to mediatek/mtk-jpeg/. Signed-off-by: Mauro Carvalho Chehab --- 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/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => mediatek}/mtk-jpeg/Kconfig | 0 drivers/media/platform/{ => mediatek}/mtk-jpeg/Makefile | 0 drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.c | 0 drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.h | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.c | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.h | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.c | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.h | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_reg.h | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.c | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.h | 0 14 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/Kconfig (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/Makefile (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_reg.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 09b0e60da4e9..fa0a3de3865f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12130,7 +12130,7 @@ M: Rick Chang M: Bin Liu S: Supported F: Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt -F: drivers/media/platform/mtk-jpeg/ +F: drivers/media/platform/mediatek/mtk-jpeg/ MEDIATEK MDP DRIVER M: Minghsiu Tsai diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index d8436923aebe..fdb4e1a8aa81 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -78,7 +78,7 @@ 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/mtk-jpeg/Kconfig" +source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" source "drivers/media/platform/mtk-mdp/Kconfig" source "drivers/media/platform/mtk-vcodec/Kconfig" source "drivers/media/platform/mtk-vpu/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 48531f93d92f..c792f6216918 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -18,7 +18,7 @@ obj-y += exynos-gsc/ obj-y += exynos4-is/ obj-y += intel/ obj-y += marvell/ -obj-y += mtk-jpeg/ +obj-y += mediatek/mtk-jpeg/ obj-y += mtk-mdp/ obj-y += mtk-vcodec/ obj-y += mtk-vpu/ diff --git a/drivers/media/platform/mtk-jpeg/Kconfig b/drivers/media/platform/mediatek/mtk-jpeg/Kconfig similarity index 100% rename from drivers/media/platform/mtk-jpeg/Kconfig rename to drivers/media/platform/mediatek/mtk-jpeg/Kconfig diff --git a/drivers/media/platform/mtk-jpeg/Makefile b/drivers/media/platform/mediatek/mtk-jpeg/Makefile similarity index 100% rename from drivers/media/platform/mtk-jpeg/Makefile rename to drivers/media/platform/mediatek/mtk-jpeg/Makefile diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.c similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.c diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.h similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.h diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.c similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.c diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.h similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.h diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.c similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.c rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.c diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.h similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.h rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.h diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_reg.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_reg.h similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_reg.h rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_reg.h diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.c similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.c diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.h similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.h From patchwork Sun Mar 13 10:51:46 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: 12779178 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0173EC433FE for ; Sun, 13 Mar 2022 10:53:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GgarDx8S2bLtf6d/lSLnt3DNqiroMoeXWMYRenOLy4M=; b=P2iYNSLmNc77td abfzjcmJuw0SCZ5x3jL/BQIHKXN7uj7MCB+MBPol4NuB5D1ZiPKh3WB19+eHSBATlCTEo5FKG0Nvd I62Mc35nPEXGVLt35+xj7f71vmkOKK05VCV4L+zMLgQYocmn0y+uv3ivQupXonlV/c+npZBkUnmC+ ZO4rtHaGVMA3XnktowI7QvmL63JL6hLt/XPY7jcQhpQx3hxgck4qVJjGiXl7sJliQaRDPF1w2hKkY JiY0RJlo1BHeeVmjyt08GUIw70HpNPcHDuL3G6F4NIJr6CoTpKJBrgg8UUwNSErzeVSkqmBHSorUB zDtnEWQIEUEJD2xH7mFg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTLqI-002Zg3-LG; Sun, 13 Mar 2022 10:52:54 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTLpb-002ZNo-PV; Sun, 13 Mar 2022 10:52:16 +0000 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 F303561024; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FC21C340FD; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=VWp9rNO5VHb/uQlqyJjbKMngzlNKF6477cOMkAGw5n0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nLWn4BafK98HHe4zRU/FzGDR73fzyLeIJlCphwr00zvP4MPjBUa75TVkRC4Cwb9+y l1ZUIWgZR1cDrKKSAkOqz6Ar3lWWQwF3AdGM+DBTVdAu92xBovniezvxSxYZGa1BNJ saYsQ8XjmWUFa9G5b4U2DznXqhpjCAtOv98jWsuMnF1C0c+2oYX7WrbU3Jn4EnMw+/ qrUBzl2tfEitgp/KA0wMo7cKmB7IAPFTK7Wx4V90uvEjxxy00rPr4UIAHo4OKYBa+H TigXgzoInJdX1ESk+F+XI8ss+Lpcy+MXT9ABjsQda9Ql4h16x47czbMw+LFryriJ9q M1vsehf/a2yXw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpW-001I1Y-Tw; Sun, 13 Mar 2022 11:52:06 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Andrew-CT Chen , AngeloGioacchino Del Regno , Dafna Hirschfeld , Dmitry Osipenko , Eugen Hristev , Evan Green , Hans Verkuil , Houlong Wei , Jacopo Mondi , Jernej Skrabec , Jonathan Cameron , Laurent Pinchart , Matthias Brugger , Ming Qian , Minghsiu Tsai , Sakari Ailus , Xu Wang , Yong Wu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH 05/24] media: platform: rename mtk-mdp/ to mediatek/mtk-mdp/ Date: Sun, 13 Mar 2022 11:51:46 +0100 Message-Id: <834b10510c01800e171e34c06a9d82c8e072fbc9.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220313_035211_959629_551477E8 X-CRM114-Status: GOOD ( 10.87 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org As the end goal is to have platform drivers split by vendor, rename mtk-mdp/ to mediatek/mtk-mdp/. Signed-off-by: Mauro Carvalho Chehab --- 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/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => mediatek}/mtk-mdp/Kconfig | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/Makefile | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.c | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.h | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.c | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.h | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_ipi.h | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.c | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.h | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.c | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.h | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.c | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.h | 0 16 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ => mediatek}/mtk-mdp/Kconfig (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/Makefile (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_ipi.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index fa0a3de3865f..2203d98bbcf1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12138,7 +12138,7 @@ M: Houlong Wei M: Andrew-CT Chen S: Supported F: Documentation/devicetree/bindings/media/mediatek-mdp.txt -F: drivers/media/platform/mtk-mdp/ +F: drivers/media/platform/mediatek/mtk-mdp/ F: drivers/media/platform/mtk-vpu/ MEDIATEK MEDIA DRIVER diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index fdb4e1a8aa81..a45fd3fe103e 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -79,7 +79,7 @@ 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" -source "drivers/media/platform/mtk-mdp/Kconfig" +source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" source "drivers/media/platform/mtk-vcodec/Kconfig" source "drivers/media/platform/mtk-vpu/Kconfig" source "drivers/media/platform/nxp/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index c792f6216918..6f5d09cd8f9b 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -19,7 +19,7 @@ obj-y += exynos4-is/ obj-y += intel/ obj-y += marvell/ obj-y += mediatek/mtk-jpeg/ -obj-y += mtk-mdp/ +obj-y += mediatek/mtk-mdp/ obj-y += mtk-vcodec/ obj-y += mtk-vpu/ obj-y += nxp/ diff --git a/drivers/media/platform/mtk-mdp/Kconfig b/drivers/media/platform/mediatek/mtk-mdp/Kconfig similarity index 100% rename from drivers/media/platform/mtk-mdp/Kconfig rename to drivers/media/platform/mediatek/mtk-mdp/Kconfig diff --git a/drivers/media/platform/mtk-mdp/Makefile b/drivers/media/platform/mediatek/mtk-mdp/Makefile similarity index 100% rename from drivers/media/platform/mtk-mdp/Makefile rename to drivers/media/platform/mediatek/mtk-mdp/Makefile diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_comp.c rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_comp.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_core.c rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_core.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_regs.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_regs.c rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_regs.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_regs.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h From patchwork Sun Mar 13 10:51:47 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: 12779205 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9CDC9C433EF for ; Sun, 13 Mar 2022 10:55:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AjdnRmDNzPxJNV2+8PP16uxh1hn+JIgT1vs9kf2Xf58=; b=MRnIQAbQY375Hu rSW59YIR0r7L6KQjae4x4sMEGYUuKlVOIhW7eSSqFra4liIsOEfNrXdP+u7ny+S2HnU4+YBw0pksl iL0AHK69LiKhZK7YO+NFbceRfOam3lPqKqSTLglevJ3iZvxR9LBe5hsxDB1BpPbd29d3YUHcfoor9 HJcwfHob1c2JHFZDFfv04pRvMiggQqf+dM1pl5xdc6rJTfQAO4s69CG5QKGQYwWOHf1NCuW/yPeN8 yqVBYllKuDOsuyEFyUAE9hvo52rt0fIhiJOeVBEe1k75B3vzdsbexY7tJQic448wz7CHoj6wGQC1D ip0zCwP8dmmmqWKBYSkg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTLsx-002bBU-FE; Sun, 13 Mar 2022 10:55:39 +0000 Received: from desiato.infradead.org ([90.155.92.199]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTLpk-002ZVc-B7; Sun, 13 Mar 2022 10:52:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=ZBiDiCLTNiwe4oJnh5EXAgHADZMGZ25T3+T32153og0=; b=mJlyQlCNGL0cMQy92FGmBZryRl BR02CgRcPQZJKxrY4vBVz7IaFAh+jlk+beoOaOuWoWz6rnGWJOBWNMsMuR5cojCQolLtPomVE0hch Jx5yP1pb2dSfsE3GT+YnThS4DP3b1vVnKKIuYmgi+nap3F9wFrm3FNXSn28oZi30lSKTIvLuPe5gr vQW+6yLeo8o1NWY9zWXChbMnOkXF+3hjT/eq0TJNAjEBteeN6MB5Mim8n33ERnrnkrkkvLpRnGukj tX1p1htMGONJtKLrmqZa4C7bUBvtlxMlfhSoTV+pUya2rCP1egPR1X8FLRzVEbsULzFEJ7Be6+Khu t4oyKEwA==; Received: from ams.source.kernel.org ([145.40.68.75]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTLpe-000Uq4-Lq; Sun, 13 Mar 2022 10:52:17 +0000 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 ams.source.kernel.org (Postfix) with ESMTPS id 586C4B80CC5; Sun, 13 Mar 2022 10:52:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5DD89C340FA; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=HoopYOEpxuaYPaONTVhJjIO5eFHfFTSdNlpQocjOuNc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KKBcRn2CzfXUR2sCEdms5vFAj4K7/mxfXAjBMFBzPriFIVdBakehntZwv0MjYlH+1 LwkFzfobDbTnM02r2u9H7yAjufCIVkWG/gEQZSis4evNXz4RTOqCXPT1nePiPCb3AE cz+6+DyiIOnwDj+1ZtIkXl2aEscOA4Ztvy7+MjaoXMWvbP7FJln/8bOFDbJGwlUYsP p6uRpEHMJeS86/2BiCxws0uux7QpuAyPXG6HHd1nH2dGXNp9f402zxk1C+h6iQ68H1 APjZ7d+IAbafL/Dgn9UBN8pz2RrkTMCdCImmQCtk9SOTJbr3JCEGMTShMqIJTmByG6 TS17BB0kYuVrQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpW-001I1c-Vd; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Alexandre Courbot , Andrew-CT Chen , AngeloGioacchino Del Regno , Benjamin Gaignard , Christophe JAILLET , Dafna Hirschfeld , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Hirokazu Honda , Hsin-Yi Wang , Irui Wang , Jacopo Mondi , Jernej Skrabec , Jiasheng Jiang , Jonathan Cameron , Laurent Pinchart , Matthias Brugger , Ming Qian , Nicolas Dufresne , Sakari Ailus , Steve Cho , Tiffany Lin , Tzung-Bi Shih , Yong Wu , Yunfei Dong , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH 06/24] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/ Date: Sun, 13 Mar 2022 11:51:47 +0100 Message-Id: <53a632ce79c9d02673d7540e18d681f123afb801.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220313_105214_879524_C4085DB9 X-CRM114-Status: GOOD ( 11.00 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org As the end goal is to have platform drivers split by vendor, rename mtk-vcodec/ to mediatek/mtk-vcodec/. Signed-off-by: Mauro Carvalho Chehab Acked-by: Nicolas Dufresne --- 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/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h | 0 .../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c | 0 .../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h | 0 .../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c | 0 .../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h | 0 .../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h | 0 .../platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h | 0 49 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 2203d98bbcf1..bfe014870a77 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12147,7 +12147,7 @@ M: Andrew-CT Chen S: Supported F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt F: Documentation/devicetree/bindings/media/mediatek-vpu.txt -F: drivers/media/platform/mtk-vcodec/ +F: drivers/media/platform/mediatek/mtk-vcodec/ F: drivers/media/platform/mtk-vpu/ MEDIATEK MMC/SD/SDIO DRIVER diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index a45fd3fe103e..8ba10b657164 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -80,7 +80,7 @@ source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" -source "drivers/media/platform/mtk-vcodec/Kconfig" +source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" source "drivers/media/platform/mtk-vpu/Kconfig" source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/omap/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 6f5d09cd8f9b..637a3a7ac036 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -20,7 +20,7 @@ obj-y += intel/ obj-y += marvell/ obj-y += mediatek/mtk-jpeg/ obj-y += mediatek/mtk-mdp/ -obj-y += mtk-vcodec/ +obj-y += mediatek/mtk-vcodec/ obj-y += mtk-vpu/ obj-y += nxp/ obj-y += omap/ diff --git a/drivers/media/platform/mtk-vcodec/Kconfig b/drivers/media/platform/mediatek/mtk-vcodec/Kconfig similarity index 100% rename from drivers/media/platform/mtk-vcodec/Kconfig rename to drivers/media/platform/mediatek/mtk-vcodec/Kconfig diff --git a/drivers/media/platform/mtk-vcodec/Makefile b/drivers/media/platform/mediatek/mtk-vcodec/Makefile similarity index 100% rename from drivers/media/platform/mtk-vcodec/Makefile rename to drivers/media/platform/mediatek/mtk-vcodec/Makefile diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_drv_base.h rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.h rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h diff --git a/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.h rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.h rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_drv_base.h rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_drv_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_drv_if.h rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h diff --git a/drivers/media/platform/mtk-vcodec/venc_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_ipi_msg.h rename to drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.h rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h From patchwork Sun Mar 13 10:51:48 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: 12779179 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A26BAC433F5 for ; Sun, 13 Mar 2022 10:54:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dPC7PoW2txW07CXwvJapFO/TVtnkX60HSXqG/5LcotQ=; b=L5ngRUHn581O8D gbh4xyJgSVXy5a9i3OHVJor11CrWlVzEa/6V5qyzoBW4nFMBUbjvUdMxVodkgsVvrs/w5mG3NPtMr 0ncZGR1heY7SAy6wiWkC3dCpanhMX3tT/ItN56b8sgcpU9ysSgKqAA0UidaoCybTCJhGD1tSeLTdx fdyy2tHklqKE/o79lohw4WjPMzKinDHkqTCIGfCCyo6mFU56q76da24d+/t5f9C0zALUZJV6h1lB9 Rst72jSL3KpUlSl1QdHXVaRReJ6OMg2j5IcIdyJA69kMIFI2CMFLa9MBwG/F4c7enZK0gpoSvbjPs nJoGGtBDakjpJzm5hWTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTLrH-002aDK-Qs; Sun, 13 Mar 2022 10:53:55 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTLpc-002ZNt-E4; Sun, 13 Mar 2022 10:52:18 +0000 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 ams.source.kernel.org (Postfix) with ESMTPS id 19908B80CAC; Sun, 13 Mar 2022 10:52:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C8ACC340FC; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=+XUrxUNJJc78O+G+Ztb+zSl+5Iq7rWoIkMhUhvOheWI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IG+X9wJ1YQpuJ79qHtaVUuZ9k1cWgA9Wts6EoW3UWDux4fElQnuv8sKbU14YuK1GF +7tjg3rOVRRUOL8EnEjnGZQ3K4XaRAY6gquOqf38M1Uh+tfb02Bzo3uk8GCd841ziJ 7m+U+2fjAlX4wGc1vXBNrhSeJdJhTc4qrjK9C+JgDYsB2bHztmCiQ7AooqFtI8wNuC yXxgYNwmlPZJM9A5cCQ6NAyWusoFXMB617ie3O+eOS31X8c3Mi3k6Un4FhGRK9orQC rCN3UFOL04S0mnfDKB2n7ahehABI471RPQrJ9M9ikQKym0WsK+zqGzvoxj9yZh3j5x TcgdOEQfIJ4pQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I1g-1I; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Andrew-CT Chen , Christophe JAILLET , Dafna Hirschfeld , Ding Senjie , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Houlong Wei , Jacopo Mondi , Jernej Skrabec , Lad Prabhakar , Laurent Pinchart , Matthias Brugger , Ming Qian , Minghsiu Tsai , Sakari Ailus , Tiffany Lin , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH 07/24] media: platform: rename mtk-vpu/ to mediatek/mtk-vpu/ Date: Sun, 13 Mar 2022 11:51:48 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220313_035212_793258_D920DFC4 X-CRM114-Status: GOOD ( 11.77 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org As the end goal is to have platform drivers split by vendor, rename mtk-vpu/ to mediatek/mtk-vpu/. Signed-off-by: Mauro Carvalho Chehab --- 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/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 4 ++-- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/mediatek/mtk-mdp/Makefile | 2 +- drivers/media/platform/{ => mediatek}/mtk-vpu/Kconfig | 0 drivers/media/platform/{ => mediatek}/mtk-vpu/Makefile | 0 drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.c | 0 drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.h | 0 8 files changed, 5 insertions(+), 5 deletions(-) rename drivers/media/platform/{ => mediatek}/mtk-vpu/Kconfig (100%) rename drivers/media/platform/{ => mediatek}/mtk-vpu/Makefile (100%) rename drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index bfe014870a77..58e0d42b1278 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12139,7 +12139,7 @@ M: Andrew-CT Chen S: Supported F: Documentation/devicetree/bindings/media/mediatek-mdp.txt F: drivers/media/platform/mediatek/mtk-mdp/ -F: drivers/media/platform/mtk-vpu/ +F: drivers/media/platform/mediatek/mtk-vpu/ MEDIATEK MEDIA DRIVER M: Tiffany Lin @@ -12148,7 +12148,7 @@ S: Supported F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt F: Documentation/devicetree/bindings/media/mediatek-vpu.txt F: drivers/media/platform/mediatek/mtk-vcodec/ -F: drivers/media/platform/mtk-vpu/ +F: drivers/media/platform/mediatek/mtk-vpu/ MEDIATEK MMC/SD/SDIO DRIVER M: Chaotian Jing diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 8ba10b657164..33f8f41b2771 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -81,7 +81,7 @@ source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" -source "drivers/media/platform/mtk-vpu/Kconfig" +source "drivers/media/platform/mediatek/mtk-vpu/Kconfig" source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/omap3isp/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 637a3a7ac036..954ad8f2cde1 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -21,7 +21,7 @@ obj-y += marvell/ obj-y += mediatek/mtk-jpeg/ obj-y += mediatek/mtk-mdp/ obj-y += mediatek/mtk-vcodec/ -obj-y += mtk-vpu/ +obj-y += mediatek/mtk-vpu/ obj-y += nxp/ obj-y += omap/ obj-y += omap3isp/ diff --git a/drivers/media/platform/mediatek/mtk-mdp/Makefile b/drivers/media/platform/mediatek/mtk-mdp/Makefile index 5982d65c9971..eab6f984aeea 100644 --- a/drivers/media/platform/mediatek/mtk-mdp/Makefile +++ b/drivers/media/platform/mediatek/mtk-mdp/Makefile @@ -7,4 +7,4 @@ mtk-mdp-y += mtk_mdp_vpu.o obj-$(CONFIG_VIDEO_MEDIATEK_MDP) += mtk-mdp.o -ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vpu +ccflags-y += -I$(srctree)/drivers/media/platform/mediatek/mtk-vpu diff --git a/drivers/media/platform/mtk-vpu/Kconfig b/drivers/media/platform/mediatek/mtk-vpu/Kconfig similarity index 100% rename from drivers/media/platform/mtk-vpu/Kconfig rename to drivers/media/platform/mediatek/mtk-vpu/Kconfig diff --git a/drivers/media/platform/mtk-vpu/Makefile b/drivers/media/platform/mediatek/mtk-vpu/Makefile similarity index 100% rename from drivers/media/platform/mtk-vpu/Makefile rename to drivers/media/platform/mediatek/mtk-vpu/Makefile diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c similarity index 100% rename from drivers/media/platform/mtk-vpu/mtk_vpu.c rename to drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.h b/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h similarity index 100% rename from drivers/media/platform/mtk-vpu/mtk_vpu.h rename to drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h From patchwork Sun Mar 13 10:52:04 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: 12779206 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E9AE3C433EF for ; Sun, 13 Mar 2022 10:57:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xSArKJ8v6G+qa4gFVLAaFx+d6LAXYNw288396mqeRhY=; b=rylj2ECvQyIAhE PHAT8KMZ73tqv8YhaTGzYysvmMl01CJ1tz9CufUxAqzp5jsLXrY4arx6BeC5aJsOnPFw1SaQ939un swOxkV42S5yHvPJkXq+g0rT1ffrRWOs+ZDlV/bevdtYHAKdZ+lRhvmi2YmbvKqj1UZZVAoNQOK7ti NIhCH5TuQmqLvMbJGCMS/f2qP3tYo6IuoSAZf7DsjvJ6NFXYMb8x6FZVo7cgGPxxXm/kShjetvpTH IgzlpB/iV+nFamMbDRD61+ZnFSR0rIzXDNCdl462q8j0p553hhFpOrOOQxmwIWYECbXmPqlggie2t alIPrRbkRf8bMTyWuGgg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTLup-002bzT-Hj; Sun, 13 Mar 2022 10:57:35 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTLpn-002ZY5-Se; Sun, 13 Mar 2022 10:52:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=VR7l/aH3Jmjxuw1ICIBPNm2gDIGR1QczOZds9SSRJFE=; b=FaiX7+aW6OWGQeRbAcNpR4RQGo cRSksc+HGf8Nbt59YMz7uQaiJ14rhxMlytfp/Ksy1WnWmHy4KigUyKC9RSP79JlLb+eu1IpkLRERY +wp5cExkBSIFSnQgZt5voi9qubVg34ELlp3Hp9zglmqB3GaNVzcWg17PdtDujKuRX9IkO4UXtSUBE P52PtTIHNbjWL1/GzvMnG1evW+l+UA3Ufs1CNOZCHoauWEb6JJRGE6SwLsJj1Xxj0NJmXhczwtcIB /zQsDXmAqby20qhsNxmgzrrikP9waRhl2YFN+1ew9PjjpccmHfO4EpRydD28Iw79Z5oovCGa1UDNo fdTn0wkw==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTLph-000Urj-Em; Sun, 13 Mar 2022 10:52:22 +0000 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 42BFD6109E; Sun, 13 Mar 2022 10:52:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 302A9C36AF5; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168730; bh=ZJpDoFp5EVeECmac6pdqahL0F4Nn1kZOAzMvBSNwEMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D+PzrITrS1Cxj7gsEoQHQXrY3T4geigSw9fPsVMF04tWihbcZAbf+YwdnIKnm+G5f PYQsl9qLUKw/XNrChWPYn6T19xD8DqxIkjxbm7PsbGI4ia1HX88NWI3bhT6lubpng7 momyLMqBuEnr0N2IxynFEiUhBvOlnh3kRWiL8E0Sugq9bGlWpYGfkhkdFeyFBMLqrM YNv8TsPU9eLiwKHmmrytxq//3PF04qLoZ8JfNyg39qZ+yFS9tSQQhayumWud/o3PqY thN7+BJQBS4Hhh5qF9QbEDs3OCy1g34XkkNExXrFS1CHVJWksIZUGJtwqDp1+mph6C 5FBAssrz8/YLQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I2i-Rl; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Andy Gross , Bjorn Andersson , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Heiko Stuebner , Jacopo Mondi , Jernej Skrabec , Laurent Pinchart , Matthias Brugger , Ming Qian , Robert Foss , Sakari Ailus , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH 23/24] media: platform: Create vendor/{Makefile, Kconfig} files Date: Sun, 13 Mar 2022 11:52:04 +0100 Message-Id: <96ba1497fde1226a3ccc3efe7b39c67f4a6f2aa3.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220313_105217_756894_1B8EF0A8 X-CRM114-Status: GOOD ( 14.93 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Instead of placing multiple per-vendor entries at the platform/{Makefile,Kconfig}, create them at the per-vendor directories. Signed-off-by: Mauro Carvalho Chehab --- 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/cover.1647167750.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 24 ++++------------ drivers/media/platform/Makefile | 35 ++++++------------------ drivers/media/platform/amlogic/Kconfig | 2 ++ drivers/media/platform/amlogic/Makefile | 2 ++ drivers/media/platform/mediatek/Kconfig | 5 ++++ drivers/media/platform/mediatek/Makefile | 5 ++++ drivers/media/platform/nvidia/Kconfig | 2 ++ drivers/media/platform/nxp/Kconfig | 1 + drivers/media/platform/nxp/Makefile | 1 + drivers/media/platform/qcom/Makefile | 3 ++ drivers/media/platform/rockchip/Makefile | 3 ++ drivers/media/platform/samsung/Kconfig | 7 +++++ drivers/media/platform/samsung/Makefile | 7 +++++ drivers/media/platform/sti/Kconfig | 1 + drivers/media/platform/sti/Makefile | 6 ++++ drivers/media/platform/ti/Kconfig | 6 ++++ drivers/media/platform/ti/Makefile | 6 ++++ 17 files changed, 70 insertions(+), 46 deletions(-) create mode 100644 drivers/media/platform/amlogic/Kconfig create mode 100644 drivers/media/platform/amlogic/Makefile create mode 100644 drivers/media/platform/mediatek/Kconfig create mode 100644 drivers/media/platform/mediatek/Makefile create mode 100644 drivers/media/platform/nvidia/Kconfig create mode 100644 drivers/media/platform/qcom/Makefile create mode 100644 drivers/media/platform/rockchip/Makefile create mode 100644 drivers/media/platform/samsung/Kconfig create mode 100644 drivers/media/platform/samsung/Makefile create mode 100644 drivers/media/platform/sti/Makefile create mode 100644 drivers/media/platform/ti/Kconfig create mode 100644 drivers/media/platform/ti/Makefile diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index d9bd7a675c22..4e7b2973fbc1 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -67,36 +67,22 @@ config VIDEO_MUX source "drivers/media/platform/allegro-dvt/Kconfig" source "drivers/media/platform/allwinner/Kconfig" -source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" +source "drivers/media/platform/amlogic/Kconfig" 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/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" -source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" -source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" -source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" -source "drivers/media/platform/mediatek/mtk-vpu/Kconfig" -source "drivers/media/platform/nvidia/tegra-vde/Kconfig" +source "drivers/media/platform/mediatek/Kconfig" +source "drivers/media/platform/nvidia/Kconfig" source "drivers/media/platform/nxp/Kconfig" -source "drivers/media/platform/nxp/amphion/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/Kconfig" -source "drivers/media/platform/samsung/exynos-gsc/Kconfig" -source "drivers/media/platform/samsung/exynos4-is/Kconfig" -source "drivers/media/platform/samsung/s3c-camif/Kconfig" -source "drivers/media/platform/samsung/s5p-g2d/Kconfig" -source "drivers/media/platform/samsung/s5p-jpeg/Kconfig" -source "drivers/media/platform/samsung/s5p-mfc/Kconfig" +source "drivers/media/platform/samsung/Kconfig" source "drivers/media/platform/sti/Kconfig" -source "drivers/media/platform/sti/stm32/Kconfig" -source "drivers/media/platform/ti/am437x/Kconfig" -source "drivers/media/platform/ti/davinci/Kconfig" -source "drivers/media/platform/ti/omap/Kconfig" -source "drivers/media/platform/ti/omap3isp/Kconfig" -source "drivers/media/platform/ti/vpe/Kconfig" +source "drivers/media/platform/ti/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 1e62a4009b6c..5b14b231140b 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -7,41 +7,22 @@ # (e. g. LC_ALL=C sort Makefile) obj-y += allegro-dvt/ obj-y += allwinner/ -obj-y += amlogic/meson-ge2d/ +obj-y += amlogic/ obj-y += aspeed/ obj-y += atmel/ obj-y += cadence/ obj-y += chips-media/ obj-y += intel/ obj-y += marvell/ -obj-y += mediatek/mtk-jpeg/ -obj-y += mediatek/mtk-mdp/ -obj-y += mediatek/mtk-vcodec/ -obj-y += mediatek/mtk-vpu/ -obj-y += nvidia/tegra-vde/ +obj-y += mediatek/ +obj-y += nvidia/ obj-y += nxp/ -obj-y += nxp/amphion/ -obj-y += qcom/camss/ -obj-y += qcom/venus/ +obj-y += qcom/ obj-y += renesas/ -obj-y += rockchip/rga/ -obj-y += rockchip/rkisp1/ -obj-y += samsung/exynos-gsc/ -obj-y += samsung/exynos4-is/ -obj-y += samsung/s3c-camif/ -obj-y += samsung/s5p-g2d/ -obj-y += samsung/s5p-jpeg/ -obj-y += samsung/s5p-mfc/ -obj-y += sti/bdisp/ -obj-y += sti/c8sectpfe/ -obj-y += sti/delta/ -obj-y += sti/hva/ -obj-y += sti/stm32/ -obj-y += ti/am437x/ -obj-y += ti/davinci/ -obj-y += ti/omap/ -obj-y += ti/omap3isp/ -obj-y += ti/vpe/ +obj-y += rockchip/ +obj-y += samsung/ +obj-y += sti/ +obj-y += ti/ obj-y += via/ obj-y += xilinx/ diff --git a/drivers/media/platform/amlogic/Kconfig b/drivers/media/platform/amlogic/Kconfig new file mode 100644 index 000000000000..09fb145a0b30 --- /dev/null +++ b/drivers/media/platform/amlogic/Kconfig @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" diff --git a/drivers/media/platform/amlogic/Makefile b/drivers/media/platform/amlogic/Makefile new file mode 100644 index 000000000000..ec387adbacdd --- /dev/null +++ b/drivers/media/platform/amlogic/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += meson-ge2d/ diff --git a/drivers/media/platform/mediatek/Kconfig b/drivers/media/platform/mediatek/Kconfig new file mode 100644 index 000000000000..549abf1df7d9 --- /dev/null +++ b/drivers/media/platform/mediatek/Kconfig @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 +source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" +source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" +source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" +source "drivers/media/platform/mediatek/mtk-vpu/Kconfig" diff --git a/drivers/media/platform/mediatek/Makefile b/drivers/media/platform/mediatek/Makefile new file mode 100644 index 000000000000..ec7f58943576 --- /dev/null +++ b/drivers/media/platform/mediatek/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += mtk-jpeg/ +obj-y += mtk-mdp/ +obj-y += mtk-vcodec/ +obj-y += mtk-vpu/ diff --git a/drivers/media/platform/nvidia/Kconfig b/drivers/media/platform/nvidia/Kconfig new file mode 100644 index 000000000000..413005d8cd66 --- /dev/null +++ b/drivers/media/platform/nvidia/Kconfig @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +source "drivers/media/platform/nvidia/tegra-vde/Kconfig" diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nxp/Kconfig index af5cd4eb6bf3..e8c9d33cd3b7 100644 --- a/drivers/media/platform/nxp/Kconfig +++ b/drivers/media/platform/nxp/Kconfig @@ -64,3 +64,4 @@ config VIDEO_MX2_EMMAPRP conversion. source "drivers/media/platform/nxp/imx-jpeg/Kconfig" +source "drivers/media/platform/nxp/amphion/Kconfig" diff --git a/drivers/media/platform/nxp/Makefile b/drivers/media/platform/nxp/Makefile index a217cf7f109d..9ff13ce1391d 100644 --- a/drivers/media/platform/nxp/Makefile +++ b/drivers/media/platform/nxp/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 +obj-y += amphion/ obj-y += imx-jpeg/ obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx-mipi-csis.o diff --git a/drivers/media/platform/qcom/Makefile b/drivers/media/platform/qcom/Makefile new file mode 100644 index 000000000000..98628912bc05 --- /dev/null +++ b/drivers/media/platform/qcom/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += camss/ +obj-y += venus/ diff --git a/drivers/media/platform/rockchip/Makefile b/drivers/media/platform/rockchip/Makefile new file mode 100644 index 000000000000..ef58d1a82fc6 --- /dev/null +++ b/drivers/media/platform/rockchip/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += rga/ +obj-y += rkisp1/ diff --git a/drivers/media/platform/samsung/Kconfig b/drivers/media/platform/samsung/Kconfig new file mode 100644 index 000000000000..9e9e8acdccd3 --- /dev/null +++ b/drivers/media/platform/samsung/Kconfig @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +source "drivers/media/platform/samsung/exynos-gsc/Kconfig" +source "drivers/media/platform/samsung/exynos4-is/Kconfig" +source "drivers/media/platform/samsung/s3c-camif/Kconfig" +source "drivers/media/platform/samsung/s5p-g2d/Kconfig" +source "drivers/media/platform/samsung/s5p-jpeg/Kconfig" +source "drivers/media/platform/samsung/s5p-mfc/Kconfig" diff --git a/drivers/media/platform/samsung/Makefile b/drivers/media/platform/samsung/Makefile new file mode 100644 index 000000000000..00a2d7e4daab --- /dev/null +++ b/drivers/media/platform/samsung/Makefile @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += exynos-gsc/ +obj-y += exynos4-is/ +obj-y += s3c-camif/ +obj-y += s5p-g2d/ +obj-y += s5p-jpeg/ +obj-y += s5p-mfc/ diff --git a/drivers/media/platform/sti/Kconfig b/drivers/media/platform/sti/Kconfig index 9fb5e78a92cf..d5423743d905 100644 --- a/drivers/media/platform/sti/Kconfig +++ b/drivers/media/platform/sti/Kconfig @@ -3,3 +3,4 @@ source "drivers/media/platform/sti/bdisp/Kconfig" source "drivers/media/platform/sti/c8sectpfe/Kconfig" source "drivers/media/platform/sti/delta/Kconfig" source "drivers/media/platform/sti/hva/Kconfig" +source "drivers/media/platform/sti/stm32/Kconfig" diff --git a/drivers/media/platform/sti/Makefile b/drivers/media/platform/sti/Makefile new file mode 100644 index 000000000000..a26dc89de577 --- /dev/null +++ b/drivers/media/platform/sti/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += bdisp/ +obj-y += c8sectpfe/ +obj-y += delta/ +obj-y += hva/ +obj-y += stm32/ diff --git a/drivers/media/platform/ti/Kconfig b/drivers/media/platform/ti/Kconfig new file mode 100644 index 000000000000..796acd229987 --- /dev/null +++ b/drivers/media/platform/ti/Kconfig @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +source "drivers/media/platform/ti/am437x/Kconfig" +source "drivers/media/platform/ti/davinci/Kconfig" +source "drivers/media/platform/ti/omap/Kconfig" +source "drivers/media/platform/ti/omap3isp/Kconfig" +source "drivers/media/platform/ti/vpe/Kconfig" diff --git a/drivers/media/platform/ti/Makefile b/drivers/media/platform/ti/Makefile new file mode 100644 index 000000000000..2e0f43ed2e25 --- /dev/null +++ b/drivers/media/platform/ti/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += am437x/ +obj-y += davinci/ +obj-y += omap/ +obj-y += omap3isp/ +obj-y += vpe/ From patchwork Sun Mar 13 10:52:05 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: 12779207 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 79767C433EF for ; Sun, 13 Mar 2022 10:59:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PNYNaFd0V6kA3gS3E30ExXlBoUKQaZem5uTDp8E4Sog=; b=YU7y/fzkiBNeom oNXfcI0mQMznFsMsDyUDA3yag8vRQ8oLqXUCgnn21g9Al9JUgMMwzrFFt0WqCc+D216+rjtqj12P/ dBUXXVTuF679qoxoSVatLsT8Lh6YGS9WNmMgyN5a/a6jYgRSOe142sOv67ieRxyfkyVj2XBI99bWF cH9n3e/8vpSYtBNy8f2Rq8V+YqFdbUf33j1vdTu8FIWsRZBvHkBbQ4lJVZPO1zf+eveIKuVhVpwpZ 14M1JCTb4yaoa4/GabM2lfxMcsqRbviJf2+BeYRY2TgCMg8xZjVRT+uj++4/rnK5beZbQ3lzeyv5+ 5glN2SDEPU3trUx4v88g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTLwO-002cm5-0E; Sun, 13 Mar 2022 10:59:12 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTLpf-002ZTC-J4; Sun, 13 Mar 2022 10:52:26 +0000 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 2458561073; Sun, 13 Mar 2022 10:52:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C0AAC36AF2; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168730; bh=FFtBVxCNU0lgtf6MUAIWU8V5I44U7IcShp/XmPLquDk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AKD41VptMrEe+KcRJCNw7xHaeEIs5iGnrBPLPFycB4lXByUCL/38lXjxxbEmSSn47 3BSq/Rc+w/EJVuOfdM9XgDd9Twsi8hFDqYAbqgymBRpwUv/lWbQGKQY7XAjMIjhr4W vYU4duYCyeEQp+v64p4dqK+k+i0OoW95Xb11gyz4c3xQ6fH43PmU82cXh9aVWjbVct NnVbVQOom1sfAaei9jha7r8BksuK5GXt3RK8KONxCnw09MplpEiqkzaLwlS4MrWd2o /EoVe7FqoC4hwo07D05FDxS3dVwV3KxCtJ0sJnwOk+bS/NymyVkbYx//QAomVz3I9c ym7VCuHLA8YRw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I2m-Ts; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , Alexandre Belloni , Andrew Jeffery , Andy Gross , Bjorn Andersson , Eddie James , Eugen Hristev , Hans Verkuil , Heiko Stuebner , Hyun Kwon , Jacopo Mondi , Jernej Skrabec , Joel Stanley , Laurent Pinchart , Ludovic Desroches , Matthias Brugger , Michael Tretter , Michal Simek , Nicolas Ferre , Pengutronix Kernel Team , Philipp Zabel , Robert Foss , 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-rockchip@lists.infradead.org, openbmc@lists.ozlabs.org Subject: [PATCH 24/24] media: platform/*/Kconfig: make menus more uniform Date: Sun, 13 Mar 2022 11:52:05 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220313_035215_736901_F21CF286 X-CRM114-Status: GOOD ( 17.99 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Do some adjustments at the per-vendor Kconfig, adding a comment at the beginning in order to identify the manufacturer, and adjust a few entries to make them look more uniform. Signed-off-by: Mauro Carvalho Chehab --- 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/cover.1647167750.git.mchehab@kernel.org/ drivers/media/platform/allegro-dvt/Kconfig | 3 +++ drivers/media/platform/amlogic/Kconfig | 3 +++ drivers/media/platform/aspeed/Kconfig | 3 +++ drivers/media/platform/atmel/Kconfig | 3 +++ drivers/media/platform/cadence/Kconfig | 13 +----------- drivers/media/platform/chips-media/Kconfig | 3 +++ drivers/media/platform/intel/Kconfig | 3 +++ drivers/media/platform/marvell/Kconfig | 3 +++ drivers/media/platform/mediatek/Kconfig | 3 +++ drivers/media/platform/nvidia/Kconfig | 3 +++ drivers/media/platform/nxp/Kconfig | 24 ++++++---------------- drivers/media/platform/qcom/Kconfig | 3 +++ drivers/media/platform/renesas/Kconfig | 2 ++ drivers/media/platform/rockchip/Kconfig | 3 +++ drivers/media/platform/samsung/Kconfig | 3 +++ drivers/media/platform/sti/Kconfig | 3 +++ drivers/media/platform/ti/Kconfig | 3 +++ drivers/media/platform/via/Kconfig | 3 +++ drivers/media/platform/xilinx/Kconfig | 7 +++---- 19 files changed, 57 insertions(+), 34 deletions(-) diff --git a/drivers/media/platform/allegro-dvt/Kconfig b/drivers/media/platform/allegro-dvt/Kconfig index c3f76a6fb6f8..735440369c5c 100644 --- a/drivers/media/platform/allegro-dvt/Kconfig +++ b/drivers/media/platform/allegro-dvt/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Allegro DVT drivers" + config VIDEO_ALLEGRO_DVT tristate "Allegro DVT Video IP Core" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/amlogic/Kconfig b/drivers/media/platform/amlogic/Kconfig index 09fb145a0b30..bc8d99e12f96 100644 --- a/drivers/media/platform/amlogic/Kconfig +++ b/drivers/media/platform/amlogic/Kconfig @@ -1,2 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 + +comment "Amlogic drivers" + source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" diff --git a/drivers/media/platform/aspeed/Kconfig b/drivers/media/platform/aspeed/Kconfig index 810902c8a85a..af95b08adf46 100644 --- a/drivers/media/platform/aspeed/Kconfig +++ b/drivers/media/platform/aspeed/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Aspeed drivers" + config VIDEO_ASPEED tristate "Aspeed AST2400 and AST2500 Video Engine driver" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/atmel/Kconfig b/drivers/media/platform/atmel/Kconfig index abeb0ac595b3..ae0fa7f96f66 100644 --- a/drivers/media/platform/atmel/Kconfig +++ b/drivers/media/platform/atmel/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Atmel drivers" + config VIDEO_ATMEL_ISC tristate "ATMEL Image Sensor Controller (ISC) support" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/cadence/Kconfig b/drivers/media/platform/cadence/Kconfig index acfa0ef6247e..1a0f2d9a6a28 100644 --- a/drivers/media/platform/cadence/Kconfig +++ b/drivers/media/platform/cadence/Kconfig @@ -1,15 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only -config VIDEO_CADENCE - bool "Cadence Video Devices" - depends on V4L_PLATFORM_DRIVERS - help - If you have a media device designed by Cadence, say Y. - Note that this option doesn't include new drivers in the kernel: - saying N will just cause Kconfig to skip all the questions about - Cadence media devices. - -if VIDEO_CADENCE +comment "Cadence drivers" config VIDEO_CADENCE_CSI2RX tristate "Cadence MIPI-CSI2 RX Controller" @@ -34,5 +25,3 @@ config VIDEO_CADENCE_CSI2TX To compile this driver as a module, choose M here: the module will be called cdns-csi2tx. - -endif diff --git a/drivers/media/platform/chips-media/Kconfig b/drivers/media/platform/chips-media/Kconfig index 22b654018f3c..ea49b3563320 100644 --- a/drivers/media/platform/chips-media/Kconfig +++ b/drivers/media/platform/chips-media/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Chips&Media drivers" + config VIDEO_CODA tristate "Chips&Media Coda multi-standard codec IP" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/intel/Kconfig b/drivers/media/platform/intel/Kconfig index d47a2cf6f334..091e15f00ef5 100644 --- a/drivers/media/platform/intel/Kconfig +++ b/drivers/media/platform/intel/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Intel drivers" + config VIDEO_PXA27x tristate "PXA27x Quick Capture Interface driver" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/marvell/Kconfig b/drivers/media/platform/marvell/Kconfig index 474795668930..d7275322fd92 100644 --- a/drivers/media/platform/marvell/Kconfig +++ b/drivers/media/platform/marvell/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Marvell drivers" + config VIDEO_CAFE_CCIC tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/mediatek/Kconfig b/drivers/media/platform/mediatek/Kconfig index 549abf1df7d9..8e0770fb2dd3 100644 --- a/drivers/media/platform/mediatek/Kconfig +++ b/drivers/media/platform/mediatek/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 + +comment "Mediatek drivers" + source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" diff --git a/drivers/media/platform/nvidia/Kconfig b/drivers/media/platform/nvidia/Kconfig index 413005d8cd66..8fdb41e64308 100644 --- a/drivers/media/platform/nvidia/Kconfig +++ b/drivers/media/platform/nvidia/Kconfig @@ -1,2 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 + +comment "NVidia drivers" + source "drivers/media/platform/nvidia/tegra-vde/Kconfig" diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nxp/Kconfig index e8c9d33cd3b7..65357344d5e5 100644 --- a/drivers/media/platform/nxp/Kconfig +++ b/drivers/media/platform/nxp/Kconfig @@ -2,20 +2,10 @@ # V4L drivers -menuconfig VIDEO_IMX - bool "V4L2 capture drivers for NXP i.MX devices" - depends on V4L_PLATFORM_DRIVERS - depends on ARCH_MXC || COMPILE_TEST - depends on VIDEO_DEV - help - Say yes here to enable support for capture drivers on i.MX SoCs. - Support for the single SoC features are selectable in the sub-menu - options. - -if VIDEO_IMX +comment "NXP drivers" config VIDEO_IMX_MIPI_CSIS - tristate "MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models" + tristate "NXP MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models" select MEDIA_CONTROLLER select V4L2_FWNODE select VIDEO_V4L2_SUBDEV_API @@ -24,10 +14,8 @@ config VIDEO_IMX_MIPI_CSIS Video4Linux2 sub-device driver for the MIPI CSI-2 CSIS receiver v3.3/v3.6.3 found on some i.MX7 and i.MX8 SoCs. -endif # VIDEO_IMX - config VIDEO_VIU - tristate "Freescale/NXP VIU Video Driver" + tristate "NXP VIU Video Driver" depends on V4L_PLATFORM_DRIVERS depends on VIDEO_DEV && (PPC_MPC512x || COMPILE_TEST) && I2C select VIDEOBUF_DMA_CONTIG @@ -42,7 +30,7 @@ config VIDEO_VIU # mem2mem drivers config VIDEO_IMX_PXP - tristate "i.MX Pixel Pipeline (PXP)" + tristate "NXP i.MX Pixel Pipeline (PXP)" depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && (ARCH_MXC || COMPILE_TEST) select VIDEOBUF2_DMA_CONTIG @@ -52,7 +40,7 @@ config VIDEO_IMX_PXP color space conversion, and rotation. config VIDEO_MX2_EMMAPRP - tristate "Freescale/NXP MX2 eMMa-PrP support" + tristate "NXP MX2 eMMa-PrP support" depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV depends on SOC_IMX27 || COMPILE_TEST @@ -63,5 +51,5 @@ config VIDEO_MX2_EMMAPRP memory to memory. Operations include resizing and format conversion. -source "drivers/media/platform/nxp/imx-jpeg/Kconfig" source "drivers/media/platform/nxp/amphion/Kconfig" +source "drivers/media/platform/nxp/imx-jpeg/Kconfig" diff --git a/drivers/media/platform/qcom/Kconfig b/drivers/media/platform/qcom/Kconfig index aa2428f641d3..b19b4f319f6b 100644 --- a/drivers/media/platform/qcom/Kconfig +++ b/drivers/media/platform/qcom/Kconfig @@ -1,3 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 + +comment "Qualcomm drivers" + source "drivers/media/platform/qcom/camss/Kconfig" source "drivers/media/platform/qcom/venus/Kconfig" diff --git a/drivers/media/platform/renesas/Kconfig b/drivers/media/platform/renesas/Kconfig index 0c0de21584ba..8c707ab38d0a 100644 --- a/drivers/media/platform/renesas/Kconfig +++ b/drivers/media/platform/renesas/Kconfig @@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only +comment "Renesas drivers" + # V4L drivers config VIDEO_RENESAS_CEU diff --git a/drivers/media/platform/rockchip/Kconfig b/drivers/media/platform/rockchip/Kconfig index c7ba06388780..558e3e4b5aa4 100644 --- a/drivers/media/platform/rockchip/Kconfig +++ b/drivers/media/platform/rockchip/Kconfig @@ -1,3 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 + +comment "Rockchip drivers" + source "drivers/media/platform/rockchip/rga/Kconfig" source "drivers/media/platform/rockchip/rkisp1/Kconfig" diff --git a/drivers/media/platform/samsung/Kconfig b/drivers/media/platform/samsung/Kconfig index 9e9e8acdccd3..8813b61b06f4 100644 --- a/drivers/media/platform/samsung/Kconfig +++ b/drivers/media/platform/samsung/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 + +comment "Samsung drivers" + source "drivers/media/platform/samsung/exynos-gsc/Kconfig" source "drivers/media/platform/samsung/exynos4-is/Kconfig" source "drivers/media/platform/samsung/s3c-camif/Kconfig" diff --git a/drivers/media/platform/sti/Kconfig b/drivers/media/platform/sti/Kconfig index d5423743d905..a352087dba27 100644 --- a/drivers/media/platform/sti/Kconfig +++ b/drivers/media/platform/sti/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "STMicroelectronics drivers" + source "drivers/media/platform/sti/bdisp/Kconfig" source "drivers/media/platform/sti/c8sectpfe/Kconfig" source "drivers/media/platform/sti/delta/Kconfig" diff --git a/drivers/media/platform/ti/Kconfig b/drivers/media/platform/ti/Kconfig index 796acd229987..9e63ea70b48f 100644 --- a/drivers/media/platform/ti/Kconfig +++ b/drivers/media/platform/ti/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 + +comment "Texas Instruments drivers" + source "drivers/media/platform/ti/am437x/Kconfig" source "drivers/media/platform/ti/davinci/Kconfig" source "drivers/media/platform/ti/omap/Kconfig" diff --git a/drivers/media/platform/via/Kconfig b/drivers/media/platform/via/Kconfig index a289f5c81b7c..6077222eb274 100644 --- a/drivers/media/platform/via/Kconfig +++ b/drivers/media/platform/via/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "VIA drivers" + config VIDEO_VIA_CAMERA tristate "VIAFB camera controller support" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/xilinx/Kconfig b/drivers/media/platform/xilinx/Kconfig index 439120c45eb1..0c772d070eb6 100644 --- a/drivers/media/platform/xilinx/Kconfig +++ b/drivers/media/platform/xilinx/Kconfig @@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 +comment "Xilinx drivers" + config VIDEO_XILINX tristate "Xilinx Video IP (EXPERIMENTAL)" depends on V4L_PLATFORM_DRIVERS @@ -11,9 +13,8 @@ config VIDEO_XILINX help Driver for Xilinx Video IP Pipelines -if VIDEO_XILINX - config VIDEO_XILINX_CSI2RXSS + depends on VIDEO_XILINX tristate "Xilinx CSI-2 Rx Subsystem" help Driver for Xilinx MIPI CSI-2 Rx Subsystem. This is a V4L sub-device @@ -32,5 +33,3 @@ config VIDEO_XILINX_VTC depends on VIDEO_XILINX help Driver for the Xilinx Video Timing Controller - -endif #VIDEO_XILINX