From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9ACB6C433EF for ; Mon, 14 Mar 2022 07:56:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236881AbiCNH52 (ORCPT ); Mon, 14 Mar 2022 03:57:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236828AbiCNH5S (ORCPT ); Mon, 14 Mar 2022 03:57:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B8B441325; Mon, 14 Mar 2022 00:56:02 -0700 (PDT) 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 F118761181; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD50EC340F5; Mon, 14 Mar 2022 07:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=sG+EGKNooQ7ytwrbd3sfWhKa2qzMXjhOXW1OCOdb588=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tXzdMqhLh8x415IaREmoltZBBVsLE636rGhKIHydYBTUFPpuKWhxSbg2B+7GVuxzD 2WaYJD4fdaUTTthXR8egcUPmtjGuOwnycsSMSJlgobc2vSRUc/lUDb6VohcZK2k/kZ YPc0zzbaGJtAvZbmiWMMy5dLZq7+EcXZ8ignLl1yyN6sbgEDlW0M0XxZ9ueBQTb0H6 QT9rKvh/i+d+DxUcXrqzH3hH+/oAPx1ZRyQriFHr4QId4e7W+XF2wIehfF6peKj4yP B0SDxI4yCOg8Hy2FgEznxC3E4tBpZmMEarAvkb+GRCMvOj7H5C3FeKPEnCJjgKeS6y Sb1QT5FyYlvfg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYc-001kUF-8M; Mon, 14 Mar 2022 08:55:58 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Andy Walls , Hans Verkuil , Laurent Pinchart , Leon Romanovsky , Michael Krufky , Scott K Logan , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 01/64] media: xc2028: rename the driver from tuner-xc2028 Date: Mon, 14 Mar 2022 08:54:53 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This is the only tuner driver that has "tuner-" on its name. Rename it, in order to match all the other tuner drivers. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ Documentation/admin-guide/media/i2c-cardlist.rst | 2 +- MAINTAINERS | 2 +- 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/tuners/Makefile | 2 +- drivers/media/tuners/tuner-types.c | 2 +- .../media/tuners/{tuner-xc2028-types.h =3D> xc2028-types.h} | 6 +++--- drivers/media/tuners/{tuner-xc2028.c =3D> xc2028.c} | 6 +++--- drivers/media/tuners/{tuner-xc2028.h =3D> xc2028.h} | 2 +- drivers/media/tuners/xc4000.c | 2 +- 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/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/tuner-core.c | 2 +- 27 files changed, 31 insertions(+), 31 deletions(-) rename drivers/media/tuners/{tuner-xc2028-types.h =3D> xc2028-types.h} (96= %) rename drivers/media/tuners/{tuner-xc2028.c =3D> xc2028.c} (99%) rename drivers/media/tuners/{tuner-xc2028.h =3D> xc2028.h} (99%) diff --git a/Documentation/admin-guide/media/i2c-cardlist.rst b/Documentati= on/admin-guide/media/i2c-cardlist.rst index db17f39b56cf..ef3b5fff3b01 100644 --- a/Documentation/admin-guide/media/i2c-cardlist.rst +++ b/Documentation/admin-guide/media/i2c-cardlist.rst @@ -284,7 +284,7 @@ tda9887 TDA 9885/6/7 analog IF demodulator tea5761 TEA 5761 radio tuner tea5767 TEA 5767 radio tuner tua9001 Infineon TUA9001 silicon tuner -tuner-xc2028 XCeive xc2028/xc3028 tuners +xc2028 XCeive xc2028/xc3028 tuners xc4000 Xceive XC4000 silicon tuner xc5000 Xceive XC5000 silicon tuner =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/MAINTAINERS b/MAINTAINERS index ae55cd558d95..1a9fb0615925 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21049,7 +21049,7 @@ L: linux-media@vger.kernel.org S: Maintained W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git -F: drivers/media/tuners/tuner-xc2028.* +F: drivers/media/tuners/xc2028.* =20 XDP (eXpress Data Path) M: Alexei Starovoitov diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/= cx18-driver.c index 1be9672ae9d4..84260972c343 100644 --- a/drivers/media/pci/cx18/cx18-driver.c +++ b/drivers/media/pci/cx18/cx18-driver.c @@ -23,7 +23,7 @@ #include "cx18-mailbox.h" #include "cx18-ioctl.h" #include "cx18-controls.h" -#include "tuner-xc2028.h" +#include "xc2028.h" #include #include =20 diff --git a/drivers/media/pci/cx18/cx18-dvb.c b/drivers/media/pci/cx18/cx1= 8-dvb.c index 4c57a294b9fa..33e5a5b5fab4 100644 --- a/drivers/media/pci/cx18/cx18-dvb.c +++ b/drivers/media/pci/cx18/cx18-dvb.c @@ -22,7 +22,7 @@ #include #include "mt352.h" #include "mt352_priv.h" -#include "tuner-xc2028.h" +#include "xc2028.h" =20 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); =20 diff --git a/drivers/media/pci/cx18/cx18-gpio.c b/drivers/media/pci/cx18/cx= 18-gpio.c index cf7cfda94107..160c8377e352 100644 --- a/drivers/media/pci/cx18/cx18-gpio.c +++ b/drivers/media/pci/cx18/cx18-gpio.c @@ -12,7 +12,7 @@ #include "cx18-io.h" #include "cx18-cards.h" #include "cx18-gpio.h" -#include "tuner-xc2028.h" +#include "xc2028.h" =20 /********************* GPIO stuffs *********************/ =20 diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/= cx23885/cx23885-cards.c index 0160f909f38c..9244b4320558 100644 --- a/drivers/media/pci/cx23885/cx23885-cards.c +++ b/drivers/media/pci/cx23885/cx23885-cards.c @@ -15,7 +15,7 @@ #include #include =20 -#include "tuner-xc2028.h" +#include "xc2028.h" #include "netup-eeprom.h" #include "netup-init.h" #include "altera-ci.h" diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx= 23885/cx23885-dvb.c index 45c2f4afceb8..8fd5b6ef2428 100644 --- a/drivers/media/pci/cx23885/cx23885-dvb.c +++ b/drivers/media/pci/cx23885/cx23885-dvb.c @@ -28,7 +28,7 @@ #include "xc5000.h" #include "max2165.h" #include "tda10048.h" -#include "tuner-xc2028.h" +#include "xc2028.h" #include "tuner-simple.h" #include "dib7000p.h" #include "dib0070.h" diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/= cx23885/cx23885-video.c index a380e0920a21..3d03f5e95786 100644 --- a/drivers/media/pci/cx23885/cx23885-video.c +++ b/drivers/media/pci/cx23885/cx23885-video.c @@ -24,7 +24,7 @@ #include #include #include "cx23885-ioctl.h" -#include "tuner-xc2028.h" +#include "xc2028.h" =20 #include =20 diff --git a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h index ce4acf6de6aa..2ff3226a52ec 100644 --- a/drivers/media/pci/cx88/cx88.h +++ b/drivers/media/pci/cx88/cx88.h @@ -28,7 +28,7 @@ #include =20 #include "cx88-reg.h" -#include "tuner-xc2028.h" +#include "xc2028.h" =20 #include =20 diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/= ivtv-driver.c index 57d4d5485d7a..f5846c22c799 100644 --- a/drivers/media/pci/ivtv/ivtv-driver.c +++ b/drivers/media/pci/ivtv/ivtv-driver.c @@ -57,7 +57,7 @@ #include #include #include -#include "tuner-xc2028.h" +#include "xc2028.h" #include =20 /* If you have already X v4l cards, then set this to X. This way diff --git a/drivers/media/pci/ivtv/ivtv-gpio.c b/drivers/media/pci/ivtv/iv= tv-gpio.c index 856e7ab7f33e..6434c0d03a6d 100644 --- a/drivers/media/pci/ivtv/ivtv-gpio.c +++ b/drivers/media/pci/ivtv/ivtv-gpio.c @@ -10,7 +10,7 @@ #include "ivtv-driver.h" #include "ivtv-cards.h" #include "ivtv-gpio.h" -#include "tuner-xc2028.h" +#include "xc2028.h" #include #include =20 diff --git a/drivers/media/pci/saa7134/saa7134-cards.c b/drivers/media/pci/= saa7134/saa7134-cards.c index 0d82a4b27d5b..99be59af3560 100644 --- a/drivers/media/pci/saa7134/saa7134-cards.c +++ b/drivers/media/pci/saa7134/saa7134-cards.c @@ -15,7 +15,7 @@ #include #include =20 -#include "tuner-xc2028.h" +#include "xc2028.h" #include #include #include "tea5767.h" diff --git a/drivers/media/pci/saa7134/saa7134-dvb.c b/drivers/media/pci/sa= a7134/saa7134-dvb.c index d17a1b15faee..9c6cfef03331 100644 --- a/drivers/media/pci/saa7134/saa7134-dvb.c +++ b/drivers/media/pci/saa7134/saa7134-dvb.c @@ -26,7 +26,7 @@ #include "mt352_priv.h" /* FIXME */ #include "tda1004x.h" #include "nxt200x.h" -#include "tuner-xc2028.h" +#include "xc2028.h" #include "xc5000.h" =20 #include "tda10086.h" diff --git a/drivers/media/tuners/Makefile b/drivers/media/tuners/Makefile index 7b4f8423501e..abcad519a4f9 100644 --- a/drivers/media/tuners/Makefile +++ b/drivers/media/tuners/Makefile @@ -5,7 +5,7 @@ =20 tda18271-objs :=3D tda18271-maps.o tda18271-common.o tda18271-fe.o =20 -obj-$(CONFIG_MEDIA_TUNER_XC2028) +=3D tuner-xc2028.o +obj-$(CONFIG_MEDIA_TUNER_XC2028) +=3D xc2028.o obj-$(CONFIG_MEDIA_TUNER_SIMPLE) +=3D tuner-simple.o # tuner-types will be merged into tuner-simple, in the future obj-$(CONFIG_MEDIA_TUNER_SIMPLE) +=3D tuner-types.o diff --git a/drivers/media/tuners/tuner-types.c b/drivers/media/tuners/tune= r-types.c index 0ed2c5bc082e..ff5a6c0acdd4 100644 --- a/drivers/media/tuners/tuner-types.c +++ b/drivers/media/tuners/tuner-types.c @@ -1831,7 +1831,7 @@ struct tunertype tuners[] =3D { }, [TUNER_XC2028] =3D { /* Xceive 2028 */ .name =3D "Xceive xc2028/xc3028 tuner", - /* see tuner-xc2028.c for details */ + /* see xc2028.c for details */ }, [TUNER_THOMSON_FE6600] =3D { /* Thomson PAL / DVB-T */ .name =3D "Thomson FE6600", diff --git a/drivers/media/tuners/tuner-xc2028-types.h b/drivers/media/tune= rs/xc2028-types.h similarity index 96% rename from drivers/media/tuners/tuner-xc2028-types.h rename to drivers/media/tuners/xc2028-types.h index fcca39d3e006..63a03de1e97b 100644 --- a/drivers/media/tuners/tuner-xc2028-types.h +++ b/drivers/media/tuners/xc2028-types.h @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* - * tuner-xc2028_types + * xc2028_types * - * This file includes internal tipes to be used inside tuner-xc2028. - * Shouldn't be included outside tuner-xc2028 + * This file includes internal tipes to be used inside xc2028. + * Shouldn't be included outside xc2028 * * Copyright (c) 2007-2008 Mauro Carvalho Chehab */ diff --git a/drivers/media/tuners/tuner-xc2028.c b/drivers/media/tuners/xc2= 028.c similarity index 99% rename from drivers/media/tuners/tuner-xc2028.c rename to drivers/media/tuners/xc2028.c index 574c3bb135d7..69c2e1b99bf1 100644 --- a/drivers/media/tuners/tuner-xc2028.c +++ b/drivers/media/tuners/xc2028.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -// tuner-xc2028 +// xc2028 // // Copyright (c) 2007-2008 Mauro Carvalho Chehab // @@ -16,8 +16,8 @@ #include #include #include "tuner-i2c.h" -#include "tuner-xc2028.h" -#include "tuner-xc2028-types.h" +#include "xc2028.h" +#include "xc2028-types.h" =20 #include #include diff --git a/drivers/media/tuners/tuner-xc2028.h b/drivers/media/tuners/xc2= 028.h similarity index 99% rename from drivers/media/tuners/tuner-xc2028.h rename to drivers/media/tuners/xc2028.h index 2dd45d0765d7..072faae7a954 100644 --- a/drivers/media/tuners/tuner-xc2028.h +++ b/drivers/media/tuners/xc2028.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* - * tuner-xc2028 + * xc2028 * * Copyright (c) 2007-2008 Mauro Carvalho Chehab */ diff --git a/drivers/media/tuners/xc4000.c b/drivers/media/tuners/xc4000.c index d9606738ce43..a04dfd5799f7 100644 --- a/drivers/media/tuners/xc4000.c +++ b/drivers/media/tuners/xc4000.c @@ -22,7 +22,7 @@ =20 #include "xc4000.h" #include "tuner-i2c.h" -#include "tuner-xc2028-types.h" +#include "xc2028-types.h" =20 static int debug; module_param(debug, int, 0644); diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/= cxusb.c index 7707de7bae7c..265b960db499 100644 --- a/drivers/media/usb/dvb-usb/cxusb.c +++ b/drivers/media/usb/dvb-usb/cxusb.c @@ -35,7 +35,7 @@ #include "mt352.h" #include "mt352_priv.h" #include "zl10353.h" -#include "tuner-xc2028.h" +#include "xc2028.h" #include "tuner-simple.h" #include "mxl5005s.h" #include "max2165.h" diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/us= b/dvb-usb/dib0700_devices.c index 710c1afe3e85..08fcf120daf1 100644 --- a/drivers/media/usb/dvb-usb/dib0700_devices.c +++ b/drivers/media/usb/dvb-usb/dib0700_devices.c @@ -12,7 +12,7 @@ #include "dib9000.h" #include "mt2060.h" #include "mt2266.h" -#include "tuner-xc2028.h" +#include "xc2028.h" #include "xc5000.h" #include "xc4000.h" #include "s5h1411.h" diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28= xx/em28xx-i2c.c index 255395959255..b9a8d3fbad1a 100644 --- a/drivers/media/usb/em28xx/em28xx-i2c.c +++ b/drivers/media/usb/em28xx/em28xx-i2c.c @@ -26,7 +26,7 @@ #include #include =20 -#include "tuner-xc2028.h" +#include "xc2028.h" #include #include =20 diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/e= m28xx.h index ab167cd1f400..7fc0b68a4a22 100644 --- a/drivers/media/usb/em28xx/em28xx.h +++ b/drivers/media/usb/em28xx/em28xx.h @@ -41,7 +41,7 @@ #include #include #include -#include "tuner-xc2028.h" +#include "xc2028.h" #include "xc5000.h" #include "em28xx-reg.h" =20 diff --git a/drivers/media/usb/tm6000/tm6000-cards.c b/drivers/media/usb/tm= 6000/tm6000-cards.c index 5358cd8c4603..98f4a63adc2a 100644 --- a/drivers/media/usb/tm6000/tm6000-cards.c +++ b/drivers/media/usb/tm6000/tm6000-cards.c @@ -17,7 +17,7 @@ =20 #include "tm6000.h" #include "tm6000-regs.h" -#include "tuner-xc2028.h" +#include "xc2028.h" #include "xc5000.h" =20 #define TM6000_BOARD_UNKNOWN 0 diff --git a/drivers/media/usb/tm6000/tm6000-dvb.c b/drivers/media/usb/tm60= 00/tm6000-dvb.c index 4990fa886d7a..8c2725e4105b 100644 --- a/drivers/media/usb/tm6000/tm6000-dvb.c +++ b/drivers/media/usb/tm6000/tm6000-dvb.c @@ -16,7 +16,7 @@ =20 #include =20 -#include "tuner-xc2028.h" +#include "xc2028.h" #include "xc5000.h" =20 MODULE_DESCRIPTION("DVB driver extension module for tm5600/6000/6010 based= TV cards"); diff --git a/drivers/media/usb/tm6000/tm6000-i2c.c b/drivers/media/usb/tm60= 00/tm6000-i2c.c index b37782d6f79c..7554b93b82e6 100644 --- a/drivers/media/usb/tm6000/tm6000-i2c.c +++ b/drivers/media/usb/tm6000/tm6000-i2c.c @@ -15,7 +15,7 @@ #include "tm6000-regs.h" #include #include -#include "tuner-xc2028.h" +#include "xc2028.h" =20 =20 /* ----------------------------------------------------------- */ diff --git a/drivers/media/v4l2-core/tuner-core.c b/drivers/media/v4l2-core= /tuner-core.c index 12d1e0c33c3c..ad9224a18853 100644 --- a/drivers/media/v4l2-core/tuner-core.c +++ b/drivers/media/v4l2-core/tuner-core.c @@ -35,7 +35,7 @@ #include "tda8290.h" #include "tea5761.h" #include "tea5767.h" -#include "tuner-xc2028.h" +#include "xc2028.h" #include "tuner-simple.h" #include "tda9887.h" #include "xc5000.h" --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A18D8C433F5 for ; Mon, 14 Mar 2022 07:56:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236866AbiCNH5Z (ORCPT ); Mon, 14 Mar 2022 03:57:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236743AbiCNH5P (ORCPT ); Mon, 14 Mar 2022 03:57:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2430041323; Mon, 14 Mar 2022 00:56:02 -0700 (PDT) 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 974496117E; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6ABCC340E9; Mon, 14 Mar 2022 07:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=P2geQHH31RLZReClIkTVIqPSBaDXnpj6/KtMlxx22Ec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i+qkPkQy4Q9RULnxRdY8pN4dmEr6gTA2UP3Ito5vmqHFJenPZ89zLBXQi/RSZ3TUq xr6Ewt6usm6wDw9Kqjh8jDlaAzTu6NKErj64u/3WtwXL+m5gHjgzyF147i6kMNCovQ tgGIjkMcAdxxMhvREu+OtePzKyG8NEwlsPzb9Fmqhm4rrJPwKzow2zZc0XGuc4WLSe hn2VtdQBNiteFvnqLrax3UZsaZUklnUcFZdmV45rgj7AdJvKoEcz3JpOmDZu6bDP0S GOs4dpS2L1thdh/dUt/ri1OAPdZIdwoaEDvLAsegIgS6Jk/TBcIARwtTF6l+JA8M1H 3h5EqLCF+7vBA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYc-001kUI-BM; Mon, 14 Mar 2022 08:55:58 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Arec Kao , Daniele Alessandrelli , Hans Verkuil , Laurent Pinchart , Marek Vasut , Martin Kepplinger , Martina Krasteva , Sakari Ailus , Shawn Tu , Stefan Richter , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux1394-devel@lists.sourceforge.net Subject: [PATCH 02/64] media: Makefiles: remove extra spaces Date: Mon, 14 Mar 2022 08:54:54 +0100 Message-Id: <271e4323d9e93340fe37c15288056bae9e5bb1a0.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" It is hard to keep all those options aligned as newer config changes get added, and we really don't want to have patches adding new options also touching already existing entries. So, drop the extra spaces. Reviewed-by: Laurent Pinchart 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/Makefile | 4 +- drivers/media/cec/platform/Makefile | 16 ++--- drivers/media/firewire/Makefile | 2 +- drivers/media/i2c/Makefile | 92 ++++++++++++++--------------- drivers/media/test-drivers/Makefile | 10 ++-- drivers/media/usb/Makefile | 14 ++--- drivers/media/usb/gspca/Makefile | 88 +++++++++++++-------------- 7 files changed, 113 insertions(+), 113 deletions(-) diff --git a/drivers/media/Makefile b/drivers/media/Makefile index d18357bf1346..20fac24e4f0f 100644 --- a/drivers/media/Makefile +++ b/drivers/media/Makefile @@ -8,7 +8,7 @@ # when compiled as builtin drivers # obj-y +=3D i2c/ tuners/ -obj-$(CONFIG_DVB_CORE) +=3D dvb-frontends/ +obj-$(CONFIG_DVB_CORE) +=3D dvb-frontends/ =20 # # Now, let's link-in the media controller core @@ -18,7 +18,7 @@ ifeq ($(CONFIG_MEDIA_CONTROLLER),y) endif =20 obj-$(CONFIG_VIDEO_DEV) +=3D v4l2-core/ -obj-$(CONFIG_DVB_CORE) +=3D dvb-core/ +obj-$(CONFIG_DVB_CORE) +=3D dvb-core/ =20 # There are both core and drivers at RC subtree - merge before drivers obj-y +=3D rc/ diff --git a/drivers/media/cec/platform/Makefile b/drivers/media/cec/platfo= rm/Makefile index ea6f8ee8161c..26d2bc778394 100644 --- a/drivers/media/cec/platform/Makefile +++ b/drivers/media/cec/platform/Makefile @@ -4,12 +4,12 @@ # =20 # Please keep it in alphabetic order -obj-$(CONFIG_CEC_CROS_EC) +=3D cros-ec/ -obj-$(CONFIG_CEC_GPIO) +=3D cec-gpio/ -obj-$(CONFIG_CEC_MESON_AO) +=3D meson/ -obj-$(CONFIG_CEC_SAMSUNG_S5P) +=3D s5p/ -obj-$(CONFIG_CEC_SECO) +=3D seco/ -obj-$(CONFIG_CEC_STI) +=3D sti/ -obj-$(CONFIG_CEC_STM32) +=3D stm32/ -obj-$(CONFIG_CEC_TEGRA) +=3D tegra/ +obj-$(CONFIG_CEC_CROS_EC) +=3D cros-ec/ +obj-$(CONFIG_CEC_GPIO) +=3D cec-gpio/ +obj-$(CONFIG_CEC_MESON_AO) +=3D meson/ +obj-$(CONFIG_CEC_SAMSUNG_S5P) +=3D s5p/ +obj-$(CONFIG_CEC_SECO) +=3D seco/ +obj-$(CONFIG_CEC_STI) +=3D sti/ +obj-$(CONFIG_CEC_STM32) +=3D stm32/ +obj-$(CONFIG_CEC_TEGRA) +=3D tegra/ =20 diff --git a/drivers/media/firewire/Makefile b/drivers/media/firewire/Makef= ile index 3670c85af6f5..d5551e6389bf 100644 --- a/drivers/media/firewire/Makefile +++ b/drivers/media/firewire/Makefile @@ -2,4 +2,4 @@ obj-$(CONFIG_DVB_FIREDTV) +=3D firedtv.o =20 firedtv-y +=3D firedtv-avc.o firedtv-ci.o firedtv-dvb.o firedtv-fe.o fired= tv-fw.o -firedtv-$(CONFIG_DVB_FIREDTV_INPUT) +=3D firedtv-rc.o +firedtv-$(CONFIG_DVB_FIREDTV_INPUT) +=3D firedtv-rc.o diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile index 7f8c1df60330..557c8c9dfafe 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -2,10 +2,10 @@ msp3400-objs :=3D msp3400-driver.o msp3400-kthreads.o obj-$(CONFIG_VIDEO_MSP3400) +=3D msp3400.o =20 -obj-$(CONFIG_VIDEO_CCS) +=3D ccs/ -obj-$(CONFIG_VIDEO_ET8EK8) +=3D et8ek8/ +obj-$(CONFIG_VIDEO_CCS) +=3D ccs/ +obj-$(CONFIG_VIDEO_ET8EK8) +=3D et8ek8/ obj-$(CONFIG_VIDEO_CX25840) +=3D cx25840/ -obj-$(CONFIG_VIDEO_M5MOLS) +=3D m5mols/ +obj-$(CONFIG_VIDEO_M5MOLS) +=3D m5mols/ =20 obj-$(CONFIG_VIDEO_APTINA_PLL) +=3D aptina-pll.o obj-$(CONFIG_VIDEO_TVAUDIO) +=3D tvaudio.o @@ -21,11 +21,11 @@ obj-$(CONFIG_VIDEO_SAA717X) +=3D saa717x.o obj-$(CONFIG_VIDEO_SAA7127) +=3D saa7127.o obj-$(CONFIG_VIDEO_SAA7185) +=3D saa7185.o obj-$(CONFIG_VIDEO_SAA6752HS) +=3D saa6752hs.o -obj-$(CONFIG_VIDEO_AD5820) +=3D ad5820.o -obj-$(CONFIG_VIDEO_AK7375) +=3D ak7375.o -obj-$(CONFIG_VIDEO_DW9714) +=3D dw9714.o -obj-$(CONFIG_VIDEO_DW9768) +=3D dw9768.o -obj-$(CONFIG_VIDEO_DW9807_VCM) +=3D dw9807-vcm.o +obj-$(CONFIG_VIDEO_AD5820) +=3D ad5820.o +obj-$(CONFIG_VIDEO_AK7375) +=3D ak7375.o +obj-$(CONFIG_VIDEO_DW9714) +=3D dw9714.o +obj-$(CONFIG_VIDEO_DW9768) +=3D dw9768.o +obj-$(CONFIG_VIDEO_DW9807_VCM) +=3D dw9807-vcm.o obj-$(CONFIG_VIDEO_ADV7170) +=3D adv7170.o obj-$(CONFIG_VIDEO_ADV7175) +=3D adv7175.o obj-$(CONFIG_VIDEO_ADV7180) +=3D adv7180.o @@ -38,7 +38,7 @@ obj-$(CONFIG_VIDEO_ADV7842) +=3D adv7842.o obj-$(CONFIG_VIDEO_AD9389B) +=3D ad9389b.o obj-$(CONFIG_VIDEO_ADV7511) +=3D adv7511-v4l2.o obj-$(CONFIG_VIDEO_VPX3220) +=3D vpx3220.o -obj-$(CONFIG_VIDEO_VS6624) +=3D vs6624.o +obj-$(CONFIG_VIDEO_VS6624) +=3D vs6624.o obj-$(CONFIG_VIDEO_BT819) +=3D bt819.o obj-$(CONFIG_VIDEO_BT856) +=3D bt856.o obj-$(CONFIG_VIDEO_BT866) +=3D bt866.o @@ -102,42 +102,42 @@ obj-$(CONFIG_VIDEO_MT9T112) +=3D mt9t112.o obj-$(CONFIG_VIDEO_MT9V011) +=3D mt9v011.o obj-$(CONFIG_VIDEO_MT9V032) +=3D mt9v032.o obj-$(CONFIG_VIDEO_MT9V111) +=3D mt9v111.o -obj-$(CONFIG_VIDEO_SR030PC30) +=3D sr030pc30.o -obj-$(CONFIG_VIDEO_NOON010PC30) +=3D noon010pc30.o -obj-$(CONFIG_VIDEO_RJ54N1) +=3D rj54n1cb0c.o -obj-$(CONFIG_VIDEO_S5K6AA) +=3D s5k6aa.o -obj-$(CONFIG_VIDEO_S5K6A3) +=3D s5k6a3.o -obj-$(CONFIG_VIDEO_S5K4ECGX) +=3D s5k4ecgx.o -obj-$(CONFIG_VIDEO_S5K5BAF) +=3D s5k5baf.o -obj-$(CONFIG_VIDEO_S5C73M3) +=3D s5c73m3/ -obj-$(CONFIG_VIDEO_ADP1653) +=3D adp1653.o -obj-$(CONFIG_VIDEO_LM3560) +=3D lm3560.o -obj-$(CONFIG_VIDEO_LM3646) +=3D lm3646.o -obj-$(CONFIG_VIDEO_CCS_PLL) +=3D ccs-pll.o -obj-$(CONFIG_VIDEO_AK881X) +=3D ak881x.o -obj-$(CONFIG_VIDEO_IR_I2C) +=3D ir-kbd-i2c.o -obj-$(CONFIG_VIDEO_I2C) +=3D video-i2c.o -obj-$(CONFIG_VIDEO_ML86V7667) +=3D ml86v7667.o -obj-$(CONFIG_VIDEO_OV2659) +=3D ov2659.o -obj-$(CONFIG_VIDEO_TC358743) +=3D tc358743.o -obj-$(CONFIG_VIDEO_HI556) +=3D hi556.o -obj-$(CONFIG_VIDEO_HI846) +=3D hi846.o -obj-$(CONFIG_VIDEO_HI847) +=3D hi847.o -obj-$(CONFIG_VIDEO_IMX208) +=3D imx208.o -obj-$(CONFIG_VIDEO_IMX214) +=3D imx214.o -obj-$(CONFIG_VIDEO_IMX219) +=3D imx219.o -obj-$(CONFIG_VIDEO_IMX258) +=3D imx258.o -obj-$(CONFIG_VIDEO_IMX274) +=3D imx274.o -obj-$(CONFIG_VIDEO_IMX290) +=3D imx290.o -obj-$(CONFIG_VIDEO_IMX319) +=3D imx319.o -obj-$(CONFIG_VIDEO_IMX334) +=3D imx334.o -obj-$(CONFIG_VIDEO_IMX335) +=3D imx335.o -obj-$(CONFIG_VIDEO_IMX355) +=3D imx355.o -obj-$(CONFIG_VIDEO_IMX412) +=3D imx412.o -obj-$(CONFIG_VIDEO_ISL7998X) +=3D isl7998x.o -obj-$(CONFIG_VIDEO_MAX9286) +=3D max9286.o -obj-$(CONFIG_VIDEO_MAX9271_LIB) +=3D max9271.o -obj-$(CONFIG_VIDEO_RDACM20) +=3D rdacm20.o -obj-$(CONFIG_VIDEO_RDACM21) +=3D rdacm21.o +obj-$(CONFIG_VIDEO_SR030PC30) +=3D sr030pc30.o +obj-$(CONFIG_VIDEO_NOON010PC30) +=3D noon010pc30.o +obj-$(CONFIG_VIDEO_RJ54N1) +=3D rj54n1cb0c.o +obj-$(CONFIG_VIDEO_S5K6AA) +=3D s5k6aa.o +obj-$(CONFIG_VIDEO_S5K6A3) +=3D s5k6a3.o +obj-$(CONFIG_VIDEO_S5K4ECGX) +=3D s5k4ecgx.o +obj-$(CONFIG_VIDEO_S5K5BAF) +=3D s5k5baf.o +obj-$(CONFIG_VIDEO_S5C73M3) +=3D s5c73m3/ +obj-$(CONFIG_VIDEO_ADP1653) +=3D adp1653.o +obj-$(CONFIG_VIDEO_LM3560) +=3D lm3560.o +obj-$(CONFIG_VIDEO_LM3646) +=3D lm3646.o +obj-$(CONFIG_VIDEO_CCS_PLL) +=3D ccs-pll.o +obj-$(CONFIG_VIDEO_AK881X) +=3D ak881x.o +obj-$(CONFIG_VIDEO_IR_I2C) +=3D ir-kbd-i2c.o +obj-$(CONFIG_VIDEO_I2C) +=3D video-i2c.o +obj-$(CONFIG_VIDEO_ML86V7667) +=3D ml86v7667.o +obj-$(CONFIG_VIDEO_OV2659) +=3D ov2659.o +obj-$(CONFIG_VIDEO_TC358743) +=3D tc358743.o +obj-$(CONFIG_VIDEO_HI556) +=3D hi556.o +obj-$(CONFIG_VIDEO_HI846) +=3D hi846.o +obj-$(CONFIG_VIDEO_HI847) +=3D hi847.o +obj-$(CONFIG_VIDEO_IMX208) +=3D imx208.o +obj-$(CONFIG_VIDEO_IMX214) +=3D imx214.o +obj-$(CONFIG_VIDEO_IMX219) +=3D imx219.o +obj-$(CONFIG_VIDEO_IMX258) +=3D imx258.o +obj-$(CONFIG_VIDEO_IMX274) +=3D imx274.o +obj-$(CONFIG_VIDEO_IMX290) +=3D imx290.o +obj-$(CONFIG_VIDEO_IMX319) +=3D imx319.o +obj-$(CONFIG_VIDEO_IMX334) +=3D imx334.o +obj-$(CONFIG_VIDEO_IMX335) +=3D imx335.o +obj-$(CONFIG_VIDEO_IMX355) +=3D imx355.o +obj-$(CONFIG_VIDEO_IMX412) +=3D imx412.o +obj-$(CONFIG_VIDEO_ISL7998X) +=3D isl7998x.o +obj-$(CONFIG_VIDEO_MAX9286) +=3D max9286.o +obj-$(CONFIG_VIDEO_MAX9271_LIB) +=3D max9271.o +obj-$(CONFIG_VIDEO_RDACM20) +=3D rdacm20.o +obj-$(CONFIG_VIDEO_RDACM21) +=3D rdacm21.o obj-$(CONFIG_VIDEO_ST_MIPID02) +=3D st-mipid02.o obj-$(CONFIG_SDR_MAX2175) +=3D max2175.o diff --git a/drivers/media/test-drivers/Makefile b/drivers/media/test-drive= rs/Makefile index 9f0e4ebb2efe..1e64e05c1f22 100644 --- a/drivers/media/test-drivers/Makefile +++ b/drivers/media/test-drivers/Makefile @@ -3,8 +3,8 @@ # Makefile for the test drivers. # =20 -obj-$(CONFIG_VIDEO_VIMC) +=3D vimc/ -obj-$(CONFIG_VIDEO_VIVID) +=3D vivid/ -obj-$(CONFIG_VIDEO_VIM2M) +=3D vim2m.o -obj-$(CONFIG_VIDEO_VICODEC) +=3D vicodec/ -obj-$(CONFIG_DVB_VIDTV) +=3D vidtv/ +obj-$(CONFIG_VIDEO_VIMC) +=3D vimc/ +obj-$(CONFIG_VIDEO_VIVID) +=3D vivid/ +obj-$(CONFIG_VIDEO_VIM2M) +=3D vim2m.o +obj-$(CONFIG_VIDEO_VICODEC) +=3D vicodec/ +obj-$(CONFIG_DVB_VIDTV) +=3D vidtv/ diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile index 3eaff3149ef4..65521f4921e3 100644 --- a/drivers/media/usb/Makefile +++ b/drivers/media/usb/Makefile @@ -7,15 +7,15 @@ obj-y +=3D ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ b2c2/ obj-y +=3D zr364xx/ stkwebcam/ s2255/ =20 -obj-$(CONFIG_USB_VIDEO_CLASS) +=3D uvc/ -obj-$(CONFIG_USB_GSPCA) +=3D gspca/ -obj-$(CONFIG_USB_PWC) +=3D pwc/ -obj-$(CONFIG_USB_AIRSPY) +=3D airspy/ -obj-$(CONFIG_USB_HACKRF) +=3D hackrf/ -obj-$(CONFIG_USB_MSI2500) +=3D msi2500/ +obj-$(CONFIG_USB_VIDEO_CLASS) +=3D uvc/ +obj-$(CONFIG_USB_GSPCA) +=3D gspca/ +obj-$(CONFIG_USB_PWC) +=3D pwc/ +obj-$(CONFIG_USB_AIRSPY) +=3D airspy/ +obj-$(CONFIG_USB_HACKRF) +=3D hackrf/ +obj-$(CONFIG_USB_MSI2500) +=3D msi2500/ obj-$(CONFIG_VIDEO_CPIA2) +=3D cpia2/ obj-$(CONFIG_VIDEO_AU0828) +=3D au0828/ -obj-$(CONFIG_VIDEO_HDPVR) +=3D hdpvr/ +obj-$(CONFIG_VIDEO_HDPVR) +=3D hdpvr/ obj-$(CONFIG_VIDEO_PVRUSB2) +=3D pvrusb2/ obj-$(CONFIG_VIDEO_STK1160) +=3D stk1160/ obj-$(CONFIG_VIDEO_CX231XX) +=3D cx231xx/ diff --git a/drivers/media/usb/gspca/Makefile b/drivers/media/usb/gspca/Mak= efile index 3e3ecbffdf9f..a35c45006130 100644 --- a/drivers/media/usb/gspca/Makefile +++ b/drivers/media/usb/gspca/Makefile @@ -1,51 +1,51 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_USB_GSPCA) +=3D gspca_main.o -obj-$(CONFIG_USB_GSPCA_BENQ) +=3D gspca_benq.o -obj-$(CONFIG_USB_GSPCA_CONEX) +=3D gspca_conex.o -obj-$(CONFIG_USB_GSPCA_CPIA1) +=3D gspca_cpia1.o -obj-$(CONFIG_USB_GSPCA_DTCS033) +=3D gspca_dtcs033.o -obj-$(CONFIG_USB_GSPCA_ETOMS) +=3D gspca_etoms.o -obj-$(CONFIG_USB_GSPCA_FINEPIX) +=3D gspca_finepix.o -obj-$(CONFIG_USB_GSPCA_JEILINJ) +=3D gspca_jeilinj.o +obj-$(CONFIG_USB_GSPCA) +=3D gspca_main.o +obj-$(CONFIG_USB_GSPCA_BENQ) +=3D gspca_benq.o +obj-$(CONFIG_USB_GSPCA_CONEX) +=3D gspca_conex.o +obj-$(CONFIG_USB_GSPCA_CPIA1) +=3D gspca_cpia1.o +obj-$(CONFIG_USB_GSPCA_DTCS033) +=3D gspca_dtcs033.o +obj-$(CONFIG_USB_GSPCA_ETOMS) +=3D gspca_etoms.o +obj-$(CONFIG_USB_GSPCA_FINEPIX) +=3D gspca_finepix.o +obj-$(CONFIG_USB_GSPCA_JEILINJ) +=3D gspca_jeilinj.o obj-$(CONFIG_USB_GSPCA_JL2005BCD) +=3D gspca_jl2005bcd.o -obj-$(CONFIG_USB_GSPCA_KINECT) +=3D gspca_kinect.o -obj-$(CONFIG_USB_GSPCA_KONICA) +=3D gspca_konica.o -obj-$(CONFIG_USB_GSPCA_MARS) +=3D gspca_mars.o +obj-$(CONFIG_USB_GSPCA_KINECT) +=3D gspca_kinect.o +obj-$(CONFIG_USB_GSPCA_KONICA) +=3D gspca_konica.o +obj-$(CONFIG_USB_GSPCA_MARS) +=3D gspca_mars.o obj-$(CONFIG_USB_GSPCA_MR97310A) +=3D gspca_mr97310a.o -obj-$(CONFIG_USB_GSPCA_NW80X) +=3D gspca_nw80x.o -obj-$(CONFIG_USB_GSPCA_OV519) +=3D gspca_ov519.o -obj-$(CONFIG_USB_GSPCA_OV534) +=3D gspca_ov534.o -obj-$(CONFIG_USB_GSPCA_OV534_9) +=3D gspca_ov534_9.o -obj-$(CONFIG_USB_GSPCA_PAC207) +=3D gspca_pac207.o -obj-$(CONFIG_USB_GSPCA_PAC7302) +=3D gspca_pac7302.o -obj-$(CONFIG_USB_GSPCA_PAC7311) +=3D gspca_pac7311.o -obj-$(CONFIG_USB_GSPCA_SE401) +=3D gspca_se401.o +obj-$(CONFIG_USB_GSPCA_NW80X) +=3D gspca_nw80x.o +obj-$(CONFIG_USB_GSPCA_OV519) +=3D gspca_ov519.o +obj-$(CONFIG_USB_GSPCA_OV534) +=3D gspca_ov534.o +obj-$(CONFIG_USB_GSPCA_OV534_9) +=3D gspca_ov534_9.o +obj-$(CONFIG_USB_GSPCA_PAC207) +=3D gspca_pac207.o +obj-$(CONFIG_USB_GSPCA_PAC7302) +=3D gspca_pac7302.o +obj-$(CONFIG_USB_GSPCA_PAC7311) +=3D gspca_pac7311.o +obj-$(CONFIG_USB_GSPCA_SE401) +=3D gspca_se401.o obj-$(CONFIG_USB_GSPCA_SN9C2028) +=3D gspca_sn9c2028.o -obj-$(CONFIG_USB_GSPCA_SN9C20X) +=3D gspca_sn9c20x.o -obj-$(CONFIG_USB_GSPCA_SONIXB) +=3D gspca_sonixb.o -obj-$(CONFIG_USB_GSPCA_SONIXJ) +=3D gspca_sonixj.o -obj-$(CONFIG_USB_GSPCA_SPCA500) +=3D gspca_spca500.o -obj-$(CONFIG_USB_GSPCA_SPCA501) +=3D gspca_spca501.o -obj-$(CONFIG_USB_GSPCA_SPCA505) +=3D gspca_spca505.o -obj-$(CONFIG_USB_GSPCA_SPCA506) +=3D gspca_spca506.o -obj-$(CONFIG_USB_GSPCA_SPCA508) +=3D gspca_spca508.o -obj-$(CONFIG_USB_GSPCA_SPCA561) +=3D gspca_spca561.o +obj-$(CONFIG_USB_GSPCA_SN9C20X) +=3D gspca_sn9c20x.o +obj-$(CONFIG_USB_GSPCA_SONIXB) +=3D gspca_sonixb.o +obj-$(CONFIG_USB_GSPCA_SONIXJ) +=3D gspca_sonixj.o +obj-$(CONFIG_USB_GSPCA_SPCA500) +=3D gspca_spca500.o +obj-$(CONFIG_USB_GSPCA_SPCA501) +=3D gspca_spca501.o +obj-$(CONFIG_USB_GSPCA_SPCA505) +=3D gspca_spca505.o +obj-$(CONFIG_USB_GSPCA_SPCA506) +=3D gspca_spca506.o +obj-$(CONFIG_USB_GSPCA_SPCA508) +=3D gspca_spca508.o +obj-$(CONFIG_USB_GSPCA_SPCA561) +=3D gspca_spca561.o obj-$(CONFIG_USB_GSPCA_SPCA1528) +=3D gspca_spca1528.o -obj-$(CONFIG_USB_GSPCA_SQ905) +=3D gspca_sq905.o -obj-$(CONFIG_USB_GSPCA_SQ905C) +=3D gspca_sq905c.o -obj-$(CONFIG_USB_GSPCA_SQ930X) +=3D gspca_sq930x.o -obj-$(CONFIG_USB_GSPCA_SUNPLUS) +=3D gspca_sunplus.o -obj-$(CONFIG_USB_GSPCA_STK014) +=3D gspca_stk014.o -obj-$(CONFIG_USB_GSPCA_STK1135) +=3D gspca_stk1135.o -obj-$(CONFIG_USB_GSPCA_STV0680) +=3D gspca_stv0680.o -obj-$(CONFIG_USB_GSPCA_T613) +=3D gspca_t613.o -obj-$(CONFIG_USB_GSPCA_TOPRO) +=3D gspca_topro.o -obj-$(CONFIG_USB_GSPCA_TOUPTEK) +=3D gspca_touptek.o -obj-$(CONFIG_USB_GSPCA_TV8532) +=3D gspca_tv8532.o -obj-$(CONFIG_USB_GSPCA_VC032X) +=3D gspca_vc032x.o -obj-$(CONFIG_USB_GSPCA_VICAM) +=3D gspca_vicam.o +obj-$(CONFIG_USB_GSPCA_SQ905) +=3D gspca_sq905.o +obj-$(CONFIG_USB_GSPCA_SQ905C) +=3D gspca_sq905c.o +obj-$(CONFIG_USB_GSPCA_SQ930X) +=3D gspca_sq930x.o +obj-$(CONFIG_USB_GSPCA_SUNPLUS) +=3D gspca_sunplus.o +obj-$(CONFIG_USB_GSPCA_STK014) +=3D gspca_stk014.o +obj-$(CONFIG_USB_GSPCA_STK1135) +=3D gspca_stk1135.o +obj-$(CONFIG_USB_GSPCA_STV0680) +=3D gspca_stv0680.o +obj-$(CONFIG_USB_GSPCA_T613) +=3D gspca_t613.o +obj-$(CONFIG_USB_GSPCA_TOPRO) +=3D gspca_topro.o +obj-$(CONFIG_USB_GSPCA_TOUPTEK) +=3D gspca_touptek.o +obj-$(CONFIG_USB_GSPCA_TV8532) +=3D gspca_tv8532.o +obj-$(CONFIG_USB_GSPCA_VC032X) +=3D gspca_vc032x.o +obj-$(CONFIG_USB_GSPCA_VICAM) +=3D gspca_vicam.o obj-$(CONFIG_USB_GSPCA_XIRLINK_CIT) +=3D gspca_xirlink_cit.o -obj-$(CONFIG_USB_GSPCA_ZC3XX) +=3D gspca_zc3xx.o +obj-$(CONFIG_USB_GSPCA_ZC3XX) +=3D gspca_zc3xx.o =20 gspca_main-objs :=3D gspca.o autogain_functions.o gspca_benq-objs :=3D benq.o @@ -95,6 +95,6 @@ gspca_vicam-objs :=3D vicam.o gspca_xirlink_cit-objs :=3D xirlink_cit.o gspca_zc3xx-objs :=3D zc3xx.o =20 -obj-$(CONFIG_USB_M5602) +=3D m5602/ +obj-$(CONFIG_USB_M5602) +=3D m5602/ obj-$(CONFIG_USB_STV06XX) +=3D stv06xx/ -obj-$(CONFIG_USB_GL860) +=3D gl860/ +obj-$(CONFIG_USB_GL860) +=3D gl860/ --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 963E8C4321E for ; Mon, 14 Mar 2022 07:56:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236939AbiCNH5j (ORCPT ); Mon, 14 Mar 2022 03:57:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236831AbiCNH5S (ORCPT ); Mon, 14 Mar 2022 03:57:18 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DC8541321; Mon, 14 Mar 2022 00:56:04 -0700 (PDT) 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 C8460B80D36; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AB355C340F4; Mon, 14 Mar 2022 07:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=Bnr669VzNJbfQC0HAbNpk/b/VThnn5TXFPQfATV9BP4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=INgUmrL8Yq5cLIYc1JWn/ELm2a6PJGygE53xeM51LscJv3qBgmCC9XS34ZxW3c5qE hKw/w37wCFzmXgjs0ScRkUX7RmsjFY+RhgeQCcBl/Gd8aG99ofyMK4IOVgjBnT8Sn7 50xvM7fw8JBHzC0HGK0yd5yul+rO0s1urmOGuBNKqYfQ+y3bp+fkpSjZxz78LbS30E t7w7gn9T7EdjX+e9L3jekf9uSmegCCbCe3y6wXOw8OJ+ENKoDDh0iL/oTowhGFx9Z1 HfDbhBNvGW5jcdKxCcEgdQhD6exK9lGfKls6PWXNPBV5liHdTBYiIKQnyTRBHMyoqN TgWWr01AI0n1A== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYc-001kUN-E1; Mon, 14 Mar 2022 08:55:58 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Alexander Voronov , Andrzej Pietrasiewicz , Arnd Bergmann , Christian Hewitt , Ezequiel Garcia , Hans Verkuil , Laurent Pinchart , Mans Rullgard , Marek Szyprowski , Rob Herring , Sakari Ailus , Sean Young , Tomasz Figa , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 03/64] media: Makefiles: sort entries where it fits Date: Mon, 14 Mar 2022 08:54:55 +0100 Message-Id: <1573b0bb706a5555a8b6bc2b18ba538a9a72fd2c.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Alphabetically sort entries at the Makefiles per group, in ASCII order, e. g., using the output of: $ LC_ALL=3DC sort Makefile |grep obj-y ... $ LC_ALL=3DC sort Makefile |grep obj.*CONFIG ... Reviewed-by: Laurent Pinchart 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/common/Makefile | 7 +- drivers/media/common/videobuf2/Makefile | 8 +- drivers/media/dvb-frontends/Makefile | 193 ++++++++++++------------ drivers/media/pci/Makefile | 22 ++- drivers/media/radio/Makefile | 43 +++--- drivers/media/rc/Makefile | 47 +++--- drivers/media/rc/keymaps/Makefile | 34 +++-- drivers/media/spi/Makefile | 7 +- drivers/media/test-drivers/Makefile | 10 +- drivers/media/tuners/Makefile | 66 ++++---- drivers/media/usb/Makefile | 32 ++-- drivers/media/v4l2-core/Makefile | 34 +++-- 12 files changed, 274 insertions(+), 229 deletions(-) diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile index 55b5a1900124..ad0b1e95fb12 100644 --- a/drivers/media/common/Makefile +++ b/drivers/media/common/Makefile @@ -1,6 +1,9 @@ # SPDX-License-Identifier: GPL-2.0-only obj-y +=3D b2c2/ saa7146/ siano/ v4l2-tpg/ videobuf2/ -obj-$(CONFIG_VIDEO_CX2341X) +=3D cx2341x.o -obj-$(CONFIG_VIDEO_TVEEPROM) +=3D tveeprom.o + +# Please keep it alphabetically sorted by Kconfig name +# (e. g. LC_ALL=3DC sort Makefile) obj-$(CONFIG_CYPRESS_FIRMWARE) +=3D cypress_firmware.o obj-$(CONFIG_TTPCI_EEPROM) +=3D ttpci-eeprom.o +obj-$(CONFIG_VIDEO_CX2341X) +=3D cx2341x.o +obj-$(CONFIG_VIDEO_TVEEPROM) +=3D tveeprom.o diff --git a/drivers/media/common/videobuf2/Makefile b/drivers/media/common= /videobuf2/Makefile index 54306f8d096c..a6fe3f304685 100644 --- a/drivers/media/common/videobuf2/Makefile +++ b/drivers/media/common/videobuf2/Makefile @@ -6,10 +6,12 @@ ifeq ($(CONFIG_TRACEPOINTS),y) videobuf2-common-objs +=3D vb2-trace.o endif =20 +# Please keep it alphabetically sorted by Kconfig name +# (e. g. LC_ALL=3DC sort Makefile) obj-$(CONFIG_VIDEOBUF2_CORE) +=3D videobuf2-common.o -obj-$(CONFIG_VIDEOBUF2_V4L2) +=3D videobuf2-v4l2.o -obj-$(CONFIG_VIDEOBUF2_MEMOPS) +=3D videobuf2-memops.o -obj-$(CONFIG_VIDEOBUF2_VMALLOC) +=3D videobuf2-vmalloc.o obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) +=3D videobuf2-dma-contig.o obj-$(CONFIG_VIDEOBUF2_DMA_SG) +=3D videobuf2-dma-sg.o obj-$(CONFIG_VIDEOBUF2_DVB) +=3D videobuf2-dvb.o +obj-$(CONFIG_VIDEOBUF2_MEMOPS) +=3D videobuf2-memops.o +obj-$(CONFIG_VIDEOBUF2_V4L2) +=3D videobuf2-v4l2.o +obj-$(CONFIG_VIDEOBUF2_VMALLOC) +=3D videobuf2-vmalloc.o diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-front= ends/Makefile index d32e4c0be576..a93146cb428c 100644 --- a/drivers/media/dvb-frontends/Makefile +++ b/drivers/media/dvb-frontends/Makefile @@ -10,126 +10,129 @@ ifdef CONFIG_DVB_RTL2832_SDR ccflags-y +=3D -I$(srctree)/drivers/media/usb/dvb-usb-v2 endif =20 -stb0899-objs :=3D stb0899_drv.o stb0899_algo.o -stv0900-objs :=3D stv0900_core.o stv0900_sw.o -drxd-objs :=3D drxd_firm.o drxd_hard.o cxd2820r-objs :=3D cxd2820r_core.o cxd2820r_c.o cxd2820r_t.o cxd2820r_t2.o +drxd-objs :=3D drxd_firm.o drxd_hard.o drxk-objs :=3D drxk_hard.o +stb0899-objs :=3D stb0899_drv.o stb0899_algo.o +stv0900-objs :=3D stv0900_core.o stv0900_sw.o =20 -obj-$(CONFIG_DVB_PLL) +=3D dvb-pll.o -obj-$(CONFIG_DVB_STV0299) +=3D stv0299.o -obj-$(CONFIG_DVB_STB0899) +=3D stb0899.o -obj-$(CONFIG_DVB_STB6100) +=3D stb6100.o +# Please keep it alphabetically sorted by Kconfig name +# (e. g. LC_ALL=3DC sort Makefile) + +obj-$(CONFIG_DVB_A8293) +=3D a8293.o +obj-$(CONFIG_DVB_AF9013) +=3D af9013.o +obj-$(CONFIG_DVB_AF9033) +=3D af9033.o +obj-$(CONFIG_DVB_AS102_FE) +=3D as102_fe.o +obj-$(CONFIG_DVB_ASCOT2E) +=3D ascot2e.o +obj-$(CONFIG_DVB_ATBM8830) +=3D atbm8830.o +obj-$(CONFIG_DVB_AU8522) +=3D au8522_common.o +obj-$(CONFIG_DVB_AU8522_DTV) +=3D au8522_dig.o +obj-$(CONFIG_DVB_AU8522_V4L) +=3D au8522_decoder.o +obj-$(CONFIG_DVB_BCM3510) +=3D bcm3510.o obj-$(CONFIG_DVB_CX22700) +=3D cx22700.o -obj-$(CONFIG_DVB_S5H1432) +=3D s5h1432.o +obj-$(CONFIG_DVB_CX22702) +=3D cx22702.o obj-$(CONFIG_DVB_CX24110) +=3D cx24110.o -obj-$(CONFIG_DVB_TDA8083) +=3D tda8083.o -obj-$(CONFIG_DVB_L64781) +=3D l64781.o +obj-$(CONFIG_DVB_CX24116) +=3D cx24116.o +obj-$(CONFIG_DVB_CX24117) +=3D cx24117.o +obj-$(CONFIG_DVB_CX24120) +=3D cx24120.o +obj-$(CONFIG_DVB_CX24123) +=3D cx24123.o +obj-$(CONFIG_DVB_CXD2099) +=3D cxd2099.o +obj-$(CONFIG_DVB_CXD2820R) +=3D cxd2820r.o +obj-$(CONFIG_DVB_CXD2841ER) +=3D cxd2841er.o +obj-$(CONFIG_DVB_CXD2880) +=3D cxd2880/ obj-$(CONFIG_DVB_DIB3000MB) +=3D dib3000mb.o obj-$(CONFIG_DVB_DIB3000MC) +=3D dib3000mc.o dibx000_common.o obj-$(CONFIG_DVB_DIB7000M) +=3D dib7000m.o dibx000_common.o obj-$(CONFIG_DVB_DIB7000P) +=3D dib7000p.o dibx000_common.o obj-$(CONFIG_DVB_DIB8000) +=3D dib8000.o dibx000_common.o obj-$(CONFIG_DVB_DIB9000) +=3D dib9000.o dibx000_common.o -obj-$(CONFIG_DVB_MT312) +=3D mt312.o -obj-$(CONFIG_DVB_VES1820) +=3D ves1820.o -obj-$(CONFIG_DVB_VES1X93) +=3D ves1x93.o -obj-$(CONFIG_DVB_TDA1004X) +=3D tda1004x.o -obj-$(CONFIG_DVB_SP887X) +=3D sp887x.o -obj-$(CONFIG_DVB_NXT6000) +=3D nxt6000.o -obj-$(CONFIG_DVB_MT352) +=3D mt352.o -obj-$(CONFIG_DVB_ZL10036) +=3D zl10036.o -obj-$(CONFIG_DVB_ZL10039) +=3D zl10039.o -obj-$(CONFIG_DVB_ZL10353) +=3D zl10353.o -obj-$(CONFIG_DVB_CX22702) +=3D cx22702.o +obj-$(CONFIG_DVB_DRX39XYJ) +=3D drx39xyj/ obj-$(CONFIG_DVB_DRXD) +=3D drxd.o -obj-$(CONFIG_DVB_TDA10021) +=3D tda10021.o -obj-$(CONFIG_DVB_TDA10023) +=3D tda10023.o -obj-$(CONFIG_DVB_STV0297) +=3D stv0297.o -obj-$(CONFIG_DVB_NXT200X) +=3D nxt200x.o -obj-$(CONFIG_DVB_OR51211) +=3D or51211.o -obj-$(CONFIG_DVB_OR51132) +=3D or51132.o -obj-$(CONFIG_DVB_BCM3510) +=3D bcm3510.o -obj-$(CONFIG_DVB_S5H1420) +=3D s5h1420.o -obj-$(CONFIG_DVB_LGDT330X) +=3D lgdt330x.o +obj-$(CONFIG_DVB_DRXK) +=3D drxk.o +obj-$(CONFIG_DVB_DS3000) +=3D ds3000.o +obj-$(CONFIG_DVB_DUMMY_FE) +=3D dvb_dummy_fe.o +obj-$(CONFIG_DVB_EC100) +=3D ec100.o +obj-$(CONFIG_DVB_GP8PSK_FE) +=3D gp8psk-fe.o +obj-$(CONFIG_DVB_HELENE) +=3D helene.o +obj-$(CONFIG_DVB_HORUS3A) +=3D horus3a.o +obj-$(CONFIG_DVB_ISL6405) +=3D isl6405.o +obj-$(CONFIG_DVB_ISL6421) +=3D isl6421.o +obj-$(CONFIG_DVB_ISL6423) +=3D isl6423.o +obj-$(CONFIG_DVB_IX2505V) +=3D ix2505v.o +obj-$(CONFIG_DVB_L64781) +=3D l64781.o +obj-$(CONFIG_DVB_LG2160) +=3D lg2160.o obj-$(CONFIG_DVB_LGDT3305) +=3D lgdt3305.o obj-$(CONFIG_DVB_LGDT3306A) +=3D lgdt3306a.o -obj-$(CONFIG_DVB_MXL692) +=3D mxl692.o -obj-$(CONFIG_DVB_LG2160) +=3D lg2160.o -obj-$(CONFIG_DVB_CX24123) +=3D cx24123.o +obj-$(CONFIG_DVB_LGDT330X) +=3D lgdt330x.o +obj-$(CONFIG_DVB_LGS8GL5) +=3D lgs8gl5.o +obj-$(CONFIG_DVB_LGS8GXX) +=3D lgs8gxx.o obj-$(CONFIG_DVB_LNBH25) +=3D lnbh25.o obj-$(CONFIG_DVB_LNBH29) +=3D lnbh29.o obj-$(CONFIG_DVB_LNBP21) +=3D lnbp21.o obj-$(CONFIG_DVB_LNBP22) +=3D lnbp22.o -obj-$(CONFIG_DVB_ISL6405) +=3D isl6405.o -obj-$(CONFIG_DVB_ISL6421) +=3D isl6421.o -obj-$(CONFIG_DVB_TDA10086) +=3D tda10086.o -obj-$(CONFIG_DVB_TDA826X) +=3D tda826x.o -obj-$(CONFIG_DVB_TDA8261) +=3D tda8261.o -obj-$(CONFIG_DVB_TUNER_DIB0070) +=3D dib0070.o -obj-$(CONFIG_DVB_TUNER_DIB0090) +=3D dib0090.o -obj-$(CONFIG_DVB_TUA6100) +=3D tua6100.o +obj-$(CONFIG_DVB_M88DS3103) +=3D m88ds3103.o +obj-$(CONFIG_DVB_M88RS2000) +=3D m88rs2000.o +obj-$(CONFIG_DVB_MB86A16) +=3D mb86a16.o +obj-$(CONFIG_DVB_MB86A20S) +=3D mb86a20s.o +obj-$(CONFIG_DVB_MN88443X) +=3D mn88443x.o +obj-$(CONFIG_DVB_MN88472) +=3D mn88472.o +obj-$(CONFIG_DVB_MN88473) +=3D mn88473.o +obj-$(CONFIG_DVB_MT312) +=3D mt312.o +obj-$(CONFIG_DVB_MT352) +=3D mt352.o +obj-$(CONFIG_DVB_MXL5XX) +=3D mxl5xx.o +obj-$(CONFIG_DVB_MXL692) +=3D mxl692.o +obj-$(CONFIG_DVB_NXT200X) +=3D nxt200x.o +obj-$(CONFIG_DVB_NXT6000) +=3D nxt6000.o +obj-$(CONFIG_DVB_OR51132) +=3D or51132.o +obj-$(CONFIG_DVB_OR51211) +=3D or51211.o +obj-$(CONFIG_DVB_PLL) +=3D dvb-pll.o +obj-$(CONFIG_DVB_RTL2830) +=3D rtl2830.o +obj-$(CONFIG_DVB_RTL2832) +=3D rtl2832.o +obj-$(CONFIG_DVB_RTL2832_SDR) +=3D rtl2832_sdr.o obj-$(CONFIG_DVB_S5H1409) +=3D s5h1409.o -obj-$(CONFIG_DVB_TUNER_ITD1000) +=3D itd1000.o -obj-$(CONFIG_DVB_AU8522) +=3D au8522_common.o -obj-$(CONFIG_DVB_AU8522_DTV) +=3D au8522_dig.o -obj-$(CONFIG_DVB_AU8522_V4L) +=3D au8522_decoder.o -obj-$(CONFIG_DVB_TDA10048) +=3D tda10048.o -obj-$(CONFIG_DVB_TUNER_CX24113) +=3D cx24113.o obj-$(CONFIG_DVB_S5H1411) +=3D s5h1411.o -obj-$(CONFIG_DVB_LGS8GL5) +=3D lgs8gl5.o -obj-$(CONFIG_DVB_TDA665x) +=3D tda665x.o -obj-$(CONFIG_DVB_LGS8GXX) +=3D lgs8gxx.o -obj-$(CONFIG_DVB_ATBM8830) +=3D atbm8830.o -obj-$(CONFIG_DVB_DUMMY_FE) +=3D dvb_dummy_fe.o -obj-$(CONFIG_DVB_AF9013) +=3D af9013.o -obj-$(CONFIG_DVB_CX24116) +=3D cx24116.o -obj-$(CONFIG_DVB_CX24117) +=3D cx24117.o -obj-$(CONFIG_DVB_CX24120) +=3D cx24120.o -obj-$(CONFIG_DVB_SI21XX) +=3D si21xx.o +obj-$(CONFIG_DVB_S5H1420) +=3D s5h1420.o +obj-$(CONFIG_DVB_S5H1432) +=3D s5h1432.o +obj-$(CONFIG_DVB_S921) +=3D s921.o +obj-$(CONFIG_DVB_SI2165) +=3D si2165.o obj-$(CONFIG_DVB_SI2168) +=3D si2168.o -obj-$(CONFIG_DVB_STV0288) +=3D stv0288.o +obj-$(CONFIG_DVB_SI21XX) +=3D si21xx.o +obj-$(CONFIG_DVB_SP2) +=3D sp2.o +obj-$(CONFIG_DVB_SP887X) +=3D sp887x.o +obj-$(CONFIG_DVB_STB0899) +=3D stb0899.o obj-$(CONFIG_DVB_STB6000) +=3D stb6000.o -obj-$(CONFIG_DVB_S921) +=3D s921.o -obj-$(CONFIG_DVB_STV6110) +=3D stv6110.o +obj-$(CONFIG_DVB_STB6100) +=3D stb6100.o +obj-$(CONFIG_DVB_STV0288) +=3D stv0288.o +obj-$(CONFIG_DVB_STV0297) +=3D stv0297.o +obj-$(CONFIG_DVB_STV0299) +=3D stv0299.o +obj-$(CONFIG_DVB_STV0367) +=3D stv0367.o obj-$(CONFIG_DVB_STV0900) +=3D stv0900.o obj-$(CONFIG_DVB_STV090x) +=3D stv090x.o -obj-$(CONFIG_DVB_STV6110x) +=3D stv6110x.o -obj-$(CONFIG_DVB_M88DS3103) +=3D m88ds3103.o -obj-$(CONFIG_DVB_MN88472) +=3D mn88472.o -obj-$(CONFIG_DVB_MN88473) +=3D mn88473.o -obj-$(CONFIG_DVB_ISL6423) +=3D isl6423.o -obj-$(CONFIG_DVB_EC100) +=3D ec100.o -obj-$(CONFIG_DVB_DS3000) +=3D ds3000.o -obj-$(CONFIG_DVB_TS2020) +=3D ts2020.o -obj-$(CONFIG_DVB_MB86A16) +=3D mb86a16.o -obj-$(CONFIG_DVB_DRX39XYJ) +=3D drx39xyj/ -obj-$(CONFIG_DVB_MB86A20S) +=3D mb86a20s.o -obj-$(CONFIG_DVB_IX2505V) +=3D ix2505v.o -obj-$(CONFIG_DVB_STV0367) +=3D stv0367.o -obj-$(CONFIG_DVB_CXD2820R) +=3D cxd2820r.o -obj-$(CONFIG_DVB_CXD2841ER) +=3D cxd2841er.o -obj-$(CONFIG_DVB_DRXK) +=3D drxk.o -obj-$(CONFIG_DVB_TDA18271C2DD) +=3D tda18271c2dd.o obj-$(CONFIG_DVB_STV0910) +=3D stv0910.o +obj-$(CONFIG_DVB_STV6110) +=3D stv6110.o +obj-$(CONFIG_DVB_STV6110x) +=3D stv6110x.o obj-$(CONFIG_DVB_STV6111) +=3D stv6111.o -obj-$(CONFIG_DVB_MXL5XX) +=3D mxl5xx.o -obj-$(CONFIG_DVB_SI2165) +=3D si2165.o -obj-$(CONFIG_DVB_A8293) +=3D a8293.o -obj-$(CONFIG_DVB_SP2) +=3D sp2.o -obj-$(CONFIG_DVB_TDA10071) +=3D tda10071.o -obj-$(CONFIG_DVB_RTL2830) +=3D rtl2830.o -obj-$(CONFIG_DVB_RTL2832) +=3D rtl2832.o -obj-$(CONFIG_DVB_RTL2832_SDR) +=3D rtl2832_sdr.o -obj-$(CONFIG_DVB_M88RS2000) +=3D m88rs2000.o -obj-$(CONFIG_DVB_AF9033) +=3D af9033.o -obj-$(CONFIG_DVB_AS102_FE) +=3D as102_fe.o -obj-$(CONFIG_DVB_GP8PSK_FE) +=3D gp8psk-fe.o obj-$(CONFIG_DVB_TC90522) +=3D tc90522.o -obj-$(CONFIG_DVB_MN88443X) +=3D mn88443x.o -obj-$(CONFIG_DVB_HORUS3A) +=3D horus3a.o -obj-$(CONFIG_DVB_ASCOT2E) +=3D ascot2e.o -obj-$(CONFIG_DVB_HELENE) +=3D helene.o +obj-$(CONFIG_DVB_TDA10021) +=3D tda10021.o +obj-$(CONFIG_DVB_TDA10023) +=3D tda10023.o +obj-$(CONFIG_DVB_TDA10048) +=3D tda10048.o +obj-$(CONFIG_DVB_TDA1004X) +=3D tda1004x.o +obj-$(CONFIG_DVB_TDA10071) +=3D tda10071.o +obj-$(CONFIG_DVB_TDA10086) +=3D tda10086.o +obj-$(CONFIG_DVB_TDA18271C2DD) +=3D tda18271c2dd.o +obj-$(CONFIG_DVB_TDA665x) +=3D tda665x.o +obj-$(CONFIG_DVB_TDA8083) +=3D tda8083.o +obj-$(CONFIG_DVB_TDA8261) +=3D tda8261.o +obj-$(CONFIG_DVB_TDA826X) +=3D tda826x.o +obj-$(CONFIG_DVB_TS2020) +=3D ts2020.o +obj-$(CONFIG_DVB_TUA6100) +=3D tua6100.o +obj-$(CONFIG_DVB_TUNER_CX24113) +=3D cx24113.o +obj-$(CONFIG_DVB_TUNER_DIB0070) +=3D dib0070.o +obj-$(CONFIG_DVB_TUNER_DIB0090) +=3D dib0090.o +obj-$(CONFIG_DVB_TUNER_ITD1000) +=3D itd1000.o +obj-$(CONFIG_DVB_VES1820) +=3D ves1820.o +obj-$(CONFIG_DVB_VES1X93) +=3D ves1x93.o obj-$(CONFIG_DVB_ZD1301_DEMOD) +=3D zd1301_demod.o -obj-$(CONFIG_DVB_CXD2099) +=3D cxd2099.o -obj-$(CONFIG_DVB_CXD2880) +=3D cxd2880/ +obj-$(CONFIG_DVB_ZL10036) +=3D zl10036.o +obj-$(CONFIG_DVB_ZL10039) +=3D zl10039.o +obj-$(CONFIG_DVB_ZL10353) +=3D zl10353.o diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile index 984fa247096d..551169a3e434 100644 --- a/drivers/media/pci/Makefile +++ b/drivers/media/pci/Makefile @@ -3,6 +3,8 @@ # Makefile for the kernel multimedia device drivers. # =20 +# Please keep it alphabetically sorted by directory +# (e. g. LC_ALL=3DC sort Makefile) obj-y +=3D ttpci/ \ b2c2/ \ pluto2/ \ @@ -17,19 +19,23 @@ obj-y +=3D ttpci/ \ netup_unidvb/ \ intel/ =20 -obj-$(CONFIG_VIDEO_IVTV) +=3D ivtv/ +# Please keep it alphabetically sorted by Kconfig name +# (e. g. LC_ALL=3DC sort Makefile) + +obj-$(CONFIG_STA2X11_VIP) +=3D sta2x11/ + +obj-$(CONFIG_VIDEO_BT848) +=3D bt8xx/ +obj-$(CONFIG_VIDEO_COBALT) +=3D cobalt/ obj-$(CONFIG_VIDEO_CX18) +=3D cx18/ obj-$(CONFIG_VIDEO_CX23885) +=3D cx23885/ obj-$(CONFIG_VIDEO_CX25821) +=3D cx25821/ obj-$(CONFIG_VIDEO_CX88) +=3D cx88/ -obj-$(CONFIG_VIDEO_BT848) +=3D bt8xx/ -obj-$(CONFIG_VIDEO_SAA7134) +=3D saa7134/ -obj-$(CONFIG_VIDEO_SAA7164) +=3D saa7164/ -obj-$(CONFIG_VIDEO_TW68) +=3D tw68/ -obj-$(CONFIG_VIDEO_TW686X) +=3D tw686x/ obj-$(CONFIG_VIDEO_DT3155) +=3D dt3155/ +obj-$(CONFIG_VIDEO_IVTV) +=3D ivtv/ obj-$(CONFIG_VIDEO_MEYE) +=3D meye/ -obj-$(CONFIG_STA2X11_VIP) +=3D sta2x11/ +obj-$(CONFIG_VIDEO_SAA7134) +=3D saa7134/ +obj-$(CONFIG_VIDEO_SAA7164) +=3D saa7164/ obj-$(CONFIG_VIDEO_SOLO6X10) +=3D solo6x10/ -obj-$(CONFIG_VIDEO_COBALT) +=3D cobalt/ obj-$(CONFIG_VIDEO_TW5864) +=3D tw5864/ +obj-$(CONFIG_VIDEO_TW686X) +=3D tw686x/ +obj-$(CONFIG_VIDEO_TW68) +=3D tw68/ diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile index 53c7ae135460..cfb6af7d3bc3 100644 --- a/drivers/media/radio/Makefile +++ b/drivers/media/radio/Makefile @@ -3,36 +3,39 @@ # Makefile for the kernel character device drivers. # =20 -obj-$(CONFIG_RADIO_ISA) +=3D radio-isa.o +shark2-objs :=3D radio-shark2.o radio-tea5777.o + +# Please keep it alphabetically sorted by Kconfig name +# (e. g. LC_ALL=3DC sort Makefile) obj-$(CONFIG_RADIO_AZTECH) +=3D radio-aztech.o +obj-$(CONFIG_RADIO_CADET) +=3D radio-cadet.o +obj-$(CONFIG_RADIO_GEMTEK) +=3D radio-gemtek.o +obj-$(CONFIG_RADIO_ISA) +=3D radio-isa.o +obj-$(CONFIG_RADIO_MAXIRADIO) +=3D radio-maxiradio.o +obj-$(CONFIG_RADIO_MIROPCM20) +=3D radio-miropcm20.o obj-$(CONFIG_RADIO_RTRACK2) +=3D radio-rtrack2.o +obj-$(CONFIG_RADIO_RTRACK) +=3D radio-aimslab.o +obj-$(CONFIG_RADIO_SAA7706H) +=3D saa7706h.o obj-$(CONFIG_RADIO_SF16FMI) +=3D radio-sf16fmi.o obj-$(CONFIG_RADIO_SF16FMR2) +=3D radio-sf16fmr2.o -obj-$(CONFIG_RADIO_CADET) +=3D radio-cadet.o -obj-$(CONFIG_RADIO_TYPHOON) +=3D radio-typhoon.o -obj-$(CONFIG_RADIO_TERRATEC) +=3D radio-terratec.o -obj-$(CONFIG_RADIO_MAXIRADIO) +=3D radio-maxiradio.o -obj-$(CONFIG_RADIO_SHARK) +=3D radio-shark.o obj-$(CONFIG_RADIO_SHARK2) +=3D shark2.o -obj-$(CONFIG_RADIO_RTRACK) +=3D radio-aimslab.o -obj-$(CONFIG_RADIO_ZOLTRIX) +=3D radio-zoltrix.o -obj-$(CONFIG_RADIO_GEMTEK) +=3D radio-gemtek.o -obj-$(CONFIG_RADIO_TRUST) +=3D radio-trust.o -obj-$(CONFIG_RADIO_SI476X) +=3D radio-si476x.o -obj-$(CONFIG_RADIO_MIROPCM20) +=3D radio-miropcm20.o -obj-$(CONFIG_USB_DSBR) +=3D dsbr100.o +obj-$(CONFIG_RADIO_SHARK) +=3D radio-shark.o obj-$(CONFIG_RADIO_SI470X) +=3D si470x/ obj-$(CONFIG_RADIO_SI4713) +=3D si4713/ -obj-$(CONFIG_USB_MR800) +=3D radio-mr800.o -obj-$(CONFIG_USB_KEENE) +=3D radio-keene.o -obj-$(CONFIG_USB_MA901) +=3D radio-ma901.o +obj-$(CONFIG_RADIO_SI476X) +=3D radio-si476x.o +obj-$(CONFIG_RADIO_TEA575X) +=3D tea575x.o obj-$(CONFIG_RADIO_TEA5764) +=3D radio-tea5764.o -obj-$(CONFIG_RADIO_SAA7706H) +=3D saa7706h.o obj-$(CONFIG_RADIO_TEF6862) +=3D tef6862.o +obj-$(CONFIG_RADIO_TERRATEC) +=3D radio-terratec.o obj-$(CONFIG_RADIO_TIMBERDALE) +=3D radio-timb.o +obj-$(CONFIG_RADIO_TRUST) +=3D radio-trust.o +obj-$(CONFIG_RADIO_TYPHOON) +=3D radio-typhoon.o obj-$(CONFIG_RADIO_WL1273) +=3D radio-wl1273.o obj-$(CONFIG_RADIO_WL128X) +=3D wl128x/ -obj-$(CONFIG_RADIO_TEA575X) +=3D tea575x.o +obj-$(CONFIG_RADIO_ZOLTRIX) +=3D radio-zoltrix.o + +obj-$(CONFIG_USB_DSBR) +=3D dsbr100.o +obj-$(CONFIG_USB_KEENE) +=3D radio-keene.o +obj-$(CONFIG_USB_MA901) +=3D radio-ma901.o +obj-$(CONFIG_USB_MR800) +=3D radio-mr800.o obj-$(CONFIG_USB_RAREMONO) +=3D radio-raremono.o - -shark2-objs :=3D radio-shark2.o radio-tea5777.o diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile index 378d62d21e06..a9285266e944 100644 --- a/drivers/media/rc/Makefile +++ b/drivers/media/rc/Makefile @@ -2,51 +2,56 @@ =20 obj-y +=3D keymaps/ =20 -obj-$(CONFIG_RC_CORE) +=3D rc-core.o rc-core-y :=3D rc-main.o rc-ir-raw.o rc-core-$(CONFIG_LIRC) +=3D lirc_dev.o rc-core-$(CONFIG_MEDIA_CEC_RC) +=3D keymaps/rc-cec.o rc-core-$(CONFIG_BPF_LIRC_MODE2) +=3D bpf-lirc.o + +obj-$(CONFIG_RC_CORE) +=3D rc-core.o + +# IR decoders - please keep it alphabetically sorted by Kconfig name +# (e. g. LC_ALL=3DC sort Makefile) +obj-$(CONFIG_IR_IMON_DECODER) +=3D ir-imon-decoder.o +obj-$(CONFIG_IR_JVC_DECODER) +=3D ir-jvc-decoder.o +obj-$(CONFIG_IR_MCE_KBD_DECODER) +=3D ir-mce_kbd-decoder.o obj-$(CONFIG_IR_NEC_DECODER) +=3D ir-nec-decoder.o obj-$(CONFIG_IR_RC5_DECODER) +=3D ir-rc5-decoder.o obj-$(CONFIG_IR_RC6_DECODER) +=3D ir-rc6-decoder.o -obj-$(CONFIG_IR_JVC_DECODER) +=3D ir-jvc-decoder.o -obj-$(CONFIG_IR_SONY_DECODER) +=3D ir-sony-decoder.o +obj-$(CONFIG_IR_RCMM_DECODER) +=3D ir-rcmm-decoder.o obj-$(CONFIG_IR_SANYO_DECODER) +=3D ir-sanyo-decoder.o obj-$(CONFIG_IR_SHARP_DECODER) +=3D ir-sharp-decoder.o -obj-$(CONFIG_IR_MCE_KBD_DECODER) +=3D ir-mce_kbd-decoder.o +obj-$(CONFIG_IR_SONY_DECODER) +=3D ir-sony-decoder.o obj-$(CONFIG_IR_XMP_DECODER) +=3D ir-xmp-decoder.o -obj-$(CONFIG_IR_IMON_DECODER) +=3D ir-imon-decoder.o -obj-$(CONFIG_IR_RCMM_DECODER) +=3D ir-rcmm-decoder.o =20 -# stand-alone IR receivers/transmitters -obj-$(CONFIG_RC_ATI_REMOTE) +=3D ati_remote.o +# stand-alone IR receivers/transmitters - please keep it alphabetically +# sorted by Kconfig name (e. g. LC_ALL=3DC sort Makefile) +obj-$(CONFIG_IR_ENE) +=3D ene_ir.o +obj-$(CONFIG_IR_FINTEK) +=3D fintek-cir.o +obj-$(CONFIG_IR_GPIO_CIR) +=3D gpio-ir-recv.o +obj-$(CONFIG_IR_GPIO_TX) +=3D gpio-ir-tx.o obj-$(CONFIG_IR_HIX5HD2) +=3D ir-hix5hd2.o +obj-$(CONFIG_IR_IGORPLUGUSB) +=3D igorplugusb.o +obj-$(CONFIG_IR_IGUANA) +=3D iguanair.o +obj-$(CONFIG_IR_IMG) +=3D img-ir/ obj-$(CONFIG_IR_IMON) +=3D imon.o obj-$(CONFIG_IR_IMON_RAW) +=3D imon_raw.o obj-$(CONFIG_IR_ITE_CIR) +=3D ite-cir.o obj-$(CONFIG_IR_MCEUSB) +=3D mceusb.o -obj-$(CONFIG_IR_FINTEK) +=3D fintek-cir.o obj-$(CONFIG_IR_MESON) +=3D meson-ir.o obj-$(CONFIG_IR_MESON_TX) +=3D meson-ir-tx.o +obj-$(CONFIG_IR_MTK) +=3D mtk-cir.o obj-$(CONFIG_IR_NUVOTON) +=3D nuvoton-cir.o -obj-$(CONFIG_IR_ENE) +=3D ene_ir.o +obj-$(CONFIG_IR_PWM_TX) +=3D pwm-ir-tx.o obj-$(CONFIG_IR_REDRAT3) +=3D redrat3.o obj-$(CONFIG_IR_RX51) +=3D ir-rx51.o +obj-$(CONFIG_IR_SERIAL) +=3D serial_ir.o obj-$(CONFIG_IR_SPI) +=3D ir-spi.o obj-$(CONFIG_IR_STREAMZAP) +=3D streamzap.o +obj-$(CONFIG_IR_SUNXI) +=3D sunxi-cir.o +obj-$(CONFIG_IR_TOY) +=3D ir_toy.o +obj-$(CONFIG_IR_TTUSBIR) +=3D ttusbir.o obj-$(CONFIG_IR_WINBOND_CIR) +=3D winbond-cir.o +obj-$(CONFIG_RC_ATI_REMOTE) +=3D ati_remote.o obj-$(CONFIG_RC_LOOPBACK) +=3D rc-loopback.o -obj-$(CONFIG_IR_GPIO_CIR) +=3D gpio-ir-recv.o -obj-$(CONFIG_IR_GPIO_TX) +=3D gpio-ir-tx.o -obj-$(CONFIG_IR_PWM_TX) +=3D pwm-ir-tx.o -obj-$(CONFIG_IR_IGORPLUGUSB) +=3D igorplugusb.o -obj-$(CONFIG_IR_IGUANA) +=3D iguanair.o -obj-$(CONFIG_IR_TTUSBIR) +=3D ttusbir.o obj-$(CONFIG_RC_ST) +=3D st_rc.o -obj-$(CONFIG_IR_SUNXI) +=3D sunxi-cir.o -obj-$(CONFIG_IR_IMG) +=3D img-ir/ -obj-$(CONFIG_IR_SERIAL) +=3D serial_ir.o -obj-$(CONFIG_IR_MTK) +=3D mtk-cir.o obj-$(CONFIG_RC_XBOX_DVD) +=3D xbox_remote.o -obj-$(CONFIG_IR_TOY) +=3D ir_toy.o diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/M= akefile index 5fe5c9e1a46d..f513ff5caf4e 100644 --- a/drivers/media/rc/keymaps/Makefile +++ b/drivers/media/rc/keymaps/Makefile @@ -1,5 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_RC_MAP) +=3D rc-adstech-dvb-t-pci.o \ + +# Please keep keymaps alphabetically sorted by directory name +#(e. g. LC_ALL=3DC sort Makefile) +obj-$(CONFIG_RC_MAP) +=3D \ + rc-adstech-dvb-t-pci.o \ rc-alink-dtu-m.o \ rc-anysee.o \ rc-apac-viewcomp.o \ @@ -9,17 +13,17 @@ obj-$(CONFIG_RC_MAP) +=3D rc-adstech-dvb-t-pci.o \ rc-ati-tv-wonder-hd-600.o \ rc-ati-x10.o \ rc-avermedia-a16d.o \ - rc-avermedia.o \ rc-avermedia-cardbus.o \ rc-avermedia-dvbt.o \ rc-avermedia-m135a.o \ rc-avermedia-m733a-rm-k6.o \ + rc-avermedia.o \ rc-avermedia-rm-ks.o \ rc-avertv-303.o \ rc-azurewave-ad-tu700.o \ rc-beelink-gs1.o \ - rc-behold.o \ rc-behold-columbus.o \ + rc-behold.o \ rc-budget-ci-old.o \ rc-cinergy-1400.o \ rc-cinergy.o \ @@ -39,8 +43,8 @@ obj-$(CONFIG_RC_MAP) +=3D rc-adstech-dvb-t-pci.o \ rc-dvico-portable.o \ rc-em-terratec.o \ rc-encore-enltv2.o \ - rc-encore-enltv.o \ rc-encore-enltv-fm53.o \ + rc-encore-enltv.o \ rc-evga-indtube.o \ rc-eztv.o \ rc-flydvb.o \ @@ -50,6 +54,7 @@ obj-$(CONFIG_RC_MAP) +=3D rc-adstech-dvb-t-pci.o \ rc-geekbox.o \ rc-genius-tvgo-a11mce.o \ rc-gotview7135.o \ + rc-hauppauge.o \ rc-hisi-poplar.o \ rc-hisi-tv-demo.o \ rc-imon-mce.o \ @@ -67,14 +72,14 @@ obj-$(CONFIG_RC_MAP) +=3D rc-adstech-dvb-t-pci.o \ rc-leadtek-y04g0051.o \ rc-lme2510.o \ rc-manli.o \ - rc-mecool-kii-pro.o \ rc-mecool-kiii-pro.o \ - rc-medion-x10.o \ + rc-mecool-kii-pro.o \ rc-medion-x10-digitainer.o \ + rc-medion-x10.o \ rc-medion-x10-or2x.o \ rc-minix-neo.o \ - rc-msi-digivox-ii.o \ rc-msi-digivox-iii.o \ + rc-msi-digivox-ii.o \ rc-msi-tvanywhere.o \ rc-msi-tvanywhere-plus.o \ rc-nebula.o \ @@ -87,20 +92,20 @@ obj-$(CONFIG_RC_MAP) +=3D rc-adstech-dvb-t-pci.o \ rc-pinnacle-color.o \ rc-pinnacle-grey.o \ rc-pinnacle-pctv-hd.o \ - rc-pixelview.o \ - rc-pixelview-mk12.o \ rc-pixelview-002t.o \ + rc-pixelview-mk12.o \ rc-pixelview-new.o \ + rc-pixelview.o \ rc-powercolor-real-angel.o \ rc-proteus-2309.o \ rc-purpletv.o \ rc-pv951.o \ - rc-hauppauge.o \ rc-rc6-mce.o \ rc-real-audio-220-32-keys.o \ rc-reddo.o \ rc-snapstream-firefly.o \ rc-streamzap.o \ + rc-su3000.o \ rc-tanix-tx3mini.o \ rc-tanix-tx5max.o \ rc-tbs-nec.o \ @@ -109,16 +114,16 @@ obj-$(CONFIG_RC_MAP) +=3D rc-adstech-dvb-t-pci.o \ rc-terratec-cinergy-c-pci.o \ rc-terratec-cinergy-s2-hd.o \ rc-terratec-cinergy-xs.o \ - rc-terratec-slim.o \ rc-terratec-slim-2.o \ + rc-terratec-slim.o \ rc-tevii-nec.o \ rc-tivo.o \ - rc-total-media-in-hand.o \ rc-total-media-in-hand-02.o \ + rc-total-media-in-hand.o \ rc-trekstor.o \ rc-tt-1500.o \ - rc-twinhan-dtv-cab-ci.o \ rc-twinhan1027.o \ + rc-twinhan-dtv-cab-ci.o \ rc-vega-s9x.o \ rc-videomate-m1f.o \ rc-videomate-s350.o \ @@ -128,8 +133,7 @@ obj-$(CONFIG_RC_MAP) +=3D rc-adstech-dvb-t-pci.o \ rc-wetek-play2.o \ rc-winfast.o \ rc-winfast-usbii-deluxe.o \ - rc-su3000.o \ + rc-x96max.o \ rc-xbox-360.o \ rc-xbox-dvd.o \ - rc-x96max.o \ rc-zx-irdec.o diff --git a/drivers/media/spi/Makefile b/drivers/media/spi/Makefile index 9f45787d680d..6ac7adc64124 100644 --- a/drivers/media/spi/Makefile +++ b/drivers/media/spi/Makefile @@ -1,5 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_VIDEO_GS1662) +=3D gs1662.o -obj-$(CONFIG_CXD2880_SPI_DRV) +=3D cxd2880-spi.o =20 ccflags-y +=3D -I $(srctree)/drivers/media/dvb-frontends/cxd2880 + +# Please keep it alphabetically sorted by Kconfig name +# (e. g. LC_ALL=3DC sort Makefile) +obj-$(CONFIG_CXD2880_SPI_DRV) +=3D cxd2880-spi.o +obj-$(CONFIG_VIDEO_GS1662) +=3D gs1662.o diff --git a/drivers/media/test-drivers/Makefile b/drivers/media/test-drive= rs/Makefile index 1e64e05c1f22..ff390b687189 100644 --- a/drivers/media/test-drivers/Makefile +++ b/drivers/media/test-drivers/Makefile @@ -3,8 +3,12 @@ # Makefile for the test drivers. # =20 +# Please keep it alphabetically sorted by Kconfig name +# (e. g. LC_ALL=3DC sort Makefile) + +obj-$(CONFIG_DVB_VIDTV) +=3D vidtv/ + +obj-$(CONFIG_VIDEO_VICODEC) +=3D vicodec/ +obj-$(CONFIG_VIDEO_VIM2M) +=3D vim2m.o obj-$(CONFIG_VIDEO_VIMC) +=3D vimc/ obj-$(CONFIG_VIDEO_VIVID) +=3D vivid/ -obj-$(CONFIG_VIDEO_VIM2M) +=3D vim2m.o -obj-$(CONFIG_VIDEO_VICODEC) +=3D vicodec/ -obj-$(CONFIG_DVB_VIDTV) +=3D vidtv/ diff --git a/drivers/media/tuners/Makefile b/drivers/media/tuners/Makefile index abcad519a4f9..bd350a285aad 100644 --- a/drivers/media/tuners/Makefile +++ b/drivers/media/tuners/Makefile @@ -3,46 +3,46 @@ # Makefile for common V4L/DVB tuners # =20 +ccflags-y +=3D -I$(srctree)/drivers/media/dvb-frontends tda18271-objs :=3D tda18271-maps.o tda18271-common.o tda18271-fe.o =20 -obj-$(CONFIG_MEDIA_TUNER_XC2028) +=3D xc2028.o -obj-$(CONFIG_MEDIA_TUNER_SIMPLE) +=3D tuner-simple.o -# tuner-types will be merged into tuner-simple, in the future -obj-$(CONFIG_MEDIA_TUNER_SIMPLE) +=3D tuner-types.o -obj-$(CONFIG_MEDIA_TUNER_MT20XX) +=3D mt20xx.o -obj-$(CONFIG_MEDIA_TUNER_TDA8290) +=3D tda8290.o -obj-$(CONFIG_MEDIA_TUNER_TEA5767) +=3D tea5767.o -obj-$(CONFIG_MEDIA_TUNER_TEA5761) +=3D tea5761.o -obj-$(CONFIG_MEDIA_TUNER_TDA9887) +=3D tda9887.o -obj-$(CONFIG_MEDIA_TUNER_TDA827X) +=3D tda827x.o -obj-$(CONFIG_MEDIA_TUNER_TDA18271) +=3D tda18271.o -obj-$(CONFIG_MEDIA_TUNER_XC5000) +=3D xc5000.o -obj-$(CONFIG_MEDIA_TUNER_XC4000) +=3D xc4000.o -obj-$(CONFIG_MEDIA_TUNER_MSI001) +=3D msi001.o -obj-$(CONFIG_MEDIA_TUNER_MT2060) +=3D mt2060.o -obj-$(CONFIG_MEDIA_TUNER_MT2063) +=3D mt2063.o -obj-$(CONFIG_MEDIA_TUNER_MT2266) +=3D mt2266.o -obj-$(CONFIG_MEDIA_TUNER_QT1010) +=3D qt1010.o -obj-$(CONFIG_MEDIA_TUNER_MT2131) +=3D mt2131.o -obj-$(CONFIG_MEDIA_TUNER_MXL5005S) +=3D mxl5005s.o -obj-$(CONFIG_MEDIA_TUNER_MXL5007T) +=3D mxl5007t.o -obj-$(CONFIG_MEDIA_TUNER_MC44S803) +=3D mc44s803.o -obj-$(CONFIG_MEDIA_TUNER_MAX2165) +=3D max2165.o -obj-$(CONFIG_MEDIA_TUNER_TDA18218) +=3D tda18218.o -obj-$(CONFIG_MEDIA_TUNER_TDA18212) +=3D tda18212.o +# Please keep it alphabetically sorted by Kconfig name +# (e. g. LC_ALL=3DC sort Makefile) obj-$(CONFIG_MEDIA_TUNER_E4000) +=3D e4000.o -obj-$(CONFIG_MEDIA_TUNER_FC2580) +=3D fc2580.o -obj-$(CONFIG_MEDIA_TUNER_TUA9001) +=3D tua9001.o -obj-$(CONFIG_MEDIA_TUNER_SI2157) +=3D si2157.o obj-$(CONFIG_MEDIA_TUNER_FC0011) +=3D fc0011.o obj-$(CONFIG_MEDIA_TUNER_FC0012) +=3D fc0012.o obj-$(CONFIG_MEDIA_TUNER_FC0013) +=3D fc0013.o +obj-$(CONFIG_MEDIA_TUNER_FC2580) +=3D fc2580.o obj-$(CONFIG_MEDIA_TUNER_IT913X) +=3D it913x.o -obj-$(CONFIG_MEDIA_TUNER_R820T) +=3D r820t.o +obj-$(CONFIG_MEDIA_TUNER_M88RS6000T) +=3D m88rs6000t.o +obj-$(CONFIG_MEDIA_TUNER_MAX2165) +=3D max2165.o +obj-$(CONFIG_MEDIA_TUNER_MC44S803) +=3D mc44s803.o +obj-$(CONFIG_MEDIA_TUNER_MSI001) +=3D msi001.o +obj-$(CONFIG_MEDIA_TUNER_MT2060) +=3D mt2060.o +obj-$(CONFIG_MEDIA_TUNER_MT2063) +=3D mt2063.o +obj-$(CONFIG_MEDIA_TUNER_MT20XX) +=3D mt20xx.o +obj-$(CONFIG_MEDIA_TUNER_MT2131) +=3D mt2131.o +obj-$(CONFIG_MEDIA_TUNER_MT2266) +=3D mt2266.o obj-$(CONFIG_MEDIA_TUNER_MXL301RF) +=3D mxl301rf.o -obj-$(CONFIG_MEDIA_TUNER_QM1D1C0042) +=3D qm1d1c0042.o +obj-$(CONFIG_MEDIA_TUNER_MXL5005S) +=3D mxl5005s.o +obj-$(CONFIG_MEDIA_TUNER_MXL5007T) +=3D mxl5007t.o obj-$(CONFIG_MEDIA_TUNER_QM1D1B0004) +=3D qm1d1b0004.o -obj-$(CONFIG_MEDIA_TUNER_M88RS6000T) +=3D m88rs6000t.o +obj-$(CONFIG_MEDIA_TUNER_QM1D1C0042) +=3D qm1d1c0042.o +obj-$(CONFIG_MEDIA_TUNER_QT1010) +=3D qt1010.o +obj-$(CONFIG_MEDIA_TUNER_R820T) +=3D r820t.o +obj-$(CONFIG_MEDIA_TUNER_SI2157) +=3D si2157.o +obj-$(CONFIG_MEDIA_TUNER_SIMPLE) +=3D tuner-simple.o +obj-$(CONFIG_MEDIA_TUNER_SIMPLE) +=3D tuner-types.o +obj-$(CONFIG_MEDIA_TUNER_TDA18212) +=3D tda18212.o +obj-$(CONFIG_MEDIA_TUNER_TDA18218) +=3D tda18218.o obj-$(CONFIG_MEDIA_TUNER_TDA18250) +=3D tda18250.o - -ccflags-y +=3D -I$(srctree)/drivers/media/dvb-frontends +obj-$(CONFIG_MEDIA_TUNER_TDA18271) +=3D tda18271.o +obj-$(CONFIG_MEDIA_TUNER_TDA827X) +=3D tda827x.o +obj-$(CONFIG_MEDIA_TUNER_TDA8290) +=3D tda8290.o +obj-$(CONFIG_MEDIA_TUNER_TDA9887) +=3D tda9887.o +obj-$(CONFIG_MEDIA_TUNER_TEA5761) +=3D tea5761.o +obj-$(CONFIG_MEDIA_TUNER_TEA5767) +=3D tea5767.o +obj-$(CONFIG_MEDIA_TUNER_TUA9001) +=3D tua9001.o +obj-$(CONFIG_MEDIA_TUNER_XC2028) +=3D xc2028.o +obj-$(CONFIG_MEDIA_TUNER_XC4000) +=3D xc4000.o +obj-$(CONFIG_MEDIA_TUNER_XC5000) +=3D xc5000.o diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile index 65521f4921e3..044bd46c799c 100644 --- a/drivers/media/usb/Makefile +++ b/drivers/media/usb/Makefile @@ -3,24 +3,34 @@ # Makefile for the USB media device drivers # =20 -# DVB USB-only drivers -obj-y +=3D ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ b2c2/ -obj-y +=3D zr364xx/ stkwebcam/ s2255/ +# DVB USB-only drivers. Please keep it alphabetically sorted by directory = name +# (e. g. LC_ALL=3DC sort Makefile) +obj-y +=3D b2c2/ +obj-y +=3D dvb-usb/ +obj-y +=3D dvb-usb-v2/ +obj-y +=3D s2255/ +obj-y +=3D siano/ +obj-y +=3D stkwebcam/ +obj-y +=3D ttusb-budget/ +obj-y +=3D ttusb-dec/ +obj-y +=3D zr364xx/ =20 -obj-$(CONFIG_USB_VIDEO_CLASS) +=3D uvc/ -obj-$(CONFIG_USB_GSPCA) +=3D gspca/ -obj-$(CONFIG_USB_PWC) +=3D pwc/ +# Please keep it alphabetically sorted by Kconfig name +# (e. g. LC_ALL=3DC sort Makefile) +obj-$(CONFIG_DVB_AS102) +=3D as102/ obj-$(CONFIG_USB_AIRSPY) +=3D airspy/ +obj-$(CONFIG_USB_GSPCA) +=3D gspca/ obj-$(CONFIG_USB_HACKRF) +=3D hackrf/ obj-$(CONFIG_USB_MSI2500) +=3D msi2500/ -obj-$(CONFIG_VIDEO_CPIA2) +=3D cpia2/ +obj-$(CONFIG_USB_PWC) +=3D pwc/ +obj-$(CONFIG_USB_VIDEO_CLASS) +=3D uvc/ obj-$(CONFIG_VIDEO_AU0828) +=3D au0828/ +obj-$(CONFIG_VIDEO_CPIA2) +=3D cpia2/ +obj-$(CONFIG_VIDEO_CX231XX) +=3D cx231xx/ +obj-$(CONFIG_VIDEO_EM28XX) +=3D em28xx/ +obj-$(CONFIG_VIDEO_GO7007) +=3D go7007/ obj-$(CONFIG_VIDEO_HDPVR) +=3D hdpvr/ obj-$(CONFIG_VIDEO_PVRUSB2) +=3D pvrusb2/ obj-$(CONFIG_VIDEO_STK1160) +=3D stk1160/ -obj-$(CONFIG_VIDEO_CX231XX) +=3D cx231xx/ obj-$(CONFIG_VIDEO_TM6000) +=3D tm6000/ -obj-$(CONFIG_VIDEO_EM28XX) +=3D em28xx/ obj-$(CONFIG_VIDEO_USBTV) +=3D usbtv/ -obj-$(CONFIG_VIDEO_GO7007) +=3D go7007/ -obj-$(CONFIG_DVB_AS102) +=3D as102/ diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Mak= efile index 83fac5c746f5..1ec7e9cae1fa 100644 --- a/drivers/media/v4l2-core/Makefile +++ b/drivers/media/v4l2-core/Makefile @@ -3,37 +3,39 @@ # Makefile for the V4L2 core # =20 +ccflags-y +=3D -I$(srctree)/drivers/media/dvb-frontends +ccflags-y +=3D -I$(srctree)/drivers/media/tuners + tuner-objs :=3D tuner-core.o =20 videodev-objs :=3D v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-fh.o \ v4l2-event.o v4l2-subdev.o v4l2-common.o \ v4l2-ctrls-core.o v4l2-ctrls-api.o \ v4l2-ctrls-request.o v4l2-ctrls-defs.o + +# Please keep it alphabetically sorted by Kconfig name +# (e. g. LC_ALL=3DC sort Makefile) videodev-$(CONFIG_COMPAT) +=3D v4l2-compat-ioctl32.o -videodev-$(CONFIG_TRACEPOINTS) +=3D v4l2-trace.o videodev-$(CONFIG_MEDIA_CONTROLLER) +=3D v4l2-mc.o videodev-$(CONFIG_SPI) +=3D v4l2-spi.o +videodev-$(CONFIG_TRACEPOINTS) +=3D v4l2-trace.o videodev-$(CONFIG_VIDEO_V4L2_I2C) +=3D v4l2-i2c.o =20 -obj-$(CONFIG_VIDEO_V4L2) +=3D videodev.o -obj-$(CONFIG_V4L2_FWNODE) +=3D v4l2-fwnode.o +# Please keep it alphabetically sorted by Kconfig name +# (e. g. LC_ALL=3DC sort Makefile) + obj-$(CONFIG_V4L2_ASYNC) +=3D v4l2-async.o -obj-$(CONFIG_VIDEO_V4L2) +=3D v4l2-dv-timings.o - -obj-$(CONFIG_VIDEO_TUNER) +=3D tuner.o - -obj-$(CONFIG_V4L2_MEM2MEM_DEV) +=3D v4l2-mem2mem.o -obj-$(CONFIG_V4L2_H264) +=3D v4l2-h264.o -obj-$(CONFIG_V4L2_VP9) +=3D v4l2-vp9.o - obj-$(CONFIG_V4L2_FLASH_LED_CLASS) +=3D v4l2-flash-led-class.o - +obj-$(CONFIG_V4L2_FWNODE) +=3D v4l2-fwnode.o +obj-$(CONFIG_V4L2_H264) +=3D v4l2-h264.o obj-$(CONFIG_V4L2_JPEG_HELPER) +=3D v4l2-jpeg.o +obj-$(CONFIG_V4L2_MEM2MEM_DEV) +=3D v4l2-mem2mem.o +obj-$(CONFIG_V4L2_VP9) +=3D v4l2-vp9.o =20 -obj-$(CONFIG_VIDEOBUF_GEN) +=3D videobuf-core.o -obj-$(CONFIG_VIDEOBUF_DMA_SG) +=3D videobuf-dma-sg.o obj-$(CONFIG_VIDEOBUF_DMA_CONTIG) +=3D videobuf-dma-contig.o +obj-$(CONFIG_VIDEOBUF_DMA_SG) +=3D videobuf-dma-sg.o +obj-$(CONFIG_VIDEOBUF_GEN) +=3D videobuf-core.o obj-$(CONFIG_VIDEOBUF_VMALLOC) +=3D videobuf-vmalloc.o =20 -ccflags-y +=3D -I$(srctree)/drivers/media/dvb-frontends -ccflags-y +=3D -I$(srctree)/drivers/media/tuners +obj-$(CONFIG_VIDEO_TUNER) +=3D tuner.o +obj-$(CONFIG_VIDEO_V4L2) +=3D v4l2-dv-timings.o videodev.o --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2AABC433EF for ; Mon, 14 Mar 2022 07:56:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236853AbiCNH5V (ORCPT ); Mon, 14 Mar 2022 03:57:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236738AbiCNH5P (ORCPT ); Mon, 14 Mar 2022 03:57:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC81F41315; Mon, 14 Mar 2022 00:56:01 -0700 (PDT) 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 4E2A761168; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1F64C340EE; Mon, 14 Mar 2022 07:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244560; bh=u0SqTDlgpFphqN5PIZ+ohOG5mS7wT/lESZxcUmR9eL0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OPJ1WBwHzC81qI4ZmbnklEOnZ/Ak4Cf0J0ximIqpnmURBJ2B+ZmpAUGSfL2Vk49Bm 35+hoWyuPgtgO6pOklraSEa46wK/jIwuTqef6ry/0Pn8rG7gDVzuENIlDYZhpdw0cm Siuok8yNjCjsk0fAckHBrbpJZphpO7rm6f9XKAjzIZJn+BoLv14fcum3TjjPhTUpyd RHZQHf1WvOqTxczFyxGt7fgmHXB8M6yPztb9LgBru8XxMhXxnvOg6L1qOVVSi8d+cK SbdFKP1EecjdX7qGsFG3FyLaIaVJpyrShgbu/OuzOyVIVKVXaOwvknBtGlswuNnHM9 IbmfEji1dVpHA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYc-001kUR-Fp; Mon, 14 Mar 2022 08:55:58 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Laurent Pinchart , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 04/64] media: platform: Makefile: reorganize its contents Date: Mon, 14 Mar 2022 08:54:56 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" There are lots of inconsistencies here: some directories are included as-is, and others included using one (or more) symbols that are inside it. Also, its entries are not sorted. That makes it harder to maintain. Reorganize it by placing everything on alphabetic order and providing some hints about how patches for such file is expected. Reviewed-by: Laurent Pinchart 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Makefile | 132 ++++++++++++-------------------- 1 file changed, 50 insertions(+), 82 deletions(-) diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index 4032816f8e8a..e319044c57e9 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -3,94 +3,62 @@ # Makefile for the video capture/playback device drivers. # =20 -obj-$(CONFIG_VIDEO_ALLEGRO_DVT) +=3D allegro-dvt/ +# Place here, alphabetically sorted by directory +# (e. g. LC_ALL=3DC sort Makefile) +obj-y +=3D allegro-dvt/ +obj-y +=3D am437x/ +obj-y +=3D amphion/ +obj-y +=3D atmel/ +obj-y +=3D cadence/ +obj-y +=3D coda/ +obj-y +=3D davinci/ +obj-y +=3D exynos-gsc/ +obj-y +=3D exynos4-is/ +obj-y +=3D imx/ +obj-y +=3D imx-jpeg/ +obj-y +=3D marvell-ccic/ +obj-y +=3D meson/ge2d/ +obj-y +=3D mtk-jpeg/ +obj-y +=3D mtk-mdp/ +obj-y +=3D mtk-vcodec/ +obj-y +=3D mtk-vpu/ +obj-y +=3D omap/ +obj-y +=3D omap3isp/ +obj-y +=3D qcom/camss/ +obj-y +=3D qcom/venus/ +obj-y +=3D rcar-vin/ +obj-y +=3D rockchip/rga/ +obj-y +=3D rockchip/rkisp1/ +obj-y +=3D s3c-camif/ +obj-y +=3D s5p-g2d/ +obj-y +=3D s5p-jpeg/ +obj-y +=3D s5p-mfc/ +obj-y +=3D sti/bdisp/ +obj-y +=3D sti/c8sectpfe/ +obj-y +=3D sti/delta/ +obj-y +=3D sti/hva/ +obj-y +=3D stm32/ +obj-y +=3D sunxi/ +obj-y +=3D tegra/vde/ +obj-y +=3D ti-vpe/ +obj-y +=3D vsp1/ +obj-y +=3D xilinx/ + +# Please place here only ancillary drivers that aren't SoC-specific +# Please keep it alphabetically sorted by Kconfig name +# (e. g. LC_ALL=3DC sort Makefile) obj-$(CONFIG_VIDEO_ASPEED) +=3D aspeed-video.o -obj-$(CONFIG_VIDEO_CADENCE) +=3D cadence/ -obj-$(CONFIG_VIDEO_VIA_CAMERA) +=3D via-camera.o -obj-$(CONFIG_VIDEO_CAFE_CCIC) +=3D marvell-ccic/ -obj-$(CONFIG_VIDEO_MMP_CAMERA) +=3D marvell-ccic/ - -obj-$(CONFIG_VIDEO_OMAP3) +=3D omap3isp/ -obj-$(CONFIG_VIDEO_PXA27x) +=3D pxa_camera.o - -obj-$(CONFIG_VIDEO_VIU) +=3D fsl-viu.o - -obj-y +=3D ti-vpe/ - -obj-$(CONFIG_VIDEO_MX2_EMMAPRP) +=3D mx2_emmaprp.o -obj-$(CONFIG_VIDEO_CODA) +=3D coda/ - -obj-$(CONFIG_VIDEO_IMX) +=3D imx/ obj-$(CONFIG_VIDEO_IMX_PXP) +=3D imx-pxp.o -obj-$(CONFIG_VIDEO_IMX8_JPEG) +=3D imx-jpeg/ - obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) +=3D m2m-deinterlace.o - obj-$(CONFIG_VIDEO_MUX) +=3D video-mux.o - -obj-$(CONFIG_VIDEO_S3C_CAMIF) +=3D s3c-camif/ -obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS) +=3D exynos4-is/ -obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG) +=3D s5p-jpeg/ -obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) +=3D s5p-mfc/ - -obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D) +=3D s5p-g2d/ -obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) +=3D exynos-gsc/ - -obj-$(CONFIG_VIDEO_STI_BDISP) +=3D sti/bdisp/ -obj-$(CONFIG_VIDEO_STI_HVA) +=3D sti/hva/ -obj-$(CONFIG_DVB_C8SECTPFE) +=3D sti/c8sectpfe/ - -obj-$(CONFIG_VIDEO_STI_DELTA) +=3D sti/delta/ - -obj-y +=3D stm32/ - -obj-y +=3D davinci/ - -obj-$(CONFIG_VIDEO_SH_VOU) +=3D sh_vou.o - +obj-$(CONFIG_VIDEO_MX2_EMMAPRP) +=3D mx2_emmaprp.o +obj-$(CONFIG_VIDEO_PXA27x) +=3D pxa_camera.o obj-$(CONFIG_VIDEO_RCAR_DRIF) +=3D rcar_drif.o +obj-$(CONFIG_VIDEO_RCAR_ISP) +=3D rcar-isp.o obj-$(CONFIG_VIDEO_RENESAS_CEU) +=3D renesas-ceu.o obj-$(CONFIG_VIDEO_RENESAS_FCP) +=3D rcar-fcp.o obj-$(CONFIG_VIDEO_RENESAS_FDP1) +=3D rcar_fdp1.o obj-$(CONFIG_VIDEO_RENESAS_JPU) +=3D rcar_jpu.o -obj-$(CONFIG_VIDEO_RENESAS_VSP1) +=3D vsp1/ - -obj-$(CONFIG_VIDEO_ROCKCHIP_ISP1) +=3D rockchip/rkisp1/ -obj-$(CONFIG_VIDEO_ROCKCHIP_RGA) +=3D rockchip/rga/ - -obj-y +=3D omap/ - -obj-$(CONFIG_VIDEO_AM437X_VPFE) +=3D am437x/ - -obj-$(CONFIG_VIDEO_XILINX) +=3D xilinx/ - -obj-$(CONFIG_VIDEO_RCAR_ISP) +=3D rcar-isp.o -obj-$(CONFIG_VIDEO_RCAR_VIN) +=3D rcar-vin/ - -obj-$(CONFIG_VIDEO_ATMEL_ISC) +=3D atmel/ -obj-$(CONFIG_VIDEO_ATMEL_ISI) +=3D atmel/ -obj-$(CONFIG_VIDEO_ATMEL_XISC) +=3D atmel/ -obj-$(CONFIG_VIDEO_MICROCHIP_CSI2DC) +=3D atmel/ - -obj-$(CONFIG_VIDEO_STM32_DCMI) +=3D stm32/ -obj-$(CONFIG_VIDEO_STM32_DMA2D) +=3D stm32/ - -obj-$(CONFIG_VIDEO_MEDIATEK_VPU) +=3D mtk-vpu/ - -obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) +=3D mtk-vcodec/ - -obj-$(CONFIG_VIDEO_MEDIATEK_MDP) +=3D mtk-mdp/ - -obj-$(CONFIG_VIDEO_MEDIATEK_JPEG) +=3D mtk-jpeg/ - -obj-$(CONFIG_VIDEO_QCOM_CAMSS) +=3D qcom/camss/ - -obj-$(CONFIG_VIDEO_QCOM_VENUS) +=3D qcom/venus/ - -obj-y +=3D sunxi/ - -obj-$(CONFIG_VIDEO_MESON_GE2D) +=3D meson/ge2d/ - -obj-$(CONFIG_VIDEO_TEGRA_VDE) +=3D tegra/vde/ - -obj-$(CONFIG_VIDEO_AMPHION_VPU) +=3D amphion/ +obj-$(CONFIG_VIDEO_SH_VOU) +=3D sh_vou.o +obj-$(CONFIG_VIDEO_VIA_CAMERA) +=3D via-camera.o +obj-$(CONFIG_VIDEO_VIU) +=3D fsl-viu.o --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D108C433EF for ; Mon, 14 Mar 2022 07:57:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237224AbiCNH64 (ORCPT ); Mon, 14 Mar 2022 03:58:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236829AbiCNH5f (ORCPT ); Mon, 14 Mar 2022 03:57:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AC1B41313; Mon, 14 Mar 2022 00:56:07 -0700 (PDT) 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 3A59361182; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7E47C340F8; Mon, 14 Mar 2022 07:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=VIGbCrZ8+zN5ch8SWnpLAP7B/f7EQGdFY8sPD60Bz/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZsMfkCaFkjOKRlnrUYqStaZ5J973X3CDROBEAs1/CtqGf15OjHEtpbFArm/MTyCfv hqNX+xjR3N9IdiOiq/LllOYazzsFHCoBjK4lm0xaez2+zRJafW8Szq4cOdEMswxOfr kp8NyTUbysrN8RsruJLVezVaaKNT/ffohE4FQEkNs2GmC4feoPYetBy1/A4zXSR0ru neZxlec5iw2iIpTgUKDQy1jUk9wlWXLWgy4z32TUakN9icmLh3sD5Yzs/oTCRxE/+4 wFHKBANcwIzTB5ukVaUn7V/Cou7z4SI30zjpCD1brekzb6CjP0I0OeSnNNLdYnanMy 7cwXIfsqKhHrw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYc-001kUV-HI; Mon, 14 Mar 2022 08:55:58 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Alexandre Belloni , Chen-Yu Tsai , Dmitry Osipenko , Eugen Hristev , Fabio Estevam , Geert Uytterhoeven , Hans Verkuil , Hyun Kwon , Jacopo Mondi , Jernej Skrabec , Krzysztof Kozlowski , Laurent Pinchart , Ludovic Desroches , Maxime Ripard , Michal Simek , Ming Qian , Mirela Rabulea , NXP Linux Team , Nicolas Ferre , Patrice Chotard , Pengutronix Kernel Team , Rui Miguel Silva , Sakari Ailus , Sascha Hauer , Shawn Guo , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 05/64] media: platform: move platform menu dependencies to drivers Date: Mon, 14 Mar 2022 08:54:57 +0100 Message-Id: <0bbd7df4b52f17246a6afe9c81e77b03b3313728.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Right now, platform dependencies are organized by the type of the platform driver. Yet, things tend to become very messy with time. The better seems to organize the drivers per manufacturer, as other Kernel subsystems are doing. As a preparation for such purpose, get rid of menuconfigs, moving the per-menu dependencies to be at the driver-specifig config entires. This shoud give flexibility to reorganize the platform drivers per manufacturer and re-sort them. This patch removes all "if..endif" options from the platform Kconfig, converting them into depends on. Acked-by: Jernej Skrabec 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 119 +++++++++++------- drivers/media/platform/am437x/Kconfig | 1 + drivers/media/platform/atmel/Kconfig | 4 + drivers/media/platform/cadence/Kconfig | 1 + drivers/media/platform/davinci/Kconfig | 6 + drivers/media/platform/exynos4-is/Kconfig | 1 + drivers/media/platform/imx-jpeg/Kconfig | 1 + drivers/media/platform/imx/Kconfig | 1 + drivers/media/platform/marvell-ccic/Kconfig | 2 + drivers/media/platform/omap/Kconfig | 1 + drivers/media/platform/rcar-vin/Kconfig | 2 + drivers/media/platform/sti/c8sectpfe/Kconfig | 1 + .../media/platform/sunxi/sun4i-csi/Kconfig | 1 + .../media/platform/sunxi/sun6i-csi/Kconfig | 1 + drivers/media/platform/xilinx/Kconfig | 1 + 15 files changed, 98 insertions(+), 45 deletions(-) diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 4843fabb8bb2..1446a99159c5 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -3,17 +3,39 @@ # Platform drivers # Most drivers here are currently for webcam support =20 -menuconfig V4L_PLATFORM_DRIVERS +config V4L_PLATFORM_DRIVERS bool "V4L platform devices" help Say Y here to enable support for platform-specific V4L drivers. =20 -if V4L_PLATFORM_DRIVERS +config SDR_PLATFORM_DRIVERS + bool "SDR platform devices" + depends on MEDIA_SDR_SUPPORT + help + Say Y here to enable support for platform-specific SDR Drivers. + +config DVB_PLATFORM_DRIVERS + bool "DVB platform devices" + depends on MEDIA_DIGITAL_TV_SUPPORT + help + Say Y here to enable support for platform-specific Digital TV drivers. + +config V4L_MEM2MEM_DRIVERS + bool "Memory-to-memory multimedia devices" + depends on VIDEO_V4L2 + help + Say Y here to enable selecting drivers for V4L devices that + use system memory for both source and destination buffers, as opposed + to capture and output drivers, which use memory buffers for just + one of those. + +# V4L platform drivers =20 source "drivers/media/platform/marvell-ccic/Kconfig" =20 config VIDEO_VIA_CAMERA tristate "VIAFB camera controller support" + depends on V4L_PLATFORM_DRIVERS depends on FB_VIA && VIDEO_V4L2 select VIDEOBUF2_DMA_SG select VIDEO_OV7670 @@ -22,9 +44,6 @@ config VIDEO_VIA_CAMERA Chrome9 chipsets. Currently only tested on OLPC xo-1.5 systems with ov7670 sensors. =20 -# -# Platform multimedia device configuration -# source "drivers/media/platform/cadence/Kconfig" =20 source "drivers/media/platform/davinci/Kconfig" @@ -33,6 +52,7 @@ source "drivers/media/platform/omap/Kconfig" =20 config VIDEO_ASPEED tristate "Aspeed AST2400 and AST2500 Video Engine driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 select VIDEOBUF2_DMA_CONTIG help @@ -42,6 +62,7 @@ config VIDEO_ASPEED =20 config VIDEO_SH_VOU tristate "SuperH VOU video output driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_DEV && I2C depends on ARCH_SHMOBILE || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -50,6 +71,7 @@ config VIDEO_SH_VOU =20 config VIDEO_VIU tristate "Freescale VIU Video Driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && (PPC_MPC512x || COMPILE_TEST) && I2C select VIDEOBUF_DMA_CONTIG default y @@ -62,6 +84,7 @@ config VIDEO_VIU =20 config VIDEO_MUX tristate "Video Multiplexer" + depends on V4L_PLATFORM_DRIVERS select MULTIPLEXER depends on VIDEO_V4L2 && OF select MEDIA_CONTROLLER @@ -73,6 +96,7 @@ config VIDEO_MUX =20 config VIDEO_OMAP3 tristate "OMAP 3 Camera support" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && I2C depends on (ARCH_OMAP3 && OMAP_IOMMU) || COMPILE_TEST depends on COMMON_CLK && OF @@ -93,6 +117,7 @@ config VIDEO_OMAP3_DEBUG =20 config VIDEO_PXA27x tristate "PXA27x Quick Capture Interface driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on PXA27x || COMPILE_TEST select VIDEOBUF2_DMA_SG @@ -103,6 +128,7 @@ config VIDEO_PXA27x =20 config VIDEO_QCOM_CAMSS tristate "Qualcomm V4L2 Camera Subsystem driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST select MEDIA_CONTROLLER @@ -112,6 +138,7 @@ config VIDEO_QCOM_CAMSS =20 config VIDEO_S3C_CAMIF tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && I2C && PM depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST select MEDIA_CONTROLLER @@ -126,6 +153,7 @@ config VIDEO_S3C_CAMIF =20 config VIDEO_STM32_DCMI tristate "STM32 Digital Camera Memory Interface (DCMI) support" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && OF depends on ARCH_STM32 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -140,6 +168,7 @@ config VIDEO_STM32_DCMI =20 config VIDEO_RENESAS_CEU tristate "Renesas Capture Engine Unit (CEU) driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_SHMOBILE || ARCH_R7S72100 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -149,6 +178,7 @@ config VIDEO_RENESAS_CEU =20 config VIDEO_ROCKCHIP_ISP1 tristate "Rockchip Image Signal Processing v1 Unit driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && OF depends on ARCH_ROCKCHIP || COMPILE_TEST select MEDIA_CONTROLLER @@ -175,6 +205,7 @@ source "drivers/media/platform/imx/Kconfig" =20 config VIDEO_TI_CAL tristate "TI CAL (Camera Adaptation Layer) driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API @@ -187,10 +218,9 @@ config VIDEO_TI_CAL In TI Technical Reference Manual this module is referred as Camera Interface Subsystem (CAMSS). =20 -if VIDEO_TI_CAL - config VIDEO_TI_CAL_MC bool "Media Controller centric mode by default" + depends on VIDEO_TI_CAL default n help Enables Media Controller centric mode by default. @@ -199,10 +229,9 @@ config VIDEO_TI_CAL_MC default. Note that this behavior can be overridden via module parameter 'mc_api'. =20 -endif # VIDEO_TI_CAL - config VIDEO_RCAR_ISP tristate "R-Car Image Signal Processor (ISP)" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && OF depends on ARCH_RENESAS || COMPILE_TEST select MEDIA_CONTROLLER @@ -217,21 +246,11 @@ config VIDEO_RCAR_ISP To compile this driver as a module, choose M here: the module will be called rcar-isp. =20 -endif # V4L_PLATFORM_DRIVERS - -menuconfig V4L_MEM2MEM_DRIVERS - bool "Memory-to-memory multimedia devices" - depends on VIDEO_V4L2 - help - Say Y here to enable selecting drivers for V4L devices that - use system memory for both source and destination buffers, as opposed - to capture and output drivers, which use memory buffers for just - one of those. - -if V4L_MEM2MEM_DRIVERS +# Mem2mem drivers =20 config VIDEO_ALLEGRO_DVT tristate "Allegro DVT Video IP Core" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_ZYNQMP || COMPILE_TEST select V4L2_MEM2MEM_DEV @@ -247,6 +266,7 @@ config VIDEO_ALLEGRO_DVT =20 config VIDEO_CODA tristate "Chips&Media Coda multi-standard codec IP" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 && OF && (ARCH_MXC || COMPILE_TEST) select SRAM select VIDEOBUF2_DMA_CONTIG @@ -263,6 +283,7 @@ config VIDEO_IMX_VDOA =20 config VIDEO_IMX_PXP tristate "i.MX Pixel Pipeline (PXP)" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST) select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV @@ -274,6 +295,7 @@ source "drivers/media/platform/imx-jpeg/Kconfig" =20 config VIDEO_MEDIATEK_JPEG tristate "Mediatek JPEG Codec driver" + depends on V4L_MEM2MEM_DRIVERS depends on MTK_IOMMU_V1 || MTK_IOMMU || COMPILE_TEST depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_MEDIATEK || COMPILE_TEST @@ -289,6 +311,7 @@ config VIDEO_MEDIATEK_JPEG =20 config VIDEO_MEDIATEK_VPU tristate "Mediatek Video Processor Unit" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_MEDIATEK || COMPILE_TEST help @@ -302,6 +325,7 @@ config VIDEO_MEDIATEK_VPU =20 config VIDEO_MEDIATEK_MDP tristate "Mediatek MDP driver" + depends on V4L_MEM2MEM_DRIVERS depends on MTK_IOMMU || COMPILE_TEST depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_MEDIATEK || COMPILE_TEST @@ -318,6 +342,7 @@ config VIDEO_MEDIATEK_MDP =20 config VIDEO_MEDIATEK_VCODEC tristate "Mediatek Video Codec driver" + depends on V4L_MEM2MEM_DRIVERS depends on MTK_IOMMU || COMPILE_TEST depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_MEDIATEK || COMPILE_TEST @@ -353,6 +378,7 @@ config VIDEO_MEDIATEK_VCODEC_SCP =20 config VIDEO_MEM2MEM_DEINTERLACE tristate "Deinterlace support" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on HAS_DMA select VIDEOBUF2_DMA_CONTIG @@ -362,6 +388,7 @@ config VIDEO_MEM2MEM_DEINTERLACE =20 config VIDEO_MESON_GE2D tristate "Amlogic 2D Graphic Acceleration Unit" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_MESON || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -375,6 +402,7 @@ config VIDEO_MESON_GE2D =20 config VIDEO_SAMSUNG_S5P_G2D tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -385,6 +413,7 @@ config VIDEO_SAMSUNG_S5P_G2D =20 config VIDEO_SAMSUNG_S5P_JPEG tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -395,6 +424,7 @@ config VIDEO_SAMSUNG_S5P_JPEG =20 config VIDEO_SAMSUNG_S5P_MFC tristate "Samsung S5P MFC Video Codec" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -403,6 +433,7 @@ config VIDEO_SAMSUNG_S5P_MFC =20 config VIDEO_MX2_EMMAPRP tristate "MX2 eMMa-PrP support" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on SOC_IMX27 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -414,6 +445,7 @@ config VIDEO_MX2_EMMAPRP =20 config VIDEO_SAMSUNG_EXYNOS_GSC tristate "Samsung Exynos G-Scaler driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_EXYNOS || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -423,6 +455,7 @@ config VIDEO_SAMSUNG_EXYNOS_GSC =20 config VIDEO_STI_BDISP tristate "STMicroelectronics BDISP 2D blitter driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_STI || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -432,6 +465,7 @@ config VIDEO_STI_BDISP =20 config VIDEO_STI_HVA tristate "STMicroelectronics HVA multi-format video encoder V4L2 driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_STI || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -446,6 +480,7 @@ config VIDEO_STI_HVA =20 config VIDEO_STI_HVA_DEBUGFS bool "Export STMicroelectronics HVA internals in debugfs" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_STI_HVA depends on DEBUG_FS help @@ -457,6 +492,7 @@ config VIDEO_STI_HVA_DEBUGFS =20 config VIDEO_STI_DELTA tristate "STMicroelectronics DELTA multi-format video decoder V4L2 driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_STI || COMPILE_TEST help @@ -471,11 +507,10 @@ config VIDEO_STI_DELTA Please notice that the driver will only be built if at least one of the DELTA decoder below is selected. =20 -if VIDEO_STI_DELTA - config VIDEO_STI_DELTA_MJPEG bool "STMicroelectronics DELTA MJPEG support" default y + depends on VIDEO_STI_DELTA help Enables DELTA MJPEG hardware support. =20 @@ -491,10 +526,9 @@ config VIDEO_STI_DELTA_DRIVER select V4L2_MEM2MEM_DEV select RPMSG =20 -endif # VIDEO_STI_DELTA - config VIDEO_STM32_DMA2D tristate "STM32 Chrom-Art Accelerator (DMA2D)" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_STM32 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -507,6 +541,7 @@ config VIDEO_STM32_DMA2D =20 config VIDEO_RENESAS_FDP1 tristate "Renesas Fine Display Processor" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_RENESAS || COMPILE_TEST depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP @@ -521,6 +556,7 @@ config VIDEO_RENESAS_FDP1 =20 config VIDEO_RENESAS_JPU tristate "Renesas JPEG Processing Unit" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_RENESAS || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -533,6 +569,7 @@ config VIDEO_RENESAS_JPU =20 config VIDEO_RENESAS_FCP tristate "Renesas Frame Compression Processor" + depends on V4L_MEM2MEM_DRIVERS depends on ARCH_RENESAS || COMPILE_TEST depends on OF help @@ -546,6 +583,7 @@ config VIDEO_RENESAS_FCP =20 config VIDEO_RENESAS_VSP1 tristate "Renesas VSP1 Video Processing Engine" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_V4L2 depends on ARCH_RENESAS || COMPILE_TEST depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP @@ -561,6 +599,7 @@ config VIDEO_RENESAS_VSP1 =20 config VIDEO_ROCKCHIP_RGA tristate "Rockchip Raster 2d Graphic Acceleration Unit" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_ROCKCHIP || COMPILE_TEST select VIDEOBUF2_DMA_SG @@ -575,6 +614,7 @@ config VIDEO_ROCKCHIP_RGA =20 config VIDEO_TI_VPE tristate "TI VPE (Video Processing Engine) driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on SOC_DRA7XX || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -588,12 +628,14 @@ config VIDEO_TI_VPE =20 config VIDEO_TI_VPE_DEBUG bool "VPE debug messages" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_TI_VPE help Enable debug messages on VPE driver. =20 config VIDEO_QCOM_VENUS tristate "Qualcomm Venus V4L2 encoder/decoder driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 && QCOM_SMEM depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST select QCOM_MDT_LOADER if ARCH_QCOM @@ -608,6 +650,7 @@ config VIDEO_QCOM_VENUS =20 config VIDEO_SUN8I_DEINTERLACE tristate "Allwinner Deinterlace driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_SUNXI || COMPILE_TEST depends on COMMON_CLK && OF @@ -621,6 +664,7 @@ config VIDEO_SUN8I_DEINTERLACE =20 config VIDEO_SUN8I_ROTATE tristate "Allwinner DE2 rotation driver" + depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && VIDEO_V4L2 depends on ARCH_SUNXI || COMPILE_TEST depends on COMMON_CLK && OF @@ -633,6 +677,7 @@ config VIDEO_SUN8I_ROTATE =20 config VIDEO_TEGRA_VDE tristate "NVIDIA Tegra Video Decoder Engine driver" + depends on V4L_MEM2MEM_DRIVERS depends on ARCH_TEGRA || COMPILE_TEST depends on VIDEO_DEV && VIDEO_V4L2 select DMA_SHARED_BUFFER @@ -650,6 +695,7 @@ config VIDEO_TEGRA_VDE =20 config VIDEO_AMPHION_VPU tristate "Amphion VPU (Video Processing Unit) Codec IP" + depends on V4L_MEM2MEM_DRIVERS depends on ARCH_MXC || COMPILE_TEST depends on MEDIA_SUPPORT depends on VIDEO_DEV @@ -667,8 +713,6 @@ config VIDEO_AMPHION_VPU various NXP SoCs. To compile this driver as a module choose m here. =20 -endif # V4L_MEM2MEM_DRIVERS - # TI VIDEO PORT Helper Modules # These will be selected by VPE and VIP config VIDEO_TI_VPDMA @@ -680,26 +724,13 @@ config VIDEO_TI_SC config VIDEO_TI_CSC tristate =20 -menuconfig DVB_PLATFORM_DRIVERS - bool "DVB platform devices" - depends on MEDIA_DIGITAL_TV_SUPPORT - help - Say Y here to enable support for platform-specific Digital TV drivers. - -if DVB_PLATFORM_DRIVERS +# DVB platform drivers source "drivers/media/platform/sti/c8sectpfe/Kconfig" -endif #DVB_PLATFORM_DRIVERS - -menuconfig SDR_PLATFORM_DRIVERS - bool "SDR platform devices" - depends on MEDIA_SDR_SUPPORT - help - Say Y here to enable support for platform-specific SDR Drivers. - -if SDR_PLATFORM_DRIVERS =20 +# SDR platform drivers config VIDEO_RCAR_DRIF tristate "Renesas Digital Radio Interface (DRIF)" + depends on SDR_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on ARCH_RENESAS || COMPILE_TEST select VIDEOBUF2_VMALLOC @@ -712,5 +743,3 @@ config VIDEO_RCAR_DRIF =20 To compile this driver as a module, choose M here; the module will be called rcar_drif. - -endif # SDR_PLATFORM_DRIVERS diff --git a/drivers/media/platform/am437x/Kconfig b/drivers/media/platform= /am437x/Kconfig index 9ef898f512de..619cefca7590 100644 --- a/drivers/media/platform/am437x/Kconfig +++ b/drivers/media/platform/am437x/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_AM437X_VPFE tristate "TI AM437x VPFE video capture driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on SOC_AM43XX || COMPILE_TEST select MEDIA_CONTROLLER diff --git a/drivers/media/platform/atmel/Kconfig b/drivers/media/platform/= atmel/Kconfig index f83bee373d82..5122290729ae 100644 --- a/drivers/media/platform/atmel/Kconfig +++ b/drivers/media/platform/atmel/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_ATMEL_ISC tristate "ATMEL Image Sensor Controller (ISC) support" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && COMMON_CLK depends on ARCH_AT91 || COMPILE_TEST select MEDIA_CONTROLLER @@ -15,6 +16,7 @@ config VIDEO_ATMEL_ISC =20 config VIDEO_ATMEL_XISC tristate "ATMEL eXtended Image Sensor Controller (XISC) support" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && COMMON_CLK && VIDEO_V4L2_SUBDEV_API depends on ARCH_AT91 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -33,6 +35,7 @@ config VIDEO_ATMEL_ISC_BASE =20 config VIDEO_ATMEL_ISI tristate "ATMEL Image Sensor Interface (ISI) support" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && OF depends on ARCH_AT91 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG @@ -43,6 +46,7 @@ config VIDEO_ATMEL_ISI =20 config VIDEO_MICROCHIP_CSI2DC tristate "Microchip CSI2 Demux Controller" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && COMMON_CLK && OF depends on ARCH_AT91 || COMPILE_TEST select MEDIA_CONTROLLER diff --git a/drivers/media/platform/cadence/Kconfig b/drivers/media/platfor= m/cadence/Kconfig index 80cf601323ce..79a7e9fb2575 100644 --- a/drivers/media/platform/cadence/Kconfig +++ b/drivers/media/platform/cadence/Kconfig @@ -1,6 +1,7 @@ # 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. =20 diff --git a/drivers/media/platform/davinci/Kconfig b/drivers/media/platfor= m/davinci/Kconfig index 9d2a9eeb3499..7e5f92b0082a 100644 --- a/drivers/media/platform/davinci/Kconfig +++ b/drivers/media/platform/davinci/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_DAVINCI_VPIF_DISPLAY tristate "TI DaVinci VPIF V4L2-Display driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C @@ -17,6 +18,7 @@ config VIDEO_DAVINCI_VPIF_DISPLAY =20 config VIDEO_DAVINCI_VPIF_CAPTURE tristate "TI DaVinci VPIF video capture driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C @@ -32,6 +34,7 @@ config VIDEO_DAVINCI_VPIF_CAPTURE =20 config VIDEO_DM6446_CCDC tristate "TI DM6446 CCDC video capture driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C @@ -48,6 +51,7 @@ config VIDEO_DM6446_CCDC =20 config VIDEO_DM355_CCDC tristate "TI DM355 CCDC video capture driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C @@ -64,6 +68,7 @@ config VIDEO_DM355_CCDC =20 config VIDEO_DM365_ISIF tristate "TI DM365 ISIF video capture driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C @@ -78,6 +83,7 @@ config VIDEO_DM365_ISIF =20 config VIDEO_DAVINCI_VPBE_DISPLAY tristate "TI DaVinci VPBE V4L2-Display driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/plat= form/exynos4-is/Kconfig index 136d3b2a0fbb..868bb86c7699 100644 --- a/drivers/media/platform/exynos4-is/Kconfig +++ b/drivers/media/platform/exynos4-is/Kconfig @@ -2,6 +2,7 @@ =20 config VIDEO_SAMSUNG_EXYNOS4_IS tristate "Samsung S5P/EXYNOS4 SoC series Camera Subsystem driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && OF && COMMON_CLK depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST select MEDIA_CONTROLLER diff --git a/drivers/media/platform/imx-jpeg/Kconfig b/drivers/media/platfo= rm/imx-jpeg/Kconfig index 2fdd648cda80..cbf6101a8b1d 100644 --- a/drivers/media/platform/imx-jpeg/Kconfig +++ b/drivers/media/platform/imx-jpeg/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 config VIDEO_IMX8_JPEG tristate "IMX8 JPEG Encoder/Decoder" + depends on V4L_MEM2MEM_DRIVERS depends on ARCH_MXC || COMPILE_TEST depends on VIDEO_DEV && VIDEO_V4L2 select VIDEOBUF2_DMA_CONTIG diff --git a/drivers/media/platform/imx/Kconfig b/drivers/media/platform/im= x/Kconfig index 683863572c20..7cd0617c9b1b 100644 --- a/drivers/media/platform/imx/Kconfig +++ b/drivers/media/platform/imx/Kconfig @@ -2,6 +2,7 @@ =20 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 && VIDEO_V4L2 help diff --git a/drivers/media/platform/marvell-ccic/Kconfig b/drivers/media/pl= atform/marvell-ccic/Kconfig index 3e3f86264762..bfe655b2cedd 100644 --- a/drivers/media/platform/marvell-ccic/Kconfig +++ b/drivers/media/platform/marvell-ccic/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_CAFE_CCIC tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support" + depends on V4L_PLATFORM_DRIVERS depends on PCI && I2C && VIDEO_V4L2 depends on COMMON_CLK select VIDEO_OV7670 @@ -14,6 +15,7 @@ config VIDEO_CAFE_CCIC =20 config VIDEO_MMP_CAMERA tristate "Marvell Armada 610 integrated camera controller support" + depends on V4L_PLATFORM_DRIVERS depends on I2C && VIDEO_V4L2 depends on ARCH_MMP || COMPILE_TEST depends on COMMON_CLK diff --git a/drivers/media/platform/omap/Kconfig b/drivers/media/platform/o= map/Kconfig index de16de46c0f4..789d5e5686c7 100644 --- a/drivers/media/platform/omap/Kconfig +++ b/drivers/media/platform/omap/Kconfig @@ -6,6 +6,7 @@ config VIDEO_OMAP2_VOUT_VRFB =20 config VIDEO_OMAP2_VOUT tristate "OMAP2/OMAP3 V4L2-Display driver" + depends on V4L_PLATFORM_DRIVERS depends on MMU depends on FB_OMAP2 || (COMPILE_TEST && FB_OMAP2=3Dn) depends on ARCH_OMAP2 || ARCH_OMAP3 || COMPILE_TEST diff --git a/drivers/media/platform/rcar-vin/Kconfig b/drivers/media/platfo= rm/rcar-vin/Kconfig index 030312d862e7..34b7ea6f1246 100644 --- a/drivers/media/platform/rcar-vin/Kconfig +++ b/drivers/media/platform/rcar-vin/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 config VIDEO_RCAR_CSI2 tristate "R-Car MIPI CSI-2 Receiver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && OF depends on ARCH_RENESAS || COMPILE_TEST select MEDIA_CONTROLLER @@ -16,6 +17,7 @@ config VIDEO_RCAR_CSI2 =20 config VIDEO_RCAR_VIN tristate "R-Car Video Input (VIN) Driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && OF depends on ARCH_RENESAS || COMPILE_TEST select MEDIA_CONTROLLER diff --git a/drivers/media/platform/sti/c8sectpfe/Kconfig b/drivers/media/p= latform/sti/c8sectpfe/Kconfig index 369509e03071..702b910509c9 100644 --- a/drivers/media/platform/sti/c8sectpfe/Kconfig +++ b/drivers/media/platform/sti/c8sectpfe/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config DVB_C8SECTPFE tristate "STMicroelectronics C8SECTPFE DVB support" + depends on DVB_PLATFORM_DRIVERS depends on PINCTRL && DVB_CORE && I2C depends on ARCH_STI || ARCH_MULTIPLATFORM || COMPILE_TEST select FW_LOADER diff --git a/drivers/media/platform/sunxi/sun4i-csi/Kconfig b/drivers/media= /platform/sunxi/sun4i-csi/Kconfig index 903c6152f6e8..43ad2dd7da5d 100644 --- a/drivers/media/platform/sunxi/sun4i-csi/Kconfig +++ b/drivers/media/platform/sunxi/sun4i-csi/Kconfig @@ -2,6 +2,7 @@ =20 config VIDEO_SUN4I_CSI tristate "Allwinner A10 CMOS Sensor Interface Support" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && COMMON_CLK && HAS_DMA depends on ARCH_SUNXI || COMPILE_TEST select MEDIA_CONTROLLER diff --git a/drivers/media/platform/sunxi/sun6i-csi/Kconfig b/drivers/media= /platform/sunxi/sun6i-csi/Kconfig index 586e3fb3a80d..6d9cf1963c41 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/Kconfig +++ b/drivers/media/platform/sunxi/sun6i-csi/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_SUN6I_CSI tristate "Allwinner V3s Camera Sensor Interface driver" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && COMMON_CLK && HAS_DMA depends on ARCH_SUNXI || COMPILE_TEST select MEDIA_CONTROLLER diff --git a/drivers/media/platform/xilinx/Kconfig b/drivers/media/platform= /xilinx/Kconfig index 44587dccacf1..a9531d5efd50 100644 --- a/drivers/media/platform/xilinx/Kconfig +++ b/drivers/media/platform/xilinx/Kconfig @@ -2,6 +2,7 @@ =20 config VIDEO_XILINX tristate "Xilinx Video IP (EXPERIMENTAL)" + depends on V4L_PLATFORM_DRIVERS depends on VIDEO_V4L2 && OF && HAS_DMA select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BBF9C433F5 for ; Mon, 14 Mar 2022 07:57:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236990AbiCNH6N (ORCPT ); Mon, 14 Mar 2022 03:58:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236846AbiCNH5U (ORCPT ); Mon, 14 Mar 2022 03:57:20 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FC9C41327; Mon, 14 Mar 2022 00:56:04 -0700 (PDT) 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 sin.source.kernel.org (Postfix) with ESMTPS id D185ECE10A2; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C52B2C340F6; Mon, 14 Mar 2022 07:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244560; bh=Cjpduq8olBZOgE+bYd/xOtdGUWEVLm0mAF9YidPcc4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bMe7ehKmKI7iAZ3JBOvmU90PvcAQOYZewF1R8qBm88XkVIV+u0wtazak35hnhoycR KFJd6FXUjelIJoCScrRv9v07mFDrbjcYB71NFBNAGupZX2Yw4GTFOnbgAlJnexguzm XMq7hsVzI6kcBawGNTn4B4U1gzUhOm9k9e7hRAY+O5YcQXmKv2afSrnuDpIXLGqWd5 YHewaS/BRrEGXiiDZThkvYODp1WKQ81gxVub0PAcRokwGAuar2SFYcc9LKF7YkaIiR XpdoqSC1z5/BTKMBqpW/QwbKlAg1slOl6ixDNnk1W2/EQuSKAJxpve2dDb7IjNyoTc TeQTEvlmS3G+g== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYc-001kUZ-JA; Mon, 14 Mar 2022 08:55:58 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Andrew Jeffery , Dmitry Osipenko , Eddie James , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jammy Huang , Jernej Skrabec , Joel Stanley , Laurent Pinchart , Ming Qian , Paul Menzel , Sakari Ailus , Yang Li , Zev Weiss , linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, openbmc@lists.ozlabs.org Subject: [PATCH 06/64] media: platform: place Aspeed driver on a separate dir Date: Mon, 14 Mar 2022 08:54:58 +0100 Message-Id: <6b24deadd7706454612c14e6fde45af062633261.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to cleanup the main platform media directory, move Aspeed driver to its own directory. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 10 +--------- drivers/media/platform/Makefile | 2 +- drivers/media/platform/aspeed/Kconfig | 10 ++++++++++ drivers/media/platform/aspeed/Makefile | 2 ++ drivers/media/platform/{ =3D> aspeed}/aspeed-video.c | 0 6 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 drivers/media/platform/aspeed/Kconfig create mode 100644 drivers/media/platform/aspeed/Makefile rename drivers/media/platform/{ =3D> aspeed}/aspeed-video.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 1a9fb0615925..1b6f48a660de 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3026,7 +3026,7 @@ L: linux-media@vger.kernel.org L: openbmc@lists.ozlabs.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/media/aspeed-video.txt -F: drivers/media/platform/aspeed-video.c +F: drivers/media/platform/aspeed/ =20 ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS M: Corentin Chary diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 1446a99159c5..10f453ff2717 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -50,15 +50,7 @@ source "drivers/media/platform/davinci/Kconfig" =20 source "drivers/media/platform/omap/Kconfig" =20 -config VIDEO_ASPEED - tristate "Aspeed AST2400 and AST2500 Video Engine driver" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 - select VIDEOBUF2_DMA_CONTIG - help - Support for the Aspeed Video Engine (VE) embedded in the Aspeed - AST2400 and AST2500 SOCs. The VE can capture and compress video data - from digital or analog sources. +source "drivers/media/platform/aspeed/Kconfig" =20 config VIDEO_SH_VOU tristate "SuperH VOU video output driver" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index e319044c57e9..18ec3d208483 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -6,6 +6,7 @@ # Place here, alphabetically sorted by directory # (e. g. LC_ALL=3DC sort Makefile) obj-y +=3D allegro-dvt/ +obj-y +=3D aspeed/ obj-y +=3D am437x/ obj-y +=3D amphion/ obj-y +=3D atmel/ @@ -47,7 +48,6 @@ obj-y +=3D xilinx/ # Please place here only ancillary drivers that aren't SoC-specific # Please keep it alphabetically sorted by Kconfig name # (e. g. LC_ALL=3DC sort Makefile) -obj-$(CONFIG_VIDEO_ASPEED) +=3D aspeed-video.o obj-$(CONFIG_VIDEO_IMX_PXP) +=3D imx-pxp.o obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) +=3D m2m-deinterlace.o obj-$(CONFIG_VIDEO_MUX) +=3D video-mux.o diff --git a/drivers/media/platform/aspeed/Kconfig b/drivers/media/platform= /aspeed/Kconfig new file mode 100644 index 000000000000..5025e892844c --- /dev/null +++ b/drivers/media/platform/aspeed/Kconfig @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_ASPEED + tristate "Aspeed AST2400 and AST2500 Video Engine driver" + depends on V4L_PLATFORM_DRIVERS + depends on VIDEO_V4L2 + select VIDEOBUF2_DMA_CONTIG + help + Support for the Aspeed Video Engine (VE) embedded in the Aspeed + AST2400 and AST2500 SOCs. The VE can capture and compress video data + from digital or analog sources. diff --git a/drivers/media/platform/aspeed/Makefile b/drivers/media/platfor= m/aspeed/Makefile new file mode 100644 index 000000000000..1979af63dadd --- /dev/null +++ b/drivers/media/platform/aspeed/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_VIDEO_ASPEED) +=3D aspeed-video.o diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform= /aspeed/aspeed-video.c similarity index 100% rename from drivers/media/platform/aspeed-video.c rename to drivers/media/platform/aspeed/aspeed-video.c --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB4E5C433EF for ; Mon, 14 Mar 2022 07:56:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236807AbiCNH5x (ORCPT ); Mon, 14 Mar 2022 03:57:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236839AbiCNH5T (ORCPT ); Mon, 14 Mar 2022 03:57:19 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6764241316; Mon, 14 Mar 2022 00:56:04 -0700 (PDT) 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 C7308B80D26; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4B94C340F9; Mon, 14 Mar 2022 07:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=gCY6DeOD7tIAL1xAGYlvKwLzO3GNjzbI3uQICgso1GA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jHUFOqDZYbL0XjZnOJlVuyDBkZVMfRQWU0cmfJO7kcgdvi9nqrtS8wUHhNOYUPFHD MXT6hGaG5ZhNgF/GSZjALRx8UXkxWEPwWubHcrtB5jGPESVw2n3g26R2tnz64CbREw Gld7H3WtXk0vgzzdPaltlZyhrJnCPGX/0fLMW6ETMsT2aAk6k9LJ7JyQ/wRhU0jGz9 2jfT2Ti0hUsl6ht/GP5GCgLwOUaaOgm47noiEBYXo3rZxD03Nbfyox7tO7idDZ3cuG iQFtN290y5rBuHrxVbkQ4kEdAuVjbpO0cFtCT6QsG8wM833coPth6yt/50er3m/9p5 Omc/eAAet2xMw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYc-001kUd-Kb; Mon, 14 Mar 2022 08:55:58 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Cai Huoqing , Colin Ian King , Dmitry Osipenko , Eugen Hristev , Fabio Estevam , Geert Uytterhoeven , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Julia Lawall , Laurent Pinchart , Laurentiu Palcu , Ming Qian , Mirela Rabulea , NXP Linux Team , Pengutronix Kernel Team , Philipp Zabel , Rikard Falkeborn , Rui Miguel Silva , Sakari Ailus , Sascha Hauer , Shawn Guo , Wei Yongjun , Yang Yingliang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 07/64] media: platform: place NXP drivers on a separate dir Date: Mon, 14 Mar 2022 08:54:59 +0100 Message-Id: <92c02beaa7918253ca0d537e4454b839def2ab38.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to cleanup the main platform media directory, move NXP drivers to their own directory. Reviewed-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Reviewed-by: Philipp Zabel --- To avoid mailbombing on a large number of people, only mailing lists were C= /C on the cover. See [PATCH 00/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 40 +---------- drivers/media/platform/Makefile | 6 +- drivers/media/platform/imx/Kconfig | 25 ------- drivers/media/platform/imx/Makefile | 1 - drivers/media/platform/nxp/Kconfig | 66 +++++++++++++++++++ drivers/media/platform/nxp/Makefile | 8 +++ drivers/media/platform/{ =3D> nxp}/fsl-viu.c | 0 .../media/platform/{ =3D> nxp}/imx-jpeg/Kconfig | 0 .../platform/{ =3D> nxp}/imx-jpeg/Makefile | 0 .../platform/{ =3D> nxp}/imx-jpeg/mxc-jpeg-hw.c | 0 .../platform/{ =3D> nxp}/imx-jpeg/mxc-jpeg-hw.h | 0 .../platform/{ =3D> nxp}/imx-jpeg/mxc-jpeg.c | 0 .../platform/{ =3D> nxp}/imx-jpeg/mxc-jpeg.h | 0 .../platform/{imx =3D> nxp}/imx-mipi-csis.c | 0 drivers/media/platform/{ =3D> nxp}/imx-pxp.c | 0 drivers/media/platform/{ =3D> nxp}/imx-pxp.h | 0 .../media/platform/{ =3D> nxp}/mx2_emmaprp.c | 0 18 files changed, 78 insertions(+), 70 deletions(-) delete mode 100644 drivers/media/platform/imx/Kconfig delete mode 100644 drivers/media/platform/imx/Makefile create mode 100644 drivers/media/platform/nxp/Kconfig create mode 100644 drivers/media/platform/nxp/Makefile rename drivers/media/platform/{ =3D> nxp}/fsl-viu.c (100%) rename drivers/media/platform/{ =3D> nxp}/imx-jpeg/Kconfig (100%) rename drivers/media/platform/{ =3D> nxp}/imx-jpeg/Makefile (100%) rename drivers/media/platform/{ =3D> nxp}/imx-jpeg/mxc-jpeg-hw.c (100%) rename drivers/media/platform/{ =3D> nxp}/imx-jpeg/mxc-jpeg-hw.h (100%) rename drivers/media/platform/{ =3D> nxp}/imx-jpeg/mxc-jpeg.c (100%) rename drivers/media/platform/{ =3D> nxp}/imx-jpeg/mxc-jpeg.h (100%) rename drivers/media/platform/{imx =3D> nxp}/imx-mipi-csis.c (100%) rename drivers/media/platform/{ =3D> nxp}/imx-pxp.c (100%) rename drivers/media/platform/{ =3D> nxp}/imx-pxp.h (100%) rename drivers/media/platform/{ =3D> nxp}/mx2_emmaprp.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 1b6f48a660de..780ef2ef3362 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11841,7 +11841,7 @@ M: Philipp Zabel L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git -F: drivers/media/platform/imx-pxp.[ch] +F: drivers/media/platform/nxp/imx-pxp.[ch] =20 MEDIA DRIVERS FOR ASCOT2E M: Sergey Kozlov diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 10f453ff2717..711b6ab9370b 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -29,6 +29,8 @@ config V4L_MEM2MEM_DRIVERS to capture and output drivers, which use memory buffers for just one of those. =20 +source "drivers/media/platform/nxp/Kconfig" + # V4L platform drivers =20 source "drivers/media/platform/marvell-ccic/Kconfig" @@ -61,19 +63,6 @@ config VIDEO_SH_VOU help Support for the Video Output Unit (VOU) on SuperH SoCs. =20 -config VIDEO_VIU - tristate "Freescale VIU Video Driver" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && (PPC_MPC512x || COMPILE_TEST) && I2C - select VIDEOBUF_DMA_CONTIG - default y - help - Support for Freescale VIU video driver. This device captures - video data, or overlays video on DIU frame buffer. - - Say Y here if you want to enable VIU device on MPC5121e Rev2+. - In doubt, say N. - config VIDEO_MUX tristate "Video Multiplexer" depends on V4L_PLATFORM_DRIVERS @@ -193,7 +182,6 @@ source "drivers/media/platform/xilinx/Kconfig" source "drivers/media/platform/rcar-vin/Kconfig" source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/sunxi/Kconfig" -source "drivers/media/platform/imx/Kconfig" =20 config VIDEO_TI_CAL tristate "TI CAL (Camera Adaptation Layer) driver" @@ -273,18 +261,6 @@ config VIDEO_CODA config VIDEO_IMX_VDOA def_tristate VIDEO_CODA if SOC_IMX6Q || COMPILE_TEST =20 -config VIDEO_IMX_PXP - tristate "i.MX Pixel Pipeline (PXP)" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST) - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - The i.MX Pixel Pipeline is a memory-to-memory engine for scaling, - color space conversion, and rotation. - -source "drivers/media/platform/imx-jpeg/Kconfig" - config VIDEO_MEDIATEK_JPEG tristate "Mediatek JPEG Codec driver" depends on V4L_MEM2MEM_DRIVERS @@ -423,18 +399,6 @@ config VIDEO_SAMSUNG_S5P_MFC help MFC 5.1 and 6.x driver for V4L2 =20 -config VIDEO_MX2_EMMAPRP - tristate "MX2 eMMa-PrP support" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on SOC_IMX27 || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - MX2X chips have a PrP that can be used to process buffers from - memory to memory. Operations include resizing and format - conversion. - config VIDEO_SAMSUNG_EXYNOS_GSC tristate "Samsung Exynos G-Scaler driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index 18ec3d208483..4458690c1965 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -15,14 +15,13 @@ obj-y +=3D coda/ obj-y +=3D davinci/ obj-y +=3D exynos-gsc/ obj-y +=3D exynos4-is/ -obj-y +=3D imx/ -obj-y +=3D imx-jpeg/ obj-y +=3D marvell-ccic/ obj-y +=3D meson/ge2d/ obj-y +=3D mtk-jpeg/ obj-y +=3D mtk-mdp/ obj-y +=3D mtk-vcodec/ obj-y +=3D mtk-vpu/ +obj-y +=3D nxp/ obj-y +=3D omap/ obj-y +=3D omap3isp/ obj-y +=3D qcom/camss/ @@ -48,10 +47,8 @@ obj-y +=3D xilinx/ # Please place here only ancillary drivers that aren't SoC-specific # Please keep it alphabetically sorted by Kconfig name # (e. g. LC_ALL=3DC sort Makefile) -obj-$(CONFIG_VIDEO_IMX_PXP) +=3D imx-pxp.o obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) +=3D m2m-deinterlace.o obj-$(CONFIG_VIDEO_MUX) +=3D video-mux.o -obj-$(CONFIG_VIDEO_MX2_EMMAPRP) +=3D mx2_emmaprp.o obj-$(CONFIG_VIDEO_PXA27x) +=3D pxa_camera.o obj-$(CONFIG_VIDEO_RCAR_DRIF) +=3D rcar_drif.o obj-$(CONFIG_VIDEO_RCAR_ISP) +=3D rcar-isp.o @@ -61,4 +58,3 @@ obj-$(CONFIG_VIDEO_RENESAS_FDP1) +=3D rcar_fdp1.o obj-$(CONFIG_VIDEO_RENESAS_JPU) +=3D rcar_jpu.o obj-$(CONFIG_VIDEO_SH_VOU) +=3D sh_vou.o obj-$(CONFIG_VIDEO_VIA_CAMERA) +=3D via-camera.o -obj-$(CONFIG_VIDEO_VIU) +=3D fsl-viu.o diff --git a/drivers/media/platform/imx/Kconfig b/drivers/media/platform/im= x/Kconfig deleted file mode 100644 index 7cd0617c9b1b..000000000000 --- a/drivers/media/platform/imx/Kconfig +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -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 && VIDEO_V4L2 - 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 - -config VIDEO_IMX_MIPI_CSIS - tristate "MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models" - select MEDIA_CONTROLLER - select V4L2_FWNODE - select VIDEO_V4L2_SUBDEV_API - default n - help - 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 diff --git a/drivers/media/platform/imx/Makefile b/drivers/media/platform/i= mx/Makefile deleted file mode 100644 index f72bdbe8e6ef..000000000000 --- a/drivers/media/platform/imx/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) +=3D imx-mipi-csis.o diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nx= p/Kconfig new file mode 100644 index 000000000000..df52d32ebe50 --- /dev/null +++ b/drivers/media/platform/nxp/Kconfig @@ -0,0 +1,66 @@ +# SPDX-License-Identifier: GPL-2.0-only + +# 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 && VIDEO_V4L2 + 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 + +config VIDEO_IMX_MIPI_CSIS + tristate "MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models" + select MEDIA_CONTROLLER + select V4L2_FWNODE + select VIDEO_V4L2_SUBDEV_API + default n + help + 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" + depends on V4L_PLATFORM_DRIVERS + depends on VIDEO_V4L2 && (PPC_MPC512x || COMPILE_TEST) && I2C + select VIDEOBUF_DMA_CONTIG + default y + help + Support for Freescale VIU video driver. This device captures + video data, or overlays video on DIU frame buffer. + + Say Y here if you want to enable VIU device on MPC5121e Rev2+. + In doubt, say N. + +# mem2mem drivers + +config VIDEO_IMX_PXP + tristate "i.MX Pixel Pipeline (PXP)" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST) + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + The i.MX Pixel Pipeline is a memory-to-memory engine for scaling, + color space conversion, and rotation. + +config VIDEO_MX2_EMMAPRP + tristate "Freescale/NXP MX2 eMMa-PrP support" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on SOC_IMX27 || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + MX2X chips have a PrP that can be used to process buffers from + memory to memory. Operations include resizing and format + conversion. + +source "drivers/media/platform/nxp/imx-jpeg/Kconfig" diff --git a/drivers/media/platform/nxp/Makefile b/drivers/media/platform/n= xp/Makefile new file mode 100644 index 000000000000..efc38c6578ce --- /dev/null +++ b/drivers/media/platform/nxp/Makefile @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-y +=3D imx-jpeg/ + +obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) +=3D imx-mipi-csis.o +obj-$(CONFIG_VIDEO_IMX_PXP) +=3D imx-pxp.o +obj-$(CONFIG_VIDEO_MX2_EMMAPRP) +=3D mx2_emmaprp.o +obj-$(CONFIG_VIDEO_VIU) +=3D fsl-viu.o diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/nxp/= fsl-viu.c similarity index 100% rename from drivers/media/platform/fsl-viu.c rename to drivers/media/platform/nxp/fsl-viu.c diff --git a/drivers/media/platform/imx-jpeg/Kconfig b/drivers/media/platfo= rm/nxp/imx-jpeg/Kconfig similarity index 100% rename from drivers/media/platform/imx-jpeg/Kconfig rename to drivers/media/platform/nxp/imx-jpeg/Kconfig diff --git a/drivers/media/platform/imx-jpeg/Makefile b/drivers/media/platf= orm/nxp/imx-jpeg/Makefile similarity index 100% rename from drivers/media/platform/imx-jpeg/Makefile rename to drivers/media/platform/nxp/imx-jpeg/Makefile diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg-hw.c b/drivers/media/= platform/nxp/imx-jpeg/mxc-jpeg-hw.c similarity index 100% rename from drivers/media/platform/imx-jpeg/mxc-jpeg-hw.c rename to drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg-hw.h b/drivers/media/= platform/nxp/imx-jpeg/mxc-jpeg-hw.h similarity index 100% rename from drivers/media/platform/imx-jpeg/mxc-jpeg-hw.h rename to drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.c b/drivers/media/pla= tform/nxp/imx-jpeg/mxc-jpeg.c similarity index 100% rename from drivers/media/platform/imx-jpeg/mxc-jpeg.c rename to drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.h b/drivers/media/pla= tform/nxp/imx-jpeg/mxc-jpeg.h similarity index 100% rename from drivers/media/platform/imx-jpeg/mxc-jpeg.h rename to drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h diff --git a/drivers/media/platform/imx/imx-mipi-csis.c b/drivers/media/pla= tform/nxp/imx-mipi-csis.c similarity index 100% rename from drivers/media/platform/imx/imx-mipi-csis.c rename to drivers/media/platform/nxp/imx-mipi-csis.c diff --git a/drivers/media/platform/imx-pxp.c b/drivers/media/platform/nxp/= imx-pxp.c similarity index 100% rename from drivers/media/platform/imx-pxp.c rename to drivers/media/platform/nxp/imx-pxp.c diff --git a/drivers/media/platform/imx-pxp.h b/drivers/media/platform/nxp/= imx-pxp.h similarity index 100% rename from drivers/media/platform/imx-pxp.h rename to drivers/media/platform/nxp/imx-pxp.h diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/= nxp/mx2_emmaprp.c similarity index 100% rename from drivers/media/platform/mx2_emmaprp.c rename to drivers/media/platform/nxp/mx2_emmaprp.c --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD95AC433F5 for ; Mon, 14 Mar 2022 07:56:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236887AbiCNH5b (ORCPT ); Mon, 14 Mar 2022 03:57:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236830AbiCNH5S (ORCPT ); Mon, 14 Mar 2022 03:57:18 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A53014131F; Mon, 14 Mar 2022 00:56:03 -0700 (PDT) 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 3F10EB80CD7; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD868C340FA; Mon, 14 Mar 2022 07:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244560; bh=9DGItyRqo5/TWrsCFxegH0TQiWspharIIrhV3x3Mb5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZFdpmQvnRvMuJyA+ym0T7a8yeLcIb0fc/hdwJE+xcgYzlV8QqLAa+/UzK+GQ/+Jfm Ud23qEzvUjMbaC9eGypCXo4IDg2KxJdyekrugyv+rYFmNlmzkCrh0HlpzNXr2IFov8 L6go9twm0cZunQiv20qTXbFoKHDZkJW6IMuARe5ObcOgOeWQemnyIcASe2IU8MhN1x nD1dFlvjiV5OOXEGzF+5w/jfNeYqGIDprXy/Dwjv6cpqVZnS7O4XuWmp1QBM29Jm25 cyPNC9BKl0r/bvTxuGB8KgB9gqlgY5OCV4PZDwSHUC9RXCH6xX32xf7LbP0AXp9lfK 3yARTdDzW39Kw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYc-001kUh-M9; Mon, 14 Mar 2022 08:55:58 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Laurent Pinchart , Ming Qian , Rui Miguel Silva , Sakari Ailus , Tomi Valkeinen , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 08/64] media: platform: place Intel drivers on a separate dir Date: Mon, 14 Mar 2022 08:55:00 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to cleanup the main platform media directory, move Intel driver to its own directory. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 11 +---------- drivers/media/platform/Makefile | 2 +- drivers/media/platform/intel/Kconfig | 11 +++++++++++ drivers/media/platform/intel/Makefile | 2 ++ drivers/media/platform/{ =3D> intel}/pxa_camera.c | 0 5 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 drivers/media/platform/intel/Kconfig create mode 100644 drivers/media/platform/intel/Makefile rename drivers/media/platform/{ =3D> intel}/pxa_camera.c (100%) diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 711b6ab9370b..0cfbc0c2aa7a 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -96,16 +96,7 @@ config VIDEO_OMAP3_DEBUG help Enable debug messages on OMAP 3 camera controller driver. =20 -config VIDEO_PXA27x - tristate "PXA27x Quick Capture Interface driver" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on PXA27x || COMPILE_TEST - select VIDEOBUF2_DMA_SG - select SG_SPLIT - select V4L2_FWNODE - help - This is a v4l2 driver for the PXA27x Quick Capture Interface +source "drivers/media/platform/intel/Kconfig" =20 config VIDEO_QCOM_CAMSS tristate "Qualcomm V4L2 Camera Subsystem driver" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index 4458690c1965..78ac0fa4dd57 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -15,6 +15,7 @@ obj-y +=3D coda/ obj-y +=3D davinci/ obj-y +=3D exynos-gsc/ obj-y +=3D exynos4-is/ +obj-y +=3D intel/ obj-y +=3D marvell-ccic/ obj-y +=3D meson/ge2d/ obj-y +=3D mtk-jpeg/ @@ -49,7 +50,6 @@ obj-y +=3D xilinx/ # (e. g. LC_ALL=3DC sort Makefile) obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) +=3D m2m-deinterlace.o obj-$(CONFIG_VIDEO_MUX) +=3D video-mux.o -obj-$(CONFIG_VIDEO_PXA27x) +=3D pxa_camera.o obj-$(CONFIG_VIDEO_RCAR_DRIF) +=3D rcar_drif.o obj-$(CONFIG_VIDEO_RCAR_ISP) +=3D rcar-isp.o obj-$(CONFIG_VIDEO_RENESAS_CEU) +=3D renesas-ceu.o diff --git a/drivers/media/platform/intel/Kconfig b/drivers/media/platform/= intel/Kconfig new file mode 100644 index 000000000000..aeda421f7248 --- /dev/null +++ b/drivers/media/platform/intel/Kconfig @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_PXA27x + tristate "PXA27x Quick Capture Interface driver" + depends on V4L_PLATFORM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on PXA27x || COMPILE_TEST + select VIDEOBUF2_DMA_SG + select SG_SPLIT + select V4L2_FWNODE + help + This is a v4l2 driver for the PXA27x Quick Capture Interface diff --git a/drivers/media/platform/intel/Makefile b/drivers/media/platform= /intel/Makefile new file mode 100644 index 000000000000..7e8889cbd2df --- /dev/null +++ b/drivers/media/platform/intel/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_VIDEO_PXA27x) +=3D pxa_camera.o diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/i= ntel/pxa_camera.c similarity index 100% rename from drivers/media/platform/pxa_camera.c rename to drivers/media/platform/intel/pxa_camera.c --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E4EDC4332F for ; Mon, 14 Mar 2022 07:56:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236834AbiCNH5S (ORCPT ); Mon, 14 Mar 2022 03:57:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234643AbiCNH5P (ORCPT ); Mon, 14 Mar 2022 03:57:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 083383981D; Mon, 14 Mar 2022 00:56:01 -0700 (PDT) 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 811B06117C; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DAE90C340FB; Mon, 14 Mar 2022 07:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244560; bh=ac25/WJhoyDyFTbiMSLWiuHNdyYFaxWUkp4ZUnCYYMI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V93fkfLeV11ew1Qspa8IwKVmnMxlXYxMy2XWvD5o0BBmGh0SGmaqRUKPMLw0c/d2n drccz+OGA3GFDnqLBISmvEkx0rQhQtA1IVILOrXnqcXt/fwAMz9Ksthss2txPtMqvU itml5gCI8kGPAe4qG2e6y1Gau9o778V/9c0KQrya4ywWVaAlqetiqoxa4bhy8/PPAV IfbTBaEfyorwF2vGJnqIFLq/5B1Wvj+N5PqI9ndI1ED6AFmtemhSgRDgWNEDm5Lxfx awwJno+XaVP3PhxmXhHjr0kHIFgtxMKnr03CQNnD9gFcN7UZhsBD2WCIzqJnPCe2kM I7/HR4fEsK5XQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYc-001kUl-NM; Mon, 14 Mar 2022 08:55:58 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Laurent Pinchart , Ming Qian , Tomi Valkeinen , lijian , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 09/64] media: platform: place Via drivers on a separate dir Date: Mon, 14 Mar 2022 08:55:01 +0100 Message-Id: <11a35df1e9132ccba324ed9da204b4c018c19001.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to cleanup the main platform media directory, move Via driver to its own directory. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 11 +---------- drivers/media/platform/Makefile | 2 +- drivers/media/platform/via/Kconfig | 11 +++++++++++ drivers/media/platform/via/Makefile | 2 ++ drivers/media/platform/{ =3D> via}/via-camera.c | 0 drivers/media/platform/{ =3D> via}/via-camera.h | 0 6 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 drivers/media/platform/via/Kconfig create mode 100644 drivers/media/platform/via/Makefile rename drivers/media/platform/{ =3D> via}/via-camera.c (100%) rename drivers/media/platform/{ =3D> via}/via-camera.h (100%) diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 0cfbc0c2aa7a..83a496327325 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -35,16 +35,7 @@ source "drivers/media/platform/nxp/Kconfig" =20 source "drivers/media/platform/marvell-ccic/Kconfig" =20 -config VIDEO_VIA_CAMERA - tristate "VIAFB camera controller support" - depends on V4L_PLATFORM_DRIVERS - depends on FB_VIA && VIDEO_V4L2 - select VIDEOBUF2_DMA_SG - select VIDEO_OV7670 - help - Driver support for the integrated camera controller in VIA - Chrome9 chipsets. Currently only tested on OLPC xo-1.5 systems - with ov7670 sensors. +source "drivers/media/platform/via/Kconfig" =20 source "drivers/media/platform/cadence/Kconfig" =20 diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index 78ac0fa4dd57..4742b18fd8d8 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -42,6 +42,7 @@ obj-y +=3D stm32/ obj-y +=3D sunxi/ obj-y +=3D tegra/vde/ obj-y +=3D ti-vpe/ +obj-y +=3D via/ obj-y +=3D vsp1/ obj-y +=3D xilinx/ =20 @@ -57,4 +58,3 @@ obj-$(CONFIG_VIDEO_RENESAS_FCP) +=3D rcar-fcp.o obj-$(CONFIG_VIDEO_RENESAS_FDP1) +=3D rcar_fdp1.o obj-$(CONFIG_VIDEO_RENESAS_JPU) +=3D rcar_jpu.o obj-$(CONFIG_VIDEO_SH_VOU) +=3D sh_vou.o -obj-$(CONFIG_VIDEO_VIA_CAMERA) +=3D via-camera.o diff --git a/drivers/media/platform/via/Kconfig b/drivers/media/platform/vi= a/Kconfig new file mode 100644 index 000000000000..1dcf789dce96 --- /dev/null +++ b/drivers/media/platform/via/Kconfig @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_VIA_CAMERA + tristate "VIAFB camera controller support" + depends on V4L_PLATFORM_DRIVERS + depends on FB_VIA && VIDEO_V4L2 + select VIDEOBUF2_DMA_SG + select VIDEO_OV7670 + help + Driver support for the integrated camera controller in VIA + Chrome9 chipsets. Currently only tested on OLPC xo-1.5 systems + with ov7670 sensors. diff --git a/drivers/media/platform/via/Makefile b/drivers/media/platform/v= ia/Makefile new file mode 100644 index 000000000000..80f747f3fffc --- /dev/null +++ b/drivers/media/platform/via/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_VIDEO_VIA_CAMERA) +=3D via-camera.o diff --git a/drivers/media/platform/via-camera.c b/drivers/media/platform/v= ia/via-camera.c similarity index 100% rename from drivers/media/platform/via-camera.c rename to drivers/media/platform/via/via-camera.c diff --git a/drivers/media/platform/via-camera.h b/drivers/media/platform/v= ia/via-camera.h similarity index 100% rename from drivers/media/platform/via-camera.h rename to drivers/media/platform/via/via-camera.h --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6355C433F5 for ; Mon, 14 Mar 2022 07:59:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237325AbiCNIA1 (ORCPT ); Mon, 14 Mar 2022 04:00:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236989AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 087614161B; Mon, 14 Mar 2022 00:56:14 -0700 (PDT) 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 sin.source.kernel.org (Postfix) with ESMTPS id 15831CE10BA; Mon, 14 Mar 2022 07:56:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12825C34101; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=Dk4qqeKZEyRVnvBhM69IPdSRAU4TzxaUegvICcNvNHA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=au9V19f5CZObn9/JNtEts1aQulAknUkMahLtDRce7fekd/eNcoW3NJ/Qx68zjo665 s+7L0+QLt4DMHqA294hKt/Hx/vrdZUX+kislsFM28SOfC0AtP09I5gg/12ZPwBKKJv /32NhRPuC7QRBVZ11EaPJOKMW+3tZY7NqPfddb5C0sRRwm82/L/MKUa5PgAsgfOZel mI0yG8wMd5wUFDJnAt7YbBxY/yWWOtEC6VBnWaxKE7HybwUQDB1z+wJ1hXi1H7/s5G 8o0fB8i9HtwHW6Bvj899vQP/XRFhMeErloB414rzEkX0xyFUGmZ8UZAmU61mbM4OFc YB5Zx2m72x3VQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYc-001kUp-Ou; Mon, 14 Mar 2022 08:55:58 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Biju Das , Cai Huoqing , Dan Carpenter , Dmitry Osipenko , Eugen Hristev , Fabrizio Castro , Geert Uytterhoeven , Greg Kroah-Hartman , Hans Verkuil , Herman , Jacopo Mondi , Jernej Skrabec , Jonathan Cameron , Kieran Bingham , Lad Prabhakar , Laurent Pinchart , Mikhail Ulyanov , Ming Qian , Nikita Yushchenko , Sakari Ailus , Suresh Udipi , Tang Bin , Tomi Valkeinen , Vladimir Barinov , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH 10/64] media: platform: place Renesas drivers on a separate dir Date: Mon, 14 Mar 2022 08:55:02 +0100 Message-Id: <1d83f5b7a19947e0b996c0c03fe3f0580d0143a1.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to cleanup the main platform media directory, move Renesas driver to its own directory. Reviewed-by: Laurent Pinchart 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 18 +-- drivers/media/platform/Kconfig | 113 +---------------- drivers/media/platform/Makefile | 10 +- drivers/media/platform/renesas/Kconfig | 119 ++++++++++++++++++ drivers/media/platform/renesas/Makefile | 15 +++ .../media/platform/{ =3D> renesas}/rcar-fcp.c | 0 .../media/platform/{ =3D> renesas}/rcar-isp.c | 0 .../platform/{ =3D> renesas}/rcar-vin/Kconfig | 0 .../platform/{ =3D> renesas}/rcar-vin/Makefile | 0 .../{ =3D> renesas}/rcar-vin/rcar-core.c | 0 .../{ =3D> renesas}/rcar-vin/rcar-csi2.c | 0 .../{ =3D> renesas}/rcar-vin/rcar-dma.c | 0 .../{ =3D> renesas}/rcar-vin/rcar-v4l2.c | 0 .../{ =3D> renesas}/rcar-vin/rcar-vin.h | 0 .../media/platform/{ =3D> renesas}/rcar_drif.c | 0 .../media/platform/{ =3D> renesas}/rcar_fdp1.c | 0 .../media/platform/{ =3D> renesas}/rcar_jpu.c | 0 .../platform/{ =3D> renesas}/renesas-ceu.c | 0 drivers/media/platform/{ =3D> renesas}/sh_vou.c | 0 .../platform/{ =3D> renesas}/vsp1/Makefile | 0 .../media/platform/{ =3D> renesas}/vsp1/vsp1.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_brx.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_brx.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_clu.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_clu.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_dl.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_dl.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_drm.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_drm.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_drv.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_entity.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_entity.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_hgo.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_hgo.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_hgt.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_hgt.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_histo.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_histo.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_hsit.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_hsit.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_lif.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_lif.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_lut.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_lut.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_pipe.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_pipe.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_regs.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_rpf.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_rwpf.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_rwpf.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_sru.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_sru.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_uds.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_uds.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_uif.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_uif.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_video.c | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_video.h | 0 .../platform/{ =3D> renesas}/vsp1/vsp1_wpf.c | 0 59 files changed, 146 insertions(+), 129 deletions(-) create mode 100644 drivers/media/platform/renesas/Kconfig create mode 100644 drivers/media/platform/renesas/Makefile rename drivers/media/platform/{ =3D> renesas}/rcar-fcp.c (100%) rename drivers/media/platform/{ =3D> renesas}/rcar-isp.c (100%) rename drivers/media/platform/{ =3D> renesas}/rcar-vin/Kconfig (100%) rename drivers/media/platform/{ =3D> renesas}/rcar-vin/Makefile (100%) rename drivers/media/platform/{ =3D> renesas}/rcar-vin/rcar-core.c (100%) rename drivers/media/platform/{ =3D> renesas}/rcar-vin/rcar-csi2.c (100%) rename drivers/media/platform/{ =3D> renesas}/rcar-vin/rcar-dma.c (100%) rename drivers/media/platform/{ =3D> renesas}/rcar-vin/rcar-v4l2.c (100%) rename drivers/media/platform/{ =3D> renesas}/rcar-vin/rcar-vin.h (100%) rename drivers/media/platform/{ =3D> renesas}/rcar_drif.c (100%) rename drivers/media/platform/{ =3D> renesas}/rcar_fdp1.c (100%) rename drivers/media/platform/{ =3D> renesas}/rcar_jpu.c (100%) rename drivers/media/platform/{ =3D> renesas}/renesas-ceu.c (100%) rename drivers/media/platform/{ =3D> renesas}/sh_vou.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/Makefile (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_brx.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_brx.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_clu.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_clu.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_dl.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_dl.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_drm.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_drm.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_drv.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_entity.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_entity.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_hgo.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_hgo.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_hgt.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_hgt.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_histo.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_histo.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_hsit.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_hsit.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_lif.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_lif.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_lut.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_lut.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_pipe.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_pipe.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_regs.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_rpf.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_rwpf.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_rwpf.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_sru.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_sru.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_uds.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_uds.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_uif.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_uif.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_video.c (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_video.h (100%) rename drivers/media/platform/{ =3D> renesas}/vsp1/vsp1_wpf.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 780ef2ef3362..848640546398 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10322,7 +10322,7 @@ M: Mikhail Ulyanov L: linux-media@vger.kernel.org L: linux-renesas-soc@vger.kernel.org S: Maintained -F: drivers/media/platform/rcar_jpu.c +F: drivers/media/platform/renesas/rcar_jpu.c =20 JSM Neo PCI based serial card L: linux-serial@vger.kernel.org @@ -11973,7 +11973,7 @@ L: linux-renesas-soc@vger.kernel.org S: Supported T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/renesas,ceu.yaml -F: drivers/media/platform/renesas-ceu.c +F: drivers/media/platform/renesas/renesas-ceu.c F: include/media/drv-intf/renesas-ceu.h =20 MEDIA DRIVERS FOR RENESAS - DRIF @@ -11983,7 +11983,7 @@ L: linux-renesas-soc@vger.kernel.org S: Supported T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/renesas,drif.yaml -F: drivers/media/platform/rcar_drif.c +F: drivers/media/platform/renesas/rcar_drif.c =20 MEDIA DRIVERS FOR RENESAS - FCP M: Laurent Pinchart @@ -11992,7 +11992,7 @@ L: linux-renesas-soc@vger.kernel.org S: Supported T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/renesas,fcp.yaml -F: drivers/media/platform/rcar-fcp.c +F: drivers/media/platform/renesas/rcar-fcp.c F: include/media/rcar-fcp.h =20 MEDIA DRIVERS FOR RENESAS - FDP1 @@ -12002,7 +12002,7 @@ L: linux-renesas-soc@vger.kernel.org S: Supported T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/renesas,fdp1.yaml -F: drivers/media/platform/rcar_fdp1.c +F: drivers/media/platform/renesas/rcar_fdp1.c =20 MEDIA DRIVERS FOR RENESAS - VIN M: Niklas S=C3=B6derlund @@ -12013,8 +12013,8 @@ T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/renesas,csi2.yaml F: Documentation/devicetree/bindings/media/renesas,isp.yaml F: Documentation/devicetree/bindings/media/renesas,vin.yaml -F: drivers/media/platform/rcar-isp.c -F: drivers/media/platform/rcar-vin/ +F: drivers/media/platform/renesas/rcar-isp.c +F: drivers/media/platform/renesas/rcar-vin/ =20 MEDIA DRIVERS FOR RENESAS - VSP1 M: Laurent Pinchart @@ -12024,7 +12024,7 @@ L: linux-renesas-soc@vger.kernel.org S: Supported T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/renesas,vsp1.yaml -F: drivers/media/platform/vsp1/ +F: drivers/media/platform/renesas/vsp1/ =20 MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs L: linux-media@vger.kernel.org @@ -17536,7 +17536,7 @@ F: include/media/i2c/rj54n1cb0c.h SH_VOU V4L2 OUTPUT DRIVER L: linux-media@vger.kernel.org S: Orphan -F: drivers/media/platform/sh_vou.c +F: drivers/media/platform/renesas/sh_vou.c F: include/media/drv-intf/sh_vou.h =20 SI2157 MEDIA DRIVER diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 83a496327325..b6650caecf45 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -31,6 +31,8 @@ config V4L_MEM2MEM_DRIVERS =20 source "drivers/media/platform/nxp/Kconfig" =20 +source "drivers/media/platform/renesas/Kconfig" + # V4L platform drivers =20 source "drivers/media/platform/marvell-ccic/Kconfig" @@ -45,15 +47,6 @@ source "drivers/media/platform/omap/Kconfig" =20 source "drivers/media/platform/aspeed/Kconfig" =20 -config VIDEO_SH_VOU - tristate "SuperH VOU video output driver" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_DEV && I2C - depends on ARCH_SHMOBILE || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - help - Support for the Video Output Unit (VOU) on SuperH SoCs. - config VIDEO_MUX tristate "Video Multiplexer" depends on V4L_PLATFORM_DRIVERS @@ -129,16 +122,6 @@ config VIDEO_STM32_DCMI To compile this driver as a module, choose M here: the module will be called stm32-dcmi. =20 -config VIDEO_RENESAS_CEU - tristate "Renesas Capture Engine Unit (CEU) driver" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_SHMOBILE || ARCH_R7S72100 || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - select V4L2_FWNODE - help - This is a v4l2 driver for the Renesas CEU Interface - config VIDEO_ROCKCHIP_ISP1 tristate "Rockchip Image Signal Processing v1 Unit driver" depends on V4L_PLATFORM_DRIVERS @@ -161,7 +144,6 @@ config VIDEO_ROCKCHIP_ISP1 source "drivers/media/platform/exynos4-is/Kconfig" source "drivers/media/platform/am437x/Kconfig" source "drivers/media/platform/xilinx/Kconfig" -source "drivers/media/platform/rcar-vin/Kconfig" source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/sunxi/Kconfig" =20 @@ -191,22 +173,6 @@ config VIDEO_TI_CAL_MC default. Note that this behavior can be overridden via module parameter 'mc_api'. =20 -config VIDEO_RCAR_ISP - tristate "R-Car Image Signal Processor (ISP)" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && OF - depends on ARCH_RENESAS || COMPILE_TEST - select MEDIA_CONTROLLER - select VIDEO_V4L2_SUBDEV_API - select RESET_CONTROLLER - select V4L2_FWNODE - help - Support for Renesas R-Car Image Signal Processor (ISP). - Enable this to support the Renesas R-Car Image Signal - Processor (ISP). - - To compile this driver as a module, choose M here: the - module will be called rcar-isp. =20 # Mem2mem drivers =20 @@ -477,64 +443,6 @@ config VIDEO_STM32_DMA2D The STM32 DMA2D is a memory-to-memory engine for pixel conversion and specialized DMA dedicated to image manipulation. =20 -config VIDEO_RENESAS_FDP1 - tristate "Renesas Fine Display Processor" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_RENESAS || COMPILE_TEST - depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - This is a V4L2 driver for the Renesas Fine Display Processor - providing colour space conversion, and de-interlacing features. - - To compile this driver as a module, choose M here: the module - will be called rcar_fdp1. - -config VIDEO_RENESAS_JPU - tristate "Renesas JPEG Processing Unit" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_RENESAS || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - This is a V4L2 driver for the Renesas JPEG Processing Unit. - - To compile this driver as a module, choose M here: the module - will be called rcar_jpu. - -config VIDEO_RENESAS_FCP - tristate "Renesas Frame Compression Processor" - depends on V4L_MEM2MEM_DRIVERS - depends on ARCH_RENESAS || COMPILE_TEST - depends on OF - help - This is a driver for the Renesas Frame Compression Processor (FCP). - The FCP is a companion module of video processing modules in the - Renesas R-Car Gen3 and RZ/G2 SoCs. It handles memory access for - the codec, VSP and FDP modules. - - To compile this driver as a module, choose M here: the module - will be called rcar-fcp. - -config VIDEO_RENESAS_VSP1 - tristate "Renesas VSP1 Video Processing Engine" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_V4L2 - depends on ARCH_RENESAS || COMPILE_TEST - depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP - select MEDIA_CONTROLLER - select VIDEO_V4L2_SUBDEV_API - select VIDEOBUF2_DMA_CONTIG - select VIDEOBUF2_VMALLOC - help - This is a V4L2 driver for the Renesas VSP1 video processing engine. - - To compile this driver as a module, choose M here: the module - will be called vsp1. - config VIDEO_ROCKCHIP_RGA tristate "Rockchip Raster 2d Graphic Acceleration Unit" depends on V4L_MEM2MEM_DRIVERS @@ -664,20 +572,3 @@ config VIDEO_TI_CSC =20 # DVB platform drivers source "drivers/media/platform/sti/c8sectpfe/Kconfig" - -# SDR platform drivers -config VIDEO_RCAR_DRIF - tristate "Renesas Digital Radio Interface (DRIF)" - depends on SDR_PLATFORM_DRIVERS - depends on VIDEO_V4L2 - depends on ARCH_RENESAS || COMPILE_TEST - select VIDEOBUF2_VMALLOC - select V4L2_ASYNC - help - Say Y if you want to enable R-Car Gen3 DRIF support. DRIF is Digital - Radio Interface that interfaces with an RF front end chip. It is a - receiver of digital data which uses DMA to transfer received data to - a configured location for an application to use. - - To compile this driver as a module, choose M here; the module - will be called rcar_drif. diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index 4742b18fd8d8..20b07ae3ebf1 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -27,7 +27,7 @@ obj-y +=3D omap/ obj-y +=3D omap3isp/ obj-y +=3D qcom/camss/ obj-y +=3D qcom/venus/ -obj-y +=3D rcar-vin/ +obj-y +=3D renesas/ obj-y +=3D rockchip/rga/ obj-y +=3D rockchip/rkisp1/ obj-y +=3D s3c-camif/ @@ -43,7 +43,6 @@ obj-y +=3D sunxi/ obj-y +=3D tegra/vde/ obj-y +=3D ti-vpe/ obj-y +=3D via/ -obj-y +=3D vsp1/ obj-y +=3D xilinx/ =20 # Please place here only ancillary drivers that aren't SoC-specific @@ -51,10 +50,3 @@ obj-y +=3D xilinx/ # (e. g. LC_ALL=3DC sort Makefile) obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) +=3D m2m-deinterlace.o obj-$(CONFIG_VIDEO_MUX) +=3D video-mux.o -obj-$(CONFIG_VIDEO_RCAR_DRIF) +=3D rcar_drif.o -obj-$(CONFIG_VIDEO_RCAR_ISP) +=3D rcar-isp.o -obj-$(CONFIG_VIDEO_RENESAS_CEU) +=3D renesas-ceu.o -obj-$(CONFIG_VIDEO_RENESAS_FCP) +=3D rcar-fcp.o -obj-$(CONFIG_VIDEO_RENESAS_FDP1) +=3D rcar_fdp1.o -obj-$(CONFIG_VIDEO_RENESAS_JPU) +=3D rcar_jpu.o -obj-$(CONFIG_VIDEO_SH_VOU) +=3D sh_vou.o diff --git a/drivers/media/platform/renesas/Kconfig b/drivers/media/platfor= m/renesas/Kconfig new file mode 100644 index 000000000000..3f35f1b5106d --- /dev/null +++ b/drivers/media/platform/renesas/Kconfig @@ -0,0 +1,119 @@ +# SPDX-License-Identifier: GPL-2.0-only + +# V4L drivers + +config VIDEO_RCAR_ISP + tristate "R-Car Image Signal Processor (ISP)" + depends on V4L_PLATFORM_DRIVERS + depends on VIDEO_V4L2 && OF + depends on ARCH_RENESAS || COMPILE_TEST + select MEDIA_CONTROLLER + select VIDEO_V4L2_SUBDEV_API + select RESET_CONTROLLER + select V4L2_FWNODE + help + Support for Renesas R-Car Image Signal Processor (ISP). + Enable this to support the Renesas R-Car Image Signal + Processor (ISP). + + To compile this driver as a module, choose M here: the + module will be called rcar-isp. + +config VIDEO_RENESAS_CEU + tristate "Renesas Capture Engine Unit (CEU) driver" + depends on V4L_PLATFORM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_SHMOBILE || ARCH_R7S72100 || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + select V4L2_FWNODE + help + This is a v4l2 driver for the Renesas CEU Interface + +config VIDEO_SH_VOU + tristate "SuperH VOU video output driver" + depends on V4L_PLATFORM_DRIVERS + depends on VIDEO_DEV && I2C + depends on ARCH_SHMOBILE || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + help + Support for the Video Output Unit (VOU) on SuperH SoCs. + +source "drivers/media/platform/renesas/rcar-vin/Kconfig" + +# Mem2mem drivers + +config VIDEO_RENESAS_FCP + tristate "Renesas Frame Compression Processor" + depends on V4L_MEM2MEM_DRIVERS + depends on ARCH_RENESAS || COMPILE_TEST + depends on OF + help + This is a driver for the Renesas Frame Compression Processor (FCP). + The FCP is a companion module of video processing modules in the + Renesas R-Car Gen3 and RZ/G2 SoCs. It handles memory access for + the codec, VSP and FDP modules. + + To compile this driver as a module, choose M here: the module + will be called rcar-fcp. + +config VIDEO_RENESAS_FDP1 + tristate "Renesas Fine Display Processor" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_RENESAS || COMPILE_TEST + depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + This is a V4L2 driver for the Renesas Fine Display Processor + providing colour space conversion, and de-interlacing features. + + To compile this driver as a module, choose M here: the module + will be called rcar_fdp1. + +config VIDEO_RENESAS_JPU + tristate "Renesas JPEG Processing Unit" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_RENESAS || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + This is a V4L2 driver for the Renesas JPEG Processing Unit. + + To compile this driver as a module, choose M here: the module + will be called rcar_jpu. + +config VIDEO_RENESAS_VSP1 + tristate "Renesas VSP1 Video Processing Engine" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_V4L2 + depends on ARCH_RENESAS || COMPILE_TEST + depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP + select MEDIA_CONTROLLER + select VIDEO_V4L2_SUBDEV_API + select VIDEOBUF2_DMA_CONTIG + select VIDEOBUF2_VMALLOC + help + This is a V4L2 driver for the Renesas VSP1 video processing engine. + + To compile this driver as a module, choose M here: the module + will be called vsp1. + +# SDR drivers + +config VIDEO_RCAR_DRIF + tristate "Renesas Digital Radio Interface (DRIF)" + depends on SDR_PLATFORM_DRIVERS + depends on VIDEO_V4L2 + depends on ARCH_RENESAS || COMPILE_TEST + select VIDEOBUF2_VMALLOC + select V4L2_ASYNC + help + Say Y if you want to enable R-Car Gen3 DRIF support. DRIF is Digital + Radio Interface that interfaces with an RF front end chip. It is a + receiver of digital data which uses DMA to transfer received data to + a configured location for an application to use. + + To compile this driver as a module, choose M here; the module + will be called rcar_drif. diff --git a/drivers/media/platform/renesas/Makefile b/drivers/media/platfo= rm/renesas/Makefile new file mode 100644 index 000000000000..3ec226ef5fd2 --- /dev/null +++ b/drivers/media/platform/renesas/Makefile @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Makefile for the Renesas capture/playback device drivers. +# + +obj-y +=3D rcar-vin/ +obj-y +=3D vsp1/ + +obj-$(CONFIG_VIDEO_RCAR_DRIF) +=3D rcar_drif.o +obj-$(CONFIG_VIDEO_RCAR_ISP) +=3D rcar-isp.o +obj-$(CONFIG_VIDEO_RENESAS_CEU) +=3D renesas-ceu.o +obj-$(CONFIG_VIDEO_RENESAS_FCP) +=3D rcar-fcp.o +obj-$(CONFIG_VIDEO_RENESAS_FDP1) +=3D rcar_fdp1.o +obj-$(CONFIG_VIDEO_RENESAS_JPU) +=3D rcar_jpu.o +obj-$(CONFIG_VIDEO_SH_VOU) +=3D sh_vou.o diff --git a/drivers/media/platform/rcar-fcp.c b/drivers/media/platform/ren= esas/rcar-fcp.c similarity index 100% rename from drivers/media/platform/rcar-fcp.c rename to drivers/media/platform/renesas/rcar-fcp.c diff --git a/drivers/media/platform/rcar-isp.c b/drivers/media/platform/ren= esas/rcar-isp.c similarity index 100% rename from drivers/media/platform/rcar-isp.c rename to drivers/media/platform/renesas/rcar-isp.c diff --git a/drivers/media/platform/rcar-vin/Kconfig b/drivers/media/platfo= rm/renesas/rcar-vin/Kconfig similarity index 100% rename from drivers/media/platform/rcar-vin/Kconfig rename to drivers/media/platform/renesas/rcar-vin/Kconfig diff --git a/drivers/media/platform/rcar-vin/Makefile b/drivers/media/platf= orm/renesas/rcar-vin/Makefile similarity index 100% rename from drivers/media/platform/rcar-vin/Makefile rename to drivers/media/platform/renesas/rcar-vin/Makefile diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/pl= atform/renesas/rcar-vin/rcar-core.c similarity index 100% rename from drivers/media/platform/rcar-vin/rcar-core.c rename to drivers/media/platform/renesas/rcar-vin/rcar-core.c diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/pl= atform/renesas/rcar-vin/rcar-csi2.c similarity index 100% rename from drivers/media/platform/rcar-vin/rcar-csi2.c rename to drivers/media/platform/renesas/rcar-vin/rcar-csi2.c diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/pla= tform/renesas/rcar-vin/rcar-dma.c similarity index 100% rename from drivers/media/platform/rcar-vin/rcar-dma.c rename to drivers/media/platform/renesas/rcar-vin/rcar-dma.c diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/pl= atform/renesas/rcar-vin/rcar-v4l2.c similarity index 100% rename from drivers/media/platform/rcar-vin/rcar-v4l2.c rename to drivers/media/platform/renesas/rcar-vin/rcar-v4l2.c diff --git a/drivers/media/platform/rcar-vin/rcar-vin.h b/drivers/media/pla= tform/renesas/rcar-vin/rcar-vin.h similarity index 100% rename from drivers/media/platform/rcar-vin/rcar-vin.h rename to drivers/media/platform/renesas/rcar-vin/rcar-vin.h diff --git a/drivers/media/platform/rcar_drif.c b/drivers/media/platform/re= nesas/rcar_drif.c similarity index 100% rename from drivers/media/platform/rcar_drif.c rename to drivers/media/platform/renesas/rcar_drif.c diff --git a/drivers/media/platform/rcar_fdp1.c b/drivers/media/platform/re= nesas/rcar_fdp1.c similarity index 100% rename from drivers/media/platform/rcar_fdp1.c rename to drivers/media/platform/renesas/rcar_fdp1.c diff --git a/drivers/media/platform/rcar_jpu.c b/drivers/media/platform/ren= esas/rcar_jpu.c similarity index 100% rename from drivers/media/platform/rcar_jpu.c rename to drivers/media/platform/renesas/rcar_jpu.c diff --git a/drivers/media/platform/renesas-ceu.c b/drivers/media/platform/= renesas/renesas-ceu.c similarity index 100% rename from drivers/media/platform/renesas-ceu.c rename to drivers/media/platform/renesas/renesas-ceu.c diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/renes= as/sh_vou.c similarity index 100% rename from drivers/media/platform/sh_vou.c rename to drivers/media/platform/renesas/sh_vou.c diff --git a/drivers/media/platform/vsp1/Makefile b/drivers/media/platform/= renesas/vsp1/Makefile similarity index 100% rename from drivers/media/platform/vsp1/Makefile rename to drivers/media/platform/renesas/vsp1/Makefile diff --git a/drivers/media/platform/vsp1/vsp1.h b/drivers/media/platform/re= nesas/vsp1/vsp1.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1.h rename to drivers/media/platform/renesas/vsp1/vsp1.h diff --git a/drivers/media/platform/vsp1/vsp1_brx.c b/drivers/media/platfor= m/renesas/vsp1/vsp1_brx.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_brx.c rename to drivers/media/platform/renesas/vsp1/vsp1_brx.c diff --git a/drivers/media/platform/vsp1/vsp1_brx.h b/drivers/media/platfor= m/renesas/vsp1/vsp1_brx.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_brx.h rename to drivers/media/platform/renesas/vsp1/vsp1_brx.h diff --git a/drivers/media/platform/vsp1/vsp1_clu.c b/drivers/media/platfor= m/renesas/vsp1/vsp1_clu.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_clu.c rename to drivers/media/platform/renesas/vsp1/vsp1_clu.c diff --git a/drivers/media/platform/vsp1/vsp1_clu.h b/drivers/media/platfor= m/renesas/vsp1/vsp1_clu.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_clu.h rename to drivers/media/platform/renesas/vsp1/vsp1_clu.h diff --git a/drivers/media/platform/vsp1/vsp1_dl.c b/drivers/media/platform= /renesas/vsp1/vsp1_dl.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_dl.c rename to drivers/media/platform/renesas/vsp1/vsp1_dl.c diff --git a/drivers/media/platform/vsp1/vsp1_dl.h b/drivers/media/platform= /renesas/vsp1/vsp1_dl.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_dl.h rename to drivers/media/platform/renesas/vsp1/vsp1_dl.h diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platfor= m/renesas/vsp1/vsp1_drm.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_drm.c rename to drivers/media/platform/renesas/vsp1/vsp1_drm.c diff --git a/drivers/media/platform/vsp1/vsp1_drm.h b/drivers/media/platfor= m/renesas/vsp1/vsp1_drm.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_drm.h rename to drivers/media/platform/renesas/vsp1/vsp1_drm.h diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platfor= m/renesas/vsp1/vsp1_drv.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_drv.c rename to drivers/media/platform/renesas/vsp1/vsp1_drv.c diff --git a/drivers/media/platform/vsp1/vsp1_entity.c b/drivers/media/plat= form/renesas/vsp1/vsp1_entity.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_entity.c rename to drivers/media/platform/renesas/vsp1/vsp1_entity.c diff --git a/drivers/media/platform/vsp1/vsp1_entity.h b/drivers/media/plat= form/renesas/vsp1/vsp1_entity.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_entity.h rename to drivers/media/platform/renesas/vsp1/vsp1_entity.h diff --git a/drivers/media/platform/vsp1/vsp1_hgo.c b/drivers/media/platfor= m/renesas/vsp1/vsp1_hgo.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_hgo.c rename to drivers/media/platform/renesas/vsp1/vsp1_hgo.c diff --git a/drivers/media/platform/vsp1/vsp1_hgo.h b/drivers/media/platfor= m/renesas/vsp1/vsp1_hgo.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_hgo.h rename to drivers/media/platform/renesas/vsp1/vsp1_hgo.h diff --git a/drivers/media/platform/vsp1/vsp1_hgt.c b/drivers/media/platfor= m/renesas/vsp1/vsp1_hgt.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_hgt.c rename to drivers/media/platform/renesas/vsp1/vsp1_hgt.c diff --git a/drivers/media/platform/vsp1/vsp1_hgt.h b/drivers/media/platfor= m/renesas/vsp1/vsp1_hgt.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_hgt.h rename to drivers/media/platform/renesas/vsp1/vsp1_hgt.h diff --git a/drivers/media/platform/vsp1/vsp1_histo.c b/drivers/media/platf= orm/renesas/vsp1/vsp1_histo.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_histo.c rename to drivers/media/platform/renesas/vsp1/vsp1_histo.c diff --git a/drivers/media/platform/vsp1/vsp1_histo.h b/drivers/media/platf= orm/renesas/vsp1/vsp1_histo.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_histo.h rename to drivers/media/platform/renesas/vsp1/vsp1_histo.h diff --git a/drivers/media/platform/vsp1/vsp1_hsit.c b/drivers/media/platfo= rm/renesas/vsp1/vsp1_hsit.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_hsit.c rename to drivers/media/platform/renesas/vsp1/vsp1_hsit.c diff --git a/drivers/media/platform/vsp1/vsp1_hsit.h b/drivers/media/platfo= rm/renesas/vsp1/vsp1_hsit.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_hsit.h rename to drivers/media/platform/renesas/vsp1/vsp1_hsit.h diff --git a/drivers/media/platform/vsp1/vsp1_lif.c b/drivers/media/platfor= m/renesas/vsp1/vsp1_lif.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_lif.c rename to drivers/media/platform/renesas/vsp1/vsp1_lif.c diff --git a/drivers/media/platform/vsp1/vsp1_lif.h b/drivers/media/platfor= m/renesas/vsp1/vsp1_lif.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_lif.h rename to drivers/media/platform/renesas/vsp1/vsp1_lif.h diff --git a/drivers/media/platform/vsp1/vsp1_lut.c b/drivers/media/platfor= m/renesas/vsp1/vsp1_lut.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_lut.c rename to drivers/media/platform/renesas/vsp1/vsp1_lut.c diff --git a/drivers/media/platform/vsp1/vsp1_lut.h b/drivers/media/platfor= m/renesas/vsp1/vsp1_lut.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_lut.h rename to drivers/media/platform/renesas/vsp1/vsp1_lut.h diff --git a/drivers/media/platform/vsp1/vsp1_pipe.c b/drivers/media/platfo= rm/renesas/vsp1/vsp1_pipe.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_pipe.c rename to drivers/media/platform/renesas/vsp1/vsp1_pipe.c diff --git a/drivers/media/platform/vsp1/vsp1_pipe.h b/drivers/media/platfo= rm/renesas/vsp1/vsp1_pipe.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_pipe.h rename to drivers/media/platform/renesas/vsp1/vsp1_pipe.h diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platfo= rm/renesas/vsp1/vsp1_regs.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_regs.h rename to drivers/media/platform/renesas/vsp1/vsp1_regs.h diff --git a/drivers/media/platform/vsp1/vsp1_rpf.c b/drivers/media/platfor= m/renesas/vsp1/vsp1_rpf.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_rpf.c rename to drivers/media/platform/renesas/vsp1/vsp1_rpf.c diff --git a/drivers/media/platform/vsp1/vsp1_rwpf.c b/drivers/media/platfo= rm/renesas/vsp1/vsp1_rwpf.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_rwpf.c rename to drivers/media/platform/renesas/vsp1/vsp1_rwpf.c diff --git a/drivers/media/platform/vsp1/vsp1_rwpf.h b/drivers/media/platfo= rm/renesas/vsp1/vsp1_rwpf.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_rwpf.h rename to drivers/media/platform/renesas/vsp1/vsp1_rwpf.h diff --git a/drivers/media/platform/vsp1/vsp1_sru.c b/drivers/media/platfor= m/renesas/vsp1/vsp1_sru.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_sru.c rename to drivers/media/platform/renesas/vsp1/vsp1_sru.c diff --git a/drivers/media/platform/vsp1/vsp1_sru.h b/drivers/media/platfor= m/renesas/vsp1/vsp1_sru.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_sru.h rename to drivers/media/platform/renesas/vsp1/vsp1_sru.h diff --git a/drivers/media/platform/vsp1/vsp1_uds.c b/drivers/media/platfor= m/renesas/vsp1/vsp1_uds.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_uds.c rename to drivers/media/platform/renesas/vsp1/vsp1_uds.c diff --git a/drivers/media/platform/vsp1/vsp1_uds.h b/drivers/media/platfor= m/renesas/vsp1/vsp1_uds.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_uds.h rename to drivers/media/platform/renesas/vsp1/vsp1_uds.h diff --git a/drivers/media/platform/vsp1/vsp1_uif.c b/drivers/media/platfor= m/renesas/vsp1/vsp1_uif.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_uif.c rename to drivers/media/platform/renesas/vsp1/vsp1_uif.c diff --git a/drivers/media/platform/vsp1/vsp1_uif.h b/drivers/media/platfor= m/renesas/vsp1/vsp1_uif.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_uif.h rename to drivers/media/platform/renesas/vsp1/vsp1_uif.h diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platf= orm/renesas/vsp1/vsp1_video.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_video.c rename to drivers/media/platform/renesas/vsp1/vsp1_video.c diff --git a/drivers/media/platform/vsp1/vsp1_video.h b/drivers/media/platf= orm/renesas/vsp1/vsp1_video.h similarity index 100% rename from drivers/media/platform/vsp1/vsp1_video.h rename to drivers/media/platform/renesas/vsp1/vsp1_video.h diff --git a/drivers/media/platform/vsp1/vsp1_wpf.c b/drivers/media/platfor= m/renesas/vsp1/vsp1_wpf.c similarity index 100% rename from drivers/media/platform/vsp1/vsp1_wpf.c rename to drivers/media/platform/renesas/vsp1/vsp1_wpf.c --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03ED7C4321E for ; Mon, 14 Mar 2022 07:56:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237113AbiCNH57 (ORCPT ); Mon, 14 Mar 2022 03:57:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236847AbiCNH5U (ORCPT ); Mon, 14 Mar 2022 03:57:20 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1B454132E; Mon, 14 Mar 2022 00:56:04 -0700 (PDT) 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 sin.source.kernel.org (Postfix) with ESMTPS id 48BC1CE10A8; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A552C340FF; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=VhAg2DfM0V2K14kbMfszpRD01j0X/tOtJyqq+0ZzfTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MqPzFTvwI/J5A6ZK3SyklVYGaEAfi2arw0IlQFllhPJpDkjqbm+2bJMFAatGk3hWw x3hPhGxuwayNnhWv7xb+m4Ma2eH8WLi7LK/mVLvzvDmMQJuFxIrd3NPnzc77vDhS8F uE7zLL2ecMD6NhWkDYVSsH+wLZJONUdbh0iSsb2qHi5oxaqKo1on1En2MghLAp0hY1 kpmHfNJtA0aOxV/t6UZvlxCAUPQckYAvl0smIm8x6GBtQWHpTmjHzrdEndA/ANRjTT A6vdZObFTEkTYqNsryB1mAgIaNiksYK1cKBYuzNNQ6A6Ix9tqBEQz75g28JRO2tvG0 pf4Nlk9e2EsMg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYc-001kUt-Qo; Mon, 14 Mar 2022 08:55:58 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Michael Tretter , Ming Qian , Pengutronix Kernel Team , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 11/64] media: platform: allegro-dvt: move config to its own file Date: Mon, 14 Mar 2022 08:55:03 +0100 Message-Id: <0d5e1aaa9afee08c4d04259f5498912149306a8f.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place allegro-dvt-specific config stuff on a separate Kconfig file. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 17 +---------------- drivers/media/platform/allegro-dvt/Kconfig | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 drivers/media/platform/allegro-dvt/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index b6650caecf45..25e5ae27210d 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -29,6 +29,7 @@ config V4L_MEM2MEM_DRIVERS to capture and output drivers, which use memory buffers for just one of those. =20 +source "drivers/media/platform/allegro-dvt/Kconfig" source "drivers/media/platform/nxp/Kconfig" =20 source "drivers/media/platform/renesas/Kconfig" @@ -176,22 +177,6 @@ config VIDEO_TI_CAL_MC =20 # Mem2mem drivers =20 -config VIDEO_ALLEGRO_DVT - tristate "Allegro DVT Video IP Core" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_ZYNQMP || COMPILE_TEST - select V4L2_MEM2MEM_DEV - select VIDEOBUF2_DMA_CONTIG - select REGMAP_MMIO - help - Support for the encoder video IP core by Allegro DVT. This core is - found for example on the Xilinx ZynqMP SoC in the EV family and is - called VCU in the reference manual. - - To compile this driver as a module, choose M here: the module - will be called allegro. - config VIDEO_CODA tristate "Chips&Media Coda multi-standard codec IP" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/allegro-dvt/Kconfig b/drivers/media/pla= tform/allegro-dvt/Kconfig new file mode 100644 index 000000000000..dd528e9d0958 --- /dev/null +++ b/drivers/media/platform/allegro-dvt/Kconfig @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_ALLEGRO_DVT + tristate "Allegro DVT Video IP Core" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_ZYNQMP || COMPILE_TEST + select V4L2_MEM2MEM_DEV + select VIDEOBUF2_DMA_CONTIG + select REGMAP_MMIO + help + Support for the encoder video IP core by Allegro DVT. This core is + found for example on the Xilinx ZynqMP SoC in the EV family and is + called VCU in the reference manual. + + To compile this driver as a module, choose M here: the module + will be called allegro. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80D7FC433F5 for ; Mon, 14 Mar 2022 07:56:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236903AbiCNH5e (ORCPT ); Mon, 14 Mar 2022 03:57:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236829AbiCNH5S (ORCPT ); Mon, 14 Mar 2022 03:57:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD93E41326; Mon, 14 Mar 2022 00:56:02 -0700 (PDT) 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 44F9F61189; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A620C34100; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=Bp6Zi0uLRwIJ9TX4TDGOxTDzXrysbBE+l/1fy838lIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sD/Y7kT5ZHPPG/i99u0IhuqRHCEUwELaH797D24MqInQCQMqQLZlRjcH4DXKs6osm Mi3p/9tlphk+7vrUkmpcROHLuye4rhqT2f6p5C3Dvr0vqZJ/PcinQ2yaWKiVWmQ1xP XCpxmX3lYF4bfVDcjWOYr+8DEXh61R5c35gWtHLRBAul8E+J5QPCd8XHGZ+5ulnKxB CViXWKHoLW1szXwOxApNGV///PkOUa7AHx/7G5AOjUT7fhcVDwsCnCsNKVaQPR8M9v bAZ1BdAiYQjJJoBLDc5+/Sw/GWvgJWvexyMmBdNjAgT5GatiVj2qv3jSmC94d/byic 9wmfzoK2VOkgg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYc-001kUx-Rx; Mon, 14 Mar 2022 08:55:58 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Ming Qian , Shijie Qin , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 12/64] media: platform: amphion: move config to its own file Date: Mon, 14 Mar 2022 08:55:04 +0100 Message-Id: <68710ee0228721833e3da88c2cd89e9f0c763a80.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place amphion-specific config stuff on a separate Kconfig file. Reviewed-by: Shijie Qin 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 21 +-------------------- drivers/media/platform/amphion/Kconfig | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 drivers/media/platform/amphion/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 25e5ae27210d..060d6264dea4 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -40,6 +40,7 @@ source "drivers/media/platform/marvell-ccic/Kconfig" =20 source "drivers/media/platform/via/Kconfig" =20 +source "drivers/media/platform/amphion/Kconfig" source "drivers/media/platform/cadence/Kconfig" =20 source "drivers/media/platform/davinci/Kconfig" @@ -524,26 +525,6 @@ config VIDEO_TEGRA_VDE Support for the NVIDIA Tegra video decoder unit. To compile this driver as a module choose m here. =20 -config VIDEO_AMPHION_VPU - tristate "Amphion VPU (Video Processing Unit) Codec IP" - depends on V4L_MEM2MEM_DRIVERS - depends on ARCH_MXC || COMPILE_TEST - depends on MEDIA_SUPPORT - depends on VIDEO_DEV - depends on VIDEO_V4L2 - select MEDIA_CONTROLLER - select V4L2_MEM2MEM_DEV - select VIDEOBUF2_DMA_CONTIG - select VIDEOBUF2_VMALLOC - help - Amphion VPU Codec IP contains two parts: Windsor and Malone. - Windsor is encoder that supports H.264, and Malone is decoder - that supports H.264, HEVC, and other video formats. - This is a V4L2 driver for NXP MXC 8Q video accelerator hardware. - It accelerates encoding and decoding operations on - various NXP SoCs. - To compile this driver as a module choose m here. - # TI VIDEO PORT Helper Modules # These will be selected by VPE and VIP config VIDEO_TI_VPDMA diff --git a/drivers/media/platform/amphion/Kconfig b/drivers/media/platfor= m/amphion/Kconfig new file mode 100644 index 000000000000..13899649f766 --- /dev/null +++ b/drivers/media/platform/amphion/Kconfig @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_AMPHION_VPU + tristate "Amphion VPU (Video Processing Unit) Codec IP" + depends on V4L_MEM2MEM_DRIVERS + depends on ARCH_MXC || COMPILE_TEST + depends on MEDIA_SUPPORT + depends on VIDEO_DEV + depends on VIDEO_V4L2 + select MEDIA_CONTROLLER + select V4L2_MEM2MEM_DEV + select VIDEOBUF2_DMA_CONTIG + select VIDEOBUF2_VMALLOC + help + Amphion VPU Codec IP contains two parts: Windsor and Malone. + Windsor is encoder that supports H.264, and Malone is decoder + that supports H.264, HEVC, and other video formats. + This is a V4L2 driver for NXP MXC 8Q video accelerator hardware. + It accelerates encoding and decoding operations on + various NXP SoCs. + To compile this driver as a module choose m here. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 298EFC433EF for ; Mon, 14 Mar 2022 07:57:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236918AbiCNH6T (ORCPT ); Mon, 14 Mar 2022 03:58:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236848AbiCNH5U (ORCPT ); Mon, 14 Mar 2022 03:57:20 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4885A4132F; Mon, 14 Mar 2022 00:56:05 -0700 (PDT) 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 sin.source.kernel.org (Postfix) with ESMTPS id 6B9B8CE10B2; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2604BC3410C; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=in66uYtyikTpJ7PavXHL+NBm6nLR8BFLF0pe1Zxry/o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gosOMRhM6RvF+GmV8gMYnvxipYY4Ceai798HauLjETWz9eKGRyFommytERL2xWE1p ZjJpBZSiW3gSoNtkW27NgqnQawFGGz798O5tWDElXcSA0lbX7fl5jmEd8NLCzmL9ok sWPQ/Iycnm5n01Y0pDQLh9AtfU8poQlkyOlgee5eO3oMXPy5xehZn4XF9B/6N43ELq +FJffr+cD69k2O5ZNmIxLCkERlIHPZnbA+Ud0WzneAjKCic45xDg5OUo+G7deBgoyZ mZrTh9v3ITGnyppyUZa6YVpv0iWsumiBJAM87ZdqBUA8bQuDZ+ANK3yz7mZUvXpJo/ rlFymnu3MPRFQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYc-001kV1-TE; Mon, 14 Mar 2022 08:55:58 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Ming Qian , Philipp Zabel , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 13/64] media: platform: coda: move config to its own file Date: Mon, 14 Mar 2022 08:55:05 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place coda-specific config stuff on a separate Kconfig file. Reviewed-by: Philipp Zabel 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 18 +----------------- drivers/media/platform/coda/Kconfig | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 drivers/media/platform/coda/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 060d6264dea4..0bf9dd5da845 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -43,6 +43,7 @@ source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/amphion/Kconfig" source "drivers/media/platform/cadence/Kconfig" =20 +source "drivers/media/platform/coda/Kconfig" source "drivers/media/platform/davinci/Kconfig" =20 source "drivers/media/platform/omap/Kconfig" @@ -178,23 +179,6 @@ config VIDEO_TI_CAL_MC =20 # Mem2mem drivers =20 -config VIDEO_CODA - tristate "Chips&Media Coda multi-standard codec IP" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 && OF && (ARCH_MXC || COMPILE_TEST) - select SRAM - select VIDEOBUF2_DMA_CONTIG - select VIDEOBUF2_VMALLOC - select V4L2_JPEG_HELPER - select V4L2_MEM2MEM_DEV - select GENERIC_ALLOCATOR - help - Coda is a range of video codec IPs that supports - H.264, MPEG-4, and other video formats. - -config VIDEO_IMX_VDOA - def_tristate VIDEO_CODA if SOC_IMX6Q || COMPILE_TEST - config VIDEO_MEDIATEK_JPEG tristate "Mediatek JPEG Codec driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/coda/Kconfig b/drivers/media/platform/c= oda/Kconfig new file mode 100644 index 000000000000..ae495fd7b25a --- /dev/null +++ b/drivers/media/platform/coda/Kconfig @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_CODA + tristate "Chips&Media Coda multi-standard codec IP" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 && OF && (ARCH_MXC || COMPILE_TEST) + select SRAM + select VIDEOBUF2_DMA_CONTIG + select VIDEOBUF2_VMALLOC + select V4L2_JPEG_HELPER + select V4L2_MEM2MEM_DEV + select GENERIC_ALLOCATOR + help + Coda is a range of video codec IPs that supports + H.264, MPEG-4, and other video formats. + +config VIDEO_IMX_VDOA + def_tristate VIDEO_CODA if SOC_IMX6Q || COMPILE_TEST --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EF20C433FE for ; Mon, 14 Mar 2022 07:57:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237094AbiCNH6m (ORCPT ); Mon, 14 Mar 2022 03:58:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236891AbiCNH5d (ORCPT ); Mon, 14 Mar 2022 03:57:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4062841332; Mon, 14 Mar 2022 00:56:07 -0700 (PDT) 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 74EA56118B; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37D84C3410A; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=hcqGiVMGEQIJn5Zfm3Z7qG75i5R0pCGvpzO7FNRk+eU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZA02ar7X7XIKezfgSma6shYE1pnDu79d9iWt0NjnZTqCO7TJXjEx88lvZTnXlCIZH asVqWAxZIXSV9ixD5RqbesRnMkMvafAb9z455NYnELgf6TOypLCE18UYHe8OygjIeX fb9MV+UzXOVRQEKfez9QeC6Fxgb5y93lwfkd+SUQHqW8s9tDcfk9q1pjPv/e9YnTnH dG+o6g/rUu2fjfOCLO7hcAQCOBG0HEcN34QYZRjqoG6ZYhCbbI6urAWfxruTQ6L0pL yVbWQr2bqbzgUqqMjL8rdQmDErhpDU0FhGxnJjZ0/R+2rB7NdKdYFqYyt4FwOCjqfC MTZZJBPokE8yg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYc-001kV5-UT; Mon, 14 Mar 2022 08:55:58 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Krzysztof Kozlowski , Laurent Pinchart , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 14/64] media: platform: exynos-gsc: move config to its own file Date: Mon, 14 Mar 2022 08:55:06 +0100 Message-Id: <03342e1f211a7062cc435797a19d7cfa7aa145d5.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place exynos-gsc-specific config stuff on a separate Kconfig file. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 11 +---------- drivers/media/platform/exynos-gsc/Kconfig | 10 ++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 drivers/media/platform/exynos-gsc/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 0bf9dd5da845..57ca2426a83b 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -46,6 +46,7 @@ source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/coda/Kconfig" source "drivers/media/platform/davinci/Kconfig" =20 +source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/omap/Kconfig" =20 source "drivers/media/platform/aspeed/Kconfig" @@ -317,16 +318,6 @@ config VIDEO_SAMSUNG_S5P_MFC help MFC 5.1 and 6.x driver for V4L2 =20 -config VIDEO_SAMSUNG_EXYNOS_GSC - tristate "Samsung Exynos G-Scaler driver" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_EXYNOS || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - This is a v4l2 driver for Samsung EXYNOS5 SoC G-Scaler. - config VIDEO_STI_BDISP tristate "STMicroelectronics BDISP 2D blitter driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/exynos-gsc/Kconfig b/drivers/media/plat= form/exynos-gsc/Kconfig new file mode 100644 index 000000000000..f9bdffe915b4 --- /dev/null +++ b/drivers/media/platform/exynos-gsc/Kconfig @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_SAMSUNG_EXYNOS_GSC + tristate "Samsung Exynos G-Scaler driver" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_EXYNOS || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + This is a v4l2 driver for Samsung EXYNOS5 SoC G-Scaler. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF7E3C3526E for ; Mon, 14 Mar 2022 07:56:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235356AbiCNH6F (ORCPT ); Mon, 14 Mar 2022 03:58:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236849AbiCNH5U (ORCPT ); Mon, 14 Mar 2022 03:57:20 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB40A41330; Mon, 14 Mar 2022 00:56:05 -0700 (PDT) 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 sin.source.kernel.org (Postfix) with ESMTPS id C9DBECE10B6; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2EE12C3410D; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=va4oX5/2sFF9WAAK9adCGYXmIrWh6lSqgh0IjodMHVM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zym8d73zrsxScbav7mX26TpdTtdwu9pdvr1LJBhuzQhRra0ehxLUUSVFLMM0Ix/y2 pfakP2fJw329ia6WLE/dHkwBiKbEAdNm22uqKMGXFn83GUZWtZlKcPaHS/aWrFOtmG Xm+lq1q+zK1xY8tINq4kt96LAsKSQMxeB5pRBZpx8kjuxccFpTZbINVNfnjoYL6gwp WIUy+NTppSewBziMs0tU5JqsJz24N9Tg5xmrTQRNKKJ239dxo3uXM2DSp4jzm4bf6I kGroWvzP21W9hca4XREgYp6BF4YQo+OJf6y4ed81TaP+8kGyfBuSMCRwM9V1VSRUc8 +6+WrHCjthXnA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYc-001kV9-Vi; Mon, 14 Mar 2022 08:55:58 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Jerome Brunet , Kevin Hilman , Laurent Pinchart , Martin Blumenstingl , Ming Qian , Neil Armstrong , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 15/64] media: platform: ge2d: move config to its own file Date: Mon, 14 Mar 2022 08:55:07 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place ge2d-specific config stuff on a separate Kconfig file. Signed-off-by: Mauro Carvalho Chehab Acked-by: Neil Armstrong --- To avoid mailbombing on a large number of people, only mailing lists were C= /C on the cover. See [PATCH 00/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 15 +-------------- drivers/media/platform/meson/ge2d/Kconfig | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 drivers/media/platform/meson/ge2d/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 57ca2426a83b..d3b7bef19237 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -47,6 +47,7 @@ source "drivers/media/platform/coda/Kconfig" source "drivers/media/platform/davinci/Kconfig" =20 source "drivers/media/platform/exynos-gsc/Kconfig" +source "drivers/media/platform/meson/ge2d/Kconfig" source "drivers/media/platform/omap/Kconfig" =20 source "drivers/media/platform/aspeed/Kconfig" @@ -273,20 +274,6 @@ config VIDEO_MEM2MEM_DEINTERLACE help Generic deinterlacing V4L2 driver. =20 -config VIDEO_MESON_GE2D - tristate "Amlogic 2D Graphic Acceleration Unit" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_MESON || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - This is a v4l2 driver for Amlogic GE2D 2D graphics accelerator. - GE2D is a standalone 2D graphic acceleration unit, with color converter, - image scaling, BitBLT & alpha blending operations. - - To compile this driver as a module choose m here. - config VIDEO_SAMSUNG_S5P_G2D tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/meson/ge2d/Kconfig b/drivers/media/plat= form/meson/ge2d/Kconfig new file mode 100644 index 000000000000..8c3f3b1b6b05 --- /dev/null +++ b/drivers/media/platform/meson/ge2d/Kconfig @@ -0,0 +1,14 @@ +config VIDEO_MESON_GE2D + tristate "Amlogic 2D Graphic Acceleration Unit" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_MESON || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + This is a v4l2 driver for Amlogic GE2D 2D graphics accelerator. + GE2D is a standalone 2D graphic acceleration unit, with color converter, + image scaling, BitBLT & alpha blending operations. + + To compile this driver as a module choose m here. + --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E2D2C43217 for ; Mon, 14 Mar 2022 07:57:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237251AbiCNH63 (ORCPT ); Mon, 14 Mar 2022 03:58:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236845AbiCNH5d (ORCPT ); Mon, 14 Mar 2022 03:57:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4884941335; Mon, 14 Mar 2022 00:56:07 -0700 (PDT) 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 7772A6118E; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F41AC3410F; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=h2oPKiOhkQOnumUdeyDJRnfkogJA7+jnEd2l+b1ekfM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MaBb4LOGt7po3yDa+ua8Q8EZNPqnBdafzREASDBHBGvhGm3jlqZYqltVcIrxpKatb NfoC0FLkGiMLCJU1bGNfF6c/7/oLYOrnfD5GsJPOkHZs0D7NDyUFcwbYcS8mph4A/X y0WgUT/e2iGiRYSIBSqBOdyNutnoHjmMwMsAF6kUBFFuqUetV/whPo9Rrnz8hPgNbN wgK/sSN+Ins1dgUdEhJri3jvz0q4yOiKidQ7ykRq2GKJ1YAJYbT8aa18BimMByzW0t G3+mPWRIbEuSkWTHzpONTT5aLD1KmEPchbN6r/PNzgGOyU/I4RKxL8fLuVY/0/95UP VDhxA17LHFWBw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kVD-0c; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Matthias Brugger , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH 16/64] media: platform: mtk-jpeg: move config to its own file Date: Mon, 14 Mar 2022 08:55:08 +0100 Message-Id: <0eed3a494bdfcdefe2155a15c8ab2c916a003850.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place mtk-jpeg-specific config stuff on a separate Kconfig file. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 17 +---------------- drivers/media/platform/mtk-jpeg/Kconfig | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 drivers/media/platform/mtk-jpeg/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index d3b7bef19237..f517aa951460 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -48,6 +48,7 @@ source "drivers/media/platform/davinci/Kconfig" =20 source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/meson/ge2d/Kconfig" +source "drivers/media/platform/mtk-jpeg/Kconfig" source "drivers/media/platform/omap/Kconfig" =20 source "drivers/media/platform/aspeed/Kconfig" @@ -181,22 +182,6 @@ config VIDEO_TI_CAL_MC =20 # Mem2mem drivers =20 -config VIDEO_MEDIATEK_JPEG - tristate "Mediatek JPEG Codec driver" - depends on V4L_MEM2MEM_DRIVERS - depends on MTK_IOMMU_V1 || MTK_IOMMU || COMPILE_TEST - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_MEDIATEK || COMPILE_TEST - depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=3Dn) - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - Mediatek jpeg codec driver provides HW capability to decode - JPEG format - - To compile this driver as a module, choose M here: the - module will be called mtk-jpeg - config VIDEO_MEDIATEK_VPU tristate "Mediatek Video Processor Unit" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/mtk-jpeg/Kconfig b/drivers/media/platfo= rm/mtk-jpeg/Kconfig new file mode 100644 index 000000000000..72ed920b011a --- /dev/null +++ b/drivers/media/platform/mtk-jpeg/Kconfig @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_MEDIATEK_JPEG + tristate "Mediatek JPEG Codec driver" + depends on V4L_MEM2MEM_DRIVERS + depends on MTK_IOMMU_V1 || MTK_IOMMU || COMPILE_TEST + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_MEDIATEK || COMPILE_TEST + depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=3Dn) + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + Mediatek jpeg codec driver provides HW capability to decode + JPEG format + + To compile this driver as a module, choose M here: the + module will be called mtk-jpeg --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF97BC433EF for ; Mon, 14 Mar 2022 07:57:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237140AbiCNH6e (ORCPT ); Mon, 14 Mar 2022 03:58:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236892AbiCNH5d (ORCPT ); Mon, 14 Mar 2022 03:57:33 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D05B741331; Mon, 14 Mar 2022 00:56:05 -0700 (PDT) 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 sin.source.kernel.org (Postfix) with ESMTPS id 03F46CE10B9; Mon, 14 Mar 2022 07:56:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41AEAC34110; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=TFsfQFdGOSp/d2PY6RK1+XJEsuW1EnlOtXk3B099kBo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VX/jvbS7nV2e0TlzfwCiVHIzl0joaQ35X/MHYCHIN3bjM9xe2Tszss55sZ1UQNCKV 0Q92u6BvqClo5apTNzTQ/E4pGgUo2A51NctP+/TWyGt2AmZA+9wnoW/dHmHkUj8E+k +BSFPi5DC/liMM0F7aleBJO/0j7tXnvFiwEtpwHa1mIKhTssFz6Uwu2i1Rm0x88lZ1 VA2u5+6GvK1sg1fgLpooFbZxW7ztH4EXm5CUpUl5eH6Pl4MH4J8o8+xA5VpaqHV6Q7 Ierpr5QlCyuj0ADWODYbrtNgiyiX/JHlEszH/czm/yNgn66ID7tmLZlL74oCDHGOXv YzmO62TwICfNw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kVH-1t; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Matthias Brugger , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH 17/64] media: platform: mtk-mdp: move config to its own file Date: Mon, 14 Mar 2022 08:55:09 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place mtk-mdp-specific config stuff on a separate Kconfig file. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 18 +----------------- drivers/media/platform/mtk-mdp/Kconfig | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 drivers/media/platform/mtk-mdp/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index f517aa951460..3b3d7af47ca1 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -49,6 +49,7 @@ source "drivers/media/platform/davinci/Kconfig" source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/meson/ge2d/Kconfig" source "drivers/media/platform/mtk-jpeg/Kconfig" +source "drivers/media/platform/mtk-mdp/Kconfig" source "drivers/media/platform/omap/Kconfig" =20 source "drivers/media/platform/aspeed/Kconfig" @@ -196,23 +197,6 @@ config VIDEO_MEDIATEK_VPU To compile this driver as a module, choose M here: the module will be called mtk-vpu. =20 -config VIDEO_MEDIATEK_MDP - tristate "Mediatek MDP driver" - depends on V4L_MEM2MEM_DRIVERS - depends on MTK_IOMMU || COMPILE_TEST - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_MEDIATEK || COMPILE_TEST - depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=3Dn) - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - select VIDEO_MEDIATEK_VPU - help - It is a v4l2 driver and present in Mediatek MT8173 SoCs. - The driver supports for scaling and color space conversion. - - To compile this driver as a module, choose M here: the - module will be called mtk-mdp. - config VIDEO_MEDIATEK_VCODEC tristate "Mediatek Video Codec driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/mtk-mdp/Kconfig b/drivers/media/platfor= m/mtk-mdp/Kconfig new file mode 100644 index 000000000000..0cc743165a1a --- /dev/null +++ b/drivers/media/platform/mtk-mdp/Kconfig @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_MEDIATEK_MDP + tristate "Mediatek MDP driver" + depends on V4L_MEM2MEM_DRIVERS + depends on MTK_IOMMU || COMPILE_TEST + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_MEDIATEK || COMPILE_TEST + depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=3Dn) + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + select VIDEO_MEDIATEK_VPU + help + It is a v4l2 driver and present in Mediatek MT8173 SoCs. + The driver supports for scaling and color space conversion. + + To compile this driver as a module, choose M here: the + module will be called mtk-mdp. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2D16C433F5 for ; Mon, 14 Mar 2022 07:57:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237175AbiCNH6i (ORCPT ); Mon, 14 Mar 2022 03:58:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236905AbiCNH5f (ORCPT ); Mon, 14 Mar 2022 03:57:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5058C41318; Mon, 14 Mar 2022 00:56:10 -0700 (PDT) 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 DDC5561199; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53352C34115; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=ZWBNMKhjWkFrdhIyIsVE25iCEQUAlTjwV2xwf63/5sQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=auboGjWZOT59mgQ4g54A3kr4Gam0eivc6wNs2f3HNq6/+pQKl/r2WmawxH3vXhbcq bU2SvIatKBwyGTnccM8OmDicwiFMd9SiQmXXsyYH91p1QZEwOrHeN59XOqziDWU1hC 4p54qgx9/rN9h3qO1LaQx3u8ruPjuFy4ey4JxDhn1yGJ3bzkovQ8MhA2iBryo3EFk8 /JqO7X7Bt0iYvVj+AlKwE7vRWwAR0GYHhXUXSSLuzyOhtaZttysj4uodHd8DpACVJx 9vGOG2NqcqYVIEhWWHZgMg5ffNKwADL4rTcxu52/5hqxqW3IHioKNMDY6DObddT40v XUqPXZWlwWVcA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kVL-32; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Matthias Brugger , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH 18/64] media: platform: mtk-vcodec: move config to its own file Date: Mon, 14 Mar 2022 08:55:10 +0100 Message-Id: <3dcaf6f8db4139011a30696fb73b342fa0b014c3.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place mtk-vcodec-specific config stuff on a separate Kconfig file. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 37 +---------------------- drivers/media/platform/mtk-vcodec/Kconfig | 36 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 drivers/media/platform/mtk-vcodec/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 3b3d7af47ca1..ab7c85613625 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -50,6 +50,7 @@ source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/meson/ge2d/Kconfig" source "drivers/media/platform/mtk-jpeg/Kconfig" source "drivers/media/platform/mtk-mdp/Kconfig" +source "drivers/media/platform/mtk-vcodec/Kconfig" source "drivers/media/platform/omap/Kconfig" =20 source "drivers/media/platform/aspeed/Kconfig" @@ -197,42 +198,6 @@ config VIDEO_MEDIATEK_VPU To compile this driver as a module, choose M here: the module will be called mtk-vpu. =20 -config VIDEO_MEDIATEK_VCODEC - tristate "Mediatek Video Codec driver" - depends on V4L_MEM2MEM_DRIVERS - depends on MTK_IOMMU || COMPILE_TEST - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_MEDIATEK || COMPILE_TEST - depends on VIDEO_MEDIATEK_VPU || MTK_SCP - # The two following lines ensure we have the same state ("m" or "y") as - # our dependencies, to avoid missing symbols during link. - depends on VIDEO_MEDIATEK_VPU || !VIDEO_MEDIATEK_VPU - depends on MTK_SCP || !MTK_SCP - depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=3Dn) - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - select VIDEO_MEDIATEK_VCODEC_VPU if VIDEO_MEDIATEK_VPU - select VIDEO_MEDIATEK_VCODEC_SCP if MTK_SCP - select V4L2_H264 - select MEDIA_CONTROLLER - select MEDIA_CONTROLLER_REQUEST_API - help - Mediatek video codec driver provides HW capability to - encode and decode in a range of video formats on MT8173 - and MT8183. - - Note that support for MT8173 requires VIDEO_MEDIATEK_VPU to - also be selected. Support for MT8183 depends on MTK_SCP. - - To compile this driver as modules, choose M here: the - modules will be called mtk-vcodec-dec and mtk-vcodec-enc. - -config VIDEO_MEDIATEK_VCODEC_VPU - bool - -config VIDEO_MEDIATEK_VCODEC_SCP - bool - config VIDEO_MEM2MEM_DEINTERLACE tristate "Deinterlace support" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/mtk-vcodec/Kconfig b/drivers/media/plat= form/mtk-vcodec/Kconfig new file mode 100644 index 000000000000..635801a19d55 --- /dev/null +++ b/drivers/media/platform/mtk-vcodec/Kconfig @@ -0,0 +1,36 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_MEDIATEK_VCODEC_SCP + bool + +config VIDEO_MEDIATEK_VCODEC_VPU + bool + +config VIDEO_MEDIATEK_VCODEC + tristate "Mediatek Video Codec driver" + depends on V4L_MEM2MEM_DRIVERS + depends on MTK_IOMMU || COMPILE_TEST + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_MEDIATEK || COMPILE_TEST + depends on VIDEO_MEDIATEK_VPU || MTK_SCP + # The two following lines ensure we have the same state ("m" or "y") as + # our dependencies, to avoid missing symbols during link. + depends on VIDEO_MEDIATEK_VPU || !VIDEO_MEDIATEK_VPU + depends on MTK_SCP || !MTK_SCP + depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=3Dn) + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + select VIDEO_MEDIATEK_VCODEC_VPU if VIDEO_MEDIATEK_VPU + select VIDEO_MEDIATEK_VCODEC_SCP if MTK_SCP + select V4L2_H264 + select MEDIA_CONTROLLER + select MEDIA_CONTROLLER_REQUEST_API + help + Mediatek video codec driver provides HW capability to + encode and decode in a range of video formats on MT8173 + and MT8183. + + Note that support for MT8173 requires VIDEO_MEDIATEK_VPU to + also be selected. Support for MT8183 depends on MTK_SCP. + + To compile this driver as modules, choose M here: the + modules will be called mtk-vcodec-dec and mtk-vcodec-enc. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23758C433F5 for ; Mon, 14 Mar 2022 07:58:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237076AbiCNH7t (ORCPT ); Mon, 14 Mar 2022 03:59:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236972AbiCNH5t (ORCPT ); Mon, 14 Mar 2022 03:57:49 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D141841617; Mon, 14 Mar 2022 00:56:13 -0700 (PDT) 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 sin.source.kernel.org (Postfix) with ESMTPS id 2613DCE10BC; Mon, 14 Mar 2022 07:56:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58969C34119; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=DjiCdyYvB4UUNtqgLi3zsTof0sw84gOhwYX3QCkID5E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fbl2QjB6x4k9dSCUTexsF8ojPBdkwnUmJF1UOKJi1JYjY3fswGScDc/NbOQtuB50Z lwzI1XHXVStHV+F4VUNKtBDypA4YeaSq27lKgxm/VKTdjQxxQynHNzk/UKHoE19wzW Rv5n+YvgzlTdKK6Y2KTHWaDiiM+ngC7wcul1p3J9MK0A5qi9HPbo89qI5y+ma0asoP DIcVC6NLJScB08lVbQrRV55zb8YWVhilIhsS1qVDTaL8iJMsFz4tZ+FbmxSn4jCBva iIz3QapyICklQBzcoiZDPxJYXcHiDduQkvbOuWYgAaVgDPjZcProdnoF5t/NRqbu7q xH9TnxUhZbooA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kVP-4L; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Matthias Brugger , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH 19/64] media: platform: mtk-vpu: move config to its own file Date: Mon, 14 Mar 2022 08:55:11 +0100 Message-Id: <39b3a411ab46bc7fcd5333bad7c5ccd5042bf16e.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place mtk-vpu-specific config stuff on a separate Kconfig file. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 15 +-------------- drivers/media/platform/mtk-vpu/Kconfig | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 drivers/media/platform/mtk-vpu/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index ab7c85613625..39bf4c57e044 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -51,6 +51,7 @@ source "drivers/media/platform/meson/ge2d/Kconfig" source "drivers/media/platform/mtk-jpeg/Kconfig" source "drivers/media/platform/mtk-mdp/Kconfig" source "drivers/media/platform/mtk-vcodec/Kconfig" +source "drivers/media/platform/mtk-vpu/Kconfig" source "drivers/media/platform/omap/Kconfig" =20 source "drivers/media/platform/aspeed/Kconfig" @@ -184,20 +185,6 @@ config VIDEO_TI_CAL_MC =20 # Mem2mem drivers =20 -config VIDEO_MEDIATEK_VPU - tristate "Mediatek Video Processor Unit" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_MEDIATEK || COMPILE_TEST - help - This driver provides downloading VPU firmware and - communicating with VPU. This driver for hw video - codec embedded in Mediatek's MT8173 SOCs. It is able - to handle video decoding/encoding in a range of formats. - - To compile this driver as a module, choose M here: the - module will be called mtk-vpu. - config VIDEO_MEM2MEM_DEINTERLACE tristate "Deinterlace support" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/mtk-vpu/Kconfig b/drivers/media/platfor= m/mtk-vpu/Kconfig new file mode 100644 index 000000000000..df679ea79ed0 --- /dev/null +++ b/drivers/media/platform/mtk-vpu/Kconfig @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config VIDEO_MEDIATEK_VPU + tristate "Mediatek Video Processor Unit" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_MEDIATEK || COMPILE_TEST + help + This driver provides downloading VPU firmware and + communicating with VPU. This driver for hw video + codec embedded in Mediatek's MT8173 SOCs. It is able + to handle video decoding/encoding in a range of formats. + + To compile this driver as a module, choose M here: the + module will be called mtk-vpu. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76294C4332F for ; Mon, 14 Mar 2022 07:57:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237169AbiCNH6W (ORCPT ); Mon, 14 Mar 2022 03:58:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236888AbiCNH5d (ORCPT ); Mon, 14 Mar 2022 03:57:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 467D141334; Mon, 14 Mar 2022 00:56:07 -0700 (PDT) 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 A649961196; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A407C3411B; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=Fu2QaYR91UhyudmnrN7Kp1OM9hZzw1QcW9qki18sK0E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rgnk9YXnvq5Pbffy1mwD1epu/L6GmmSWTy7r7euwSbQEeSp5jBwWI2p65DMRloli1 PJpo1T/S3GGQja8q1Hi83GvK10hpzClJVLAQ9koCYwpJ3i37LQF/ODC7DE2NzRLCAK 75Q9aiJ/nGlgDg+9CKMPEoku/6nRu6qD4X1YJGV0WVPSuOaorvpSbGfx/UKS1YH74O /bP7TsU2eIZ8an4LI2FNxGVxTFOiiwooth5dORFgjvEbTOdwTuM5ql/a019qS8cEc3 2AIbdNkzgRBpUswfP8GwpbnzFxnlBYdqHXNWxUVMn4T1nj1tG/Yuwr+aHmZNtNskMf IY2LK5WbzYbmA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kVT-5V; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Ming Qian , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 20/64] media: platform: omap3isp: move config to its own file Date: Mon, 14 Mar 2022 08:55:12 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place omap3isp-specific config stuff on a separate Kconfig file. Reviewed-by: Laurent Pinchart 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 22 +--------------------- drivers/media/platform/omap3isp/Kconfig | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 drivers/media/platform/omap3isp/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 39bf4c57e044..1dac7a5b53eb 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -52,6 +52,7 @@ source "drivers/media/platform/mtk-jpeg/Kconfig" source "drivers/media/platform/mtk-mdp/Kconfig" source "drivers/media/platform/mtk-vcodec/Kconfig" source "drivers/media/platform/mtk-vpu/Kconfig" +source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/omap/Kconfig" =20 source "drivers/media/platform/aspeed/Kconfig" @@ -68,27 +69,6 @@ config VIDEO_MUX help This driver provides support for N:1 video bus multiplexers. =20 -config VIDEO_OMAP3 - tristate "OMAP 3 Camera support" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && I2C - depends on (ARCH_OMAP3 && OMAP_IOMMU) || COMPILE_TEST - depends on COMMON_CLK && OF - select ARM_DMA_USE_IOMMU if OMAP_IOMMU - select MEDIA_CONTROLLER - select VIDEO_V4L2_SUBDEV_API - select VIDEOBUF2_DMA_CONTIG - select MFD_SYSCON - select V4L2_FWNODE - help - Driver for an OMAP 3 camera controller. - -config VIDEO_OMAP3_DEBUG - bool "OMAP 3 Camera debug messages" - depends on VIDEO_OMAP3 - help - Enable debug messages on OMAP 3 camera controller driver. - source "drivers/media/platform/intel/Kconfig" =20 config VIDEO_QCOM_CAMSS diff --git a/drivers/media/platform/omap3isp/Kconfig b/drivers/media/platfo= rm/omap3isp/Kconfig new file mode 100644 index 000000000000..85f0cf063153 --- /dev/null +++ b/drivers/media/platform/omap3isp/Kconfig @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_OMAP3 + tristate "OMAP 3 Camera support" + depends on V4L_PLATFORM_DRIVERS + depends on VIDEO_V4L2 && I2C + depends on (ARCH_OMAP3 && OMAP_IOMMU) || COMPILE_TEST + depends on COMMON_CLK && OF + select ARM_DMA_USE_IOMMU if OMAP_IOMMU + select MEDIA_CONTROLLER + select VIDEO_V4L2_SUBDEV_API + select VIDEOBUF2_DMA_CONTIG + select MFD_SYSCON + select V4L2_FWNODE + help + Driver for an OMAP 3 camera controller. + +config VIDEO_OMAP3_DEBUG + bool "OMAP 3 Camera debug messages" + depends on VIDEO_OMAP3 + help + Enable debug messages on OMAP 3 camera controller driver. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0630AC433FE for ; Mon, 14 Mar 2022 07:57:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237131AbiCNH67 (ORCPT ); Mon, 14 Mar 2022 03:58:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236895AbiCNH5d (ORCPT ); Mon, 14 Mar 2022 03:57:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE30141337; Mon, 14 Mar 2022 00:56:07 -0700 (PDT) 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 A6D036118A; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A3EAC3411C; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=XUaFqDYZhGEU8/qfIZCkqNqvKYWXcvMw7ZbeHHfwcw0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cRMby9xQDSQT2BQFzxuCJe+vBVycn+pIavkHSHR4J3NXd5qj8kT0V11lSCZxqZbIz m4xKW0XKKAanNaoUy7Agd0M1Mt82gjFKrvdmvu7xpfDWmvgA/baGabskoQk9AqIdP5 ipS0AsIZnHoBDlSPlAMdlEhq1/vn4gep8ltv5wlYvXTESevRue1aGiu8kE4qtJdRlG YvDGaFStV3BW5r1Erdjb10ECVzE+ctNeHTcu5MtF8xu/Ug6HBt2txKM2bxOjzXn4q4 VAdOALX/OGIFQMoHg/3LfuXhF6mAABy2dBxWZiwFfQjQz02ofFZm8QyLF28JipWAOI 4ReuNfITGNJbA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kVX-6k; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Andy Gross , Bjorn Andersson , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Ming Qian , Robert Foss , Todor Tomov , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 21/64] media: platform: camss: move config to its own file Date: Mon, 14 Mar 2022 08:55:13 +0100 Message-Id: <0d112dc9bdd62313de2ffa15a4c669c8cdaa41a6.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place camss-specific config stuff on a separate Kconfig file. Reviewed-by: Robert Foss 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 11 +---------- drivers/media/platform/qcom/camss/Kconfig | 9 +++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 drivers/media/platform/qcom/camss/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 1dac7a5b53eb..b5a1cb0d62c2 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -54,6 +54,7 @@ source "drivers/media/platform/mtk-vcodec/Kconfig" source "drivers/media/platform/mtk-vpu/Kconfig" source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/omap/Kconfig" +source "drivers/media/platform/qcom/camss/Kconfig" =20 source "drivers/media/platform/aspeed/Kconfig" =20 @@ -71,16 +72,6 @@ config VIDEO_MUX =20 source "drivers/media/platform/intel/Kconfig" =20 -config VIDEO_QCOM_CAMSS - tristate "Qualcomm V4L2 Camera Subsystem driver" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 - depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST - select MEDIA_CONTROLLER - select VIDEO_V4L2_SUBDEV_API - select VIDEOBUF2_DMA_SG - select V4L2_FWNODE - config VIDEO_S3C_CAMIF tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/qcom/camss/Kconfig b/drivers/media/plat= form/qcom/camss/Kconfig new file mode 100644 index 000000000000..56be91578706 --- /dev/null +++ b/drivers/media/platform/qcom/camss/Kconfig @@ -0,0 +1,9 @@ +config VIDEO_QCOM_CAMSS + tristate "Qualcomm V4L2 Camera Subsystem driver" + depends on V4L_PLATFORM_DRIVERS + depends on VIDEO_V4L2 + depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST + select MEDIA_CONTROLLER + select VIDEO_V4L2_SUBDEV_API + select VIDEOBUF2_DMA_SG + select V4L2_FWNODE --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77A0CC433F5 for ; Mon, 14 Mar 2022 07:58:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237276AbiCNH7W (ORCPT ); Mon, 14 Mar 2022 03:59:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236922AbiCNH5f (ORCPT ); Mon, 14 Mar 2022 03:57:35 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D39F4133B; Mon, 14 Mar 2022 00:56:11 -0700 (PDT) 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 CD9C5B80D49; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72F04C3411D; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=hLXlZDsANXrQDNOF5BHnehyTUuhg/sL1AnjnfHoobO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hKbkseoZgTmkhbIJDaWcYf0/bwJI1XXMSGfndwA3bQXcYcpzWuC0nsMjDHaHK1iC6 i0SVyJ2/OporjtuQHSTVbhlKzICmv7Y5sCZCuoyA2MaK+iwqCT7kGX2SPU+l/XrWrw Kz1y7icf0LDivII0qPHbz9EzR7mBOZmAy/K8XP0YgHASQTilHtNPtRqxTMoF+SwXFa zSE/jZbUny9/UwfPX38j4hyv62istqngymjyOtSyq2vY6MEuAgl1MQbYmTerLEAbu1 jfP17lEEnXa9CbTHbFdmnRIjJeVxIKP7oQNMlR6Qz95MoWXqwmHaI9XbQ+KVe23k6r O9+zwZK0o7iFA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kVb-7u; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Andy Gross , Bjorn Andersson , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Ming Qian , Stanimir Varbanov , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 22/64] media: platform: venus: move config to its own file Date: Mon, 14 Mar 2022 08:55:14 +0100 Message-Id: <54e5d62d97b01544d78619605eebe533993bb2fb.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place venus-specific config stuff on a separate Kconfig file. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 16 +--------------- drivers/media/platform/qcom/venus/Kconfig | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 drivers/media/platform/qcom/venus/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index b5a1cb0d62c2..5a8495338fd4 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -55,6 +55,7 @@ source "drivers/media/platform/mtk-vpu/Kconfig" source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/qcom/camss/Kconfig" +source "drivers/media/platform/qcom/venus/Kconfig" =20 source "drivers/media/platform/aspeed/Kconfig" =20 @@ -319,21 +320,6 @@ config VIDEO_TI_VPE_DEBUG help Enable debug messages on VPE driver. =20 -config VIDEO_QCOM_VENUS - tristate "Qualcomm Venus V4L2 encoder/decoder driver" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 && QCOM_SMEM - depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST - select QCOM_MDT_LOADER if ARCH_QCOM - select QCOM_SCM - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - This is a V4L2 driver for Qualcomm Venus video accelerator - hardware. It accelerates encoding and decoding operations - on various Qualcomm SoCs. - To compile this driver as a module choose m here. - config VIDEO_SUN8I_DEINTERLACE tristate "Allwinner Deinterlace driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/qcom/venus/Kconfig b/drivers/media/plat= form/qcom/venus/Kconfig new file mode 100644 index 000000000000..de0fe3f7be5f --- /dev/null +++ b/drivers/media/platform/qcom/venus/Kconfig @@ -0,0 +1,14 @@ +config VIDEO_QCOM_VENUS + tristate "Qualcomm Venus V4L2 encoder/decoder driver" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 && QCOM_SMEM + depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST + select QCOM_MDT_LOADER if ARCH_QCOM + select QCOM_SCM + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + This is a V4L2 driver for Qualcomm Venus video accelerator + hardware. It accelerates encoding and decoding operations + on various Qualcomm SoCs. + To compile this driver as a module choose m here. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DC32C433F5 for ; Mon, 14 Mar 2022 07:57:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237050AbiCNH7F (ORCPT ); Mon, 14 Mar 2022 03:59:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236896AbiCNH5d (ORCPT ); Mon, 14 Mar 2022 03:57:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4503F41322; Mon, 14 Mar 2022 00:56:10 -0700 (PDT) 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 D9AB16119B; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FEF2C340EE; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=6BUbVqnuPFKm+gmmzwY62mB7iIjzgP9HCglqzjZpSPY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p+Cw2dHevoUuB3RTNfqolAAOXmDhCDCpDWxQXBAiB62P2lDEIY+ogMBm/bQX6Hpop vwroXY//vY1JyCPaK8312GNyd8F7GnMqFcBbrNHQmO1LQUQsM4SNctrJJcLMboElnI 4HQwTbNyww5tNUmshXsB57bLvEHgqkF7afiiHI2Bx45wyp5U9ybvnNUBXInVtv454d 6ztYNecLjgklqqwnSRKGKnUvlPbJ+9YnaTzvQ9AvuW/VztYX8d4JQeurUyQ3wXD/l0 EYDcwDEpDP1pE4NiruCwOAjABC3AxL7XaQ5DHWhR/mLu/4n4ukvyIHCGkazSGaS7AP heDs8OADKe+kA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kVf-95; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Ezequiel Garcia , Hans Verkuil , Heiko Stuebner , Jacob Chen , Jernej Skrabec , Laurent Pinchart , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH 23/64] media: platform: rga: move config to its own file Date: Mon, 14 Mar 2022 08:55:15 +0100 Message-Id: <933414df8ef8eac392a17fb759f79a3ef650a60c.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place rga-specific config stuff on a separate Kconfig file. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 16 +--------------- drivers/media/platform/rockchip/rga/Kconfig | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 drivers/media/platform/rockchip/rga/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 5a8495338fd4..314e25dd7ca1 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -58,6 +58,7 @@ source "drivers/media/platform/qcom/camss/Kconfig" source "drivers/media/platform/qcom/venus/Kconfig" =20 source "drivers/media/platform/aspeed/Kconfig" +source "drivers/media/platform/rockchip/rga/Kconfig" =20 config VIDEO_MUX tristate "Video Multiplexer" @@ -284,21 +285,6 @@ config VIDEO_STM32_DMA2D The STM32 DMA2D is a memory-to-memory engine for pixel conversion and specialized DMA dedicated to image manipulation. =20 -config VIDEO_ROCKCHIP_RGA - tristate "Rockchip Raster 2d Graphic Acceleration Unit" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_ROCKCHIP || COMPILE_TEST - select VIDEOBUF2_DMA_SG - select V4L2_MEM2MEM_DEV - help - This is a v4l2 driver for Rockchip SOC RGA 2d graphics accelerator. - Rockchip RGA is a separate 2D raster graphic acceleration unit. - It accelerates 2D graphics operations, such as point/line drawing, - image scaling, rotation, BitBLT, alpha blending and image blur/sharpnes= s. - - To compile this driver as a module choose m here. - config VIDEO_TI_VPE tristate "TI VPE (Video Processing Engine) driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/rockchip/rga/Kconfig b/drivers/media/pl= atform/rockchip/rga/Kconfig new file mode 100644 index 000000000000..0106cc8a93a7 --- /dev/null +++ b/drivers/media/platform/rockchip/rga/Kconfig @@ -0,0 +1,14 @@ +config VIDEO_ROCKCHIP_RGA + tristate "Rockchip Raster 2d Graphic Acceleration Unit" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_ROCKCHIP || COMPILE_TEST + select VIDEOBUF2_DMA_SG + select V4L2_MEM2MEM_DEV + help + This is a v4l2 driver for Rockchip SOC RGA 2d graphics accelerator. + Rockchip RGA is a separate 2D raster graphic acceleration unit. + It accelerates 2D graphics operations, such as point/line drawing, + image scaling, rotation, BitBLT, alpha blending and image blur/sharpnes= s. + + To compile this driver as a module choose m here. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5CB1C433FE for ; Mon, 14 Mar 2022 07:57:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237052AbiCNH6q (ORCPT ); Mon, 14 Mar 2022 03:58:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236894AbiCNH5d (ORCPT ); Mon, 14 Mar 2022 03:57:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8FD241338; Mon, 14 Mar 2022 00:56:07 -0700 (PDT) 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 D6FCE61198; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85B63C341C4; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=sSv0mD+ufRV8ZFuW7I2o0vKEQZ3EMPLVPgUWIaoyAno=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mzHk54JklHrOlCZwMtcKqQ/3UpVax0QcnzfgrUdXRBHvkOUqYQF76PKI7RzdJ0Cl6 LjwDXFoq6WfHJxyvNd+Bn/Fi5jZ3hnXmX4+62U6omOODCc25xwP/8T69faIZaC0xNa HAKZx+whwtc3BzWqGAGrtIBZMaSRvDbVmIyCH+Ou5MqdU4U8ErT/3+pa4R/A0xcv0C AgvG/AEvubiYZ6ZlBd2TgFAicmeYoHgplLrZ4ssijoM5pEmr30zInB5/U767X49c4G g6+DDTztZytC+3Qjfk9Oyai4FLu483lPY5h320NYi57/f9/MNPI8dU9bPINwxJEwZZ ALCzcN1HL+3dA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kVj-AP; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Ming Qian , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 24/64] media: platform: s3c-camif: move config to its own file Date: Mon, 14 Mar 2022 08:55:16 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place s3c-camif-specific config stuff on a separate Kconfig file. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 16 +--------------- drivers/media/platform/s3c-camif/Kconfig | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 drivers/media/platform/s3c-camif/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 314e25dd7ca1..9fe01afd4145 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -59,6 +59,7 @@ source "drivers/media/platform/qcom/venus/Kconfig" =20 source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/rockchip/rga/Kconfig" +source "drivers/media/platform/s3c-camif/Kconfig" =20 config VIDEO_MUX tristate "Video Multiplexer" @@ -74,21 +75,6 @@ config VIDEO_MUX =20 source "drivers/media/platform/intel/Kconfig" =20 -config VIDEO_S3C_CAMIF - tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && I2C && PM - depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST - select MEDIA_CONTROLLER - select VIDEO_V4L2_SUBDEV_API - select VIDEOBUF2_DMA_CONTIG - help - This is a v4l2 driver for s3c24xx and s3c64xx SoC series camera - host interface (CAMIF). - - To compile this driver as a module, choose M here: the module - will be called s3c-camif. - config VIDEO_STM32_DCMI tristate "STM32 Digital Camera Memory Interface (DCMI) support" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/s3c-camif/Kconfig b/drivers/media/platf= orm/s3c-camif/Kconfig new file mode 100644 index 000000000000..e8ef9e06dc1b --- /dev/null +++ b/drivers/media/platform/s3c-camif/Kconfig @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_S3C_CAMIF + tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver" + depends on V4L_PLATFORM_DRIVERS + depends on VIDEO_V4L2 && I2C && PM + depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST + select MEDIA_CONTROLLER + select VIDEO_V4L2_SUBDEV_API + select VIDEOBUF2_DMA_CONTIG + help + This is a v4l2 driver for s3c24xx and s3c64xx SoC series camera + host interface (CAMIF). + + To compile this driver as a module, choose M here: the module + will be called s3c-camif. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 055BDC433F5 for ; Mon, 14 Mar 2022 08:01:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237097AbiCNICF (ORCPT ); Mon, 14 Mar 2022 04:02:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236921AbiCNH5f (ORCPT ); Mon, 14 Mar 2022 03:57:35 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D37E4133D; Mon, 14 Mar 2022 00:56:11 -0700 (PDT) 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 ED820B80D50; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8AAEAC36AE9; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=GnE8f84XYDrMP2zLhIQhx16WAZQLX/XeXHJvY3cO3vc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EOf62xOIC/sw0a0bFUaGgH+uyhGsGDYaaiE29qTxH6FtTc+L9KVLN0XuzbOIzuawj 54LgcPWfRTLkZyLxs9hscx5mSV0fr/hN/ut3le8fQQaFzzfEjR9R1RR4mFXOgHrVjh FKEgB1GYHpdn9kK04WLRTeNeUbHKyUOcZxnjWogiXT/6YVzH1abpo0PmGV6wQDWl1N 1Pe9KS5bO8BNzSBhN8Z6tJGJJ4Cqs8DPq0VQrXggnM+F5xS/kD5Ut8N16E6nhHGulO AFdySk+n5h9c3mdcgxMkJlaSAbYDCLsA8pjtOM2R+7vpYkAhBe4GatPJRoVDrN7s3Z y4jXdreS9ADlw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kVn-Ba; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Ming Qian , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 25/64] media: platform: s5p-g2d: move config to its own file Date: Mon, 14 Mar 2022 08:55:17 +0100 Message-Id: <0e154ddbe90870c0a0a5f62f18fa6109023cb260.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place s5p-g2d-specific config stuff on a separate Kconfig file. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 11 +---------- drivers/media/platform/s5p-g2d/Kconfig | 11 +++++++++++ 2 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 drivers/media/platform/s5p-g2d/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 9fe01afd4145..0b88c36e8a83 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -60,6 +60,7 @@ source "drivers/media/platform/qcom/venus/Kconfig" source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/rockchip/rga/Kconfig" source "drivers/media/platform/s3c-camif/Kconfig" +source "drivers/media/platform/s5p-g2d/Kconfig" =20 config VIDEO_MUX tristate "Video Multiplexer" @@ -154,16 +155,6 @@ config VIDEO_MEM2MEM_DEINTERLACE help Generic deinterlacing V4L2 driver. =20 -config VIDEO_SAMSUNG_S5P_G2D - tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - This is a v4l2 driver for Samsung S5P and EXYNOS4 G2D - 2d graphics accelerator. =20 config VIDEO_SAMSUNG_S5P_JPEG tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver" diff --git a/drivers/media/platform/s5p-g2d/Kconfig b/drivers/media/platfor= m/s5p-g2d/Kconfig new file mode 100644 index 000000000000..9bc9d90a666a --- /dev/null +++ b/drivers/media/platform/s5p-g2d/Kconfig @@ -0,0 +1,11 @@ +config VIDEO_SAMSUNG_S5P_G2D + tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + This is a v4l2 driver for Samsung S5P and EXYNOS4 G2D + 2d graphics accelerator. + --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99A29C433FE for ; Mon, 14 Mar 2022 08:01:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234859AbiCNICN (ORCPT ); Mon, 14 Mar 2022 04:02:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236920AbiCNH5f (ORCPT ); Mon, 14 Mar 2022 03:57:35 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B3DE4133A; Mon, 14 Mar 2022 00:56:11 -0700 (PDT) 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 E7C9AB80D4E; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87C78C3411E; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=N70UEj+Gv/zoVLq5oMy0Vtm3y4d2BgX4yy7v9Brft60=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cR3hZcZp80e6WqaarkF/n2ScBBYimVs5alVhR2EH/b8vcSayV4SluoMurLEfauDWd eif8hedWBIcx5CbI4P+A19rCTa3MsGdAObF9LVxOftPa+a3+zqrc7CR3wgO8WfmbQl N/j/0JK8yrVX7NNUYeVl+bDgq+YQQ3wOg77UzjemKXlxjNXGbqGUngqWfL8nw/gAY5 li12Jdg1n5J+g4R9PXMScOFpxZxe3ljgIIA8GqF1qSQ/zQ4BmHcOQyRXh8NV/wshIx oLtDDrUSt7t5KB32xSY3z7gHaDW803mEyo+P61J5XqF4RTb5KOJptIIf9pai2WVREY w+2ZgCRlD11vw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kVr-Co; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jean-Christophe Trotin , Jernej Skrabec , Laurent Pinchart , Ming Qian , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 26/64] media: platform: hva: move config to its own file Date: Mon, 14 Mar 2022 08:55:18 +0100 Message-Id: <72896146f418efb8f6b29ba4c8f884b5008e71ab.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place hva-specific config stuff on a separate Kconfig file. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 28 +------------------------- drivers/media/platform/sti/hva/Kconfig | 26 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 drivers/media/platform/sti/hva/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 0b88c36e8a83..9408096a365e 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -61,6 +61,7 @@ source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/rockchip/rga/Kconfig" source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" +source "drivers/media/platform/sti/hva/Kconfig" =20 config VIDEO_MUX tristate "Video Multiplexer" @@ -186,33 +187,6 @@ config VIDEO_STI_BDISP help This v4l2 mem2mem driver is a 2D blitter for STMicroelectronics SoC. =20 -config VIDEO_STI_HVA - tristate "STMicroelectronics HVA multi-format video encoder V4L2 driver" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_STI || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - This V4L2 driver enables HVA (Hardware Video Accelerator) multi-format - video encoder of STMicroelectronics SoC, allowing hardware encoding of - raw uncompressed formats in various compressed video bitstreams format. - - To compile this driver as a module, choose M here: - the module will be called st-hva. - -config VIDEO_STI_HVA_DEBUGFS - bool "Export STMicroelectronics HVA internals in debugfs" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_STI_HVA - depends on DEBUG_FS - help - Select this to see information about the internal state and the last - operation of STMicroelectronics HVA multi-format video encoder in - debugfs. - - Choose N unless you know you need this. - config VIDEO_STI_DELTA tristate "STMicroelectronics DELTA multi-format video decoder V4L2 driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/sti/hva/Kconfig b/drivers/media/platfor= m/sti/hva/Kconfig new file mode 100644 index 000000000000..5651667bcc54 --- /dev/null +++ b/drivers/media/platform/sti/hva/Kconfig @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_STI_HVA + tristate "STMicroelectronics HVA multi-format video encoder V4L2 driver" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_STI || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + This V4L2 driver enables HVA (Hardware Video Accelerator) multi-format + video encoder of STMicroelectronics SoC, allowing hardware encoding of + raw uncompressed formats in various compressed video bitstreams format. + + To compile this driver as a module, choose M here: + the module will be called st-hva. + +config VIDEO_STI_HVA_DEBUGFS + bool "Export STMicroelectronics HVA internals in debugfs" + depends on VIDEO_STI_HVA + depends on DEBUG_FS + help + Select this to see information about the internal state and the last + operation of STMicroelectronics HVA multi-format video encoder in + debugfs. + + Choose N unless you know you need this. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F803C433EF for ; Mon, 14 Mar 2022 08:01:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237261AbiCNIC0 (ORCPT ); Mon, 14 Mar 2022 04:02:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236911AbiCNH5f (ORCPT ); Mon, 14 Mar 2022 03:57:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D68341323; Mon, 14 Mar 2022 00:56:10 -0700 (PDT) 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 110346119F; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95A7CC341C5; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=XwnuOMWav2wW/mQwSdrIlV80W2cHb8kKIf2vvbnpLzI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I5Taxlo+xgcPzJLl100gM8UdADsNRnBhb2WuH0paD1ngi3Kb440eMM4K//WBzoMVM ecOKhojeQxuT/AYzVGulO8H8qPuaGd9nyXb3lmqeIgif0wR+/pVv24vDrQUhta7krQ d2gKB8TlzItHuC94BuyeOngpatFI0RQJUl/jYIs1YZMFY7AwLNwcJTc6LzKuZ1tLey y51qxYQsP2kfhXlXZDEUNaT5Xpa8oidLFlSkKT7ruMvKInW5JyQMNG6G9ubuMh6a0g f2IQURv8iQIMhg4E9f8SIEaL9zb8HtXSdB9HkhOB+Z3JtNUO6eXzGBSs151Jr9u+dy gFwkG/gyqbZPg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kVv-E1; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Alexandre Torgue , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Maxime Coquelin , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH 27/64] media: platform: stm32: move config to its own file Date: Mon, 14 Mar 2022 08:55:19 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place stm32-specific config stuff on a separate Kconfig file. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 29 +------------------------- drivers/media/platform/stm32/Kconfig | 31 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 28 deletions(-) create mode 100644 drivers/media/platform/stm32/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 9408096a365e..b14a0fc78f41 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -62,6 +62,7 @@ source "drivers/media/platform/rockchip/rga/Kconfig" source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/sti/hva/Kconfig" +source "drivers/media/platform/stm32/Kconfig" =20 config VIDEO_MUX tristate "Video Multiplexer" @@ -77,21 +78,6 @@ config VIDEO_MUX =20 source "drivers/media/platform/intel/Kconfig" =20 -config VIDEO_STM32_DCMI - tristate "STM32 Digital Camera Memory Interface (DCMI) support" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && OF - depends on ARCH_STM32 || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - select MEDIA_CONTROLLER - select V4L2_FWNODE - help - This module makes the STM32 Digital Camera Memory Interface (DCMI) - available as a v4l2 device. - - To compile this driver as a module, choose M here: the module - will be called stm32-dcmi. - config VIDEO_ROCKCHIP_ISP1 tristate "Rockchip Image Signal Processing v1 Unit driver" depends on V4L_PLATFORM_DRIVERS @@ -223,19 +209,6 @@ config VIDEO_STI_DELTA_DRIVER select V4L2_MEM2MEM_DEV select RPMSG =20 -config VIDEO_STM32_DMA2D - tristate "STM32 Chrom-Art Accelerator (DMA2D)" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_STM32 || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - Enables DMA2D hardware support on stm32. - - The STM32 DMA2D is a memory-to-memory engine for pixel conversion - and specialized DMA dedicated to image manipulation. - config VIDEO_TI_VPE tristate "TI VPE (Video Processing Engine) driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/stm32/Kconfig b/drivers/media/platform/= stm32/Kconfig new file mode 100644 index 000000000000..60b87e403c7c --- /dev/null +++ b/drivers/media/platform/stm32/Kconfig @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: GPL-2.0-only + +# V4L drivers +config VIDEO_STM32_DCMI + tristate "STM32 Digital Camera Memory Interface (DCMI) support" + depends on V4L_PLATFORM_DRIVERS + depends on VIDEO_V4L2 && OF + depends on ARCH_STM32 || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + select MEDIA_CONTROLLER + select V4L2_FWNODE + help + This module makes the STM32 Digital Camera Memory Interface (DCMI) + available as a v4l2 device. + + To compile this driver as a module, choose M here: the module + will be called stm32-dcmi. + +# Mem2mem drivers +config VIDEO_STM32_DMA2D + tristate "STM32 Chrom-Art Accelerator (DMA2D)" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_STM32 || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + Enables DMA2D hardware support on stm32. + + The STM32 DMA2D is a memory-to-memory engine for pixel conversion + and specialized DMA dedicated to image manipulation. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68E8BC433EF for ; Mon, 14 Mar 2022 08:00:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237407AbiCNIBw (ORCPT ); Mon, 14 Mar 2022 04:01:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236927AbiCNH5f (ORCPT ); Mon, 14 Mar 2022 03:57:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2273D41607; Mon, 14 Mar 2022 00:56:13 -0700 (PDT) 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 764A7611B4; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AB474C341D1; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=Vz+BNDVCMkUqNoeBahQBmdpDJIgiMkHbeANCKv0QpZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jYnrlwylQkjjeV2b007Gwqjhj78n9Lkz5tMsJubLKp9NGgliouHzbf07qorx/tuJm OS0h6WMFnSLvkF5CaVmAKCpUhPGvXPAP9DLd69ENRegLMf74YasWmvJ74A6Jc60uHz WzjiLJyc0rqNOQ7fIWgJMukopK5KG1xT8Kbw+0CGXpVJvbNhvK2pY19w0iRZNjWUon kKA6KnW1EstBSCUxq/WeIKrRgdZVLX+jadvg27F+NxtBBeayWbvtaD7BhwLEq4Ke3s RvT7BwL9EXiW7PtzgP+dI2J89EgxLqpLmXFZyXMPFsl6AjmWb0zba0TU86nRl5+rLX S6/por7j9bwsQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kVz-FE; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Chen-Yu Tsai , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Maxime Ripard , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 28/64] media: platform: sun8i-di: move config to its own file Date: Mon, 14 Mar 2022 08:55:20 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place sun8i-di-specific config stuff on a separate Kconfig file. Acked-by: Jernej Skrabec 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 15 +-------------- drivers/media/platform/sunxi/sun8i-di/Kconfig | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 drivers/media/platform/sunxi/sun8i-di/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index b14a0fc78f41..61f8a8fae109 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -63,6 +63,7 @@ source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/sti/hva/Kconfig" source "drivers/media/platform/stm32/Kconfig" +source "drivers/media/platform/sunxi/sun8i-di/Kconfig" =20 config VIDEO_MUX tristate "Video Multiplexer" @@ -230,20 +231,6 @@ config VIDEO_TI_VPE_DEBUG help Enable debug messages on VPE driver. =20 -config VIDEO_SUN8I_DEINTERLACE - tristate "Allwinner Deinterlace driver" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_SUNXI || COMPILE_TEST - depends on COMMON_CLK && OF - depends on PM - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - Support for the Allwinner deinterlace unit with scaling - capability found on some SoCs, like H3. - To compile this driver as a module choose m here. - config VIDEO_SUN8I_ROTATE tristate "Allwinner DE2 rotation driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/sunxi/sun8i-di/Kconfig b/drivers/media/= platform/sunxi/sun8i-di/Kconfig new file mode 100644 index 000000000000..8d762e664d45 --- /dev/null +++ b/drivers/media/platform/sunxi/sun8i-di/Kconfig @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_SUN8I_DEINTERLACE + tristate "Allwinner Deinterlace driver" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_SUNXI || COMPILE_TEST + depends on COMMON_CLK && OF + depends on PM + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + Support for the Allwinner deinterlace unit with scaling + capability found on some SoCs, like H3. + To compile this driver as a module choose m here. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47FEFC433FE for ; Mon, 14 Mar 2022 07:58:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237060AbiCNH7K (ORCPT ); Mon, 14 Mar 2022 03:59:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236910AbiCNH5f (ORCPT ); Mon, 14 Mar 2022 03:57:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81C8241325; Mon, 14 Mar 2022 00:56:10 -0700 (PDT) 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 26105611A3; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AEDD2C341D2; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=WBtHf6ExXzuB6KSU1sK3PjMZJI9ghSITOXYKqgFchJo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uR8n+DJaI7Ac7JMYksMnZvkElC+NvOdhmGQTehFoRNSayyfBg7nIe/7S7rob80dkE 0PkJ+vtpd4dWrHItpKUVj/QrFFeIKrrP2H0gq8OiUbzuiGjzUzSua5m3gG7/Wvvjgl o0rgJJfEs/1hSswyMXT0jJUlBO9papXlwY0q+34wivxVdgfDurmInUhEqML4NtIQSX 7kT3Psqpzq7FfD3NMU/xcgewWrCHDF194PvcBaChmSZMttgnsCquY7W7E7fhb4+aRS 8F+8AWPvRxzhkqDzDVS2huTo2J0YVbqrYIwO5PGM3S3zbtYtptVhMWo5S0DEE5Tifh 4EyuYKzSMtAgA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kW3-GP; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Chen-Yu Tsai , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Maxime Ripard , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 29/64] media: platform: sun8i-rotate: move config to its own file Date: Mon, 14 Mar 2022 08:55:21 +0100 Message-Id: <9cb1837b50eeacf4eb816dc19ad3b2ad5c2d93b4.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place sun8i-rotate-specific config stuff on a separate Kconfig file. Acked-by: Jernej Skrabec 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 14 +------------- drivers/media/platform/sunxi/sun8i-rotate/Kconfig | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 drivers/media/platform/sunxi/sun8i-rotate/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 61f8a8fae109..224ebe4f5348 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -64,6 +64,7 @@ source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/sti/hva/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/sunxi/sun8i-di/Kconfig" +source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig" =20 config VIDEO_MUX tristate "Video Multiplexer" @@ -231,19 +232,6 @@ config VIDEO_TI_VPE_DEBUG help Enable debug messages on VPE driver. =20 -config VIDEO_SUN8I_ROTATE - tristate "Allwinner DE2 rotation driver" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_SUNXI || COMPILE_TEST - depends on COMMON_CLK && OF - depends on PM - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - Support for the Allwinner DE2 rotation unit. - To compile this driver as a module choose m here. - config VIDEO_TEGRA_VDE tristate "NVIDIA Tegra Video Decoder Engine driver" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/sunxi/sun8i-rotate/Kconfig b/drivers/me= dia/platform/sunxi/sun8i-rotate/Kconfig new file mode 100644 index 000000000000..64a8ea76e917 --- /dev/null +++ b/drivers/media/platform/sunxi/sun8i-rotate/Kconfig @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config VIDEO_SUN8I_ROTATE + tristate "Allwinner DE2 rotation driver" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_SUNXI || COMPILE_TEST + depends on COMMON_CLK && OF + depends on PM + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + Support for the Allwinner DE2 rotation unit. + To compile this driver as a module choose m here. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9A03CC433EF for ; Mon, 14 Mar 2022 08:00:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237396AbiCNIBr (ORCPT ); Mon, 14 Mar 2022 04:01:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236811AbiCNH5t (ORCPT ); Mon, 14 Mar 2022 03:57:49 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C73041609; Mon, 14 Mar 2022 00:56:13 -0700 (PDT) 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 2C0CA611A6; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7907C341D3; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=2U8aTKa34RibPN+qYN5jqh/sklMFMlcnaycXqtFcGnU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WfSJDhQvqZiLDSlQQ8GmCB5e66/danVVbnJaz469/5iHc7SNJ1KsmltVnq06la8a2 PBkCb+yMhNYNipno5tKmUn0pNb2XNu/9tRMAFsFQD6Ps4vM8vuP2njH/83VrbSaFGw svLmUbgirg4HyxM6sqnR8AI3zIoD2h0a3MEjxHVCliTx3aYaOvwLHE3TU6xsUOpAT7 AQ66/7H+ePeALyZC1q9mh6jdwM8ZCG199FgsGisrmxN80UmZz1MMb7GJfTZ2efem63 4AtvEBJFCwfZcaxlShhUq7aY6WSH33ak6F5GH1ccEaVPO4haW27C4+VvrnoU29lqcs fhiv/mGLtcB2Q== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kW7-Hf; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Jonathan Hunter , Laurent Pinchart , Ming Qian , Thierry Reding , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH 30/64] media: platform: vde: move config to its own file Date: Mon, 14 Mar 2022 08:55:22 +0100 Message-Id: <0a7199a8bf4f31da0281e3578138c78ddadbd5fc.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place vde-specific config stuff on a separate Kconfig file. Acked-by: Dmitry Osipenko 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 19 +------------------ drivers/media/platform/tegra/vde/Kconfig | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 drivers/media/platform/tegra/vde/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 224ebe4f5348..b0acbf3ccb69 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -65,6 +65,7 @@ source "drivers/media/platform/sti/hva/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/sunxi/sun8i-di/Kconfig" source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig" +source "drivers/media/platform/tegra/vde/Kconfig" =20 config VIDEO_MUX tristate "Video Multiplexer" @@ -232,24 +233,6 @@ config VIDEO_TI_VPE_DEBUG help Enable debug messages on VPE driver. =20 -config VIDEO_TEGRA_VDE - tristate "NVIDIA Tegra Video Decoder Engine driver" - depends on V4L_MEM2MEM_DRIVERS - depends on ARCH_TEGRA || COMPILE_TEST - depends on VIDEO_DEV && VIDEO_V4L2 - select DMA_SHARED_BUFFER - select IOMMU_IOVA - select MEDIA_CONTROLLER - select MEDIA_CONTROLLER_REQUEST_API - select SRAM - select VIDEOBUF2_DMA_CONTIG - select VIDEOBUF2_DMA_SG - select V4L2_H264 - select V4L2_MEM2MEM_DEV - help - Support for the NVIDIA Tegra video decoder unit. - To compile this driver as a module choose m here. - # TI VIDEO PORT Helper Modules # These will be selected by VPE and VIP config VIDEO_TI_VPDMA diff --git a/drivers/media/platform/tegra/vde/Kconfig b/drivers/media/platf= orm/tegra/vde/Kconfig new file mode 100644 index 000000000000..584b78d8d66c --- /dev/null +++ b/drivers/media/platform/tegra/vde/Kconfig @@ -0,0 +1,17 @@ +config VIDEO_TEGRA_VDE + tristate "NVIDIA Tegra Video Decoder Engine driver" + depends on V4L_MEM2MEM_DRIVERS + depends on ARCH_TEGRA || COMPILE_TEST + depends on VIDEO_DEV && VIDEO_V4L2 + select DMA_SHARED_BUFFER + select IOMMU_IOVA + select MEDIA_CONTROLLER + select MEDIA_CONTROLLER_REQUEST_API + select SRAM + select VIDEOBUF2_DMA_CONTIG + select VIDEOBUF2_DMA_SG + select V4L2_H264 + select V4L2_MEM2MEM_DEV + help + Support for the NVIDIA Tegra video decoder unit. + To compile this driver as a module choose m here. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 084ACC433F5 for ; Mon, 14 Mar 2022 07:58:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237308AbiCNH7f (ORCPT ); Mon, 14 Mar 2022 03:59:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236969AbiCNH5t (ORCPT ); Mon, 14 Mar 2022 03:57:49 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C6A641613; Mon, 14 Mar 2022 00:56:13 -0700 (PDT) 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 91D36611C2; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2BCEC341D6; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=6vh0NW6pE/2yG8lmami/Y4MhdJpgdS+SQOdsp7VPBLE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bR6mhUN/1sdixB4g8PBmSz93GIE2zz8DNt362WNv2pGGNfHosVbyjtIVG65C7pej7 5gZay5vLuOq5IJykWfNw9rKns2ef0HsX+m5VGbRlC52W4a+Xmz7l5V3qIOdCZ8hviG JXnhMjMbTDpCKHTCI4hdI8SRymT7Asn6G3Bt0BjgGR2D0WEXhefzehOgL2FTydgnDL 79Lh+/+S827bz4dq4CII03IZe5lGGTybKz/2ZB1xFTVM4/14Ky+ejx0Jomp95zYP02 nsX0UWeVukTse8rQLp0ihXRNU8YaPhL1dmN+ZOOG1eGtt9zdS+/t3u9gILbAmkLXlY NlMIC2R6uyLPw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kWB-Iq; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Ming Qian , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 31/64] media: platform: ti-vpe: move config to its own file Date: Mon, 14 Mar 2022 08:55:23 +0100 Message-Id: <12666f5d61d1232d17721f97d4cbe84a33bb4534.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place ti-vpe-specific config stuff on a separate Kconfig file. Reviewed-by: Laurent Pinchart 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 60 +------------------------- drivers/media/platform/ti-vpe/Kconfig | 62 +++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 59 deletions(-) create mode 100644 drivers/media/platform/ti-vpe/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index b0acbf3ccb69..228881ae0d22 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -66,6 +66,7 @@ source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/sunxi/sun8i-di/Kconfig" source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig" source "drivers/media/platform/tegra/vde/Kconfig" +source "drivers/media/platform/ti-vpe/Kconfig" =20 config VIDEO_MUX tristate "Video Multiplexer" @@ -106,33 +107,6 @@ source "drivers/media/platform/xilinx/Kconfig" source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/sunxi/Kconfig" =20 -config VIDEO_TI_CAL - tristate "TI CAL (Camera Adaptation Layer) driver" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - select MEDIA_CONTROLLER - select VIDEO_V4L2_SUBDEV_API - depends on SOC_DRA7XX || ARCH_K3 || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - select V4L2_FWNODE - help - Support for the TI CAL (Camera Adaptation Layer) block - found on DRA72X SoC. - In TI Technical Reference Manual this module is referred as - Camera Interface Subsystem (CAMSS). - -config VIDEO_TI_CAL_MC - bool "Media Controller centric mode by default" - depends on VIDEO_TI_CAL - default n - help - Enables Media Controller centric mode by default. - - If set, CAL driver will start in Media Controller mode by - default. Note that this behavior can be overridden via - module parameter 'mc_api'. - - # Mem2mem drivers =20 config VIDEO_MEM2MEM_DEINTERLACE @@ -212,37 +186,5 @@ config VIDEO_STI_DELTA_DRIVER select V4L2_MEM2MEM_DEV select RPMSG =20 -config VIDEO_TI_VPE - tristate "TI VPE (Video Processing Engine) driver" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on SOC_DRA7XX || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - select VIDEO_TI_VPDMA - select VIDEO_TI_SC - select VIDEO_TI_CSC - help - Support for the TI VPE(Video Processing Engine) block - found on DRA7XX SoC. - -config VIDEO_TI_VPE_DEBUG - bool "VPE debug messages" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_TI_VPE - help - Enable debug messages on VPE driver. - -# TI VIDEO PORT Helper Modules -# These will be selected by VPE and VIP -config VIDEO_TI_VPDMA - tristate - -config VIDEO_TI_SC - tristate - -config VIDEO_TI_CSC - tristate - # DVB platform drivers source "drivers/media/platform/sti/c8sectpfe/Kconfig" diff --git a/drivers/media/platform/ti-vpe/Kconfig b/drivers/media/platform= /ti-vpe/Kconfig new file mode 100644 index 000000000000..a9ee0189f2f2 --- /dev/null +++ b/drivers/media/platform/ti-vpe/Kconfig @@ -0,0 +1,62 @@ +# SPDX-License-Identifier: GPL-2.0-only + +# TI VIDEO PORT Helper Modules +# These will be selected by VPE and VIP +config VIDEO_TI_VPDMA + tristate + +config VIDEO_TI_SC + tristate + +config VIDEO_TI_CSC + tristate + +# V4L drivers + +config VIDEO_TI_CAL + tristate "TI CAL (Camera Adaptation Layer) driver" + depends on VIDEO_DEV && VIDEO_V4L2 + depends on V4L_PLATFORM_DRIVERS + select MEDIA_CONTROLLER + select VIDEO_V4L2_SUBDEV_API + depends on SOC_DRA7XX || ARCH_K3 || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + select V4L2_FWNODE + help + Support for the TI CAL (Camera Adaptation Layer) block + found on DRA72X SoC. + In TI Technical Reference Manual this module is referred as + Camera Interface Subsystem (CAMSS). + +config VIDEO_TI_CAL_MC + bool "Media Controller centric mode by default" + depends on VIDEO_TI_CAL + default n + help + Enables Media Controller centric mode by default. + + If set, CAL driver will start in Media Controller mode by + default. Note that this behavior can be overridden via + module parameter 'mc_api'. + +# Mem2mem drivers + +config VIDEO_TI_VPE + tristate "TI VPE (Video Processing Engine) driver" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on SOC_DRA7XX || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + select VIDEO_TI_VPDMA + select VIDEO_TI_SC + select VIDEO_TI_CSC + help + Support for the TI VPE(Video Processing Engine) block + found on DRA7XX SoC. + +config VIDEO_TI_VPE_DEBUG + bool "VPE debug messages" + depends on VIDEO_TI_VPE + help + Enable debug messages on VPE driver. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F42BC433F5 for ; Mon, 14 Mar 2022 07:58:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237181AbiCNH7x (ORCPT ); Mon, 14 Mar 2022 03:59:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236976AbiCNH5t (ORCPT ); Mon, 14 Mar 2022 03:57:49 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2698A4161E; Mon, 14 Mar 2022 00:56:14 -0700 (PDT) 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 9919D611BD; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6D57C36AEF; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=51hp8/N8isUS3r9ozBiX9C2POg/EzKiP2L+ggV/SoW8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a/HV8Rq4eZDn/XlHOjEehVz01LxWiQWY1sn83jdo3mSSDrhX3CYDwRBARGrRRU2sg 5p0F06HYZuPSmpVigR79Ec/HmQYMxBlD5zzXTLQejNqOduTQC5ydVx2wkivfyKe6ky FaJ53guMR7tN6RHh9bDQJDDYzyjdEJBiCc9+uJ19HsYpjvSyJC7tvLMvifa418ElED Jv0IQy+dusW1rZWi57HB/GvcvKH3eXVNQWw3ivzA4gy0I66Bc+dsZ0+RpMh+6kNLWI tH9CA9T7vTiYAlfwEnAVzBX+sP1J0e/etWz4vT/xYapXXMY0bC72nW3QACJoTyZLah jg4IP9+oADBLQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kWF-K7; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dafna Hirschfeld , Dmitry Osipenko , Hans Verkuil , Heiko Stuebner , Jernej Skrabec , Laurent Pinchart , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH 32/64] media: platform: rkisp1: move config to its own file Date: Mon, 14 Mar 2022 08:55:24 +0100 Message-Id: <9fd563626f13054b7c410af78f65f161376e488a.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place rkisp1-specific config stuff on a separate Kconfig file. Reviewed-by: Laurent Pinchart 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 20 +------------------ .../media/platform/rockchip/rkisp1/Kconfig | 19 ++++++++++++++++++ 2 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 drivers/media/platform/rockchip/rkisp1/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 228881ae0d22..29afef26cbe4 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -59,6 +59,7 @@ source "drivers/media/platform/qcom/venus/Kconfig" =20 source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/rockchip/rga/Kconfig" +source "drivers/media/platform/rockchip/rkisp1/Kconfig" source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/sti/hva/Kconfig" @@ -82,25 +83,6 @@ config VIDEO_MUX =20 source "drivers/media/platform/intel/Kconfig" =20 -config VIDEO_ROCKCHIP_ISP1 - tristate "Rockchip Image Signal Processing v1 Unit driver" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && OF - depends on ARCH_ROCKCHIP || COMPILE_TEST - select MEDIA_CONTROLLER - select VIDEO_V4L2_SUBDEV_API - select VIDEOBUF2_DMA_CONTIG - select VIDEOBUF2_VMALLOC - select V4L2_FWNODE - select GENERIC_PHY_MIPI_DPHY - default n - help - Enable this to support the Image Signal Processing (ISP) module - present in RK3399 SoCs. - - To compile this driver as a module, choose M here: the module - will be called rockchip-isp1. - source "drivers/media/platform/exynos4-is/Kconfig" source "drivers/media/platform/am437x/Kconfig" source "drivers/media/platform/xilinx/Kconfig" diff --git a/drivers/media/platform/rockchip/rkisp1/Kconfig b/drivers/media= /platform/rockchip/rkisp1/Kconfig new file mode 100644 index 000000000000..c2e464317929 --- /dev/null +++ b/drivers/media/platform/rockchip/rkisp1/Kconfig @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_ROCKCHIP_ISP1 + tristate "Rockchip Image Signal Processing v1 Unit driver" + depends on V4L_PLATFORM_DRIVERS + depends on VIDEO_V4L2 && OF + depends on ARCH_ROCKCHIP || COMPILE_TEST + select MEDIA_CONTROLLER + select VIDEO_V4L2_SUBDEV_API + select VIDEOBUF2_DMA_CONTIG + select VIDEOBUF2_VMALLOC + select V4L2_FWNODE + select GENERIC_PHY_MIPI_DPHY + default n + help + Enable this to support the Image Signal Processing (ISP) module + present in RK3399 SoCs. + + To compile this driver as a module, choose M here: the module + will be called rockchip-isp1. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 873E6C433EF for ; Mon, 14 Mar 2022 07:58:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235922AbiCNIAC (ORCPT ); Mon, 14 Mar 2022 04:00:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236979AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E4484161C; Mon, 14 Mar 2022 00:56:14 -0700 (PDT) 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 sin.source.kernel.org (Postfix) with ESMTPS id 97638CE10C7; Mon, 14 Mar 2022 07:56:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5AA3C36AF2; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=GjHqxp3GQXnTY+LF57yjz0Dc5yCk2r/Y7YgbsCzIOVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UFkgTr+hKzD2fELucd0rNPJkhWq1wQ5R4DPNosvdefJrocjgt9rVCdFpamKoTeNc2 8AJwON3et3wVVjnIjUGwP30hZW01lev8WPCw2f+89Zai3Rk38LiKLzuo1q9oD3+lUh JUs51fCLOPm5UkPjA0w6swtkZ9RUlB5/S7r21341bKuaKZTIuWHuxD5ef29nSGT8kV CznPb7ljflnHmfbnDmbFhZOhO9g93pH9YnhF7e1+8DcZSAH6Pz7Wq4+YY1vjy7W2P8 S+dcg7WHCeEQa8Qyd652GqEAcPAKQa192/rY2TDyU70BiLF+Ny6sRfQqu236NhDM/d Dy4XyqAs8/iUQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kWJ-LQ; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Hugues Fruchet , Jernej Skrabec , Laurent Pinchart , Ming Qian , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 33/64] media: platform: delta: move config to its own file Date: Mon, 14 Mar 2022 08:55:25 +0100 Message-Id: <0d641f338b949db839cc82d7ccf04d01825f648b.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place delta-specific config stuff on a separate Kconfig file. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 36 +----------------------- drivers/media/platform/sti/delta/Kconfig | 36 ++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 35 deletions(-) create mode 100644 drivers/media/platform/sti/delta/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 29afef26cbe4..ba4c10896537 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -132,41 +132,7 @@ config VIDEO_STI_BDISP help This v4l2 mem2mem driver is a 2D blitter for STMicroelectronics SoC. =20 -config VIDEO_STI_DELTA - tristate "STMicroelectronics DELTA multi-format video decoder V4L2 driver" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_STI || COMPILE_TEST - help - This V4L2 driver enables DELTA multi-format video decoder - of STMicroelectronics STiH4xx SoC series allowing hardware - decoding of various compressed video bitstream format in - raw uncompressed format. - - Use this option to see the decoders available for such - hardware. - - Please notice that the driver will only be built if - at least one of the DELTA decoder below is selected. - -config VIDEO_STI_DELTA_MJPEG - bool "STMicroelectronics DELTA MJPEG support" - default y - depends on VIDEO_STI_DELTA - help - Enables DELTA MJPEG hardware support. - - To compile this driver as a module, choose M here: - the module will be called st-delta. - -config VIDEO_STI_DELTA_DRIVER - tristate - depends on VIDEO_STI_DELTA - depends on VIDEO_STI_DELTA_MJPEG - default VIDEO_STI_DELTA_MJPEG - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - select RPMSG +source "drivers/media/platform/sti/delta/Kconfig" =20 # DVB platform drivers source "drivers/media/platform/sti/c8sectpfe/Kconfig" diff --git a/drivers/media/platform/sti/delta/Kconfig b/drivers/media/platf= orm/sti/delta/Kconfig new file mode 100644 index 000000000000..0bbc7edce208 --- /dev/null +++ b/drivers/media/platform/sti/delta/Kconfig @@ -0,0 +1,36 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_STI_DELTA + tristate "STMicroelectronics DELTA multi-format video decoder V4L2 driver" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_STI || COMPILE_TEST + help + This V4L2 driver enables DELTA multi-format video decoder + of STMicroelectronics STiH4xx SoC series allowing hardware + decoding of various compressed video bitstream format in + raw uncompressed format. + + Use this option to see the decoders available for such + hardware. + + Please notice that the driver will only be built if + at least one of the DELTA decoder below is selected. + +config VIDEO_STI_DELTA_MJPEG + bool "STMicroelectronics DELTA MJPEG support" + default y + depends on VIDEO_STI_DELTA + help + Enables DELTA MJPEG hardware support. + + To compile this driver as a module, choose M here: + the module will be called st-delta. + +config VIDEO_STI_DELTA_DRIVER + tristate + depends on VIDEO_STI_DELTA + depends on VIDEO_STI_DELTA_MJPEG + default VIDEO_STI_DELTA_MJPEG + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + select RPMSG --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09232C433FE for ; Mon, 14 Mar 2022 07:58:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236053AbiCNH7a (ORCPT ); Mon, 14 Mar 2022 03:59:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236961AbiCNH5t (ORCPT ); Mon, 14 Mar 2022 03:57:49 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3776F4160B; Mon, 14 Mar 2022 00:56:13 -0700 (PDT) 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 3F15761156; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5A69C341D9; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=L5kIq+7jZMFkKxSnqDG1cjfz6jM7ZGNI7WnQn0j9M+8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LdlcVDviFYtHuBzi5DChQPGj2SN7YPTZwdRhPajtwnw6Ko9te++t6cAdh3CSNf/82 kWhFE5G9Brrl6WjBhkgjHah1lK/g77hJSnLlP4sEl0Wgza3XjWvr8kPngqGjHZlFNf xLZ6Yz/bOE+MAc8hgGnxm+6dvUVIkjyM1F79RK5JismsJtucumJ2IU34GYSZ5+3jnY +nAAE9Tcgm4PM1XCG0jrIAzRYNuLgrkwzXRulwXRxY7+qVRQxSHxA0MsUy8GSYVPH7 Tcv9/UkRN3Sj2Gud5Qslgcut2n+2ViKJltDHODsgvh1Vzr/UpyybdiXstPrildjvAP ZlG1hOMfRQUVQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kWN-Mb; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Fabien Dessenne , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Ming Qian , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 34/64] media: platform: bdisp: move config to its own file Date: Mon, 14 Mar 2022 08:55:26 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place bdisp-specific config stuff on a separate Kconfig file. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 10 +--------- drivers/media/platform/sti/bdisp/Kconfig | 10 ++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 drivers/media/platform/sti/bdisp/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index ba4c10896537..2069eee801af 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -122,15 +122,7 @@ config VIDEO_SAMSUNG_S5P_MFC help MFC 5.1 and 6.x driver for V4L2 =20 -config VIDEO_STI_BDISP - tristate "STMicroelectronics BDISP 2D blitter driver" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_STI || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - This v4l2 mem2mem driver is a 2D blitter for STMicroelectronics SoC. +source "drivers/media/platform/sti/bdisp/Kconfig" =20 source "drivers/media/platform/sti/delta/Kconfig" =20 diff --git a/drivers/media/platform/sti/bdisp/Kconfig b/drivers/media/platf= orm/sti/bdisp/Kconfig new file mode 100644 index 000000000000..e583fb924f52 --- /dev/null +++ b/drivers/media/platform/sti/bdisp/Kconfig @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_STI_BDISP + tristate "STMicroelectronics BDISP 2D blitter driver" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_STI || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + This v4l2 mem2mem driver is a 2D blitter for STMicroelectronics SoC. --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7962DC433FE for ; Mon, 14 Mar 2022 07:56:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236950AbiCNH5o (ORCPT ); Mon, 14 Mar 2022 03:57:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236838AbiCNH5T (ORCPT ); Mon, 14 Mar 2022 03:57:19 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C936F41328; Mon, 14 Mar 2022 00:56:04 -0700 (PDT) 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 6845EB80D3C; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8487C36AF5; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=oIDVeF7kEIJKweEOfYGDYJj4uxM1FQJ4vqDiPrXw/TI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GQc1qc5M+IO+zc9Y+z6Jy0bJ5Ay1T8tADky2/B63LJeoNMJTzHSCD86qF0ZprL3Cz /5uYLUMUsvk1+dG6172CSefxau9JY5fzoQwau5A3pPoVaTf38r0c65aScYOtrOO62R wRN8MUZSHBqvS0d9yLJfO7ZrXWrTMmu8SIHowmQk5NtUe/EGdcpIuF1v7ep2APLKjH yLcFTNUrCJGDZXme2BcrxPp8tg+uvvYtrqlv2qjGLU39/WQnks+x8hoakoIZM0IMtL yRQ8nL6Qu5PcJNszoWY+/BmRc9/k3AxCU13BDL1x+dpvLzvsMqUdriauqrPtFdmsku ftJyEO8yePPAw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kWR-Nj; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Ming Qian , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 35/64] media: platform: s5p-mfc: move config to its own file Date: Mon, 14 Mar 2022 08:55:27 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place s5p-mfc-specific config stuff on a separate Kconfig file. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 9 +-------- drivers/media/platform/s5p-mfc/Kconfig | 9 +++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 drivers/media/platform/s5p-mfc/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 2069eee801af..fd6b18ac0c7c 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -113,14 +113,7 @@ config VIDEO_SAMSUNG_S5P_JPEG This is a v4l2 driver for Samsung S5P, EXYNOS3250 and EXYNOS4 JPEG codec =20 -config VIDEO_SAMSUNG_S5P_MFC - tristate "Samsung S5P MFC Video Codec" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - help - MFC 5.1 and 6.x driver for V4L2 +source "drivers/media/platform/s5p-mfc/Kconfig" =20 source "drivers/media/platform/sti/bdisp/Kconfig" =20 diff --git a/drivers/media/platform/s5p-mfc/Kconfig b/drivers/media/platfor= m/s5p-mfc/Kconfig new file mode 100644 index 000000000000..34b52b0de304 --- /dev/null +++ b/drivers/media/platform/s5p-mfc/Kconfig @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_SAMSUNG_S5P_MFC + tristate "Samsung S5P MFC Video Codec" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + help + MFC 5.1 and 6.x driver for V4L2 --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A8C1C433EF for ; Mon, 14 Mar 2022 08:00:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237285AbiCNIB0 (ORCPT ); Mon, 14 Mar 2022 04:01:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236984AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 978A241623; Mon, 14 Mar 2022 00:56:14 -0700 (PDT) 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 AA20D611D7; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F128DC36AF8; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244562; bh=ihpWxowWNluCH+qN13bY4MbBuqxa2b+FIdpighF1kSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lUCTpRoLWZ2RDdkp2HCVBuxgKYwJXyJROKTKwJ9FyutHBoy7un9t0lm2a7Zc7K05d UuS9EQxMiMWdAbuXEW9fZmedJLhKb/VfhbgrSX2Tu+jCMA1RWdGFlyzPVsiD/8r9Uc e3HYr8ve4u23JI7am1SBtxloFe6CBmUbVBm9cAvO1inp53xYVvhOkeX6cAeGtirbCW mM1F0b6esfubJOSXyll0YApM8My+8mZMel1s2ZRQEixQLSacnTCTKsY7J0HFjaxgEC 2ZBk1K8kamktcL4+8pGfbyRSHzxiLkekNYgIAtpMZ5u8emU6hkdgQI1gvBo7W0385z 8yxnsR/r8HXaA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kWV-Ox; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Andrzej Pietrasiewicz , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Ming Qian , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 36/64] media: platform: s5p-jpeg: move config to its own file Date: Mon, 14 Mar 2022 08:55:28 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to better organize the platform/Kconfig, place s5p-jpeg-specific config stuff on a separate Kconfig file. Acked-by: Andrzej Pietrasiewicz 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 13 +------------ drivers/media/platform/s5p-jpeg/Kconfig | 12 ++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 drivers/media/platform/s5p-jpeg/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index fd6b18ac0c7c..d5aedc6b5ca3 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -62,6 +62,7 @@ source "drivers/media/platform/rockchip/rga/Kconfig" source "drivers/media/platform/rockchip/rkisp1/Kconfig" source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" +source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/sti/hva/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/sunxi/sun8i-di/Kconfig" @@ -101,18 +102,6 @@ config VIDEO_MEM2MEM_DEINTERLACE help Generic deinterlacing V4L2 driver. =20 - -config VIDEO_SAMSUNG_S5P_JPEG - tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - This is a v4l2 driver for Samsung S5P, EXYNOS3250 - and EXYNOS4 JPEG codec - source "drivers/media/platform/s5p-mfc/Kconfig" =20 source "drivers/media/platform/sti/bdisp/Kconfig" diff --git a/drivers/media/platform/s5p-jpeg/Kconfig b/drivers/media/platfo= rm/s5p-jpeg/Kconfig new file mode 100644 index 000000000000..e522860d2b15 --- /dev/null +++ b/drivers/media/platform/s5p-jpeg/Kconfig @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config VIDEO_SAMSUNG_S5P_JPEG + tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + This is a v4l2 driver for Samsung S5P, EXYNOS3250 + and EXYNOS4 JPEG codec --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91A92C4332F for ; Mon, 14 Mar 2022 08:00:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237426AbiCNICB (ORCPT ); Mon, 14 Mar 2022 04:02:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236926AbiCNH5f (ORCPT ); Mon, 14 Mar 2022 03:57:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCA0641604; Mon, 14 Mar 2022 00:56:12 -0700 (PDT) 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 553A9611A8; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C064C36AFA; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244562; bh=BbKdmuU1ofr4mquHLU6rC7A9KAvlLBCjyf5gjk78wJE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UIkM5LqNyj5gBl8q7S6V7bDdl96mkVuIR8bCE61lCLSzdIn1mqrCEvBwK1DHE5fFe 6TDhfV2iQUNpUJLMgem6IfMBxxm0UNm+R1t4rqFuncwrvHcqOg7TJ7FL4zgDA6Hfhx 011XhnYYihfIWUj98VdI1LdeqLGT47oqGeLR5TXDntk5O29Nq/xwW3IhGpiamLL3Hv 1ctZ9rZwxyUkdkRqN1ngF1jqNPz0NnFn5UEauh/yeA1VAZ3A1GSQyX/kaf/aP+HjWo sGmRX6RFrh0pSsvy30Nro1t+jHrvwEAFyzPi1H3dSYmveS5T7BpEKRZqZt6qOOtIBB TU9kk3T/ynshw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kWZ-Q7; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Ming Qian , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 37/64] media: platform: Kconfig: sort entries Date: Mon, 14 Mar 2022 08:55:29 +0100 Message-Id: <12030c432f1f49f5e742520b81783ad92bb482a2.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Now that each non-generic driver has their own directory, sort the entries. Reviewed-by: Laurent Pinchart 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 98 +++++++++++++++------------------- 1 file changed, 43 insertions(+), 55 deletions(-) diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index d5aedc6b5ca3..b7c60969c974 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -29,84 +29,72 @@ config V4L_MEM2MEM_DRIVERS to capture and output drivers, which use memory buffers for just one of those. =20 +# Ancillary drivers + +config VIDEO_MEM2MEM_DEINTERLACE + tristate "Deinterlace support" + depends on V4L_MEM2MEM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on HAS_DMA + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + Generic deinterlacing V4L2 driver. + +config VIDEO_MUX + tristate "Video Multiplexer" + depends on V4L_PLATFORM_DRIVERS + select MULTIPLEXER + depends on VIDEO_V4L2 && OF + select MEDIA_CONTROLLER + select VIDEO_V4L2_SUBDEV_API + select REGMAP + select V4L2_FWNODE + help + This driver provides support for N:1 video bus multiplexers. + +# Platform drivers - Please keep it alphabetically sorted + +# TODO: create per-manufacturer directories + source "drivers/media/platform/allegro-dvt/Kconfig" -source "drivers/media/platform/nxp/Kconfig" - -source "drivers/media/platform/renesas/Kconfig" - -# V4L platform drivers - -source "drivers/media/platform/marvell-ccic/Kconfig" - -source "drivers/media/platform/via/Kconfig" - +source "drivers/media/platform/am437x/Kconfig" source "drivers/media/platform/amphion/Kconfig" +source "drivers/media/platform/aspeed/Kconfig" +source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/cadence/Kconfig" - source "drivers/media/platform/coda/Kconfig" source "drivers/media/platform/davinci/Kconfig" - 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-ccic/Kconfig" source "drivers/media/platform/meson/ge2d/Kconfig" source "drivers/media/platform/mtk-jpeg/Kconfig" source "drivers/media/platform/mtk-mdp/Kconfig" source "drivers/media/platform/mtk-vcodec/Kconfig" source "drivers/media/platform/mtk-vpu/Kconfig" -source "drivers/media/platform/omap3isp/Kconfig" +source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/omap/Kconfig" +source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/qcom/camss/Kconfig" source "drivers/media/platform/qcom/venus/Kconfig" - -source "drivers/media/platform/aspeed/Kconfig" +source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/rga/Kconfig" source "drivers/media/platform/rockchip/rkisp1/Kconfig" source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/s5p-jpeg/Kconfig" +source "drivers/media/platform/s5p-mfc/Kconfig" +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/stm32/Kconfig" +source "drivers/media/platform/sunxi/Kconfig" source "drivers/media/platform/sunxi/sun8i-di/Kconfig" source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig" source "drivers/media/platform/tegra/vde/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" - -config VIDEO_MUX - tristate "Video Multiplexer" - depends on V4L_PLATFORM_DRIVERS - select MULTIPLEXER - depends on VIDEO_V4L2 && OF - select MEDIA_CONTROLLER - select VIDEO_V4L2_SUBDEV_API - select REGMAP - select V4L2_FWNODE - help - This driver provides support for N:1 video bus multiplexers. - -source "drivers/media/platform/intel/Kconfig" - -source "drivers/media/platform/exynos4-is/Kconfig" -source "drivers/media/platform/am437x/Kconfig" +source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" -source "drivers/media/platform/atmel/Kconfig" -source "drivers/media/platform/sunxi/Kconfig" - -# Mem2mem drivers - -config VIDEO_MEM2MEM_DEINTERLACE - tristate "Deinterlace support" - depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on HAS_DMA - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - help - Generic deinterlacing V4L2 driver. - -source "drivers/media/platform/s5p-mfc/Kconfig" - -source "drivers/media/platform/sti/bdisp/Kconfig" - -source "drivers/media/platform/sti/delta/Kconfig" - -# DVB platform drivers -source "drivers/media/platform/sti/c8sectpfe/Kconfig" --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE870C433EF for ; Mon, 14 Mar 2022 07:58:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237072AbiCNH7l (ORCPT ); Mon, 14 Mar 2022 03:59:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236966AbiCNH5t (ORCPT ); Mon, 14 Mar 2022 03:57:49 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69DAA4160C; Mon, 14 Mar 2022 00:56:13 -0700 (PDT) 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 5D618611AF; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19E7BC36AFD; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244562; bh=q3oaScT2EmtXSaRkzmR6NjuVY1KCMcgFf9MDlddpwi0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kgUxgcyA0L4EzWgUW+0GZdu7zjJndYSGtySAhri+wyitNI2zSCTSi66GQp68sx/Ro aOb/LslsPI3rZuirNjLOiUk38BdfqGfXLJfh59A1+YiuBFRV1QXajbvRG0XgyFs+t4 q2Bv+kA9wXW4xAxzLcF+G99yGTiHMUW+/1jl3G8FtikcXXnBl4kzRIgKeekVcB8FgW 2ZMShfRfFxh3IbM9/e6NLiKjW+OK4H5rhC4e0bLZkAPEk4bs/Yao6fMlN1xAXBkgTs fW+6UaPALpkCxlwCFrpPdImt+cCEVp88s6NIL+VlfcVH7V6DzCXPyBDR92IZrbaZAX 8x4rzJKgfJnKw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kWd-RZ; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Andy Gross , Bjorn Andersson , Chen-Yu Tsai , Dmitry Osipenko , Hans Verkuil , Heiko Stuebner , Jernej Skrabec , Laurent Pinchart , Maxime Ripard , Ming Qian , Robert Foss , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev Subject: [PATCH 38/64] media: platform: move some manufacturer entries Date: Mon, 14 Mar 2022 08:55:30 +0100 Message-Id: <0ba67acab6a8757cb0d2588881d5a0907b0bb178.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As there are 4 manufacturer's directories with multiple sources (qcom, rockchip, sti and sunxi), move the sources from platform/Kconfig to their specific Konfig files. Acked-by: Jernej Skrabec Reviewed-by: Robert Foss Reviewed-by: Laurent Pinchart 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 13 +++---------- drivers/media/platform/qcom/Kconfig | 4 ++++ drivers/media/platform/rockchip/Kconfig | 3 +++ drivers/media/platform/sti/Kconfig | 5 +++++ drivers/media/platform/sunxi/Kconfig | 2 ++ 5 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 drivers/media/platform/qcom/Kconfig create mode 100644 drivers/media/platform/rockchip/Kconfig create mode 100644 drivers/media/platform/sti/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index b7c60969c974..e3316fa37a8f 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -77,23 +77,16 @@ source "drivers/media/platform/mtk-vpu/Kconfig" source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/omap3isp/Kconfig" -source "drivers/media/platform/qcom/camss/Kconfig" -source "drivers/media/platform/qcom/venus/Kconfig" +source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" -source "drivers/media/platform/rockchip/rga/Kconfig" -source "drivers/media/platform/rockchip/rkisp1/Kconfig" +source "drivers/media/platform/rockchip/Kconfig" source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/Kconfig" -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/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/sunxi/Kconfig" -source "drivers/media/platform/sunxi/sun8i-di/Kconfig" -source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig" source "drivers/media/platform/tegra/vde/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/via/Kconfig" diff --git a/drivers/media/platform/qcom/Kconfig b/drivers/media/platform/q= com/Kconfig new file mode 100644 index 000000000000..9f6c91cc95ca --- /dev/null +++ b/drivers/media/platform/qcom/Kconfig @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +source "drivers/media/platform/qcom/camss/Kconfig" +source "drivers/media/platform/qcom/venus/Kconfig" diff --git a/drivers/media/platform/rockchip/Kconfig b/drivers/media/platfo= rm/rockchip/Kconfig new file mode 100644 index 000000000000..2f97c0e0268a --- /dev/null +++ b/drivers/media/platform/rockchip/Kconfig @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only +source "drivers/media/platform/rockchip/rga/Kconfig" +source "drivers/media/platform/rockchip/rkisp1/Kconfig" diff --git a/drivers/media/platform/sti/Kconfig b/drivers/media/platform/st= i/Kconfig new file mode 100644 index 000000000000..9fb5e78a92cf --- /dev/null +++ b/drivers/media/platform/sti/Kconfig @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only +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" diff --git a/drivers/media/platform/sunxi/Kconfig b/drivers/media/platform/= sunxi/Kconfig index 7151cc249afa..a10032215b08 100644 --- a/drivers/media/platform/sunxi/Kconfig +++ b/drivers/media/platform/sunxi/Kconfig @@ -2,3 +2,5 @@ =20 source "drivers/media/platform/sunxi/sun4i-csi/Kconfig" source "drivers/media/platform/sunxi/sun6i-csi/Kconfig" +source "drivers/media/platform/sunxi/sun8i-di/Kconfig" +source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig" --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D14C2C4332F for ; Mon, 14 Mar 2022 07:56:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236971AbiCNH5t (ORCPT ); Mon, 14 Mar 2022 03:57:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236837AbiCNH5T (ORCPT ); Mon, 14 Mar 2022 03:57:19 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA04D4132D; Mon, 14 Mar 2022 00:56:04 -0700 (PDT) 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 7EAADB80D44; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19E42C36AFC; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244562; bh=ggpUNwjtxNUyHB7XLnkQRBAGYieODFjET79ttiCZ2aE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GTD/78qDIVW3rWbJxDDsApiPxCyYJY32FnAGRZ0wHd7OMvehbHiPbTvPJKRh94fWO EpzWDUK8TEC235fxfzy3VritF29ZJz6IAbcnAFd5wWvbTlNOPwOxlxZ1Bd+BP8Fpr9 RN5oIdzyrOgNc1nSM83l8PUHcohhWOs/gA9/ymcU/TbhDyJXBGh/jvjEsy4ik9S7bL mUEgo7AUUE5yj4zzZewEsxh1zVrtcPezsDlsmR2KVKzZr8SIci7TTa0YBUMar89SFb DN//bFqCoqymPVZ0WDgIV0qHPwxhCSwYli6fAaR9p19yHwZtmtjoKUPYFWCJ0hNuvD r2ww9G9IdlR/A== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kWh-Sr; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Ming Qian , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 39/64] media: platform: Kconfig: place platform drivers on a submenu Date: Mon, 14 Mar 2022 08:55:31 +0100 Message-Id: <56251e517be0b22a28bd19e57a68a49f84ac29d6.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Just like media bus drivers, place platform drivers on a submenu, in order to better organize user-selection: Media drivers ---> *** media drivers *** [*] Media USB Adapters ---> [*] Media PCI Adapters ---> -*- Radio Adapters ---> [*] Media platform devices ---> *** MMC/SDIO DVB adapters *** < > Siano SMS1xxx based MDTV via SDIO interface [*] V4L test drivers ---> [*] DVB test drivers ---> *** FireWire (IEEE 1394) Adapters *** <*> FireDTV and FloppyDTV *** common driver options *** [ ] Enable Remote Controller support for Siano devices [ ] Enable debugfs for smsdvb As this submenu depends on MEDIA_PLATFORM_DRIVERS and defaults to "y", there's no need to change already-existing .config entries, nor touch the several make *_defconfig. Reviewed-by: Laurent Pinchart 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/Kconfig | 8 +++++--- drivers/media/platform/Kconfig | 10 ++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index f3f24c63536b..1a75058df374 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -216,13 +216,12 @@ menu "Media drivers" comment "Drivers filtered as selected at 'Filter media drivers'" depends on MEDIA_SUPPORT_FILTER =20 +comment "Media drivers" + source "drivers/media/usb/Kconfig" source "drivers/media/pci/Kconfig" source "drivers/media/radio/Kconfig" =20 -# Common driver options -source "drivers/media/common/Kconfig" - if MEDIA_PLATFORM_SUPPORT source "drivers/media/platform/Kconfig" source "drivers/media/mmc/Kconfig" @@ -234,6 +233,9 @@ endif =20 source "drivers/media/firewire/Kconfig" =20 +# Common driver options +source "drivers/media/common/Kconfig" + endmenu =20 # diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index e3316fa37a8f..721f27ef0130 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -3,6 +3,14 @@ # Platform drivers # Most drivers here are currently for webcam support =20 +menuconfig MEDIA_PLATFORM_DRIVERS + bool "Media platform devices" + default "y" + help + Say Y here to enable support for platform-specific media drivers. + +if MEDIA_PLATFORM_DRIVERS + config V4L_PLATFORM_DRIVERS bool "V4L platform devices" help @@ -91,3 +99,5 @@ source "drivers/media/platform/tegra/vde/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" + +endif # MEDIA_PLATFORM_DRIVERS --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A70EC433EF for ; Mon, 14 Mar 2022 08:00:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235247AbiCNIBk (ORCPT ); Mon, 14 Mar 2022 04:01:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236967AbiCNH5t (ORCPT ); Mon, 14 Mar 2022 03:57:49 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7F3841619; Mon, 14 Mar 2022 00:56:13 -0700 (PDT) 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 83F83611BB; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2ED7EC36B00; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244562; bh=teN4+d8Dt5QQVBAVj2zCMTgU5Dq6lD+OYJHqSQvyjyw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ij5IsZP29TerHcu6LJhiOn8tmhg/1j54rLnoc3nPsmKOn76ex8gBKBBB3+62n1CMt aTBdljmHwKUBoibwLITki+225jmzvGhkHOc+wEptvLA6KVzahWFihQ74Wcv/Th25wt 4CSXCjnh3777ZSzuDG/4B607YSQAaAjA45vOg1CFODoFkq+92ybvLeoOXBBTM6oYat CeSGxL6dp+sGfoCsGTSw91EUyqZkOK827SlvUXhr/sVL3iBaS9kYHevJdDVZKM3FmE lKqJKYV5bNz2kkVZ0yDk4ab4LJ2nRgtsyqoJsO9LEgnc1zyndvLcCbhfKCgHQyUBCv jeNa6ZHCSt85Q== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kWl-UE; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Cai Huoqing , Dmitry Osipenko , Eugen Hristev , Fabio Estevam , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Jiasheng Jiang , Lad Prabhakar , Laurent Pinchart , Marco Felsch , Martin Weber , Miaoqian Lin , Ming Qian , NXP Linux Team , Pengutronix Kernel Team , Philipp Zabel , Sakari Ailus , Sascha Hauer , Shawn Guo , Wolfram Sang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 40/64] media: platform: rename coda/ to chips-media/ Date: Mon, 14 Mar 2022 08:55:32 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the end goal is to have platform drivers split by vendor, rename coda/ to chips-media/. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 4 ++-- drivers/media/platform/{coda =3D> chips-media}/Kconfig | 0 drivers/media/platform/{coda =3D> chips-media}/Makefile | 0 drivers/media/platform/{coda =3D> chips-media}/coda-bit.c | 0 drivers/media/platform/{coda =3D> chips-media}/coda-common.c | 0 drivers/media/platform/{coda =3D> chips-media}/coda-gdi.c | 0 drivers/media/platform/{coda =3D> chips-media}/coda-h264.c | 0 drivers/media/platform/{coda =3D> chips-media}/coda-jpeg.c | 0 drivers/media/platform/{coda =3D> chips-media}/coda-mpeg2.c | 0 drivers/media/platform/{coda =3D> chips-media}/coda-mpeg4.c | 0 drivers/media/platform/{coda =3D> chips-media}/coda.h | 0 drivers/media/platform/{coda =3D> chips-media}/coda_regs.h | 2 +- drivers/media/platform/{coda =3D> chips-media}/imx-vdoa.c | 0 drivers/media/platform/{coda =3D> chips-media}/imx-vdoa.h | 0 drivers/media/platform/{coda =3D> chips-media}/trace.h | 2 +- 17 files changed, 6 insertions(+), 6 deletions(-) rename drivers/media/platform/{coda =3D> chips-media}/Kconfig (100%) rename drivers/media/platform/{coda =3D> chips-media}/Makefile (100%) rename drivers/media/platform/{coda =3D> chips-media}/coda-bit.c (100%) rename drivers/media/platform/{coda =3D> chips-media}/coda-common.c (100%) rename drivers/media/platform/{coda =3D> chips-media}/coda-gdi.c (100%) rename drivers/media/platform/{coda =3D> chips-media}/coda-h264.c (100%) rename drivers/media/platform/{coda =3D> chips-media}/coda-jpeg.c (100%) rename drivers/media/platform/{coda =3D> chips-media}/coda-mpeg2.c (100%) rename drivers/media/platform/{coda =3D> chips-media}/coda-mpeg4.c (100%) rename drivers/media/platform/{coda =3D> chips-media}/coda.h (100%) rename drivers/media/platform/{coda =3D> chips-media}/coda_regs.h (99%) rename drivers/media/platform/{coda =3D> chips-media}/imx-vdoa.c (100%) rename drivers/media/platform/{coda =3D> chips-media}/imx-vdoa.h (100%) rename drivers/media/platform/{coda =3D> chips-media}/trace.h (98%) diff --git a/MAINTAINERS b/MAINTAINERS index 848640546398..84bc106acc57 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4771,7 +4771,7 @@ M: Philipp Zabel L: linux-media@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/media/coda.yaml -F: drivers/media/platform/coda/ +F: drivers/media/platform/chips-media/ =20 CODE OF CONDUCT M: Greg Kroah-Hartman diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 721f27ef0130..24a43cef18de 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -71,7 +71,7 @@ source "drivers/media/platform/amphion/Kconfig" source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/cadence/Kconfig" -source "drivers/media/platform/coda/Kconfig" +source "drivers/media/platform/chips-media/Kconfig" source "drivers/media/platform/davinci/Kconfig" source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/exynos4-is/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index 20b07ae3ebf1..8d6e15fad0b1 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -6,12 +6,12 @@ # Place here, alphabetically sorted by directory # (e. g. LC_ALL=3DC sort Makefile) obj-y +=3D allegro-dvt/ -obj-y +=3D aspeed/ obj-y +=3D am437x/ obj-y +=3D amphion/ +obj-y +=3D aspeed/ obj-y +=3D atmel/ obj-y +=3D cadence/ -obj-y +=3D coda/ +obj-y +=3D chips-media/ obj-y +=3D davinci/ obj-y +=3D exynos-gsc/ obj-y +=3D exynos4-is/ diff --git a/drivers/media/platform/coda/Kconfig b/drivers/media/platform/c= hips-media/Kconfig similarity index 100% rename from drivers/media/platform/coda/Kconfig rename to drivers/media/platform/chips-media/Kconfig diff --git a/drivers/media/platform/coda/Makefile b/drivers/media/platform/= chips-media/Makefile similarity index 100% rename from drivers/media/platform/coda/Makefile rename to drivers/media/platform/chips-media/Makefile diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platfor= m/chips-media/coda-bit.c similarity index 100% rename from drivers/media/platform/coda/coda-bit.c rename to drivers/media/platform/chips-media/coda-bit.c diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/plat= form/chips-media/coda-common.c similarity index 100% rename from drivers/media/platform/coda/coda-common.c rename to drivers/media/platform/chips-media/coda-common.c diff --git a/drivers/media/platform/coda/coda-gdi.c b/drivers/media/platfor= m/chips-media/coda-gdi.c similarity index 100% rename from drivers/media/platform/coda/coda-gdi.c rename to drivers/media/platform/chips-media/coda-gdi.c diff --git a/drivers/media/platform/coda/coda-h264.c b/drivers/media/platfo= rm/chips-media/coda-h264.c similarity index 100% rename from drivers/media/platform/coda/coda-h264.c rename to drivers/media/platform/chips-media/coda-h264.c diff --git a/drivers/media/platform/coda/coda-jpeg.c b/drivers/media/platfo= rm/chips-media/coda-jpeg.c similarity index 100% rename from drivers/media/platform/coda/coda-jpeg.c rename to drivers/media/platform/chips-media/coda-jpeg.c diff --git a/drivers/media/platform/coda/coda-mpeg2.c b/drivers/media/platf= orm/chips-media/coda-mpeg2.c similarity index 100% rename from drivers/media/platform/coda/coda-mpeg2.c rename to drivers/media/platform/chips-media/coda-mpeg2.c diff --git a/drivers/media/platform/coda/coda-mpeg4.c b/drivers/media/platf= orm/chips-media/coda-mpeg4.c similarity index 100% rename from drivers/media/platform/coda/coda-mpeg4.c rename to drivers/media/platform/chips-media/coda-mpeg4.c diff --git a/drivers/media/platform/coda/coda.h b/drivers/media/platform/ch= ips-media/coda.h similarity index 100% rename from drivers/media/platform/coda/coda.h rename to drivers/media/platform/chips-media/coda.h diff --git a/drivers/media/platform/coda/coda_regs.h b/drivers/media/platfo= rm/chips-media/coda_regs.h similarity index 99% rename from drivers/media/platform/coda/coda_regs.h rename to drivers/media/platform/chips-media/coda_regs.h index da5bb3212528..db81a904cf3f 100644 --- a/drivers/media/platform/coda/coda_regs.h +++ b/drivers/media/platform/chips-media/coda_regs.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/coda/coda_regs.h + * linux/drivers/media/platform/chips-media/coda_regs.h * * Copyright (C) 2012 Vista Silicon SL * Javier Martin diff --git a/drivers/media/platform/coda/imx-vdoa.c b/drivers/media/platfor= m/chips-media/imx-vdoa.c similarity index 100% rename from drivers/media/platform/coda/imx-vdoa.c rename to drivers/media/platform/chips-media/imx-vdoa.c diff --git a/drivers/media/platform/coda/imx-vdoa.h b/drivers/media/platfor= m/chips-media/imx-vdoa.h similarity index 100% rename from drivers/media/platform/coda/imx-vdoa.h rename to drivers/media/platform/chips-media/imx-vdoa.h diff --git a/drivers/media/platform/coda/trace.h b/drivers/media/platform/c= hips-media/trace.h similarity index 98% rename from drivers/media/platform/coda/trace.h rename to drivers/media/platform/chips-media/trace.h index c0791c847f7c..19f98e6dafb9 100644 --- a/drivers/media/platform/coda/trace.h +++ b/drivers/media/platform/chips-media/trace.h @@ -167,7 +167,7 @@ DEFINE_EVENT(coda_buf_class, coda_jpeg_done, #endif /* __CODA_TRACE_H__ */ =20 #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../../drivers/media/platform/coda +#define TRACE_INCLUDE_PATH ../../drivers/media/platform/chips-media #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE trace =20 --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26256C433FE for ; Mon, 14 Mar 2022 07:58:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237215AbiCNH77 (ORCPT ); Mon, 14 Mar 2022 03:59:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236968AbiCNH5t (ORCPT ); Mon, 14 Mar 2022 03:57:49 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7326D4160E; Mon, 14 Mar 2022 00:56:13 -0700 (PDT) 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 64F7C611B1; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A75FC36AFF; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244562; bh=7b/Ws9MK7sXL3stprXaovdGcs4nNqKe/2s/vcOJPNqU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oBfO6pNPjlZzAlUqVeGSPU1EHxUiQuPk6hRfh9WbcuZVbkqftbHWNAwyz1DhLP/Se ADL3HZ4dP7Wwt3bOrkFy2b19E0mbPt/r35EY6Rlr9XQ4P8lFDLAiKI6fFFYkQJOzz7 Wpf6Ixj+7ZzxjWHaqT384Jv3jVjjt+aGttVYenXj6Om7iWMpiWWZfTS1nXdPj88pKi yl/yChvlRen0zs7Mi9zdlssb1ZYAVHwXPa47Ukt+O6TpzW2vCWo/J5HQn/vJ22wQKs 9N3GoffMxs7iQA51VDEBxvY/ezmPeoEQvQVeC8GJQ71BC6C8X8q15gKgcVXHep/SRN UJMZjZ6oSV58g== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kWp-Vg; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Eugen Hristev , Evgeny Novikov , Hans Verkuil , Herman , Jacopo Mondi , Jernej Skrabec , Jonathan Cameron , Lad Prabhakar , Laurent Pinchart , Leon Romanovsky , Ming Qian , Rui Miguel Silva , Sakari Ailus , Tomi Valkeinen , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 41/64] media: platform: rename marvell-ccic/ to marvell/ Date: Mon, 14 Mar 2022 08:55:33 +0100 Message-Id: <90594c911b0c2de9bffe7664f9bb8b96e5ea1aef.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the end goal is to have platform drivers split by vendor, rename marvell-ccic/ to marvell/. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{marvell-ccic =3D> marvell}/Kconfig | 0 drivers/media/platform/{marvell-ccic =3D> marvell}/Makefile | 0 drivers/media/platform/{marvell-ccic =3D> marvell}/cafe-driver.c | 0 drivers/media/platform/{marvell-ccic =3D> marvell}/mcam-core.c | 0 drivers/media/platform/{marvell-ccic =3D> marvell}/mcam-core.h | 0 drivers/media/platform/{marvell-ccic =3D> marvell}/mmp-driver.c | 0 9 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{marvell-ccic =3D> marvell}/Kconfig (100%) rename drivers/media/platform/{marvell-ccic =3D> marvell}/Makefile (100%) rename drivers/media/platform/{marvell-ccic =3D> marvell}/cafe-driver.c (1= 00%) rename drivers/media/platform/{marvell-ccic =3D> marvell}/mcam-core.c (100= %) rename drivers/media/platform/{marvell-ccic =3D> marvell}/mcam-core.h (100= %) rename drivers/media/platform/{marvell-ccic =3D> marvell}/mmp-driver.c (10= 0%) diff --git a/MAINTAINERS b/MAINTAINERS index 84bc106acc57..b83cf0eb99ce 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4248,7 +4248,7 @@ L: linux-media@vger.kernel.org S: Orphan T: git git://linuxtv.org/media_tree.git F: Documentation/admin-guide/media/cafe_ccic* -F: drivers/media/platform/marvell-ccic/ +F: drivers/media/platform/marvell/ =20 CAIF NETWORK LAYER L: netdev@vger.kernel.org diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 24a43cef18de..0a4260627a00 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -76,7 +76,7 @@ source "drivers/media/platform/davinci/Kconfig" 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-ccic/Kconfig" +source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/meson/ge2d/Kconfig" source "drivers/media/platform/mtk-jpeg/Kconfig" source "drivers/media/platform/mtk-mdp/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index 8d6e15fad0b1..8b2deba4b62c 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -16,7 +16,7 @@ obj-y +=3D davinci/ obj-y +=3D exynos-gsc/ obj-y +=3D exynos4-is/ obj-y +=3D intel/ -obj-y +=3D marvell-ccic/ +obj-y +=3D marvell/ obj-y +=3D meson/ge2d/ obj-y +=3D mtk-jpeg/ obj-y +=3D mtk-mdp/ diff --git a/drivers/media/platform/marvell-ccic/Kconfig b/drivers/media/pl= atform/marvell/Kconfig similarity index 100% rename from drivers/media/platform/marvell-ccic/Kconfig rename to drivers/media/platform/marvell/Kconfig diff --git a/drivers/media/platform/marvell-ccic/Makefile b/drivers/media/p= latform/marvell/Makefile similarity index 100% rename from drivers/media/platform/marvell-ccic/Makefile rename to drivers/media/platform/marvell/Makefile diff --git a/drivers/media/platform/marvell-ccic/cafe-driver.c b/drivers/me= dia/platform/marvell/cafe-driver.c similarity index 100% rename from drivers/media/platform/marvell-ccic/cafe-driver.c rename to drivers/media/platform/marvell/cafe-driver.c diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/medi= a/platform/marvell/mcam-core.c similarity index 100% rename from drivers/media/platform/marvell-ccic/mcam-core.c rename to drivers/media/platform/marvell/mcam-core.c diff --git a/drivers/media/platform/marvell-ccic/mcam-core.h b/drivers/medi= a/platform/marvell/mcam-core.h similarity index 100% rename from drivers/media/platform/marvell-ccic/mcam-core.h rename to drivers/media/platform/marvell/mcam-core.h diff --git a/drivers/media/platform/marvell-ccic/mmp-driver.c b/drivers/med= ia/platform/marvell/mmp-driver.c similarity index 100% rename from drivers/media/platform/marvell-ccic/mmp-driver.c rename to drivers/media/platform/marvell/mmp-driver.c --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA138C433F5 for ; Mon, 14 Mar 2022 08:01:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237464AbiCNICR (ORCPT ); Mon, 14 Mar 2022 04:02:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236925AbiCNH5f (ORCPT ); Mon, 14 Mar 2022 03:57:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBDBC41602; Mon, 14 Mar 2022 00:56:12 -0700 (PDT) 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 6D6CB611AE; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38E9BC341D7; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244562; bh=0NC/tC/kV06rr47XvjpViOX6Ts4NzorwYqCzhcRrWH8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SVGjmsYIDysSiC05lcChWEnhMsnfGs7QFC+eJGuvGtp3n1unDAX9L+7FRlgAPq68h 6DjoiT+0WOc9M/BKIVTpk8HIposCeEsyI40X3cONdC24JhOLqt9x2dvY0epQzfOCVM Ows9PlZYVAqmBLAaWaKeD45lv/6Fxh8pwDJvp3DOGyDVi3jTh+tp3QrcyGlSojlUwP tKJCz0PRAnN7YknW6fkcbrJLbmSuxlJarZLSQaR5fwYQlvE2058uELQCOH+SiZpVbv aK+9XqOUorg7DFyrxVhokEVogh5hrlwiN405UzZd8gYq9a1zgpwdGlM9VBkwjxmW8q 2SyFybRyCf5cA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kWt-0t; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Cai Huoqing , Christophe JAILLET , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Jerome Brunet , Kevin Hilman , Laurent Pinchart , Martin Blumenstingl , Ming Qian , Neil Armstrong , Sakari Ailus , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 42/64] media: platform: rename meson/ge2d/ to amlogic/meson-ge2d/ Date: Mon, 14 Mar 2022 08:55:34 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the end goal is to have platform drivers split by vendor, rename meson/ge2d/ to amlogic/meson-ge2d/. Signed-off-by: Mauro Carvalho Chehab Acked-by: Neil Armstrong --- To avoid mailbombing on a large number of people, only mailing lists were C= /C on the cover. See [PATCH 00/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- .../media/platform/{meson/ge2d =3D> amlogic/meson-ge2d}/Kconfig | 0 .../media/platform/{meson/ge2d =3D> amlogic/meson-ge2d}/Makefile | 0 .../platform/{meson/ge2d =3D> amlogic/meson-ge2d}/ge2d-regs.h | 0 .../media/platform/{meson/ge2d =3D> amlogic/meson-ge2d}/ge2d.c | 0 7 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{meson/ge2d =3D> amlogic/meson-ge2d}/Kconfig= (100%) rename drivers/media/platform/{meson/ge2d =3D> amlogic/meson-ge2d}/Makefil= e (100%) rename drivers/media/platform/{meson/ge2d =3D> amlogic/meson-ge2d}/ge2d-re= gs.h (100%) rename drivers/media/platform/{meson/ge2d =3D> amlogic/meson-ge2d}/ge2d.c = (100%) diff --git a/MAINTAINERS b/MAINTAINERS index b83cf0eb99ce..09b0e60da4e9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12523,7 +12523,7 @@ L: linux-amlogic@lists.infradead.org S: Supported T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml -F: drivers/media/platform/meson/ge2d/ +F: drivers/media/platform/amlogic/meson-ge2d/ =20 MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS M: Liang Yang diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 0a4260627a00..b4faee0a1b63 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -67,6 +67,7 @@ config VIDEO_MUX =20 source "drivers/media/platform/allegro-dvt/Kconfig" source "drivers/media/platform/am437x/Kconfig" +source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" source "drivers/media/platform/amphion/Kconfig" source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/atmel/Kconfig" @@ -77,7 +78,6 @@ 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/meson/ge2d/Kconfig" source "drivers/media/platform/mtk-jpeg/Kconfig" source "drivers/media/platform/mtk-mdp/Kconfig" source "drivers/media/platform/mtk-vcodec/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index 8b2deba4b62c..48531f93d92f 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -7,6 +7,7 @@ # (e. g. LC_ALL=3DC sort Makefile) obj-y +=3D allegro-dvt/ obj-y +=3D am437x/ +obj-y +=3D amlogic/meson-ge2d/ obj-y +=3D amphion/ obj-y +=3D aspeed/ obj-y +=3D atmel/ @@ -17,7 +18,6 @@ obj-y +=3D exynos-gsc/ obj-y +=3D exynos4-is/ obj-y +=3D intel/ obj-y +=3D marvell/ -obj-y +=3D meson/ge2d/ obj-y +=3D mtk-jpeg/ obj-y +=3D mtk-mdp/ obj-y +=3D mtk-vcodec/ diff --git a/drivers/media/platform/meson/ge2d/Kconfig b/drivers/media/plat= form/amlogic/meson-ge2d/Kconfig similarity index 100% rename from drivers/media/platform/meson/ge2d/Kconfig rename to drivers/media/platform/amlogic/meson-ge2d/Kconfig diff --git a/drivers/media/platform/meson/ge2d/Makefile b/drivers/media/pla= tform/amlogic/meson-ge2d/Makefile similarity index 100% rename from drivers/media/platform/meson/ge2d/Makefile rename to drivers/media/platform/amlogic/meson-ge2d/Makefile diff --git a/drivers/media/platform/meson/ge2d/ge2d-regs.h b/drivers/media/= platform/amlogic/meson-ge2d/ge2d-regs.h similarity index 100% rename from drivers/media/platform/meson/ge2d/ge2d-regs.h rename to drivers/media/platform/amlogic/meson-ge2d/ge2d-regs.h diff --git a/drivers/media/platform/meson/ge2d/ge2d.c b/drivers/media/platf= orm/amlogic/meson-ge2d/ge2d.c similarity index 100% rename from drivers/media/platform/meson/ge2d/ge2d.c rename to drivers/media/platform/amlogic/meson-ge2d/ge2d.c --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 009CBC433EF for ; Mon, 14 Mar 2022 07:58:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237254AbiCNIAH (ORCPT ); Mon, 14 Mar 2022 04:00:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236978AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49EF14161F; Mon, 14 Mar 2022 00:56:14 -0700 (PDT) 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 9D164611C5; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EFF5C36B06; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244562; bh=S1VM+oW7wRch+UqYMXOGytVT7MR4fILO5/kTGL/OkT4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gULm8d4rxnTObBSGKxu44j/nPccwYXumWmDybuhcsBhvy8zB21W+bLRDm8RE9sTRK VJ5XBAzSm0OoyNNoqkdYT6UIGOFNJo/AmPIaHhtvM/BzRsuTWKpI2yuPVPkLLNtvom QxwP1jfAqKMbTsvqfhLXwEq6GlqHBFeDVV+nlBoM+4Q4K60uVEigLNzbiHr6HCjcOA Hzl0M13SNZJ10FWzrLT1ABzad+tC51GVlNvX8xU3rsX41ZvAgk2DEm4tJCdiwUrtCF o9ErVvoqBrfcsBAeFEX7lg7RLn9PXJvbi8iWJcHknNzpVoA5XSFEMWcaFcpVRO/+gp XXzE4Ixlhwvmw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kWx-2L; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , AngeloGioacchino Del Regno , Bin Liu , Cai Huoqing , Colin Ian King , Dafna Hirschfeld , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Kieran Bingham , 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 43/64] media: platform: rename mtk-jpeg/ to mediatek/mtk-jpeg/ Date: Mon, 14 Mar 2022 08:55:35 +0100 Message-Id: <6b4d80f28b481bdf9385faeb3bf46f10bc1242cb.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ =3D> mediatek}/mtk-jpeg/Kconfig | 0 drivers/media/platform/{ =3D> mediatek}/mtk-jpeg/Makefile | 0 drivers/media/platform/{ =3D> mediatek}/mtk-jpeg/mtk_jpeg_core.c | 0 drivers/media/platform/{ =3D> mediatek}/mtk-jpeg/mtk_jpeg_core.h | 0 .../media/platform/{ =3D> mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.c | 0 .../media/platform/{ =3D> mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.h | 0 .../media/platform/{ =3D> mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.c | 0 .../media/platform/{ =3D> mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.h | 0 .../media/platform/{ =3D> mediatek}/mtk-jpeg/mtk_jpeg_dec_reg.h | 0 .../media/platform/{ =3D> mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.c | 0 .../media/platform/{ =3D> mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.h | 0 14 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ =3D> mediatek}/mtk-jpeg/Kconfig (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-jpeg/Makefile (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-jpeg/mtk_jpeg_core.c (1= 00%) rename drivers/media/platform/{ =3D> mediatek}/mtk-jpeg/mtk_jpeg_core.h (1= 00%) rename drivers/media/platform/{ =3D> mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.c = (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.h = (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-jpeg/mtk_jpeg_dec_parse= .c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-jpeg/mtk_jpeg_dec_parse= .h (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-jpeg/mtk_jpeg_dec_reg.h= (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.c = (100%) rename drivers/media/platform/{ =3D> 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/ =20 MEDIATEK MDP DRIVER M: Minghsiu Tsai diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index b4faee0a1b63..f1746529e763 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/Makef= ile index 48531f93d92f..c792f6216918 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -18,7 +18,7 @@ obj-y +=3D exynos-gsc/ obj-y +=3D exynos4-is/ obj-y +=3D intel/ obj-y +=3D marvell/ -obj-y +=3D mtk-jpeg/ +obj-y +=3D mediatek/mtk-jpeg/ obj-y +=3D mtk-mdp/ obj-y +=3D mtk-vcodec/ obj-y +=3D mtk-vpu/ diff --git a/drivers/media/platform/mtk-jpeg/Kconfig b/drivers/media/platfo= rm/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/platf= orm/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/medi= a/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/medi= a/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/me= dia/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/me= dia/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/m= edia/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/me= dia/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/me= dia/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 --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40ED6C433F5 for ; Mon, 14 Mar 2022 08:00:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237264AbiCNIBY (ORCPT ); Mon, 14 Mar 2022 04:01:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236985AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FB3341625; Mon, 14 Mar 2022 00:56:14 -0700 (PDT) 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 A1149611CE; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5239DC36B08; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244562; bh=B5nZyd0Il5jD5iHe8BnOlrFLcEa+HQ1DD1wbSOpL8MA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bdUBTjE75pAHoc0E0qw94R4dOAk6jO5YD85Q5Gsw2/nJHiR9c4iofr8q6ZrCUpeQj wio5D0KIqX0xk+uWXj3PbzBQpxblBaCs0D2OINpD/VlF1/7zYMDLnend5Ak6/0REn7 HBK/6dfcgiu3C+8C+Da87xp9U8qttPZHyCz6a2J9pEQ1deQo+8PnojjpqFZhrP1sRL flvc9zpOsmk6othbL03d8m4hygIY1CpXHs6ewv6nJl1q9Y0OOzpb32kezYVtWiMPMK Om2Q+B8XYtdrg1C5EeaBE+bBJR9780Tl3qGnnB+2Tm9v3HYNfqggyYmYomimsfOyDS 3E0eALnVau8UA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kX1-3n; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Andrew-CT Chen , AngeloGioacchino Del Regno , Arnd Bergmann , 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 , 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 44/64] media: platform: rename mtk-mdp/ to mediatek/mtk-mdp/ Date: Mon, 14 Mar 2022 08:55:36 +0100 Message-Id: <63c4997f598fca76ef0876151d38dcfbb156f8b1.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ =3D> mediatek}/mtk-mdp/Kconfig | 0 drivers/media/platform/{ =3D> mediatek}/mtk-mdp/Makefile | 0 drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_comp.c | 0 drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_comp.h | 0 drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_core.c | 0 drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_core.h | 0 drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_ipi.h | 0 drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_m2m.c | 0 drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_m2m.h | 0 drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_regs.c | 0 drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_regs.h | 0 drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_vpu.c | 0 drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_vpu.h | 0 16 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ =3D> mediatek}/mtk-mdp/Kconfig (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-mdp/Makefile (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_comp.c (100= %) rename drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_comp.h (100= %) rename drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_core.c (100= %) rename drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_core.h (100= %) rename drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_ipi.h (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_m2m.c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_m2m.h (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_regs.c (100= %) rename drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_regs.h (100= %) rename drivers/media/platform/{ =3D> mediatek}/mtk-mdp/mtk_mdp_vpu.c (100%) rename drivers/media/platform/{ =3D> 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/ =20 MEDIATEK MEDIA DRIVER diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index f1746529e763..8a7ac0b8e09f 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/Makef= ile index c792f6216918..6f5d09cd8f9b 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -19,7 +19,7 @@ obj-y +=3D exynos4-is/ obj-y +=3D intel/ obj-y +=3D marvell/ obj-y +=3D mediatek/mtk-jpeg/ -obj-y +=3D mtk-mdp/ +obj-y +=3D mediatek/mtk-mdp/ obj-y +=3D mtk-vcodec/ obj-y +=3D mtk-vpu/ obj-y +=3D nxp/ diff --git a/drivers/media/platform/mtk-mdp/Kconfig b/drivers/media/platfor= m/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/platfo= rm/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/p= latform/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/p= latform/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/p= latform/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/p= latform/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/p= latform/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 --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8448C433EF for ; Mon, 14 Mar 2022 08:00:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237418AbiCNIB5 (ORCPT ); Mon, 14 Mar 2022 04:01:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236924AbiCNH5f (ORCPT ); Mon, 14 Mar 2022 03:57:35 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8670F4133C; Mon, 14 Mar 2022 00:56:11 -0700 (PDT) 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 D8189B80D4B; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D0A6C36B09; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244562; bh=n/UoFSRaEnwbl3Y+dHXeARVN1a8H5ZurI28WAt99CBo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CJtyxpCO+e5bOhMzPTFrXJCWExC2+TNTBp4gJdfiwvRo2Mvt2NWff2K5YmBS7rGY+ Urm+10X7yKPXSWU/nAeHVEvniNBAeV9+FX/Z8dLrjVDbCn9KI8/ymtPXVqPqqOFQU2 Finmtzjh2TifpQ3lSE1wPlcuwofXCsI+3nsn8XLKCE+JG71gyBJfN+EJihVf4U4Cdv GxYLKMyH3SuxYivbaPFfgRbHLsAQv6FvxUUUagPnNxpMRAfb2ptjIFm3UVwz8ADvTO inB+x4ZEt9pDyArlajriFFbXlPQDL86k3SloBfqhqM2Yr2aK5fXC4R0TK8jPkKEooo lQdOBHKmrIQug== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kX5-5X; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , 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 , Maoguang Meng , Matthias Brugger , Ming Qian , Nicolas Dufresne , Sakari Ailus , Steve Cho , Tiffany Lin , Tzung-Bi Shih , Yang Li , 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 45/64] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/ Date: Mon, 14 Mar 2022 08:55:37 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 --- To avoid mailbombing on a large number of people, only mailing lists were C= /C on the cover. See [PATCH 00/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/Kconfig | 0 drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/Makefile | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec.c | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec.h | 0 .../platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c | 0 .../platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c | 0 .../platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h | 0 .../platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c | 0 .../platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h | 0 .../{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c | 0 .../{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_drv.h | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_enc.c | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_enc.h | 0 .../platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c | 0 .../platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c | 0 .../platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_fw.c | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_fw.h | 0 .../platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h | 0 .../platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c | 0 .../platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_intr.c | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_intr.h | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_util.c | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_util.h | 0 .../platform/{ =3D> mediatek}/mtk-vcodec/vdec/vdec_h264_if.c | 0 .../platform/{ =3D> mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/vdec_drv_base.h | 0 drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/vdec_drv_if.c | 0 drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/vdec_drv_if.h | 0 drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/vdec_ipi_msg.h | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/vdec_msg_queue.c | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/vdec_msg_queue.h | 0 drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/vdec_vpu_if.c | 0 drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/vdec_vpu_if.h | 0 .../platform/{ =3D> mediatek}/mtk-vcodec/venc/venc_h264_if.c | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/venc/venc_vp8_if.c | 0 .../media/platform/{ =3D> mediatek}/mtk-vcodec/venc_drv_base.h | 0 drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/venc_drv_if.c | 0 drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/venc_drv_if.h | 0 drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/venc_ipi_msg.h | 0 drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/venc_vpu_if.c | 0 drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/venc_vpu_if.h | 0 49 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/Kconfig (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/Makefile (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec.c= (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec.h= (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec_d= rv.c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec_h= w.c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec_h= w.h (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec_p= m.c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec_p= m.h (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec_s= tateful.c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_dec_s= tateless.c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_drv.h= (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_enc.c= (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_enc.h= (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_enc_d= rv.c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_enc_p= m.c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_enc_p= m.h (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_fw.c = (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_fw.h = (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_fw_pr= iv.h (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_fw_sc= p.c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_fw_vp= u.c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_intr.= c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_intr.= h (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_util.= c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/mtk_vcodec_util.= h (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/vdec/vdec_h264_i= f.c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/vdec/vdec_h264_r= eq_if.c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/vdec/vdec_vp8_if= .c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/vdec/vdec_vp9_if= .c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/vdec_drv_base.h = (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/vdec_drv_if.c (1= 00%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/vdec_drv_if.h (1= 00%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/vdec_ipi_msg.h (= 100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/vdec_msg_queue.c= (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/vdec_msg_queue.h= (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/vdec_vpu_if.c (1= 00%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/vdec_vpu_if.h (1= 00%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/venc/venc_h264_i= f.c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/venc/venc_vp8_if= .c (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/venc_drv_base.h = (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/venc_drv_if.c (1= 00%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/venc_drv_if.h (1= 00%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/venc_ipi_msg.h (= 100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/venc_vpu_if.c (1= 00%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vcodec/venc_vpu_if.h (1= 00%) 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/ =20 MEDIATEK MMC/SD/SDIO DRIVER diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 8a7ac0b8e09f..10055af0c7f8 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/Makef= ile index 6f5d09cd8f9b..637a3a7ac036 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -20,7 +20,7 @@ obj-y +=3D intel/ obj-y +=3D marvell/ obj-y +=3D mediatek/mtk-jpeg/ obj-y +=3D mediatek/mtk-mdp/ -obj-y +=3D mtk-vcodec/ +obj-y +=3D mediatek/mtk-vcodec/ obj-y +=3D mtk-vpu/ obj-y +=3D nxp/ obj-y +=3D omap/ diff --git a/drivers/media/platform/mtk-vcodec/Kconfig b/drivers/media/plat= form/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/pla= tform/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/m= edia/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/m= edia/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/drive= rs/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/driver= s/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/driver= s/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/driver= s/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/driver= s/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_statefu= l.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_statele= ss.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/m= edia/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/m= edia/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/m= edia/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/drive= rs/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/driver= s/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/driver= s/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/me= dia/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/me= dia/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/drive= rs/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/driver= s/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/driver= s/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/driver= s/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/dr= ivers/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/me= dia/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/medi= a/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/medi= a/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/med= ia/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/m= edia/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/m= edia/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/medi= a/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/medi= a/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/driver= s/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/me= dia/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/medi= a/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/medi= a/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/med= ia/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/medi= a/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/medi= a/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 --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E245C433EF for ; Mon, 14 Mar 2022 08:00:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237391AbiCNIBo (ORCPT ); Mon, 14 Mar 2022 04:01:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236928AbiCNH5f (ORCPT ); Mon, 14 Mar 2022 03:57:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2296341608; Mon, 14 Mar 2022 00:56:13 -0700 (PDT) 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 8D5F7611C0; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D3F4C36B0A; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244562; bh=frM2TrgnfHXXWxzvLlBjDHJ6SZXKkAW32KrVCq9TUeg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lYplchdHkgp1dzoIMq6v5/pU/0JEfGkpMoc7Ci3sHQRRW4492Cjj+U7QzOCowIPz9 982e6MnMwdtaOpVKIuBMg8dOwk92NUGtjJxzGkv/kZCxi0dhSXAIy7TQH1Qbjfcft1 yJN11ww/PfxUXKSorLWUO1+Rdiax1Rg1txwntuODonaMRXqBthLP5UtHHDIAFmnN/Z /6DPxlTE5J4ARvkn915mAkRhLRiSVsbpWieIZ385Itaieds6tdsdgKVK9uwwmaav19 bTYIoZHUzE1/LbeMmKbL6/FUjDdIu1nsawBpPkwofhnIzK5XTy4xECVOVVT0bJ6eua T0R34Ir6ZhP4A== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kX9-7N; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , 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 46/64] media: platform: rename mtk-vpu/ to mediatek/mtk-vpu/ Date: Mon, 14 Mar 2022 08:55:38 +0100 Message-Id: <019918d9c896ddb1f3968d0fcd825c0ef1464899.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@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/{ =3D> mediatek}/mtk-vpu/Kconfig | 0 drivers/media/platform/{ =3D> mediatek}/mtk-vpu/Makefile | 0 drivers/media/platform/{ =3D> mediatek}/mtk-vpu/mtk_vpu.c | 0 drivers/media/platform/{ =3D> mediatek}/mtk-vpu/mtk_vpu.h | 0 8 files changed, 5 insertions(+), 5 deletions(-) rename drivers/media/platform/{ =3D> mediatek}/mtk-vpu/Kconfig (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vpu/Makefile (100%) rename drivers/media/platform/{ =3D> mediatek}/mtk-vpu/mtk_vpu.c (100%) rename drivers/media/platform/{ =3D> 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/ =20 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/ =20 MEDIATEK MMC/SD/SDIO DRIVER M: Chaotian Jing diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 10055af0c7f8..a9ad0c3bd0cc 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/Makef= ile index 637a3a7ac036..954ad8f2cde1 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -21,7 +21,7 @@ obj-y +=3D marvell/ obj-y +=3D mediatek/mtk-jpeg/ obj-y +=3D mediatek/mtk-mdp/ obj-y +=3D mediatek/mtk-vcodec/ -obj-y +=3D mtk-vpu/ +obj-y +=3D mediatek/mtk-vpu/ obj-y +=3D nxp/ obj-y +=3D omap/ obj-y +=3D omap3isp/ diff --git a/drivers/media/platform/mediatek/mtk-mdp/Makefile b/drivers/med= ia/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 +=3D mtk_mdp_vpu.o =20 obj-$(CONFIG_VIDEO_MEDIATEK_MDP) +=3D mtk-mdp.o =20 -ccflags-y +=3D -I$(srctree)/drivers/media/platform/mtk-vpu +ccflags-y +=3D -I$(srctree)/drivers/media/platform/mediatek/mtk-vpu diff --git a/drivers/media/platform/mtk-vpu/Kconfig b/drivers/media/platfor= m/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/platfo= rm/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/platf= orm/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/platf= orm/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 --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBC4CC433FE for ; Mon, 14 Mar 2022 07:59:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237288AbiCNIAQ (ORCPT ); Mon, 14 Mar 2022 04:00:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236980AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DFF941621; Mon, 14 Mar 2022 00:56:14 -0700 (PDT) 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 BD573611A9; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 772E2C36B0D; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244562; bh=K4SxiVfou/0FkCX5beADgb95sS9gnpCFXma9Zy6J3xY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Aw1/tg5IPJ2LXOABClN335wDRaYv+EgrV4oxWKfgJL9DKqOWo6BWPPJxTXkEF4LmP rShey7oRSE2tFLKMHvc1jAIZJEGVyztkvDyYjMtxO8wSXjOwm/8pqmHRjCHcU49JON o5asw+S5rlJK5M0e6mwTU8Woc+7oHDnVsp+pop7E7JgX8znb/kk5Nj+E2Y3rDBGWKy iUCUTMZwCaCP2QXO94nyc8OIqyVPTLZGiSrMnqcRzSFqyjoPVf/8uxR4wlb1RVL5Nz TZiVl/f3LV0fxuCVyVKx1F/tK1UBkRQ9/sFOrgXnQJuARFImLa4LTbwLiaPDEfEl91 nOk1ukYe4iRRQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXD-8y; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Cai Huoqing , Chen-Yu Tsai , Dinghao Liu , Dmitry Osipenko , Eugen Hristev , Ezequiel Garcia , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Jia-Ju Bai , Jonathan Cameron , Laurent Pinchart , Maxime Ripard , Mikhail Rudenko , Ming Qian , Ondrej Jirman , Robert Foss , Rui Miguel Silva , Sakari Ailus , Tomi Valkeinen , Yong Deng , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 47/64] media: platform: rename sunxi/ to allwinner/ Date: Mon, 14 Mar 2022 08:55:39 +0100 Message-Id: <52bfc0e6138210e85fc014f65565a86505f2f8c0.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the end goal is to have platform drivers split by vendor, rename sunxi/ to allwinner/. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 8 ++++---- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/allwinner/Kconfig | 6 ++++++ drivers/media/platform/{sunxi =3D> allwinner}/Makefile | 0 .../media/platform/{sunxi =3D> allwinner}/sun4i-csi/Kconfig | 0 .../platform/{sunxi =3D> allwinner}/sun4i-csi/Makefile | 0 .../platform/{sunxi =3D> allwinner}/sun4i-csi/sun4i_csi.c | 0 .../platform/{sunxi =3D> allwinner}/sun4i-csi/sun4i_csi.h | 0 .../platform/{sunxi =3D> allwinner}/sun4i-csi/sun4i_dma.c | 0 .../platform/{sunxi =3D> allwinner}/sun4i-csi/sun4i_v4l2.c | 0 .../media/platform/{sunxi =3D> allwinner}/sun6i-csi/Kconfig | 0 .../platform/{sunxi =3D> allwinner}/sun6i-csi/Makefile | 0 .../platform/{sunxi =3D> allwinner}/sun6i-csi/sun6i_csi.c | 0 .../platform/{sunxi =3D> allwinner}/sun6i-csi/sun6i_csi.h | 0 .../{sunxi =3D> allwinner}/sun6i-csi/sun6i_csi_reg.h | 0 .../platform/{sunxi =3D> allwinner}/sun6i-csi/sun6i_video.c | 0 .../platform/{sunxi =3D> allwinner}/sun6i-csi/sun6i_video.h | 0 .../media/platform/{sunxi =3D> allwinner}/sun8i-di/Kconfig | 0 .../media/platform/{sunxi =3D> allwinner}/sun8i-di/Makefile | 0 .../platform/{sunxi =3D> allwinner}/sun8i-di/sun8i-di.c | 0 .../platform/{sunxi =3D> allwinner}/sun8i-di/sun8i-di.h | 0 .../platform/{sunxi =3D> allwinner}/sun8i-rotate/Kconfig | 0 .../platform/{sunxi =3D> allwinner}/sun8i-rotate/Makefile | 0 .../{sunxi =3D> allwinner}/sun8i-rotate/sun8i-formats.h | 0 .../{sunxi =3D> allwinner}/sun8i-rotate/sun8i-rotate.h | 0 .../{sunxi =3D> allwinner}/sun8i-rotate/sun8i_formats.c | 0 .../{sunxi =3D> allwinner}/sun8i-rotate/sun8i_rotate.c | 0 drivers/media/platform/sunxi/Kconfig | 6 ------ 29 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 drivers/media/platform/allwinner/Kconfig rename drivers/media/platform/{sunxi =3D> allwinner}/Makefile (100%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun4i-csi/Kconfig (10= 0%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun4i-csi/Makefile (1= 00%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun4i-csi/sun4i_csi.c= (100%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun4i-csi/sun4i_csi.h= (100%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun4i-csi/sun4i_dma.c= (100%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun4i-csi/sun4i_v4l2.= c (100%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun6i-csi/Kconfig (10= 0%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun6i-csi/Makefile (1= 00%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun6i-csi/sun6i_csi.c= (100%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun6i-csi/sun6i_csi.h= (100%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun6i-csi/sun6i_csi_r= eg.h (100%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun6i-csi/sun6i_video= .c (100%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun6i-csi/sun6i_video= .h (100%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun8i-di/Kconfig (100= %) rename drivers/media/platform/{sunxi =3D> allwinner}/sun8i-di/Makefile (10= 0%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun8i-di/sun8i-di.c (= 100%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun8i-di/sun8i-di.h (= 100%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun8i-rotate/Kconfig = (100%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun8i-rotate/Makefile= (100%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun8i-rotate/sun8i-fo= rmats.h (100%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun8i-rotate/sun8i-ro= tate.h (100%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun8i-rotate/sun8i_fo= rmats.c (100%) rename drivers/media/platform/{sunxi =3D> allwinner}/sun8i-rotate/sun8i_ro= tate.c (100%) delete mode 100644 drivers/media/platform/sunxi/Kconfig diff --git a/MAINTAINERS b/MAINTAINERS index 58e0d42b1278..f29195850c16 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -750,7 +750,7 @@ L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml -F: drivers/media/platform/sunxi/sun4i-csi/ +F: drivers/media/platform/allwinner/sun4i-csi/ =20 ALLWINNER CPUFREQ DRIVER M: Yangtao Li @@ -5114,7 +5114,7 @@ L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml -F: drivers/media/platform/sunxi/sun6i-csi/ +F: drivers/media/platform/allwinner/sun6i-csi/ =20 CW1200 WLAN driver M: Solomon Peachy @@ -5391,7 +5391,7 @@ L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.= yaml -F: drivers/media/platform/sunxi/sun8i-di/ +F: drivers/media/platform/allwinner/sun8i-di/ =20 DELL LAPTOP DRIVER M: Matthew Garrett @@ -16746,7 +16746,7 @@ L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate= .yaml -F: drivers/media/platform/sunxi/sun8i-rotate/ +F: drivers/media/platform/allwinner/sun8i-rotate/ =20 RPMSG TTY DRIVER M: Arnaud Pouliquen diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index a9ad0c3bd0cc..61240f8226bb 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -66,6 +66,7 @@ config VIDEO_MUX # TODO: create per-manufacturer directories =20 source "drivers/media/platform/allegro-dvt/Kconfig" +source "drivers/media/platform/allwinner/Kconfig" source "drivers/media/platform/am437x/Kconfig" source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" source "drivers/media/platform/amphion/Kconfig" @@ -94,7 +95,6 @@ source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" -source "drivers/media/platform/sunxi/Kconfig" source "drivers/media/platform/tegra/vde/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/via/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index 954ad8f2cde1..88519e902919 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -6,6 +6,7 @@ # Place here, alphabetically sorted by directory # (e. g. LC_ALL=3DC sort Makefile) obj-y +=3D allegro-dvt/ +obj-y +=3D allwinner/ obj-y +=3D am437x/ obj-y +=3D amlogic/meson-ge2d/ obj-y +=3D amphion/ @@ -39,7 +40,6 @@ obj-y +=3D sti/c8sectpfe/ obj-y +=3D sti/delta/ obj-y +=3D sti/hva/ obj-y +=3D stm32/ -obj-y +=3D sunxi/ obj-y +=3D tegra/vde/ obj-y +=3D ti-vpe/ obj-y +=3D via/ diff --git a/drivers/media/platform/allwinner/Kconfig b/drivers/media/platf= orm/allwinner/Kconfig new file mode 100644 index 000000000000..95a671d87e85 --- /dev/null +++ b/drivers/media/platform/allwinner/Kconfig @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only + +source "drivers/media/platform/allwinner/sun4i-csi/Kconfig" +source "drivers/media/platform/allwinner/sun6i-csi/Kconfig" +source "drivers/media/platform/allwinner/sun8i-di/Kconfig" +source "drivers/media/platform/allwinner/sun8i-rotate/Kconfig" diff --git a/drivers/media/platform/sunxi/Makefile b/drivers/media/platform= /allwinner/Makefile similarity index 100% rename from drivers/media/platform/sunxi/Makefile rename to drivers/media/platform/allwinner/Makefile diff --git a/drivers/media/platform/sunxi/sun4i-csi/Kconfig b/drivers/media= /platform/allwinner/sun4i-csi/Kconfig similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/Kconfig rename to drivers/media/platform/allwinner/sun4i-csi/Kconfig diff --git a/drivers/media/platform/sunxi/sun4i-csi/Makefile b/drivers/medi= a/platform/allwinner/sun4i-csi/Makefile similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/Makefile rename to drivers/media/platform/allwinner/sun4i-csi/Makefile diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c b/drivers/m= edia/platform/allwinner/sun4i-csi/sun4i_csi.c similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.c diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h b/drivers/m= edia/platform/allwinner/sun4i-csi/sun4i_csi.h similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.h diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c b/drivers/m= edia/platform/allwinner/sun4i-csi/sun4i_dma.c similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_dma.c diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c b/drivers/= media/platform/allwinner/sun4i-csi/sun4i_v4l2.c similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_v4l2.c diff --git a/drivers/media/platform/sunxi/sun6i-csi/Kconfig b/drivers/media= /platform/allwinner/sun6i-csi/Kconfig similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/Kconfig rename to drivers/media/platform/allwinner/sun6i-csi/Kconfig diff --git a/drivers/media/platform/sunxi/sun6i-csi/Makefile b/drivers/medi= a/platform/allwinner/sun6i-csi/Makefile similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/Makefile rename to drivers/media/platform/allwinner/sun6i-csi/Makefile diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/m= edia/platform/allwinner/sun6i-csi/sun6i_csi.c similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.c diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h b/drivers/m= edia/platform/allwinner/sun6i-csi/sun6i_csi.h similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.h diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h b/drive= rs/media/platform/allwinner/sun6i-csi/sun6i_csi_reg.h similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_csi_reg.h diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c b/drivers= /media/platform/allwinner/sun6i-csi/sun6i_video.c similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_video.c diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h b/drivers= /media/platform/allwinner/sun6i-csi/sun6i_video.h similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_video.h diff --git a/drivers/media/platform/sunxi/sun8i-di/Kconfig b/drivers/media/= platform/allwinner/sun8i-di/Kconfig similarity index 100% rename from drivers/media/platform/sunxi/sun8i-di/Kconfig rename to drivers/media/platform/allwinner/sun8i-di/Kconfig diff --git a/drivers/media/platform/sunxi/sun8i-di/Makefile b/drivers/media= /platform/allwinner/sun8i-di/Makefile similarity index 100% rename from drivers/media/platform/sunxi/sun8i-di/Makefile rename to drivers/media/platform/allwinner/sun8i-di/Makefile diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c b/drivers/med= ia/platform/allwinner/sun8i-di/sun8i-di.c similarity index 100% rename from drivers/media/platform/sunxi/sun8i-di/sun8i-di.c rename to drivers/media/platform/allwinner/sun8i-di/sun8i-di.c diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.h b/drivers/med= ia/platform/allwinner/sun8i-di/sun8i-di.h similarity index 100% rename from drivers/media/platform/sunxi/sun8i-di/sun8i-di.h rename to drivers/media/platform/allwinner/sun8i-di/sun8i-di.h diff --git a/drivers/media/platform/sunxi/sun8i-rotate/Kconfig b/drivers/me= dia/platform/allwinner/sun8i-rotate/Kconfig similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/Kconfig rename to drivers/media/platform/allwinner/sun8i-rotate/Kconfig diff --git a/drivers/media/platform/sunxi/sun8i-rotate/Makefile b/drivers/m= edia/platform/allwinner/sun8i-rotate/Makefile similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/Makefile rename to drivers/media/platform/allwinner/sun8i-rotate/Makefile diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i-formats.h b/dr= ivers/media/platform/allwinner/sun8i-rotate/sun8i-formats.h similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i-formats.h rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i-formats.h diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i-rotate.h b/dri= vers/media/platform/allwinner/sun8i-rotate/sun8i-rotate.h similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i-rotate.h rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i-rotate.h diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_formats.c b/dr= ivers/media/platform/allwinner/sun8i-rotate/sun8i_formats.c similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i_formats.c rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i_formats.c diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c b/dri= vers/media/platform/allwinner/sun8i-rotate/sun8i_rotate.c similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i_rotate.c diff --git a/drivers/media/platform/sunxi/Kconfig b/drivers/media/platform/= sunxi/Kconfig deleted file mode 100644 index a10032215b08..000000000000 --- a/drivers/media/platform/sunxi/Kconfig +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - -source "drivers/media/platform/sunxi/sun4i-csi/Kconfig" -source "drivers/media/platform/sunxi/sun6i-csi/Kconfig" -source "drivers/media/platform/sunxi/sun8i-di/Kconfig" -source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig" --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFE1DC433EF for ; Mon, 14 Mar 2022 08:00:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236968AbiCNIBe (ORCPT ); Mon, 14 Mar 2022 04:01:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236974AbiCNH5t (ORCPT ); Mon, 14 Mar 2022 03:57:49 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A01741620; Mon, 14 Mar 2022 00:56:14 -0700 (PDT) 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 A32DB611D4; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87023C36B0F; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244562; bh=vLaZ7WUJiCwzgR82FCr02z2lYi4J1bMd7ENNfIorXWw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FRY8b5nwJ8xV7PvUFHaJkYX4KzHrhTDeJ6TMvniHxeQ9RjK2/Qo+EkdA2BL6bxSMT ropADukJxl5rBWqILMB7glfBgbzZ/vwxOX4pOgCGn8ZwMXqXXhtZyKKjwjJ5FUrq/n EEy/JWXvRxFcoxKFflM850Fl8AZSG2XL0tGO75JgQactwsMSXszL7BZvxyGhhxe4rw pCGpKHrNI4KXOtiy1woTddqn72svs55TSL2W87NiEliPwIhe6P6KbZtitrHTk4lX2i 1r8kgz7XF13xzyNjcRX8dvBfw3aCXU2Tdl1flc5vj8yPPao2vTYStQzAXe7gjP9Oby EVoTt2+2cZkhw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXH-Ae; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Eugen Hristev , Greg Kroah-Hartman , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Jonathan Hunter , Laurent Pinchart , Ming Qian , Sakari Ailus , Sumit Semwal , Thierry Reding , Ulf Hansson , Yang Yingliang , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH 48/64] media: platform: rename tegra/vde/ to nvidia/tegra-vde/ Date: Mon, 14 Mar 2022 08:55:40 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the end goal is to have platform drivers split by vendor, rename tegra/vde/ to nvidia/tegra-vde/. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{tegra/vde =3D> nvidia/tegra-vde}/Kconfig | 0 drivers/media/platform/{tegra/vde =3D> nvidia/tegra-vde}/Makefile | 0 .../platform/{tegra/vde =3D> nvidia/tegra-vde}/dmabuf-cache.c | 0 drivers/media/platform/{tegra/vde =3D> nvidia/tegra-vde}/h264.c | 0 drivers/media/platform/{tegra/vde =3D> nvidia/tegra-vde}/iommu.c | 0 drivers/media/platform/{tegra/vde =3D> nvidia/tegra-vde}/trace.h | 2 +- drivers/media/platform/{tegra/vde =3D> nvidia/tegra-vde}/v4l2.c | 0 drivers/media/platform/{tegra/vde =3D> nvidia/tegra-vde}/vde.c | 0 drivers/media/platform/{tegra/vde =3D> nvidia/tegra-vde}/vde.h | 0 12 files changed, 4 insertions(+), 4 deletions(-) rename drivers/media/platform/{tegra/vde =3D> nvidia/tegra-vde}/Kconfig (1= 00%) rename drivers/media/platform/{tegra/vde =3D> nvidia/tegra-vde}/Makefile (= 100%) rename drivers/media/platform/{tegra/vde =3D> nvidia/tegra-vde}/dmabuf-cac= he.c (100%) rename drivers/media/platform/{tegra/vde =3D> nvidia/tegra-vde}/h264.c (10= 0%) rename drivers/media/platform/{tegra/vde =3D> nvidia/tegra-vde}/iommu.c (1= 00%) rename drivers/media/platform/{tegra/vde =3D> nvidia/tegra-vde}/trace.h (9= 7%) rename drivers/media/platform/{tegra/vde =3D> nvidia/tegra-vde}/v4l2.c (10= 0%) rename drivers/media/platform/{tegra/vde =3D> nvidia/tegra-vde}/vde.c (100= %) rename drivers/media/platform/{tegra/vde =3D> nvidia/tegra-vde}/vde.h (100= %) diff --git a/MAINTAINERS b/MAINTAINERS index f29195850c16..c9333d46047e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11964,7 +11964,7 @@ L: linux-tegra@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt -F: drivers/media/platform/tegra/vde/ +F: drivers/media/platform/nvidia/tegra-vde/ =20 MEDIA DRIVERS FOR RENESAS - CEU M: Jacopo Mondi diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 61240f8226bb..13d8f3e59116 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -83,6 +83,7 @@ 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/nxp/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/omap3isp/Kconfig" @@ -95,7 +96,6 @@ source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" -source "drivers/media/platform/tegra/vde/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index 88519e902919..ce9909534218 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -23,6 +23,7 @@ obj-y +=3D mediatek/mtk-jpeg/ obj-y +=3D mediatek/mtk-mdp/ obj-y +=3D mediatek/mtk-vcodec/ obj-y +=3D mediatek/mtk-vpu/ +obj-y +=3D nvidia/tegra-vde/ obj-y +=3D nxp/ obj-y +=3D omap/ obj-y +=3D omap3isp/ @@ -40,7 +41,6 @@ obj-y +=3D sti/c8sectpfe/ obj-y +=3D sti/delta/ obj-y +=3D sti/hva/ obj-y +=3D stm32/ -obj-y +=3D tegra/vde/ obj-y +=3D ti-vpe/ obj-y +=3D via/ obj-y +=3D xilinx/ diff --git a/drivers/media/platform/tegra/vde/Kconfig b/drivers/media/platf= orm/nvidia/tegra-vde/Kconfig similarity index 100% rename from drivers/media/platform/tegra/vde/Kconfig rename to drivers/media/platform/nvidia/tegra-vde/Kconfig diff --git a/drivers/media/platform/tegra/vde/Makefile b/drivers/media/plat= form/nvidia/tegra-vde/Makefile similarity index 100% rename from drivers/media/platform/tegra/vde/Makefile rename to drivers/media/platform/nvidia/tegra-vde/Makefile diff --git a/drivers/media/platform/tegra/vde/dmabuf-cache.c b/drivers/medi= a/platform/nvidia/tegra-vde/dmabuf-cache.c similarity index 100% rename from drivers/media/platform/tegra/vde/dmabuf-cache.c rename to drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c diff --git a/drivers/media/platform/tegra/vde/h264.c b/drivers/media/platfo= rm/nvidia/tegra-vde/h264.c similarity index 100% rename from drivers/media/platform/tegra/vde/h264.c rename to drivers/media/platform/nvidia/tegra-vde/h264.c diff --git a/drivers/media/platform/tegra/vde/iommu.c b/drivers/media/platf= orm/nvidia/tegra-vde/iommu.c similarity index 100% rename from drivers/media/platform/tegra/vde/iommu.c rename to drivers/media/platform/nvidia/tegra-vde/iommu.c diff --git a/drivers/media/platform/tegra/vde/trace.h b/drivers/media/platf= orm/nvidia/tegra-vde/trace.h similarity index 97% rename from drivers/media/platform/tegra/vde/trace.h rename to drivers/media/platform/nvidia/tegra-vde/trace.h index 77358ddfdb8f..7853ab095ca4 100644 --- a/drivers/media/platform/tegra/vde/trace.h +++ b/drivers/media/platform/nvidia/tegra-vde/trace.h @@ -90,6 +90,6 @@ TRACE_EVENT(vde_ref_l1, =20 /* This part must be outside protection */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../../drivers/media/platform/tegra/vde +#define TRACE_INCLUDE_PATH ../../drivers/media/platform/nvidia/tegra-vde #define TRACE_INCLUDE_FILE trace #include diff --git a/drivers/media/platform/tegra/vde/v4l2.c b/drivers/media/platfo= rm/nvidia/tegra-vde/v4l2.c similarity index 100% rename from drivers/media/platform/tegra/vde/v4l2.c rename to drivers/media/platform/nvidia/tegra-vde/v4l2.c diff --git a/drivers/media/platform/tegra/vde/vde.c b/drivers/media/platfor= m/nvidia/tegra-vde/vde.c similarity index 100% rename from drivers/media/platform/tegra/vde/vde.c rename to drivers/media/platform/nvidia/tegra-vde/vde.c diff --git a/drivers/media/platform/tegra/vde/vde.h b/drivers/media/platfor= m/nvidia/tegra-vde/vde.h similarity index 100% rename from drivers/media/platform/tegra/vde/vde.h rename to drivers/media/platform/nvidia/tegra-vde/vde.h --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9DBA4C433EF for ; Mon, 14 Mar 2022 08:00:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237310AbiCNIBa (ORCPT ); Mon, 14 Mar 2022 04:01:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236975AbiCNH5t (ORCPT ); Mon, 14 Mar 2022 03:57:49 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6C8941616; Mon, 14 Mar 2022 00:56:13 -0700 (PDT) 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 sin.source.kernel.org (Postfix) with ESMTPS id DAE74CE10B5; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 897AFC36B10; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244562; bh=33ldIk/ewmr/NLPVYHWMIqcESTNcBpKoTPzPwzIe0n0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XA9YRlHdAwQnPWO3cemaUAjYKpm6af7Q57P7N4xFVl/yBhBODn0m/GuG5p6F3LPSV kLchSoeNMmHRk+XUzUIl5jer+UmfdohY3AyAEwd3zMD4wX+diplO4TepBICnuzAGSj cMzXVv0ArKMGZZui+QwygCM0A8BitMnrarWO+aULibP+s0AcoDV3+UZ5PNWR0fg6G4 v7H9TIh+ECc7qZiVJlKuATN3nx8ZQEOynDlKU/Ruy4Dc6rjboh+aV6xRG+KsllKu8D tXuDySoq21tXuhsYp5ZBUJe2RB+7TCywyfJoKU8okR7LjEsYnY0FLvRJ7dcPxLwzqk Qkg/FAw2/48Dw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXL-CA; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Eugen Hristev , Fabio Estevam , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Laurent Pinchart , Ming Qian , NXP Linux Team , Pengutronix Kernel Team , Sakari Ailus , Sascha Hauer , Shawn Guo , Shijie Qin , Zhou Peng , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 49/64] media: platform: rename amphion/ to nxp/amphion/ Date: Mon, 14 Mar 2022 08:55:41 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the end goal is to have platform drivers split by vendor, rename amphion/ to nxp/amphion/. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ =3D> nxp}/amphion/Kconfig | 0 drivers/media/platform/{ =3D> nxp}/amphion/Makefile | 0 drivers/media/platform/{ =3D> nxp}/amphion/vdec.c | 0 drivers/media/platform/{ =3D> nxp}/amphion/venc.c | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu.h | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_cmds.c | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_cmds.h | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_codec.h | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_color.c | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_core.c | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_core.h | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_dbg.c | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_defs.h | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_drv.c | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_helpers.c | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_helpers.h | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_imx8q.c | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_imx8q.h | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_malone.c | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_malone.h | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_mbox.c | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_mbox.h | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_msgs.c | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_msgs.h | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_rpc.c | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_rpc.h | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_v4l2.c | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_v4l2.h | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_windsor.c | 0 drivers/media/platform/{ =3D> nxp}/amphion/vpu_windsor.h | 0 33 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ =3D> nxp}/amphion/Kconfig (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/Makefile (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vdec.c (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/venc.c (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu.h (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_cmds.c (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_cmds.h (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_codec.h (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_color.c (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_core.c (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_core.h (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_dbg.c (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_defs.h (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_drv.c (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_helpers.c (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_helpers.h (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_imx8q.c (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_imx8q.h (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_malone.c (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_malone.h (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_mbox.c (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_mbox.h (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_msgs.c (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_msgs.h (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_rpc.c (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_rpc.h (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_v4l2.c (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_v4l2.h (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_windsor.c (100%) rename drivers/media/platform/{ =3D> nxp}/amphion/vpu_windsor.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index c9333d46047e..74901acf8f06 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1037,7 +1037,7 @@ M: Zhou Peng L: linux-media@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/media/amphion,vpu.yaml -F: drivers/media/platform/amphion/ +F: drivers/media/platform/nxp/amphion/ =20 AMS AS73211 DRIVER M: Christian Eggers diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 13d8f3e59116..7b88ef15f8c8 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -69,7 +69,6 @@ source "drivers/media/platform/allegro-dvt/Kconfig" source "drivers/media/platform/allwinner/Kconfig" source "drivers/media/platform/am437x/Kconfig" source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" -source "drivers/media/platform/amphion/Kconfig" source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/cadence/Kconfig" @@ -85,6 +84,7 @@ source "drivers/media/platform/mediatek/mtk-vcodec/Kconfi= g" source "drivers/media/platform/mediatek/mtk-vpu/Kconfig" source "drivers/media/platform/nvidia/tegra-vde/Kconfig" source "drivers/media/platform/nxp/Kconfig" +source "drivers/media/platform/nxp/amphion/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/qcom/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index ce9909534218..7a28b60dbbe6 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -9,7 +9,6 @@ obj-y +=3D allegro-dvt/ obj-y +=3D allwinner/ obj-y +=3D am437x/ obj-y +=3D amlogic/meson-ge2d/ -obj-y +=3D amphion/ obj-y +=3D aspeed/ obj-y +=3D atmel/ obj-y +=3D cadence/ @@ -25,6 +24,7 @@ obj-y +=3D mediatek/mtk-vcodec/ obj-y +=3D mediatek/mtk-vpu/ obj-y +=3D nvidia/tegra-vde/ obj-y +=3D nxp/ +obj-y +=3D nxp/amphion/ obj-y +=3D omap/ obj-y +=3D omap3isp/ obj-y +=3D qcom/camss/ diff --git a/drivers/media/platform/amphion/Kconfig b/drivers/media/platfor= m/nxp/amphion/Kconfig similarity index 100% rename from drivers/media/platform/amphion/Kconfig rename to drivers/media/platform/nxp/amphion/Kconfig diff --git a/drivers/media/platform/amphion/Makefile b/drivers/media/platfo= rm/nxp/amphion/Makefile similarity index 100% rename from drivers/media/platform/amphion/Makefile rename to drivers/media/platform/nxp/amphion/Makefile diff --git a/drivers/media/platform/amphion/vdec.c b/drivers/media/platform= /nxp/amphion/vdec.c similarity index 100% rename from drivers/media/platform/amphion/vdec.c rename to drivers/media/platform/nxp/amphion/vdec.c diff --git a/drivers/media/platform/amphion/venc.c b/drivers/media/platform= /nxp/amphion/venc.c similarity index 100% rename from drivers/media/platform/amphion/venc.c rename to drivers/media/platform/nxp/amphion/venc.c diff --git a/drivers/media/platform/amphion/vpu.h b/drivers/media/platform/= nxp/amphion/vpu.h similarity index 100% rename from drivers/media/platform/amphion/vpu.h rename to drivers/media/platform/nxp/amphion/vpu.h diff --git a/drivers/media/platform/amphion/vpu_cmds.c b/drivers/media/plat= form/nxp/amphion/vpu_cmds.c similarity index 100% rename from drivers/media/platform/amphion/vpu_cmds.c rename to drivers/media/platform/nxp/amphion/vpu_cmds.c diff --git a/drivers/media/platform/amphion/vpu_cmds.h b/drivers/media/plat= form/nxp/amphion/vpu_cmds.h similarity index 100% rename from drivers/media/platform/amphion/vpu_cmds.h rename to drivers/media/platform/nxp/amphion/vpu_cmds.h diff --git a/drivers/media/platform/amphion/vpu_codec.h b/drivers/media/pla= tform/nxp/amphion/vpu_codec.h similarity index 100% rename from drivers/media/platform/amphion/vpu_codec.h rename to drivers/media/platform/nxp/amphion/vpu_codec.h diff --git a/drivers/media/platform/amphion/vpu_color.c b/drivers/media/pla= tform/nxp/amphion/vpu_color.c similarity index 100% rename from drivers/media/platform/amphion/vpu_color.c rename to drivers/media/platform/nxp/amphion/vpu_color.c diff --git a/drivers/media/platform/amphion/vpu_core.c b/drivers/media/plat= form/nxp/amphion/vpu_core.c similarity index 100% rename from drivers/media/platform/amphion/vpu_core.c rename to drivers/media/platform/nxp/amphion/vpu_core.c diff --git a/drivers/media/platform/amphion/vpu_core.h b/drivers/media/plat= form/nxp/amphion/vpu_core.h similarity index 100% rename from drivers/media/platform/amphion/vpu_core.h rename to drivers/media/platform/nxp/amphion/vpu_core.h diff --git a/drivers/media/platform/amphion/vpu_dbg.c b/drivers/media/platf= orm/nxp/amphion/vpu_dbg.c similarity index 100% rename from drivers/media/platform/amphion/vpu_dbg.c rename to drivers/media/platform/nxp/amphion/vpu_dbg.c diff --git a/drivers/media/platform/amphion/vpu_defs.h b/drivers/media/plat= form/nxp/amphion/vpu_defs.h similarity index 100% rename from drivers/media/platform/amphion/vpu_defs.h rename to drivers/media/platform/nxp/amphion/vpu_defs.h diff --git a/drivers/media/platform/amphion/vpu_drv.c b/drivers/media/platf= orm/nxp/amphion/vpu_drv.c similarity index 100% rename from drivers/media/platform/amphion/vpu_drv.c rename to drivers/media/platform/nxp/amphion/vpu_drv.c diff --git a/drivers/media/platform/amphion/vpu_helpers.c b/drivers/media/p= latform/nxp/amphion/vpu_helpers.c similarity index 100% rename from drivers/media/platform/amphion/vpu_helpers.c rename to drivers/media/platform/nxp/amphion/vpu_helpers.c diff --git a/drivers/media/platform/amphion/vpu_helpers.h b/drivers/media/p= latform/nxp/amphion/vpu_helpers.h similarity index 100% rename from drivers/media/platform/amphion/vpu_helpers.h rename to drivers/media/platform/nxp/amphion/vpu_helpers.h diff --git a/drivers/media/platform/amphion/vpu_imx8q.c b/drivers/media/pla= tform/nxp/amphion/vpu_imx8q.c similarity index 100% rename from drivers/media/platform/amphion/vpu_imx8q.c rename to drivers/media/platform/nxp/amphion/vpu_imx8q.c diff --git a/drivers/media/platform/amphion/vpu_imx8q.h b/drivers/media/pla= tform/nxp/amphion/vpu_imx8q.h similarity index 100% rename from drivers/media/platform/amphion/vpu_imx8q.h rename to drivers/media/platform/nxp/amphion/vpu_imx8q.h diff --git a/drivers/media/platform/amphion/vpu_malone.c b/drivers/media/pl= atform/nxp/amphion/vpu_malone.c similarity index 100% rename from drivers/media/platform/amphion/vpu_malone.c rename to drivers/media/platform/nxp/amphion/vpu_malone.c diff --git a/drivers/media/platform/amphion/vpu_malone.h b/drivers/media/pl= atform/nxp/amphion/vpu_malone.h similarity index 100% rename from drivers/media/platform/amphion/vpu_malone.h rename to drivers/media/platform/nxp/amphion/vpu_malone.h diff --git a/drivers/media/platform/amphion/vpu_mbox.c b/drivers/media/plat= form/nxp/amphion/vpu_mbox.c similarity index 100% rename from drivers/media/platform/amphion/vpu_mbox.c rename to drivers/media/platform/nxp/amphion/vpu_mbox.c diff --git a/drivers/media/platform/amphion/vpu_mbox.h b/drivers/media/plat= form/nxp/amphion/vpu_mbox.h similarity index 100% rename from drivers/media/platform/amphion/vpu_mbox.h rename to drivers/media/platform/nxp/amphion/vpu_mbox.h diff --git a/drivers/media/platform/amphion/vpu_msgs.c b/drivers/media/plat= form/nxp/amphion/vpu_msgs.c similarity index 100% rename from drivers/media/platform/amphion/vpu_msgs.c rename to drivers/media/platform/nxp/amphion/vpu_msgs.c diff --git a/drivers/media/platform/amphion/vpu_msgs.h b/drivers/media/plat= form/nxp/amphion/vpu_msgs.h similarity index 100% rename from drivers/media/platform/amphion/vpu_msgs.h rename to drivers/media/platform/nxp/amphion/vpu_msgs.h diff --git a/drivers/media/platform/amphion/vpu_rpc.c b/drivers/media/platf= orm/nxp/amphion/vpu_rpc.c similarity index 100% rename from drivers/media/platform/amphion/vpu_rpc.c rename to drivers/media/platform/nxp/amphion/vpu_rpc.c diff --git a/drivers/media/platform/amphion/vpu_rpc.h b/drivers/media/platf= orm/nxp/amphion/vpu_rpc.h similarity index 100% rename from drivers/media/platform/amphion/vpu_rpc.h rename to drivers/media/platform/nxp/amphion/vpu_rpc.h diff --git a/drivers/media/platform/amphion/vpu_v4l2.c b/drivers/media/plat= form/nxp/amphion/vpu_v4l2.c similarity index 100% rename from drivers/media/platform/amphion/vpu_v4l2.c rename to drivers/media/platform/nxp/amphion/vpu_v4l2.c diff --git a/drivers/media/platform/amphion/vpu_v4l2.h b/drivers/media/plat= form/nxp/amphion/vpu_v4l2.h similarity index 100% rename from drivers/media/platform/amphion/vpu_v4l2.h rename to drivers/media/platform/nxp/amphion/vpu_v4l2.h diff --git a/drivers/media/platform/amphion/vpu_windsor.c b/drivers/media/p= latform/nxp/amphion/vpu_windsor.c similarity index 100% rename from drivers/media/platform/amphion/vpu_windsor.c rename to drivers/media/platform/nxp/amphion/vpu_windsor.c diff --git a/drivers/media/platform/amphion/vpu_windsor.h b/drivers/media/p= latform/nxp/amphion/vpu_windsor.h similarity index 100% rename from drivers/media/platform/amphion/vpu_windsor.h rename to drivers/media/platform/nxp/amphion/vpu_windsor.h --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66C70C433EF for ; Mon, 14 Mar 2022 07:59:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237304AbiCNIAx (ORCPT ); Mon, 14 Mar 2022 04:00:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237017AbiCNH5v (ORCPT ); Mon, 14 Mar 2022 03:57:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0600841997; Mon, 14 Mar 2022 00:56:19 -0700 (PDT) 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 185B2611FD; Mon, 14 Mar 2022 07:56:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F43FC341E3; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=Mm+qCsHSu8Dp1CpN98CSeM8jWa7KHMho9OOVupv4bwY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ihX3qxY/RaPxjoslofATvI6eE2r8Wxji3JRZkmFDJU+NHOPHNURtgsiJOKPM+lbDy inwXKJyzSBz3UTMNdyL41+11FyCkN6Jo8z/4NtsDq7xLqoUWgHY4HIoEYGZwRY5+Yc rHkFMfRd2pvLhZx093PnvylkhfVApYIAL6tr103Ej49mJCAE2E8GwJUGzpc8y0ZL4H pA1BCyNBZgauFIpVQqC+sLau8+J86CZ6cN7KBXcBC4fjcqmIlCgbbqMHHCIsJJUZ+R lmkUZ4qYtwGBHrT5UGlPnNX2FAUMwxc8E+MgU6+IvKjsc20og1gGrntYmb6phd16VT yXUtnVM1FkndQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXP-Dm; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Cai Huoqing , Dmitry Osipenko , Eugen Hristev , Greg Kroah-Hartman , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Krzysztof Kozlowski , Lad Prabhakar , Laurent Pinchart , Lee Jones , Lv Yunlong , Ming Qian , Sakari Ailus , Shawn Guo , Sylwester Nawrocki , Tomi Valkeinen , Yang Li , Zhen Lei , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 50/64] media: platform: rename exynos4-is/ to samsung/exynos4-is/ Date: Mon, 14 Mar 2022 08:55:42 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the end goal is to have platform drivers split by vendor, rename exynos4-is/ to samsung/exynos4-is/. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ Documentation/admin-guide/media/fimc.rst | 2 +- .../driver-api/media/drivers/fimc-devel.rst | 14 +++++++------- MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- .../platform/{ =3D> samsung}/exynos4-is/Kconfig | 0 .../platform/{ =3D> samsung}/exynos4-is/Makefile | 0 .../platform/{ =3D> samsung}/exynos4-is/common.c | 0 .../platform/{ =3D> samsung}/exynos4-is/common.h | 0 .../{ =3D> samsung}/exynos4-is/fimc-capture.c | 0 .../platform/{ =3D> samsung}/exynos4-is/fimc-core.c | 0 .../platform/{ =3D> samsung}/exynos4-is/fimc-core.h | 0 .../{ =3D> samsung}/exynos4-is/fimc-is-command.h | 0 .../{ =3D> samsung}/exynos4-is/fimc-is-errno.c | 0 .../{ =3D> samsung}/exynos4-is/fimc-is-errno.h | 0 .../{ =3D> samsung}/exynos4-is/fimc-is-i2c.c | 0 .../{ =3D> samsung}/exynos4-is/fimc-is-i2c.h | 0 .../{ =3D> samsung}/exynos4-is/fimc-is-param.c | 0 .../{ =3D> samsung}/exynos4-is/fimc-is-param.h | 0 .../{ =3D> samsung}/exynos4-is/fimc-is-regs.c | 0 .../{ =3D> samsung}/exynos4-is/fimc-is-regs.h | 0 .../{ =3D> samsung}/exynos4-is/fimc-is-sensor.c | 0 .../{ =3D> samsung}/exynos4-is/fimc-is-sensor.h | 0 .../platform/{ =3D> samsung}/exynos4-is/fimc-is.c | 0 .../platform/{ =3D> samsung}/exynos4-is/fimc-is.h | 0 .../{ =3D> samsung}/exynos4-is/fimc-isp-video.c | 0 .../{ =3D> samsung}/exynos4-is/fimc-isp-video.h | 0 .../platform/{ =3D> samsung}/exynos4-is/fimc-isp.c | 0 .../platform/{ =3D> samsung}/exynos4-is/fimc-isp.h | 0 .../{ =3D> samsung}/exynos4-is/fimc-lite-reg.c | 0 .../{ =3D> samsung}/exynos4-is/fimc-lite-reg.h | 0 .../platform/{ =3D> samsung}/exynos4-is/fimc-lite.c | 0 .../platform/{ =3D> samsung}/exynos4-is/fimc-lite.h | 0 .../platform/{ =3D> samsung}/exynos4-is/fimc-m2m.c | 0 .../platform/{ =3D> samsung}/exynos4-is/fimc-reg.c | 0 .../platform/{ =3D> samsung}/exynos4-is/fimc-reg.h | 0 .../platform/{ =3D> samsung}/exynos4-is/media-dev.c | 0 .../platform/{ =3D> samsung}/exynos4-is/media-dev.h | 0 .../platform/{ =3D> samsung}/exynos4-is/mipi-csis.c | 0 .../platform/{ =3D> samsung}/exynos4-is/mipi-csis.h | 0 40 files changed, 11 insertions(+), 11 deletions(-) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/Kconfig (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/Makefile (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/common.c (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/common.h (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-capture.c (1= 00%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-core.c (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-core.h (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-is-command.h= (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-is-errno.c (= 100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-is-errno.h (= 100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-is-i2c.c (10= 0%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-is-i2c.h (10= 0%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-is-param.c (= 100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-is-param.h (= 100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-is-regs.c (1= 00%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-is-regs.h (1= 00%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-is-sensor.c = (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-is-sensor.h = (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-is.c (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-is.h (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-isp-video.c = (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-isp-video.h = (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-isp.c (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-isp.h (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-lite-reg.c (= 100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-lite-reg.h (= 100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-lite.c (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-lite.h (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-m2m.c (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-reg.c (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/fimc-reg.h (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/media-dev.c (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/media-dev.h (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/mipi-csis.c (100%) rename drivers/media/platform/{ =3D> samsung}/exynos4-is/mipi-csis.h (100%) diff --git a/Documentation/admin-guide/media/fimc.rst b/Documentation/admin= -guide/media/fimc.rst index 56b149d9a527..267ef52fe387 100644 --- a/Documentation/admin-guide/media/fimc.rst +++ b/Documentation/admin-guide/media/fimc.rst @@ -14,7 +14,7 @@ data from LCD controller (FIMD) through the SoC internal = writeback data path. There are multiple FIMC instances in the SoCs (up to 4), having slightly different capabilities, like pixel alignment constraints, rotator availability, LCD writeback support, etc. The driver is located at -drivers/media/platform/exynos4-is directory. +drivers/media/platform/samsung/exynos4-is directory. =20 Supported SoCs -------------- diff --git a/Documentation/driver-api/media/drivers/fimc-devel.rst b/Docume= ntation/driver-api/media/drivers/fimc-devel.rst index 956e3a9901f8..4c6b7c8be19f 100644 --- a/Documentation/driver-api/media/drivers/fimc-devel.rst +++ b/Documentation/driver-api/media/drivers/fimc-devel.rst @@ -12,22 +12,22 @@ Files partitioning =20 - media device driver =20 - drivers/media/platform/exynos4-is/media-dev.[ch] + drivers/media/platform/samsung/exynos4-is/media-dev.[ch] =20 - camera capture video device driver =20 - drivers/media/platform/exynos4-is/fimc-capture.c + drivers/media/platform/samsung/exynos4-is/fimc-capture.c =20 - MIPI-CSI2 receiver subdev =20 - drivers/media/platform/exynos4-is/mipi-csis.[ch] + drivers/media/platform/samsung/exynos4-is/mipi-csis.[ch] =20 - video post-processor (mem-to-mem) =20 - drivers/media/platform/exynos4-is/fimc-core.c + drivers/media/platform/samsung/exynos4-is/fimc-core.c =20 - common files =20 - drivers/media/platform/exynos4-is/fimc-core.h - drivers/media/platform/exynos4-is/fimc-reg.h - drivers/media/platform/exynos4-is/regs-fimc.h + drivers/media/platform/samsung/exynos4-is/fimc-core.h + drivers/media/platform/samsung/exynos4-is/fimc-reg.h + drivers/media/platform/samsung/exynos4-is/regs-fimc.h diff --git a/MAINTAINERS b/MAINTAINERS index 74901acf8f06..b1418853d56f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17103,7 +17103,7 @@ M: Sylwester Nawrocki L: linux-media@vger.kernel.org S: Supported Q: https://patchwork.linuxtv.org/project/linux-media/list/ -F: drivers/media/platform/exynos4-is/ +F: drivers/media/platform/samsung/exynos4-is/ =20 SAMSUNG SOC CLOCK DRIVERS M: Sylwester Nawrocki diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 7b88ef15f8c8..6d2221a9c6ee 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -75,7 +75,6 @@ source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/chips-media/Kconfig" source "drivers/media/platform/davinci/Kconfig" 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/mediatek/mtk-jpeg/Kconfig" @@ -94,6 +93,7 @@ source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/Kconfig" +source "drivers/media/platform/samsung/exynos4-is/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index 7a28b60dbbe6..613ca6a3efa7 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -15,7 +15,6 @@ obj-y +=3D cadence/ obj-y +=3D chips-media/ obj-y +=3D davinci/ obj-y +=3D exynos-gsc/ -obj-y +=3D exynos4-is/ obj-y +=3D intel/ obj-y +=3D marvell/ obj-y +=3D mediatek/mtk-jpeg/ @@ -36,6 +35,7 @@ obj-y +=3D s3c-camif/ obj-y +=3D s5p-g2d/ obj-y +=3D s5p-jpeg/ obj-y +=3D s5p-mfc/ +obj-y +=3D samsung/exynos4-is/ obj-y +=3D sti/bdisp/ obj-y +=3D sti/c8sectpfe/ obj-y +=3D sti/delta/ diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/plat= form/samsung/exynos4-is/Kconfig similarity index 100% rename from drivers/media/platform/exynos4-is/Kconfig rename to drivers/media/platform/samsung/exynos4-is/Kconfig diff --git a/drivers/media/platform/exynos4-is/Makefile b/drivers/media/pla= tform/samsung/exynos4-is/Makefile similarity index 100% rename from drivers/media/platform/exynos4-is/Makefile rename to drivers/media/platform/samsung/exynos4-is/Makefile diff --git a/drivers/media/platform/exynos4-is/common.c b/drivers/media/pla= tform/samsung/exynos4-is/common.c similarity index 100% rename from drivers/media/platform/exynos4-is/common.c rename to drivers/media/platform/samsung/exynos4-is/common.c diff --git a/drivers/media/platform/exynos4-is/common.h b/drivers/media/pla= tform/samsung/exynos4-is/common.h similarity index 100% rename from drivers/media/platform/exynos4-is/common.h rename to drivers/media/platform/samsung/exynos4-is/common.h diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/med= ia/platform/samsung/exynos4-is/fimc-capture.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-capture.c rename to drivers/media/platform/samsung/exynos4-is/fimc-capture.c diff --git a/drivers/media/platform/exynos4-is/fimc-core.c b/drivers/media/= platform/samsung/exynos4-is/fimc-core.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-core.c rename to drivers/media/platform/samsung/exynos4-is/fimc-core.c diff --git a/drivers/media/platform/exynos4-is/fimc-core.h b/drivers/media/= platform/samsung/exynos4-is/fimc-core.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-core.h rename to drivers/media/platform/samsung/exynos4-is/fimc-core.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-command.h b/drivers/= media/platform/samsung/exynos4-is/fimc-is-command.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-command.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-command.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-errno.c b/drivers/me= dia/platform/samsung/exynos4-is/fimc-is-errno.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-errno.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is-errno.c diff --git a/drivers/media/platform/exynos4-is/fimc-is-errno.h b/drivers/me= dia/platform/samsung/exynos4-is/fimc-is-errno.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-errno.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-errno.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-i2c.c b/drivers/medi= a/platform/samsung/exynos4-is/fimc-is-i2c.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-i2c.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.c diff --git a/drivers/media/platform/exynos4-is/fimc-is-i2c.h b/drivers/medi= a/platform/samsung/exynos4-is/fimc-is-i2c.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-i2c.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-param.c b/drivers/me= dia/platform/samsung/exynos4-is/fimc-is-param.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-param.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is-param.c diff --git a/drivers/media/platform/exynos4-is/fimc-is-param.h b/drivers/me= dia/platform/samsung/exynos4-is/fimc-is-param.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-param.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-param.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-regs.c b/drivers/med= ia/platform/samsung/exynos4-is/fimc-is-regs.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-regs.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is-regs.c diff --git a/drivers/media/platform/exynos4-is/fimc-is-regs.h b/drivers/med= ia/platform/samsung/exynos4-is/fimc-is-regs.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-regs.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-regs.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-sensor.c b/drivers/m= edia/platform/samsung/exynos4-is/fimc-is-sensor.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-sensor.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.c diff --git a/drivers/media/platform/exynos4-is/fimc-is-sensor.h b/drivers/m= edia/platform/samsung/exynos4-is/fimc-is-sensor.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-sensor.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.h diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/pl= atform/samsung/exynos4-is/fimc-is.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is.c diff --git a/drivers/media/platform/exynos4-is/fimc-is.h b/drivers/media/pl= atform/samsung/exynos4-is/fimc-is.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is.h diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/m= edia/platform/samsung/exynos4-is/fimc-isp-video.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-isp-video.c rename to drivers/media/platform/samsung/exynos4-is/fimc-isp-video.c diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.h b/drivers/m= edia/platform/samsung/exynos4-is/fimc-isp-video.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-isp-video.h rename to drivers/media/platform/samsung/exynos4-is/fimc-isp-video.h diff --git a/drivers/media/platform/exynos4-is/fimc-isp.c b/drivers/media/p= latform/samsung/exynos4-is/fimc-isp.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-isp.c rename to drivers/media/platform/samsung/exynos4-is/fimc-isp.c diff --git a/drivers/media/platform/exynos4-is/fimc-isp.h b/drivers/media/p= latform/samsung/exynos4-is/fimc-isp.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-isp.h rename to drivers/media/platform/samsung/exynos4-is/fimc-isp.h diff --git a/drivers/media/platform/exynos4-is/fimc-lite-reg.c b/drivers/me= dia/platform/samsung/exynos4-is/fimc-lite-reg.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-lite-reg.c rename to drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.c diff --git a/drivers/media/platform/exynos4-is/fimc-lite-reg.h b/drivers/me= dia/platform/samsung/exynos4-is/fimc-lite-reg.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-lite-reg.h rename to drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.h diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/= platform/samsung/exynos4-is/fimc-lite.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-lite.c rename to drivers/media/platform/samsung/exynos4-is/fimc-lite.c diff --git a/drivers/media/platform/exynos4-is/fimc-lite.h b/drivers/media/= platform/samsung/exynos4-is/fimc-lite.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-lite.h rename to drivers/media/platform/samsung/exynos4-is/fimc-lite.h diff --git a/drivers/media/platform/exynos4-is/fimc-m2m.c b/drivers/media/p= latform/samsung/exynos4-is/fimc-m2m.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-m2m.c rename to drivers/media/platform/samsung/exynos4-is/fimc-m2m.c diff --git a/drivers/media/platform/exynos4-is/fimc-reg.c b/drivers/media/p= latform/samsung/exynos4-is/fimc-reg.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-reg.c rename to drivers/media/platform/samsung/exynos4-is/fimc-reg.c diff --git a/drivers/media/platform/exynos4-is/fimc-reg.h b/drivers/media/p= latform/samsung/exynos4-is/fimc-reg.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-reg.h rename to drivers/media/platform/samsung/exynos4-is/fimc-reg.h diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/= platform/samsung/exynos4-is/media-dev.c similarity index 100% rename from drivers/media/platform/exynos4-is/media-dev.c rename to drivers/media/platform/samsung/exynos4-is/media-dev.c diff --git a/drivers/media/platform/exynos4-is/media-dev.h b/drivers/media/= platform/samsung/exynos4-is/media-dev.h similarity index 100% rename from drivers/media/platform/exynos4-is/media-dev.h rename to drivers/media/platform/samsung/exynos4-is/media-dev.h diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/= platform/samsung/exynos4-is/mipi-csis.c similarity index 100% rename from drivers/media/platform/exynos4-is/mipi-csis.c rename to drivers/media/platform/samsung/exynos4-is/mipi-csis.c diff --git a/drivers/media/platform/exynos4-is/mipi-csis.h b/drivers/media/= platform/samsung/exynos4-is/mipi-csis.h similarity index 100% rename from drivers/media/platform/exynos4-is/mipi-csis.h rename to drivers/media/platform/samsung/exynos4-is/mipi-csis.h --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CB68C433FE for ; Mon, 14 Mar 2022 07:58:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237148AbiCNH7P (ORCPT ); Mon, 14 Mar 2022 03:59:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236923AbiCNH5f (ORCPT ); Mon, 14 Mar 2022 03:57:35 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1678F4132D; Mon, 14 Mar 2022 00:56:12 -0700 (PDT) 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 0CBB6B80D52; Mon, 14 Mar 2022 07:56:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3FB02C341E4; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=NUWZ3FrsjEU1KQK0UFRKOIlNOBV2tg90c49kOIeAcx0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SRS/v5RdHkMQIvcur+1IsoQ3k3FsVxkNsIf1SOB5+gztEp2R5k1qPVBI9AvUTnYm1 asVTnNL+D1aeKa8L6g+uEXv3FHO8mKNW0b8ro+U6J89dc4FKuxYbH4VyNCi+58p+yL uCKVmo9Wzt+ALMFP7APKHPnG1JjY302EkpxYsuA2s9XThz+Un7CFFg1Mdl69Hy6ysx XgxQud5dkBkaHnv7oAndCYyY+PR5saXZj+I2Q4pz5p2NptxAayA7VZk6xZ4ga/bhId 4LtIA1UHZwixLEaQQ9NVrCu+DIRcufgA/ruossIPGSLP7ci52w7YkHUOomaHvBDkys mg/WEU8BrFyVQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXT-FS; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Cai Huoqing , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Jonathan Cameron , Krzysztof Kozlowski , Lad Prabhakar , Laurent Pinchart , Ming Qian , Sakari Ailus , Sylwester Nawrocki , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 51/64] media: platform: rename exynos-gsc/ to samsung/exynos-gsc/ Date: Mon, 14 Mar 2022 08:55:43 +0100 Message-Id: <079d0d718c65424edd82e5b094211f1433094c93.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the end goal is to have platform drivers split by vendor, rename exynos-gsc/ to samsung/exynos-gsc/. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ =3D> samsung}/exynos-gsc/Kconfig | 0 drivers/media/platform/{ =3D> samsung}/exynos-gsc/Makefile | 0 drivers/media/platform/{ =3D> samsung}/exynos-gsc/gsc-core.c | 0 drivers/media/platform/{ =3D> samsung}/exynos-gsc/gsc-core.h | 0 drivers/media/platform/{ =3D> samsung}/exynos-gsc/gsc-m2m.c | 0 drivers/media/platform/{ =3D> samsung}/exynos-gsc/gsc-regs.c | 0 drivers/media/platform/{ =3D> samsung}/exynos-gsc/gsc-regs.h | 0 9 files changed, 2 insertions(+), 2 deletions(-) rename drivers/media/platform/{ =3D> samsung}/exynos-gsc/Kconfig (100%) rename drivers/media/platform/{ =3D> samsung}/exynos-gsc/Makefile (100%) rename drivers/media/platform/{ =3D> samsung}/exynos-gsc/gsc-core.c (100%) rename drivers/media/platform/{ =3D> samsung}/exynos-gsc/gsc-core.h (100%) rename drivers/media/platform/{ =3D> samsung}/exynos-gsc/gsc-m2m.c (100%) rename drivers/media/platform/{ =3D> samsung}/exynos-gsc/gsc-regs.c (100%) rename drivers/media/platform/{ =3D> samsung}/exynos-gsc/gsc-regs.h (100%) diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 6d2221a9c6ee..dca53f6a1b33 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -74,7 +74,6 @@ source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/chips-media/Kconfig" source "drivers/media/platform/davinci/Kconfig" -source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" @@ -93,6 +92,7 @@ source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/Kconfig" +source "drivers/media/platform/samsung/exynos-gsc/Kconfig" source "drivers/media/platform/samsung/exynos4-is/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index 613ca6a3efa7..848cbd6147ae 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -14,7 +14,6 @@ obj-y +=3D atmel/ obj-y +=3D cadence/ obj-y +=3D chips-media/ obj-y +=3D davinci/ -obj-y +=3D exynos-gsc/ obj-y +=3D intel/ obj-y +=3D marvell/ obj-y +=3D mediatek/mtk-jpeg/ @@ -35,6 +34,7 @@ obj-y +=3D s3c-camif/ obj-y +=3D s5p-g2d/ obj-y +=3D s5p-jpeg/ obj-y +=3D s5p-mfc/ +obj-y +=3D samsung/exynos-gsc/ obj-y +=3D samsung/exynos4-is/ obj-y +=3D sti/bdisp/ obj-y +=3D sti/c8sectpfe/ diff --git a/drivers/media/platform/exynos-gsc/Kconfig b/drivers/media/plat= form/samsung/exynos-gsc/Kconfig similarity index 100% rename from drivers/media/platform/exynos-gsc/Kconfig rename to drivers/media/platform/samsung/exynos-gsc/Kconfig diff --git a/drivers/media/platform/exynos-gsc/Makefile b/drivers/media/pla= tform/samsung/exynos-gsc/Makefile similarity index 100% rename from drivers/media/platform/exynos-gsc/Makefile rename to drivers/media/platform/samsung/exynos-gsc/Makefile diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/p= latform/samsung/exynos-gsc/gsc-core.c similarity index 100% rename from drivers/media/platform/exynos-gsc/gsc-core.c rename to drivers/media/platform/samsung/exynos-gsc/gsc-core.c diff --git a/drivers/media/platform/exynos-gsc/gsc-core.h b/drivers/media/p= latform/samsung/exynos-gsc/gsc-core.h similarity index 100% rename from drivers/media/platform/exynos-gsc/gsc-core.h rename to drivers/media/platform/samsung/exynos-gsc/gsc-core.h diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/pl= atform/samsung/exynos-gsc/gsc-m2m.c similarity index 100% rename from drivers/media/platform/exynos-gsc/gsc-m2m.c rename to drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c diff --git a/drivers/media/platform/exynos-gsc/gsc-regs.c b/drivers/media/p= latform/samsung/exynos-gsc/gsc-regs.c similarity index 100% rename from drivers/media/platform/exynos-gsc/gsc-regs.c rename to drivers/media/platform/samsung/exynos-gsc/gsc-regs.c diff --git a/drivers/media/platform/exynos-gsc/gsc-regs.h b/drivers/media/p= latform/samsung/exynos-gsc/gsc-regs.h similarity index 100% rename from drivers/media/platform/exynos-gsc/gsc-regs.h rename to drivers/media/platform/samsung/exynos-gsc/gsc-regs.h --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D571FC433EF for ; Mon, 14 Mar 2022 07:59:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237343AbiCNIAl (ORCPT ); Mon, 14 Mar 2022 04:00:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237001AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CD754163E; Mon, 14 Mar 2022 00:56:17 -0700 (PDT) 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 DDC94611E4; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C32EC341E6; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=f0gLLvVNLq+QdnIAJ7MjXom3256f3cZ5lDOYgZlUuog=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fXDIn4JYtgKVAK0wu3HY06PJovgNXt65MRLLxOe+9MkNtugC/XM5bKAkcalzlGt4n x2W1dgUkVFw1wIuqiR8+bKy+xkIIvEXRpsUMcz5dTB/fAkQSWl/SjylVBHYnPZFfao gadeuuddQ1YofZCpg/ZPZcktApgHGYJSXC7zKhTmWUXMPeAFVq7QPI7qLmrMLqYSBl VThh2ijcUpevKWjMPoQM1etAN87jqnEkFw51Ye0OqYva30qkSnz7ADYDw40CPyuNO9 nYC6CirQEzo9jscV3HEihZgUxKTqAIrJLkknBf2qmRD6dTbCZ3xJvP9bEWSphzwNCK JfyvJyQ5NS28A== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXX-Go; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Cai Huoqing , Dmitry Osipenko , Dongliang Mu , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Krzysztof Kozlowski , Laurent Pinchart , Ming Qian , Randy Dunlap , Sakari Ailus , Sylwester Nawrocki , Tomi Valkeinen , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 52/64] media: platform: rename s3c-camif/ to samsung/s3c-camif/ Date: Mon, 14 Mar 2022 08:55:44 +0100 Message-Id: <3f964b49f49400603f871b73e25762e63142b732.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the end goal is to have platform drivers split by vendor, rename s3c-camif/ to samsung/s3c-camif/. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ =3D> samsung}/s3c-camif/Kconfig | 0 drivers/media/platform/{ =3D> samsung}/s3c-camif/Makefile | 0 drivers/media/platform/{ =3D> samsung}/s3c-camif/camif-capture.c | 0 drivers/media/platform/{ =3D> samsung}/s3c-camif/camif-core.c | 0 drivers/media/platform/{ =3D> samsung}/s3c-camif/camif-core.h | 0 drivers/media/platform/{ =3D> samsung}/s3c-camif/camif-regs.c | 0 drivers/media/platform/{ =3D> samsung}/s3c-camif/camif-regs.h | 0 10 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ =3D> samsung}/s3c-camif/Kconfig (100%) rename drivers/media/platform/{ =3D> samsung}/s3c-camif/Makefile (100%) rename drivers/media/platform/{ =3D> samsung}/s3c-camif/camif-capture.c (1= 00%) rename drivers/media/platform/{ =3D> samsung}/s3c-camif/camif-core.c (100%) rename drivers/media/platform/{ =3D> samsung}/s3c-camif/camif-core.h (100%) rename drivers/media/platform/{ =3D> samsung}/s3c-camif/camif-regs.c (100%) rename drivers/media/platform/{ =3D> samsung}/s3c-camif/camif-regs.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index b1418853d56f..8ce4894699cc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17063,7 +17063,7 @@ M: Sylwester Nawrocki L: linux-media@vger.kernel.org L: linux-samsung-soc@vger.kernel.org S: Maintained -F: drivers/media/platform/s3c-camif/ +F: drivers/media/platform/samsung/s3c-camif/ F: include/media/drv-intf/s3c_camif.h =20 SAMSUNG S3FWRN5 NFC DRIVER diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index dca53f6a1b33..b371c0b258d1 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -88,12 +88,12 @@ source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/Kconfig" -source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/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/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index 848cbd6147ae..c3dfe40b2def 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -30,12 +30,12 @@ obj-y +=3D qcom/venus/ obj-y +=3D renesas/ obj-y +=3D rockchip/rga/ obj-y +=3D rockchip/rkisp1/ -obj-y +=3D s3c-camif/ obj-y +=3D s5p-g2d/ obj-y +=3D s5p-jpeg/ obj-y +=3D s5p-mfc/ obj-y +=3D samsung/exynos-gsc/ obj-y +=3D samsung/exynos4-is/ +obj-y +=3D samsung/s3c-camif/ obj-y +=3D sti/bdisp/ obj-y +=3D sti/c8sectpfe/ obj-y +=3D sti/delta/ diff --git a/drivers/media/platform/s3c-camif/Kconfig b/drivers/media/platf= orm/samsung/s3c-camif/Kconfig similarity index 100% rename from drivers/media/platform/s3c-camif/Kconfig rename to drivers/media/platform/samsung/s3c-camif/Kconfig diff --git a/drivers/media/platform/s3c-camif/Makefile b/drivers/media/plat= form/samsung/s3c-camif/Makefile similarity index 100% rename from drivers/media/platform/s3c-camif/Makefile rename to drivers/media/platform/samsung/s3c-camif/Makefile diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/med= ia/platform/samsung/s3c-camif/camif-capture.c similarity index 100% rename from drivers/media/platform/s3c-camif/camif-capture.c rename to drivers/media/platform/samsung/s3c-camif/camif-capture.c diff --git a/drivers/media/platform/s3c-camif/camif-core.c b/drivers/media/= platform/samsung/s3c-camif/camif-core.c similarity index 100% rename from drivers/media/platform/s3c-camif/camif-core.c rename to drivers/media/platform/samsung/s3c-camif/camif-core.c diff --git a/drivers/media/platform/s3c-camif/camif-core.h b/drivers/media/= platform/samsung/s3c-camif/camif-core.h similarity index 100% rename from drivers/media/platform/s3c-camif/camif-core.h rename to drivers/media/platform/samsung/s3c-camif/camif-core.h diff --git a/drivers/media/platform/s3c-camif/camif-regs.c b/drivers/media/= platform/samsung/s3c-camif/camif-regs.c similarity index 100% rename from drivers/media/platform/s3c-camif/camif-regs.c rename to drivers/media/platform/samsung/s3c-camif/camif-regs.c diff --git a/drivers/media/platform/s3c-camif/camif-regs.h b/drivers/media/= platform/samsung/s3c-camif/camif-regs.h similarity index 100% rename from drivers/media/platform/s3c-camif/camif-regs.h rename to drivers/media/platform/samsung/s3c-camif/camif-regs.h --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49BBEC433FE for ; Mon, 14 Mar 2022 07:59:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237319AbiCNIAX (ORCPT ); Mon, 14 Mar 2022 04:00:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236997AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C22D41635; Mon, 14 Mar 2022 00:56:17 -0700 (PDT) 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 08C88611D8; Mon, 14 Mar 2022 07:56:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5AA90C341E9; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=CIyk8zpMRzPK9nsaSTMJyaLpucZ2VlGYmTmnjaHqays=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=saDUPraGjQ/LiKuqLqNK6+mZe6RZsFE0xol3ng/m+MnEIrzd74XyAqG1d0y8piH1u UidUws7Tau7Hd7OempdpmE0skFNG+pS2Y8Tdaz1V9XcFONG+8BWmKhpW7zh98wPZo0 ACjQvjzhgo9A8SFNyHrlwCGURiD1OXRprii2FZimA9E6gJzMFBHo4yWPzhXnoYV/r4 RnTCnCeZkIZIJ6OcyTfV6MscD4jOrOnT9+vOIjgds53oxs771nV+HkWn2mmcOnhhkS AwRGxh8eqI87jugbsBAXlz30PVCb6QA42ibkwVcqNaqADcwh29PXKIsUN0lDgRJ1+/ FodCwYh7P5mDQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXb-I4; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , =?UTF-8?q?=C5=81ukasz=20Stelmach?= , Cai Huoqing , Dillon Min , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Lad Prabhakar , Laurent Pinchart , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 53/64] media: platform: rename s5p-g2d/ to samsung/s5p-g2d/ Date: Mon, 14 Mar 2022 08:55:45 +0100 Message-Id: <9fde68f5ac51ae5ea9ae740876d6090945c8efe6.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename s5p-g2d/ to samsung/s5p-g2d/. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-g2d/Kconfig | 0 drivers/media/platform/{ =3D> samsung}/s5p-g2d/Makefile | 0 drivers/media/platform/{ =3D> samsung}/s5p-g2d/g2d-hw.c | 0 drivers/media/platform/{ =3D> samsung}/s5p-g2d/g2d-regs.h | 0 drivers/media/platform/{ =3D> samsung}/s5p-g2d/g2d.c | 0 drivers/media/platform/{ =3D> samsung}/s5p-g2d/g2d.h | 0 9 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ =3D> samsung}/s5p-g2d/Kconfig (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-g2d/Makefile (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-g2d/g2d-hw.c (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-g2d/g2d-regs.h (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-g2d/g2d.c (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-g2d/g2d.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 8ce4894699cc..4c4be0d7ec14 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2616,7 +2616,7 @@ M: =C5=81ukasz Stelmach L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-media@vger.kernel.org S: Maintained -F: drivers/media/platform/s5p-g2d/ +F: drivers/media/platform/samsung/s5p-g2d/ =20 ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT M: Marek Szyprowski diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index b371c0b258d1..aef7c35b2215 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -88,12 +88,12 @@ source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/Kconfig" -source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/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/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index c3dfe40b2def..a5a068e18492 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -30,12 +30,12 @@ obj-y +=3D qcom/venus/ obj-y +=3D renesas/ obj-y +=3D rockchip/rga/ obj-y +=3D rockchip/rkisp1/ -obj-y +=3D s5p-g2d/ obj-y +=3D s5p-jpeg/ obj-y +=3D s5p-mfc/ obj-y +=3D samsung/exynos-gsc/ obj-y +=3D samsung/exynos4-is/ obj-y +=3D samsung/s3c-camif/ +obj-y +=3D samsung/s5p-g2d/ obj-y +=3D sti/bdisp/ obj-y +=3D sti/c8sectpfe/ obj-y +=3D sti/delta/ diff --git a/drivers/media/platform/s5p-g2d/Kconfig b/drivers/media/platfor= m/samsung/s5p-g2d/Kconfig similarity index 100% rename from drivers/media/platform/s5p-g2d/Kconfig rename to drivers/media/platform/samsung/s5p-g2d/Kconfig diff --git a/drivers/media/platform/s5p-g2d/Makefile b/drivers/media/platfo= rm/samsung/s5p-g2d/Makefile similarity index 100% rename from drivers/media/platform/s5p-g2d/Makefile rename to drivers/media/platform/samsung/s5p-g2d/Makefile diff --git a/drivers/media/platform/s5p-g2d/g2d-hw.c b/drivers/media/platfo= rm/samsung/s5p-g2d/g2d-hw.c similarity index 100% rename from drivers/media/platform/s5p-g2d/g2d-hw.c rename to drivers/media/platform/samsung/s5p-g2d/g2d-hw.c diff --git a/drivers/media/platform/s5p-g2d/g2d-regs.h b/drivers/media/plat= form/samsung/s5p-g2d/g2d-regs.h similarity index 100% rename from drivers/media/platform/s5p-g2d/g2d-regs.h rename to drivers/media/platform/samsung/s5p-g2d/g2d-regs.h diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/= samsung/s5p-g2d/g2d.c similarity index 100% rename from drivers/media/platform/s5p-g2d/g2d.c rename to drivers/media/platform/samsung/s5p-g2d/g2d.c diff --git a/drivers/media/platform/s5p-g2d/g2d.h b/drivers/media/platform/= samsung/s5p-g2d/g2d.h similarity index 100% rename from drivers/media/platform/s5p-g2d/g2d.h rename to drivers/media/platform/samsung/s5p-g2d/g2d.h --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A164FC433F5 for ; Mon, 14 Mar 2022 07:59:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229895AbiCNIBE (ORCPT ); Mon, 14 Mar 2022 04:01:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235763AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F2B04162D; Mon, 14 Mar 2022 00:56:15 -0700 (PDT) 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 C161C611DC; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C606CC36B14; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=GjqwKpHS8hMTGTpYhpZJCdxNXJ56txdSA8jqmhpXO+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tNdIaBAjDf+RMZCwntx+lYD5yAJemi4tLws3hPtEBkngbm9OcAS2n4LTjY6PhYYD2 5HX6r8OIkW1NO3R9/u/n2EFJTuPMBuUFOvKlYOm4aw1oVVSOfpO6DsWhzRmVrq7lxr t26hwtcu+ZGnz8vQBxtZi/lsQbbh8tGfAkBbGLGBG1+L6kwPFrBEoEu91IgFxM+i1u YscOBLklL0AVthLogOpz1B5wfaycFe9SxJbPLqwlnZ22bnJY6YHQ7qDsZ/WuQi2l5Z v0zbDvwkDSwvOmqOq7A4upQc3yzEmW0wpSI8pHdIfh1TGD7mSWauYbVvGql27N+J80 mAV1knGhUB/8Q== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXf-Ja; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Andrzej Pietrasiewicz , Cai Huoqing , Colin Ian King , Dmitry Osipenko , Eugen Hristev , Fabio Estevam , Hans Verkuil , Jacek Anaszewski , Jacopo Mondi , Jernej Skrabec , Krzysztof Kozlowski , Laurent Pinchart , Laurentiu Palcu , Mikhail Ulyanov , Ming Qian , Mirela Rabulea , NXP Linux Team , Pengutronix Kernel Team , Randy Dunlap , Rikard Falkeborn , Sakari Ailus , Sascha Hauer , Shawn Guo , Sylwester Nawrocki , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 54/64] media: platform: rename s5p-jpeg/ to samsung/s5p-jpeg/ Date: Mon, 14 Mar 2022 08:55:46 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the end goal is to have platform drivers split by vendor, rename s5p-jpeg/ to samsung/s5p-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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 2 +- drivers/media/platform/renesas/rcar_jpu.c | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-jpeg/Kconfig | 0 drivers/media/platform/{ =3D> samsung}/s5p-jpeg/Makefile | 0 drivers/media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-core.c | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-core.h | 2 +- .../media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-hw-exynos3250.c | 0 .../media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-hw-exynos3250.h | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-hw-exynos4.c | 0 drivers/media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-hw-exynos4.h | 0 drivers/media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-hw-s5p.c | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-hw-s5p.h | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-regs.h | 2 +- 16 files changed, 11 insertions(+), 11 deletions(-) rename drivers/media/platform/{ =3D> samsung}/s5p-jpeg/Kconfig (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-jpeg/Makefile (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-core.c (99%) rename drivers/media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-core.h (99%) rename drivers/media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-hw-exynos3250.= c (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-hw-exynos3250.= h (97%) rename drivers/media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-hw-exynos4.c (= 100%) rename drivers/media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-hw-exynos4.h (= 100%) rename drivers/media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-hw-s5p.c (99%) rename drivers/media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-hw-s5p.h (97%) rename drivers/media/platform/{ =3D> samsung}/s5p-jpeg/jpeg-regs.h (99%) diff --git a/MAINTAINERS b/MAINTAINERS index 4c4be0d7ec14..dfd490369d48 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2633,7 +2633,7 @@ M: Sylwester Nawrocki L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-media@vger.kernel.org S: Maintained -F: drivers/media/platform/s5p-jpeg/ +F: drivers/media/platform/samsung/s5p-jpeg/ =20 ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT M: Marek Szyprowski diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index aef7c35b2215..1b71ce772586 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -88,12 +88,12 @@ source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/Kconfig" -source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/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/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index a5a068e18492..94bdd5d94bb2 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -30,12 +30,12 @@ obj-y +=3D qcom/venus/ obj-y +=3D renesas/ obj-y +=3D rockchip/rga/ obj-y +=3D rockchip/rkisp1/ -obj-y +=3D s5p-jpeg/ obj-y +=3D s5p-mfc/ obj-y +=3D samsung/exynos-gsc/ obj-y +=3D samsung/exynos4-is/ obj-y +=3D samsung/s3c-camif/ obj-y +=3D samsung/s5p-g2d/ +obj-y +=3D samsung/s5p-jpeg/ obj-y +=3D sti/bdisp/ obj-y +=3D sti/c8sectpfe/ obj-y +=3D sti/delta/ diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media= /platform/nxp/imx-jpeg/mxc-jpeg.c index 3b892c5792b4..d1ec1f4b506b 100644 --- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c @@ -35,7 +35,7 @@ * it, enable dynamic debug for this module and: * echo 1 > /sys/module/mxc_jpeg_encdec/parameters/jpeg_tracing * - * This is inspired by the drivers/media/platform/s5p-jpeg driver + * This is inspired by the drivers/media/platform/samsung/s5p-jpeg driver * * Copyright 2018-2019 NXP */ diff --git a/drivers/media/platform/renesas/rcar_jpu.c b/drivers/media/plat= form/renesas/rcar_jpu.c index 56bb464629ed..293beba131e2 100644 --- a/drivers/media/platform/renesas/rcar_jpu.c +++ b/drivers/media/platform/renesas/rcar_jpu.c @@ -4,7 +4,7 @@ * Copyright (C) 2014-2015 Cogent Embedded, Inc. * Copyright (C) 2014-2015 Renesas Electronics Corporation * - * This is based on the drivers/media/platform/s5p-jpeg driver by + * This is based on the drivers/media/platform/samsung/s5p-jpeg driver by * Andrzej Pietrasiewicz and Jacek Anaszewski. * Some portions of code inspired by VSP1 driver by Laurent Pinchart. * diff --git a/drivers/media/platform/s5p-jpeg/Kconfig b/drivers/media/platfo= rm/samsung/s5p-jpeg/Kconfig similarity index 100% rename from drivers/media/platform/s5p-jpeg/Kconfig rename to drivers/media/platform/samsung/s5p-jpeg/Kconfig diff --git a/drivers/media/platform/s5p-jpeg/Makefile b/drivers/media/platf= orm/samsung/s5p-jpeg/Makefile similarity index 100% rename from drivers/media/platform/s5p-jpeg/Makefile rename to drivers/media/platform/samsung/s5p-jpeg/Makefile diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/pl= atform/samsung/s5p-jpeg/jpeg-core.c similarity index 99% rename from drivers/media/platform/s5p-jpeg/jpeg-core.c rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c index a8d9159d5ed8..5479bc8d474d 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* linux/drivers/media/platform/s5p-jpeg/jpeg-core.c +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c * * Copyright (c) 2011-2014 Samsung Electronics Co., Ltd. * http://www.samsung.com diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.h b/drivers/media/pl= atform/samsung/s5p-jpeg/jpeg-core.h similarity index 99% rename from drivers/media/platform/s5p-jpeg/jpeg-core.h rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h index 4a5fb1b15455..5570c79f122f 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.h +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* linux/drivers/media/platform/s5p-jpeg/jpeg-core.h +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h * * Copyright (c) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c b/drivers= /media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.c similarity index 100% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.c diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h b/drivers= /media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h similarity index 97% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h index 68160befce39..15af928fad76 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h * * Copyright (c) 2014 Samsung Electronics Co., Ltd. * http://www.samsung.com diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c b/drivers/me= dia/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.c similarity index 100% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.c diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h b/drivers/me= dia/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.h similarity index 100% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.h diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c b/drivers/media/= platform/samsung/s5p-jpeg/jpeg-hw-s5p.c similarity index 99% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c index 491e9248286c..01b47b3df1e7 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw.h +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw.h * * Copyright (c) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h b/drivers/media/= platform/samsung/s5p-jpeg/jpeg-hw-s5p.h similarity index 97% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h index 98ddf7097562..f068d52c66b7 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw.h +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw.h * * Copyright (c) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com diff --git a/drivers/media/platform/s5p-jpeg/jpeg-regs.h b/drivers/media/pl= atform/samsung/s5p-jpeg/jpeg-regs.h similarity index 99% rename from drivers/media/platform/s5p-jpeg/jpeg-regs.h rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h index 86f376b50581..c2298b680022 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-regs.h +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* linux/drivers/media/platform/s5p-jpeg/jpeg-regs.h +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h * * Register definition file for Samsung JPEG codec driver * --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71365C433EF for ; Mon, 14 Mar 2022 07:59:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237336AbiCNIAg (ORCPT ); Mon, 14 Mar 2022 04:00:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237000AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C7F04163C; Mon, 14 Mar 2022 00:56:17 -0700 (PDT) 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 D9C4F611E6; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3DA4C340E9; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=nLTDTeNlFXpw5hEG8uuXhFEc/E6nBrIinVD/qyo708Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L4whbSB7DmR+SmJss10nY3sjhSipO/sT9UCvzUDJ1PCLQe9X0680UA3DjT4TCqZWo z0/dp65T2nwMYfTX5Q4fShNErvtn2fG/MThW3FHlHPZQng2dAh18TWUHGd1XDSRhHF 2hZwIzzZ0qn59EYmqXSo+QFriFszq4EJi8HquGFFswtqFukecFbA4P62/C9tGQlGWu jjteDrLDY8YKMPLl6OhJjAd5W39ixD2YpmlIIC/Ogty3dlg6RsVRMHO3hCDzieLmq8 QRC3avOBXWqRB/Y9Lx57WkRTYqBwcJie4i939vDpOfz6+uDAmjE8FpE4vMFuZLa4ku PaZAbYnAzPR7g== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXj-L8; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Andrzej Hajda , Cai Huoqing , Christophe JAILLET , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Herman , Jacopo Mondi , Jernej Skrabec , Lad Prabhakar , Laurent Pinchart , Marek Szyprowski , Maxime Jourdan , Ming Qian , Nadezda Lutovinova , Paul Kocialkowski , Stanimir Varbanov , Sylwester Nawrocki , Tuo Li , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 55/64] media: platform: rename s5p-mfc/ to samsung/s5p-mfc/ Date: Mon, 14 Mar 2022 08:55:47 +0100 Message-Id: <14a15a85b47af0b8998b32e47cf879eb38142bae.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the end goal is to have platform drivers split by vendor, rename s5p-mfc/ to samsung/s5p-mfc/. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/Kconfig | 0 drivers/media/platform/{ =3D> samsung}/s5p-mfc/Makefile | 0 drivers/media/platform/{ =3D> samsung}/s5p-mfc/regs-mfc-v10.h | 0 drivers/media/platform/{ =3D> samsung}/s5p-mfc/regs-mfc-v6.h | 0 drivers/media/platform/{ =3D> samsung}/s5p-mfc/regs-mfc-v7.h | 0 drivers/media/platform/{ =3D> samsung}/s5p-mfc/regs-mfc-v8.h | 0 drivers/media/platform/{ =3D> samsung}/s5p-mfc/regs-mfc.h | 0 drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc.c | 0 drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_cmd.c | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_cmd.h | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_cmd_v5.c | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_cmd_v5.h | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_cmd_v6.c | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_cmd_v6.h | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_common.h | 0 drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_ctrl.c | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_ctrl.h | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_debug.h | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_dec.c | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_dec.h | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_enc.c | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_enc.h | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_intr.c | 0 drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_intr.h | 0 drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_iommu.h | 0 drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_opr.c | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_opr.h | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_opr_v5.c | 0 drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_opr_v5.h | 0 drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_opr_v6.c | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_opr_v6.h | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_pm.c | 2 +- drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_pm.h | 2 +- 36 files changed, 22 insertions(+), 22 deletions(-) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/Kconfig (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/Makefile (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/regs-mfc-v10.h (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/regs-mfc-v6.h (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/regs-mfc-v7.h (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/regs-mfc-v8.h (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/regs-mfc.h (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc.c (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_cmd.c (89%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_cmd.h (92%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_cmd_v5.c (98= %) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_cmd_v5.h (82= %) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_cmd_v6.c (98= %) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_cmd_v6.h (82= %) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_common.h (10= 0%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_ctrl.c (99%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_ctrl.h (92%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_debug.h (95%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_dec.c (99%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_dec.h (90%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_enc.c (99%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_enc.h (90%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_intr.c (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_intr.h (100%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_iommu.h (100= %) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_opr.c (98%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_opr.h (99%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_opr_v5.c (10= 0%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_opr_v5.h (10= 0%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_opr_v6.c (99= %) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_opr_v6.h (96= %) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_pm.c (97%) rename drivers/media/platform/{ =3D> samsung}/s5p-mfc/s5p_mfc_pm.h (87%) diff --git a/MAINTAINERS b/MAINTAINERS index dfd490369d48..7711a5ea125e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2641,7 +2641,7 @@ M: Andrzej Hajda L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-media@vger.kernel.org S: Maintained -F: drivers/media/platform/s5p-mfc/ +F: drivers/media/platform/samsung/s5p-mfc/ =20 ARM/SHMOBILE ARM ARCHITECTURE M: Geert Uytterhoeven diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 1b71ce772586..c61b785727a8 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -88,12 +88,12 @@ source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/Kconfig" -source "drivers/media/platform/s5p-mfc/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/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index 94bdd5d94bb2..6a766acfbe37 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -30,12 +30,12 @@ obj-y +=3D qcom/venus/ obj-y +=3D renesas/ obj-y +=3D rockchip/rga/ obj-y +=3D rockchip/rkisp1/ -obj-y +=3D s5p-mfc/ obj-y +=3D samsung/exynos-gsc/ obj-y +=3D samsung/exynos4-is/ obj-y +=3D samsung/s3c-camif/ obj-y +=3D samsung/s5p-g2d/ obj-y +=3D samsung/s5p-jpeg/ +obj-y +=3D samsung/s5p-mfc/ obj-y +=3D sti/bdisp/ obj-y +=3D sti/c8sectpfe/ obj-y +=3D sti/delta/ diff --git a/drivers/media/platform/s5p-mfc/Kconfig b/drivers/media/platfor= m/samsung/s5p-mfc/Kconfig similarity index 100% rename from drivers/media/platform/s5p-mfc/Kconfig rename to drivers/media/platform/samsung/s5p-mfc/Kconfig diff --git a/drivers/media/platform/s5p-mfc/Makefile b/drivers/media/platfo= rm/samsung/s5p-mfc/Makefile similarity index 100% rename from drivers/media/platform/s5p-mfc/Makefile rename to drivers/media/platform/samsung/s5p-mfc/Makefile diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h b/drivers/media/= platform/samsung/s5p-mfc/regs-mfc-v10.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc-v10.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v10.h diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v6.h b/drivers/media/p= latform/samsung/s5p-mfc/regs-mfc-v6.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc-v6.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v6.h diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v7.h b/drivers/media/p= latform/samsung/s5p-mfc/regs-mfc-v7.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc-v7.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v7.h diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v8.h b/drivers/media/p= latform/samsung/s5p-mfc/regs-mfc-v8.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc-v8.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v8.h diff --git a/drivers/media/platform/s5p-mfc/regs-mfc.h b/drivers/media/plat= form/samsung/s5p-mfc/regs-mfc.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platf= orm/samsung/s5p-mfc/s5p_mfc.c similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c b/drivers/media/p= latform/samsung/s5p-mfc/s5p_mfc_cmd.c similarity index 89% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c index 0e88c28f4ad3..774c573dc075 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c * * Copyright (C) 2012 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h b/drivers/media/p= latform/samsung/s5p-mfc/s5p_mfc_cmd.h similarity index 92% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h index ed4e32a12552..945d12fdceb7 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h * * Copyright (C) 2012 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c b/drivers/medi= a/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c similarity index 98% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c index 1ea4eda9c8e0..327e54e70611 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h b/drivers/medi= a/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h similarity index 82% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h index 917854bffe9f..6eafa514aebc 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c b/drivers/medi= a/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c similarity index 98% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c index 1f42130cc865..f8588e52dfc8 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c * * Copyright (c) 2012 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h b/drivers/medi= a/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h similarity index 82% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h index c19884ea2bfc..9dc44460cc38 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/medi= a/platform/samsung/s5p-mfc/s5p_mfc_common.h similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_common.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/= platform/samsung/s5p-mfc/s5p_mfc_ctrl.c similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c index da138c314963..72d70984e99a 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c * * Copyright (c) 2010 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h b/drivers/media/= platform/samsung/s5p-mfc/s5p_mfc_ctrl.h similarity index 92% rename from drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h index 7f32ef8a6b61..653ba5f3d048 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h * * Copyright (c) 2010 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h b/drivers/media= /platform/samsung/s5p-mfc/s5p_mfc_debug.h similarity index 95% rename from drivers/media/platform/s5p-mfc/s5p_mfc_debug.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h index 752bbe4fe48e..bba5dad6dbff 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * drivers/media/platform/s5p-mfc/s5p_mfc_debug.h + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h * * Header file for Samsung MFC (Multi Function Codec - FIMV) driver * This file contains debug macros diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/p= latform/samsung/s5p-mfc/s5p_mfc_dec.c similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_dec.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c index c0798811755c..4b89df8bfd18 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h b/drivers/media/p= latform/samsung/s5p-mfc/s5p_mfc_dec.h similarity index 90% rename from drivers/media/platform/s5p-mfc/s5p_mfc_dec.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h index 0e9a0e3bbbe7..0c52ab46cff7 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/p= latform/samsung/s5p-mfc/s5p_mfc_enc.c similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_enc.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c index 1fad99edb091..a8877d805b29 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c * * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h b/drivers/media/p= latform/samsung/s5p-mfc/s5p_mfc_enc.h similarity index 90% rename from drivers/media/platform/s5p-mfc/s5p_mfc_enc.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h index cacd1ca43e19..3f1b1a037a4f 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_intr.c b/drivers/media/= platform/samsung/s5p-mfc/s5p_mfc_intr.c similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_intr.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.c diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_intr.h b/drivers/media/= platform/samsung/s5p-mfc/s5p_mfc_intr.h similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_intr.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h b/drivers/media= /platform/samsung/s5p-mfc/s5p_mfc_iommu.h similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_iommu.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c b/drivers/media/p= latform/samsung/s5p-mfc/s5p_mfc_opr.c similarity index 98% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c index bb65671eea91..673962301173 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * drivers/media/platform/s5p-mfc/s5p_mfc_opr.c + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c * * Samsung MFC (Multi Function Codec - FIMV) driver * This file contains hw related functions. diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h b/drivers/media/p= latform/samsung/s5p-mfc/s5p_mfc_opr.h similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h index 1c5d2d4c0543..b9831275f3ab 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * drivers/media/platform/s5p-mfc/s5p_mfc_opr.h + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h * * Header file for Samsung MFC (Multi Function Codec - FIMV) driver * Contains declarations of hw related functions. diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c b/drivers/medi= a/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.c similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.c diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.h b/drivers/medi= a/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.h similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/medi= a/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c index a1453053e31a..8227004f6746 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c * * Samsung MFC (Multi Function Codec - FIMV) driver * This file contains hw related functions. diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h b/drivers/medi= a/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h similarity index 96% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h index 8ca514bf5e37..e4dd03c5454c 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h * * Header file for Samsung MFC (Multi Function Codec - FIMV) driver * Contains declarations of hw related functions. diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c b/drivers/media/pl= atform/samsung/s5p-mfc/s5p_mfc_pm.c similarity index 97% rename from drivers/media/platform/s5p-mfc/s5p_mfc_pm.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c index 88b7d33c9197..72a901e99450 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c * * Copyright (c) 2010 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h b/drivers/media/pl= atform/samsung/s5p-mfc/s5p_mfc_pm.h similarity index 87% rename from drivers/media/platform/s5p-mfc/s5p_mfc_pm.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h index 3d26443189a2..4159d2364e87 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9FC32C433EF for ; Mon, 14 Mar 2022 08:00:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236723AbiCNIBS (ORCPT ); Mon, 14 Mar 2022 04:01:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236983AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B898541627; Mon, 14 Mar 2022 00:56:14 -0700 (PDT) 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 C0DF7611DB; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF1BDC340FB; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244562; bh=Hape7kYWVuX8drA0rblmUL76LkuFBpSSgP76wC/RUso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n0N7rxBfv9Ubvbpva7I6T55YoPBXtUzE7Cva7hDUIjSXtNwoZBPnon+8yYeFC2ylD JST8CzhrQnl2bQVkmcqZatIY2AXgs25PpLV2zk8gLSFf2Ke0q6hl9bsIgwrcXO6txp ZIft8jQ+WnimZ09QQDrjSK+iKhdQf/MXIPS3LD7fEJ3JHqyWyNQTrk8Ln5gDpRnj+o +tR62bINBgD+YpMcHIJJyNzdnzoqaOPzeqMHiwOyhPduHUTJViq9+REmpSpIu6ngw6 ziJgIBoU1YKrmZlp6UmWERvTiyNCXqFrjfhN00byFKphRA8fndOC/DfU4M3/rWP37E 79C0LzPVr/BGQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXn-N2; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Alain Volmat , Alexandre Torgue , Dillon Min , Dmitriy Ulitin , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Hugues Fruchet , Jacopo Mondi , Jernej Skrabec , Lad Prabhakar , Laurent Pinchart , Leon Romanovsky , Maxime Coquelin , Ming Qian , Rui Miguel Silva , Sakari Ailus , Tomi Valkeinen , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH 56/64] media: platform: rename stm32/ to sti/stm32/ Date: Mon, 14 Mar 2022 08:55:48 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the end goal is to have platform drivers split by vendor, rename stm32/ to sti/stm32/. 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ =3D> sti}/stm32/Kconfig | 0 drivers/media/platform/{ =3D> sti}/stm32/Makefile | 0 drivers/media/platform/{ =3D> sti}/stm32/dma2d/dma2d-hw.c | 0 drivers/media/platform/{ =3D> sti}/stm32/dma2d/dma2d-regs.h | 0 drivers/media/platform/{ =3D> sti}/stm32/dma2d/dma2d.c | 0 drivers/media/platform/{ =3D> sti}/stm32/dma2d/dma2d.h | 0 drivers/media/platform/{ =3D> sti}/stm32/stm32-dcmi.c | 0 10 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ =3D> sti}/stm32/Kconfig (100%) rename drivers/media/platform/{ =3D> sti}/stm32/Makefile (100%) rename drivers/media/platform/{ =3D> sti}/stm32/dma2d/dma2d-hw.c (100%) rename drivers/media/platform/{ =3D> sti}/stm32/dma2d/dma2d-regs.h (100%) rename drivers/media/platform/{ =3D> sti}/stm32/dma2d/dma2d.c (100%) rename drivers/media/platform/{ =3D> sti}/stm32/dma2d/dma2d.h (100%) rename drivers/media/platform/{ =3D> sti}/stm32/stm32-dcmi.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 7711a5ea125e..620705e0f043 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12046,7 +12046,7 @@ L: linux-media@vger.kernel.org S: Supported T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml -F: drivers/media/platform/stm32/stm32-dcmi.c +F: drivers/media/platform/sti/stm32/stm32-dcmi.c =20 MEDIA INPUT INFRASTRUCTURE (V4L/DVB) M: Mauro Carvalho Chehab diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index c61b785727a8..7321c76ec582 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -95,7 +95,7 @@ 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/sti/Kconfig" -source "drivers/media/platform/stm32/Kconfig" +source "drivers/media/platform/sti/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index 6a766acfbe37..e3dd2331003a 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -40,7 +40,7 @@ obj-y +=3D sti/bdisp/ obj-y +=3D sti/c8sectpfe/ obj-y +=3D sti/delta/ obj-y +=3D sti/hva/ -obj-y +=3D stm32/ +obj-y +=3D sti/stm32/ obj-y +=3D ti-vpe/ obj-y +=3D via/ obj-y +=3D xilinx/ diff --git a/drivers/media/platform/stm32/Kconfig b/drivers/media/platform/= sti/stm32/Kconfig similarity index 100% rename from drivers/media/platform/stm32/Kconfig rename to drivers/media/platform/sti/stm32/Kconfig diff --git a/drivers/media/platform/stm32/Makefile b/drivers/media/platform= /sti/stm32/Makefile similarity index 100% rename from drivers/media/platform/stm32/Makefile rename to drivers/media/platform/sti/stm32/Makefile diff --git a/drivers/media/platform/stm32/dma2d/dma2d-hw.c b/drivers/media/= platform/sti/stm32/dma2d/dma2d-hw.c similarity index 100% rename from drivers/media/platform/stm32/dma2d/dma2d-hw.c rename to drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c diff --git a/drivers/media/platform/stm32/dma2d/dma2d-regs.h b/drivers/medi= a/platform/sti/stm32/dma2d/dma2d-regs.h similarity index 100% rename from drivers/media/platform/stm32/dma2d/dma2d-regs.h rename to drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h diff --git a/drivers/media/platform/stm32/dma2d/dma2d.c b/drivers/media/pla= tform/sti/stm32/dma2d/dma2d.c similarity index 100% rename from drivers/media/platform/stm32/dma2d/dma2d.c rename to drivers/media/platform/sti/stm32/dma2d/dma2d.c diff --git a/drivers/media/platform/stm32/dma2d/dma2d.h b/drivers/media/pla= tform/sti/stm32/dma2d/dma2d.h similarity index 100% rename from drivers/media/platform/stm32/dma2d/dma2d.h rename to drivers/media/platform/sti/stm32/dma2d/dma2d.h diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/plat= form/sti/stm32/stm32-dcmi.c similarity index 100% rename from drivers/media/platform/stm32/stm32-dcmi.c rename to drivers/media/platform/sti/stm32/stm32-dcmi.c --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11DFEC433F5 for ; Mon, 14 Mar 2022 07:59:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237332AbiCNIAc (ORCPT ); Mon, 14 Mar 2022 04:00:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237005AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C61641985; Mon, 14 Mar 2022 00:56:18 -0700 (PDT) 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 147AE611FB; Mon, 14 Mar 2022 07:56:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 801DFC341F0; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=VpaiS3yFbQMi+HZbkvIsEJmpQYTuY1O47ezPvl+yyl0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o4T6n+Lru4cp/FOAvrDlcR7RfTDUcR1QtawwlkbYNgIkqL8X7TuwOaRBfxsecfiUT IKzIaM60Cft5J+tOAGIc19MEZWaqyOgnwWRLakqgrSZHdLktWAOTKZoWAYRUSld01L pjJ3FNUsS4DAv9f3vSZe9yypf8XROfDPkal3R5sjexCWKEHmasMqLrTgr/pJhBscbx WWNUJuCFUwfJl6Z32F2shGHDUU+94XISOhsedyXrslgIr1d+msuOE3MYw5EKnAmQcJ thTQ/9ZFeJkSEbB+3mbvbcfZn1c7/kYDlzCMS7H2jAbVwon/1tBrs8adCS/i96rswc 6bqtQCXRPGMxA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXr-OK; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , "Lad, Prabhakar" , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Cai Huoqing , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Laurent Pinchart , Ming Qian , Rui Miguel Silva , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 57/64] media: platform: rename am437x/ to ti/am437x/ Date: Mon, 14 Mar 2022 08:55:49 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the end goal is to have platform drivers split by vendor, rename am437x/ to ti/am437x/. Reviewed-by: Laurent Pinchart 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ =3D> ti}/am437x/Kconfig | 0 drivers/media/platform/{ =3D> ti}/am437x/Makefile | 0 drivers/media/platform/{ =3D> ti}/am437x/am437x-vpfe.c | 0 drivers/media/platform/{ =3D> ti}/am437x/am437x-vpfe.h | 0 drivers/media/platform/{ =3D> ti}/am437x/am437x-vpfe_regs.h | 0 8 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ =3D> ti}/am437x/Kconfig (100%) rename drivers/media/platform/{ =3D> ti}/am437x/Makefile (100%) rename drivers/media/platform/{ =3D> ti}/am437x/am437x-vpfe.c (100%) rename drivers/media/platform/{ =3D> ti}/am437x/am437x-vpfe.h (100%) rename drivers/media/platform/{ =3D> ti}/am437x/am437x-vpfe_regs.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 620705e0f043..a8599cb4091e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19262,7 +19262,7 @@ S: Maintained W: https://linuxtv.org Q: http://patchwork.linuxtv.org/project/linux-media/list/ T: git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git -F: drivers/media/platform/am437x/ +F: drivers/media/platform/ti/am437x/ =20 TI BANDGAP AND THERMAL DRIVER M: Eduardo Valentin diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 7321c76ec582..9456144cd347 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -67,7 +67,6 @@ config VIDEO_MUX =20 source "drivers/media/platform/allegro-dvt/Kconfig" source "drivers/media/platform/allwinner/Kconfig" -source "drivers/media/platform/am437x/Kconfig" source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/atmel/Kconfig" @@ -97,6 +96,7 @@ source "drivers/media/platform/samsung/s5p-mfc/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/sti/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" +source "drivers/media/platform/ti/am437x/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" =20 diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index e3dd2331003a..a34278911145 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -7,7 +7,6 @@ # (e. g. LC_ALL=3DC sort Makefile) obj-y +=3D allegro-dvt/ obj-y +=3D allwinner/ -obj-y +=3D am437x/ obj-y +=3D amlogic/meson-ge2d/ obj-y +=3D aspeed/ obj-y +=3D atmel/ @@ -42,6 +41,7 @@ obj-y +=3D sti/delta/ obj-y +=3D sti/hva/ obj-y +=3D sti/stm32/ obj-y +=3D ti-vpe/ +obj-y +=3D ti/am437x/ obj-y +=3D via/ obj-y +=3D xilinx/ =20 diff --git a/drivers/media/platform/am437x/Kconfig b/drivers/media/platform= /ti/am437x/Kconfig similarity index 100% rename from drivers/media/platform/am437x/Kconfig rename to drivers/media/platform/ti/am437x/Kconfig diff --git a/drivers/media/platform/am437x/Makefile b/drivers/media/platfor= m/ti/am437x/Makefile similarity index 100% rename from drivers/media/platform/am437x/Makefile rename to drivers/media/platform/ti/am437x/Makefile diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/pl= atform/ti/am437x/am437x-vpfe.c similarity index 100% rename from drivers/media/platform/am437x/am437x-vpfe.c rename to drivers/media/platform/ti/am437x/am437x-vpfe.c diff --git a/drivers/media/platform/am437x/am437x-vpfe.h b/drivers/media/pl= atform/ti/am437x/am437x-vpfe.h similarity index 100% rename from drivers/media/platform/am437x/am437x-vpfe.h rename to drivers/media/platform/ti/am437x/am437x-vpfe.h diff --git a/drivers/media/platform/am437x/am437x-vpfe_regs.h b/drivers/med= ia/platform/ti/am437x/am437x-vpfe_regs.h similarity index 100% rename from drivers/media/platform/am437x/am437x-vpfe_regs.h rename to drivers/media/platform/ti/am437x/am437x-vpfe_regs.h --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28B78C433EF for ; Mon, 14 Mar 2022 08:00:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236768AbiCNIBO (ORCPT ); Mon, 14 Mar 2022 04:01:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236837AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C3FE4163B; Mon, 14 Mar 2022 00:56:17 -0700 (PDT) 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 CA38B611DD; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2FE2C36B1B; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=swRxq5gsw5Yf8Epflxt4EJGeebzMkO7Mkk9AcDrNib0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EfZqZFl4+tQFY0SXQnHCWVQFhFq5b+s7TP2+zg/YJXd1fx927aIUP3KWCqe5LuBuT p8uJJhoN+xgXDMLAHLSXyP1QiniKO9o1I46watanyDZ9jjeqF6N7j1TU3cFsFIYUxF szRZQBByb61NvMR/lmQoOXoUJikD1WJZsmqSxAXAFCOeUaaU948szVyy3OLIb8Ar6s bUgeWk1ujrEmNJ5+oZYb6bqB9bGCKzrl2WHilSk8Oj/XqKIrJ2zYcQoiZJqkX4QUyu UQxYbJZvuff2yB+BXH/DYsKOK+7KorEMPgdqj8LBhUF8mxyugXPkGZP+gvdUCqQG9F KMUW16ohtaB4A== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXv-Pf; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , "Lad, Prabhakar" , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Arnd Bergmann , Cai Huoqing , Colin Ian King , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Herman , Jacopo Mondi , Jernej Skrabec , Johan Hovold , Lad Prabhakar , Laurent Pinchart , Ming Qian , Rui Miguel Silva , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 58/64] media: platform: rename davinci/ to ti/davinci/ Date: Mon, 14 Mar 2022 08:55:50 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the end goal is to have platform drivers split by vendor, rename davinci/ to ti/davinci/. Reviewed-by: Laurent Pinchart 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ .../media/drivers/davinci-vpbe-devel.rst | 20 +++++++++---------- MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- .../media/platform/{ =3D> ti}/davinci/Kconfig | 0 .../media/platform/{ =3D> ti}/davinci/Makefile | 0 .../{ =3D> ti}/davinci/ccdc_hw_device.h | 0 .../platform/{ =3D> ti}/davinci/dm355_ccdc.c | 0 .../{ =3D> ti}/davinci/dm355_ccdc_regs.h | 0 .../platform/{ =3D> ti}/davinci/dm644x_ccdc.c | 0 .../{ =3D> ti}/davinci/dm644x_ccdc_regs.h | 0 .../media/platform/{ =3D> ti}/davinci/isif.c | 0 .../platform/{ =3D> ti}/davinci/isif_regs.h | 0 .../media/platform/{ =3D> ti}/davinci/vpbe.c | 0 .../platform/{ =3D> ti}/davinci/vpbe_display.c | 0 .../platform/{ =3D> ti}/davinci/vpbe_osd.c | 0 .../platform/{ =3D> ti}/davinci/vpbe_osd_regs.h | 0 .../platform/{ =3D> ti}/davinci/vpbe_venc.c | 0 .../{ =3D> ti}/davinci/vpbe_venc_regs.h | 0 .../platform/{ =3D> ti}/davinci/vpfe_capture.c | 0 .../media/platform/{ =3D> ti}/davinci/vpif.c | 0 .../media/platform/{ =3D> ti}/davinci/vpif.h | 0 .../platform/{ =3D> ti}/davinci/vpif_capture.c | 0 .../platform/{ =3D> ti}/davinci/vpif_capture.h | 0 .../platform/{ =3D> ti}/davinci/vpif_display.c | 0 .../platform/{ =3D> ti}/davinci/vpif_display.h | 0 .../media/platform/{ =3D> ti}/davinci/vpss.c | 0 27 files changed, 13 insertions(+), 13 deletions(-) rename drivers/media/platform/{ =3D> ti}/davinci/Kconfig (100%) rename drivers/media/platform/{ =3D> ti}/davinci/Makefile (100%) rename drivers/media/platform/{ =3D> ti}/davinci/ccdc_hw_device.h (100%) rename drivers/media/platform/{ =3D> ti}/davinci/dm355_ccdc.c (100%) rename drivers/media/platform/{ =3D> ti}/davinci/dm355_ccdc_regs.h (100%) rename drivers/media/platform/{ =3D> ti}/davinci/dm644x_ccdc.c (100%) rename drivers/media/platform/{ =3D> ti}/davinci/dm644x_ccdc_regs.h (100%) rename drivers/media/platform/{ =3D> ti}/davinci/isif.c (100%) rename drivers/media/platform/{ =3D> ti}/davinci/isif_regs.h (100%) rename drivers/media/platform/{ =3D> ti}/davinci/vpbe.c (100%) rename drivers/media/platform/{ =3D> ti}/davinci/vpbe_display.c (100%) rename drivers/media/platform/{ =3D> ti}/davinci/vpbe_osd.c (100%) rename drivers/media/platform/{ =3D> ti}/davinci/vpbe_osd_regs.h (100%) rename drivers/media/platform/{ =3D> ti}/davinci/vpbe_venc.c (100%) rename drivers/media/platform/{ =3D> ti}/davinci/vpbe_venc_regs.h (100%) rename drivers/media/platform/{ =3D> ti}/davinci/vpfe_capture.c (100%) rename drivers/media/platform/{ =3D> ti}/davinci/vpif.c (100%) rename drivers/media/platform/{ =3D> ti}/davinci/vpif.h (100%) rename drivers/media/platform/{ =3D> ti}/davinci/vpif_capture.c (100%) rename drivers/media/platform/{ =3D> ti}/davinci/vpif_capture.h (100%) rename drivers/media/platform/{ =3D> ti}/davinci/vpif_display.c (100%) rename drivers/media/platform/{ =3D> ti}/davinci/vpif_display.h (100%) rename drivers/media/platform/{ =3D> ti}/davinci/vpss.c (100%) diff --git a/Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst = b/Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst index f0961672e6a3..4e87bdbc7ae4 100644 --- a/Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst +++ b/Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst @@ -7,22 +7,22 @@ File partitioning ----------------- =20 V4L2 display device driver - drivers/media/platform/davinci/vpbe_display.c - drivers/media/platform/davinci/vpbe_display.h + drivers/media/platform/ti/davinci/vpbe_display.c + drivers/media/platform/ti/davinci/vpbe_display.h =20 VPBE display controller - drivers/media/platform/davinci/vpbe.c - drivers/media/platform/davinci/vpbe.h + drivers/media/platform/ti/davinci/vpbe.c + drivers/media/platform/ti/davinci/vpbe.h =20 VPBE venc sub device driver - drivers/media/platform/davinci/vpbe_venc.c - drivers/media/platform/davinci/vpbe_venc.h - drivers/media/platform/davinci/vpbe_venc_regs.h + drivers/media/platform/ti/davinci/vpbe_venc.c + drivers/media/platform/ti/davinci/vpbe_venc.h + drivers/media/platform/ti/davinci/vpbe_venc_regs.h =20 VPBE osd driver - drivers/media/platform/davinci/vpbe_osd.c - drivers/media/platform/davinci/vpbe_osd.h - drivers/media/platform/davinci/vpbe_osd_regs.h + drivers/media/platform/ti/davinci/vpbe_osd.c + drivers/media/platform/ti/davinci/vpbe_osd.h + drivers/media/platform/ti/davinci/vpbe_osd_regs.h =20 To be done ---------- diff --git a/MAINTAINERS b/MAINTAINERS index a8599cb4091e..801391246c87 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19321,7 +19321,7 @@ S: Maintained W: https://linuxtv.org Q: http://patchwork.linuxtv.org/project/linux-media/list/ T: git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git -F: drivers/media/platform/davinci/ +F: drivers/media/platform/ti/davinci/ F: include/media/davinci/ =20 TI ENHANCED QUADRATURE ENCODER PULSE (eQEP) DRIVER diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 9456144cd347..bedc8f2522e2 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -72,7 +72,6 @@ source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/chips-media/Kconfig" -source "drivers/media/platform/davinci/Kconfig" source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" @@ -97,6 +96,7 @@ source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/sti/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/ti/am437x/Kconfig" +source "drivers/media/platform/ti/davinci/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" =20 diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index a34278911145..4e063935f061 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -12,7 +12,6 @@ obj-y +=3D aspeed/ obj-y +=3D atmel/ obj-y +=3D cadence/ obj-y +=3D chips-media/ -obj-y +=3D davinci/ obj-y +=3D intel/ obj-y +=3D marvell/ obj-y +=3D mediatek/mtk-jpeg/ @@ -42,6 +41,7 @@ obj-y +=3D sti/hva/ obj-y +=3D sti/stm32/ obj-y +=3D ti-vpe/ obj-y +=3D ti/am437x/ +obj-y +=3D ti/davinci/ obj-y +=3D via/ obj-y +=3D xilinx/ =20 diff --git a/drivers/media/platform/davinci/Kconfig b/drivers/media/platfor= m/ti/davinci/Kconfig similarity index 100% rename from drivers/media/platform/davinci/Kconfig rename to drivers/media/platform/ti/davinci/Kconfig diff --git a/drivers/media/platform/davinci/Makefile b/drivers/media/platfo= rm/ti/davinci/Makefile similarity index 100% rename from drivers/media/platform/davinci/Makefile rename to drivers/media/platform/ti/davinci/Makefile diff --git a/drivers/media/platform/davinci/ccdc_hw_device.h b/drivers/medi= a/platform/ti/davinci/ccdc_hw_device.h similarity index 100% rename from drivers/media/platform/davinci/ccdc_hw_device.h rename to drivers/media/platform/ti/davinci/ccdc_hw_device.h diff --git a/drivers/media/platform/davinci/dm355_ccdc.c b/drivers/media/pl= atform/ti/davinci/dm355_ccdc.c similarity index 100% rename from drivers/media/platform/davinci/dm355_ccdc.c rename to drivers/media/platform/ti/davinci/dm355_ccdc.c diff --git a/drivers/media/platform/davinci/dm355_ccdc_regs.h b/drivers/med= ia/platform/ti/davinci/dm355_ccdc_regs.h similarity index 100% rename from drivers/media/platform/davinci/dm355_ccdc_regs.h rename to drivers/media/platform/ti/davinci/dm355_ccdc_regs.h diff --git a/drivers/media/platform/davinci/dm644x_ccdc.c b/drivers/media/p= latform/ti/davinci/dm644x_ccdc.c similarity index 100% rename from drivers/media/platform/davinci/dm644x_ccdc.c rename to drivers/media/platform/ti/davinci/dm644x_ccdc.c diff --git a/drivers/media/platform/davinci/dm644x_ccdc_regs.h b/drivers/me= dia/platform/ti/davinci/dm644x_ccdc_regs.h similarity index 100% rename from drivers/media/platform/davinci/dm644x_ccdc_regs.h rename to drivers/media/platform/ti/davinci/dm644x_ccdc_regs.h diff --git a/drivers/media/platform/davinci/isif.c b/drivers/media/platform= /ti/davinci/isif.c similarity index 100% rename from drivers/media/platform/davinci/isif.c rename to drivers/media/platform/ti/davinci/isif.c diff --git a/drivers/media/platform/davinci/isif_regs.h b/drivers/media/pla= tform/ti/davinci/isif_regs.h similarity index 100% rename from drivers/media/platform/davinci/isif_regs.h rename to drivers/media/platform/ti/davinci/isif_regs.h diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform= /ti/davinci/vpbe.c similarity index 100% rename from drivers/media/platform/davinci/vpbe.c rename to drivers/media/platform/ti/davinci/vpbe.c diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/= platform/ti/davinci/vpbe_display.c similarity index 100% rename from drivers/media/platform/davinci/vpbe_display.c rename to drivers/media/platform/ti/davinci/vpbe_display.c diff --git a/drivers/media/platform/davinci/vpbe_osd.c b/drivers/media/plat= form/ti/davinci/vpbe_osd.c similarity index 100% rename from drivers/media/platform/davinci/vpbe_osd.c rename to drivers/media/platform/ti/davinci/vpbe_osd.c diff --git a/drivers/media/platform/davinci/vpbe_osd_regs.h b/drivers/media= /platform/ti/davinci/vpbe_osd_regs.h similarity index 100% rename from drivers/media/platform/davinci/vpbe_osd_regs.h rename to drivers/media/platform/ti/davinci/vpbe_osd_regs.h diff --git a/drivers/media/platform/davinci/vpbe_venc.c b/drivers/media/pla= tform/ti/davinci/vpbe_venc.c similarity index 100% rename from drivers/media/platform/davinci/vpbe_venc.c rename to drivers/media/platform/ti/davinci/vpbe_venc.c diff --git a/drivers/media/platform/davinci/vpbe_venc_regs.h b/drivers/medi= a/platform/ti/davinci/vpbe_venc_regs.h similarity index 100% rename from drivers/media/platform/davinci/vpbe_venc_regs.h rename to drivers/media/platform/ti/davinci/vpbe_venc_regs.h diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/= platform/ti/davinci/vpfe_capture.c similarity index 100% rename from drivers/media/platform/davinci/vpfe_capture.c rename to drivers/media/platform/ti/davinci/vpfe_capture.c diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform= /ti/davinci/vpif.c similarity index 100% rename from drivers/media/platform/davinci/vpif.c rename to drivers/media/platform/ti/davinci/vpif.c diff --git a/drivers/media/platform/davinci/vpif.h b/drivers/media/platform= /ti/davinci/vpif.h similarity index 100% rename from drivers/media/platform/davinci/vpif.h rename to drivers/media/platform/ti/davinci/vpif.h diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/= platform/ti/davinci/vpif_capture.c similarity index 100% rename from drivers/media/platform/davinci/vpif_capture.c rename to drivers/media/platform/ti/davinci/vpif_capture.c diff --git a/drivers/media/platform/davinci/vpif_capture.h b/drivers/media/= platform/ti/davinci/vpif_capture.h similarity index 100% rename from drivers/media/platform/davinci/vpif_capture.h rename to drivers/media/platform/ti/davinci/vpif_capture.h diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/= platform/ti/davinci/vpif_display.c similarity index 100% rename from drivers/media/platform/davinci/vpif_display.c rename to drivers/media/platform/ti/davinci/vpif_display.c diff --git a/drivers/media/platform/davinci/vpif_display.h b/drivers/media/= platform/ti/davinci/vpif_display.h similarity index 100% rename from drivers/media/platform/davinci/vpif_display.h rename to drivers/media/platform/ti/davinci/vpif_display.h diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform= /ti/davinci/vpss.c similarity index 100% rename from drivers/media/platform/davinci/vpss.c rename to drivers/media/platform/ti/davinci/vpss.c --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ABF01C433EF for ; Mon, 14 Mar 2022 07:59:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237355AbiCNIAu (ORCPT ); Mon, 14 Mar 2022 04:00:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237013AbiCNH5v (ORCPT ); Mon, 14 Mar 2022 03:57:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B8904198E; Mon, 14 Mar 2022 00:56:18 -0700 (PDT) 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 083EC611F2; Mon, 14 Mar 2022 07:56:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0047AC36B1C; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=kz16Bjwyo2MGvf2z65WGS2e7jnNzK1KkOZzgkEcfYtc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UWQP01sv7hw8e/BS2dE17tg+zvvqHFCXhToq1E6Z71iNu6mzbNt/Cp1xkCuXy2XJj 9FpSxR/HDY7FnB7NP2fPcFmyZkzinbFIPknHc03Y4/I+r0JgJZB6tW5l3RwfMB+/0a bXczIrXfmreRelTUHroVcXhgk5RwJunK5QkzAtUNKwJStaU8dgTfipTy8uSuma3Dmz S4lipJmjOaSdEvgyvvYxQUsIH+/q1lHO60wsvexB6Lj4YOza4u7ZLg8niXqEocgwkc UdYHp++lP0EOffWY3zrOkSglI4crFIFV6qQ5B/V+l+bwC4899hFUZ7VGnUQz9qKlHq 6lLfoHxL4Z6Ew== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXz-RG; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , "Gustavo A. R. Silva" , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Kees Cook , Laurent Pinchart , Ming Qian , Rui Miguel Silva , Sakari Ailus , Tomi Valkeinen , Wei Yongjun , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 59/64] media: platform: rename omap3isp/ to ti/omap3isp/ Date: Mon, 14 Mar 2022 08:55:51 +0100 Message-Id: <5fe739c3d01c12be25bd28cdb45875ce323b927e.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the end goal is to have platform drivers split by vendor, rename omap3isp/ to ti/omap3isp/. Reviewed-by: Laurent Pinchart 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ Documentation/admin-guide/media/omap3isp.rst | 2 +- Documentation/admin-guide/media/omap4_camera.rst | 2 +- Documentation/driver-api/media/v4l2-event.rst | 2 +- MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ =3D> ti}/omap3isp/Kconfig | 0 drivers/media/platform/{ =3D> ti}/omap3isp/Makefile | 0 drivers/media/platform/{ =3D> ti}/omap3isp/cfa_coef_table.h | 0 drivers/media/platform/{ =3D> ti}/omap3isp/gamma_table.h | 0 drivers/media/platform/{ =3D> ti}/omap3isp/isp.c | 0 drivers/media/platform/{ =3D> ti}/omap3isp/isp.h | 0 drivers/media/platform/{ =3D> ti}/omap3isp/ispccdc.c | 0 drivers/media/platform/{ =3D> ti}/omap3isp/ispccdc.h | 0 drivers/media/platform/{ =3D> ti}/omap3isp/ispccp2.c | 0 drivers/media/platform/{ =3D> ti}/omap3isp/ispccp2.h | 0 drivers/media/platform/{ =3D> ti}/omap3isp/ispcsi2.c | 0 drivers/media/platform/{ =3D> ti}/omap3isp/ispcsi2.h | 0 drivers/media/platform/{ =3D> ti}/omap3isp/ispcsiphy.c | 0 drivers/media/platform/{ =3D> ti}/omap3isp/ispcsiphy.h | 0 drivers/media/platform/{ =3D> ti}/omap3isp/isph3a.h | 0 drivers/media/platform/{ =3D> ti}/omap3isp/isph3a_aewb.c | 0 drivers/media/platform/{ =3D> ti}/omap3isp/isph3a_af.c | 0 drivers/media/platform/{ =3D> ti}/omap3isp/isphist.c | 0 drivers/media/platform/{ =3D> ti}/omap3isp/isphist.h | 0 drivers/media/platform/{ =3D> ti}/omap3isp/isppreview.c | 0 drivers/media/platform/{ =3D> ti}/omap3isp/isppreview.h | 0 drivers/media/platform/{ =3D> ti}/omap3isp/ispreg.h | 0 drivers/media/platform/{ =3D> ti}/omap3isp/ispresizer.c | 0 drivers/media/platform/{ =3D> ti}/omap3isp/ispresizer.h | 0 drivers/media/platform/{ =3D> ti}/omap3isp/ispstat.c | 0 drivers/media/platform/{ =3D> ti}/omap3isp/ispstat.h | 0 drivers/media/platform/{ =3D> ti}/omap3isp/ispvideo.c | 0 drivers/media/platform/{ =3D> ti}/omap3isp/ispvideo.h | 0 drivers/media/platform/{ =3D> ti}/omap3isp/luma_enhance_table.h | 0 drivers/media/platform/{ =3D> ti}/omap3isp/noise_filter_table.h | 0 drivers/media/platform/{ =3D> ti}/omap3isp/omap3isp.h | 0 37 files changed, 6 insertions(+), 6 deletions(-) rename drivers/media/platform/{ =3D> ti}/omap3isp/Kconfig (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/Makefile (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/cfa_coef_table.h (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/gamma_table.h (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/isp.c (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/isp.h (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/ispccdc.c (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/ispccdc.h (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/ispccp2.c (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/ispccp2.h (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/ispcsi2.c (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/ispcsi2.h (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/ispcsiphy.c (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/ispcsiphy.h (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/isph3a.h (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/isph3a_aewb.c (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/isph3a_af.c (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/isphist.c (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/isphist.h (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/isppreview.c (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/isppreview.h (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/ispreg.h (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/ispresizer.c (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/ispresizer.h (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/ispstat.c (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/ispstat.h (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/ispvideo.c (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/ispvideo.h (100%) rename drivers/media/platform/{ =3D> ti}/omap3isp/luma_enhance_table.h (10= 0%) rename drivers/media/platform/{ =3D> ti}/omap3isp/noise_filter_table.h (10= 0%) rename drivers/media/platform/{ =3D> ti}/omap3isp/omap3isp.h (100%) diff --git a/Documentation/admin-guide/media/omap3isp.rst b/Documentation/a= dmin-guide/media/omap3isp.rst index bc447bbec7ce..f32e7375a1a2 100644 --- a/Documentation/admin-guide/media/omap3isp.rst +++ b/Documentation/admin-guide/media/omap3isp.rst @@ -17,7 +17,7 @@ Introduction ------------ =20 This file documents the Texas Instruments OMAP 3 Image Signal Processor (I= SP) -driver located under drivers/media/platform/omap3isp. The original driver = was +driver located under drivers/media/platform/ti/omap3isp. The original driv= er was written by Texas Instruments but since that it has been rewritten (twice) = at Nokia. =20 diff --git a/Documentation/admin-guide/media/omap4_camera.rst b/Documentati= on/admin-guide/media/omap4_camera.rst index 24db4222d36d..2ada9b1e6897 100644 --- a/Documentation/admin-guide/media/omap4_camera.rst +++ b/Documentation/admin-guide/media/omap4_camera.rst @@ -25,7 +25,7 @@ As of Revision AB, the ISS is described in detail in sect= ion 8. This driver is supporting **only** the CSI2-A/B interfaces for now. =20 It makes use of the Media Controller framework [#f2]_, and inherited most = of the -code from OMAP3 ISP driver (found under drivers/media/platform/omap3isp/\*= ), +code from OMAP3 ISP driver (found under drivers/media/platform/ti/omap3isp= /\*), except that it doesn't need an IOMMU now for ISS buffers memory mapping. =20 Supports usage of MMAP buffers only (for now). diff --git a/Documentation/driver-api/media/v4l2-event.rst b/Documentation/= driver-api/media/v4l2-event.rst index 5b8254eba7da..52d4fbc5d819 100644 --- a/Documentation/driver-api/media/v4l2-event.rst +++ b/Documentation/driver-api/media/v4l2-event.rst @@ -167,7 +167,7 @@ The first event type in the class is reserved for futur= e use, so the first available event type is 'class base + 1'. =20 An example on how the V4L2 events may be used can be found in the OMAP -3 ISP driver (``drivers/media/platform/omap3isp``). +3 ISP driver (``drivers/media/platform/ti/omap3isp``). =20 A subdev can directly send an event to the :c:type:`v4l2_device` notify function with ``V4L2_DEVICE_NOTIFY_EVENT``. This allows the bridge to map diff --git a/MAINTAINERS b/MAINTAINERS index 801391246c87..2a85c98a77e4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14094,7 +14094,7 @@ M: Laurent Pinchart L: linux-media@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/media/ti,omap3isp.txt -F: drivers/media/platform/omap3isp/ +F: drivers/media/platform/ti/omap3isp/ F: drivers/staging/media/omap4iss/ =20 OMAP MMC SUPPORT diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index bedc8f2522e2..22d462f43a21 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -82,7 +82,6 @@ source "drivers/media/platform/nvidia/tegra-vde/Kconfig" source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/nxp/amphion/Kconfig" source "drivers/media/platform/omap/Kconfig" -source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/Kconfig" @@ -97,6 +96,7 @@ source "drivers/media/platform/sti/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/ti/am437x/Kconfig" source "drivers/media/platform/ti/davinci/Kconfig" +source "drivers/media/platform/ti/omap3isp/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" =20 diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index 4e063935f061..ef6c00b2ed64 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -22,7 +22,6 @@ obj-y +=3D nvidia/tegra-vde/ obj-y +=3D nxp/ obj-y +=3D nxp/amphion/ obj-y +=3D omap/ -obj-y +=3D omap3isp/ obj-y +=3D qcom/camss/ obj-y +=3D qcom/venus/ obj-y +=3D renesas/ @@ -42,6 +41,7 @@ obj-y +=3D sti/stm32/ obj-y +=3D ti-vpe/ obj-y +=3D ti/am437x/ obj-y +=3D ti/davinci/ +obj-y +=3D ti/omap3isp/ obj-y +=3D via/ obj-y +=3D xilinx/ =20 diff --git a/drivers/media/platform/omap3isp/Kconfig b/drivers/media/platfo= rm/ti/omap3isp/Kconfig similarity index 100% rename from drivers/media/platform/omap3isp/Kconfig rename to drivers/media/platform/ti/omap3isp/Kconfig diff --git a/drivers/media/platform/omap3isp/Makefile b/drivers/media/platf= orm/ti/omap3isp/Makefile similarity index 100% rename from drivers/media/platform/omap3isp/Makefile rename to drivers/media/platform/ti/omap3isp/Makefile diff --git a/drivers/media/platform/omap3isp/cfa_coef_table.h b/drivers/med= ia/platform/ti/omap3isp/cfa_coef_table.h similarity index 100% rename from drivers/media/platform/omap3isp/cfa_coef_table.h rename to drivers/media/platform/ti/omap3isp/cfa_coef_table.h diff --git a/drivers/media/platform/omap3isp/gamma_table.h b/drivers/media/= platform/ti/omap3isp/gamma_table.h similarity index 100% rename from drivers/media/platform/omap3isp/gamma_table.h rename to drivers/media/platform/ti/omap3isp/gamma_table.h diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform= /ti/omap3isp/isp.c similarity index 100% rename from drivers/media/platform/omap3isp/isp.c rename to drivers/media/platform/ti/omap3isp/isp.c diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform= /ti/omap3isp/isp.h similarity index 100% rename from drivers/media/platform/omap3isp/isp.h rename to drivers/media/platform/ti/omap3isp/isp.h diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/plat= form/ti/omap3isp/ispccdc.c similarity index 100% rename from drivers/media/platform/omap3isp/ispccdc.c rename to drivers/media/platform/ti/omap3isp/ispccdc.c diff --git a/drivers/media/platform/omap3isp/ispccdc.h b/drivers/media/plat= form/ti/omap3isp/ispccdc.h similarity index 100% rename from drivers/media/platform/omap3isp/ispccdc.h rename to drivers/media/platform/ti/omap3isp/ispccdc.h diff --git a/drivers/media/platform/omap3isp/ispccp2.c b/drivers/media/plat= form/ti/omap3isp/ispccp2.c similarity index 100% rename from drivers/media/platform/omap3isp/ispccp2.c rename to drivers/media/platform/ti/omap3isp/ispccp2.c diff --git a/drivers/media/platform/omap3isp/ispccp2.h b/drivers/media/plat= form/ti/omap3isp/ispccp2.h similarity index 100% rename from drivers/media/platform/omap3isp/ispccp2.h rename to drivers/media/platform/ti/omap3isp/ispccp2.h diff --git a/drivers/media/platform/omap3isp/ispcsi2.c b/drivers/media/plat= form/ti/omap3isp/ispcsi2.c similarity index 100% rename from drivers/media/platform/omap3isp/ispcsi2.c rename to drivers/media/platform/ti/omap3isp/ispcsi2.c diff --git a/drivers/media/platform/omap3isp/ispcsi2.h b/drivers/media/plat= form/ti/omap3isp/ispcsi2.h similarity index 100% rename from drivers/media/platform/omap3isp/ispcsi2.h rename to drivers/media/platform/ti/omap3isp/ispcsi2.h diff --git a/drivers/media/platform/omap3isp/ispcsiphy.c b/drivers/media/pl= atform/ti/omap3isp/ispcsiphy.c similarity index 100% rename from drivers/media/platform/omap3isp/ispcsiphy.c rename to drivers/media/platform/ti/omap3isp/ispcsiphy.c diff --git a/drivers/media/platform/omap3isp/ispcsiphy.h b/drivers/media/pl= atform/ti/omap3isp/ispcsiphy.h similarity index 100% rename from drivers/media/platform/omap3isp/ispcsiphy.h rename to drivers/media/platform/ti/omap3isp/ispcsiphy.h diff --git a/drivers/media/platform/omap3isp/isph3a.h b/drivers/media/platf= orm/ti/omap3isp/isph3a.h similarity index 100% rename from drivers/media/platform/omap3isp/isph3a.h rename to drivers/media/platform/ti/omap3isp/isph3a.h diff --git a/drivers/media/platform/omap3isp/isph3a_aewb.c b/drivers/media/= platform/ti/omap3isp/isph3a_aewb.c similarity index 100% rename from drivers/media/platform/omap3isp/isph3a_aewb.c rename to drivers/media/platform/ti/omap3isp/isph3a_aewb.c diff --git a/drivers/media/platform/omap3isp/isph3a_af.c b/drivers/media/pl= atform/ti/omap3isp/isph3a_af.c similarity index 100% rename from drivers/media/platform/omap3isp/isph3a_af.c rename to drivers/media/platform/ti/omap3isp/isph3a_af.c diff --git a/drivers/media/platform/omap3isp/isphist.c b/drivers/media/plat= form/ti/omap3isp/isphist.c similarity index 100% rename from drivers/media/platform/omap3isp/isphist.c rename to drivers/media/platform/ti/omap3isp/isphist.c diff --git a/drivers/media/platform/omap3isp/isphist.h b/drivers/media/plat= form/ti/omap3isp/isphist.h similarity index 100% rename from drivers/media/platform/omap3isp/isphist.h rename to drivers/media/platform/ti/omap3isp/isphist.h diff --git a/drivers/media/platform/omap3isp/isppreview.c b/drivers/media/p= latform/ti/omap3isp/isppreview.c similarity index 100% rename from drivers/media/platform/omap3isp/isppreview.c rename to drivers/media/platform/ti/omap3isp/isppreview.c diff --git a/drivers/media/platform/omap3isp/isppreview.h b/drivers/media/p= latform/ti/omap3isp/isppreview.h similarity index 100% rename from drivers/media/platform/omap3isp/isppreview.h rename to drivers/media/platform/ti/omap3isp/isppreview.h diff --git a/drivers/media/platform/omap3isp/ispreg.h b/drivers/media/platf= orm/ti/omap3isp/ispreg.h similarity index 100% rename from drivers/media/platform/omap3isp/ispreg.h rename to drivers/media/platform/ti/omap3isp/ispreg.h diff --git a/drivers/media/platform/omap3isp/ispresizer.c b/drivers/media/p= latform/ti/omap3isp/ispresizer.c similarity index 100% rename from drivers/media/platform/omap3isp/ispresizer.c rename to drivers/media/platform/ti/omap3isp/ispresizer.c diff --git a/drivers/media/platform/omap3isp/ispresizer.h b/drivers/media/p= latform/ti/omap3isp/ispresizer.h similarity index 100% rename from drivers/media/platform/omap3isp/ispresizer.h rename to drivers/media/platform/ti/omap3isp/ispresizer.h diff --git a/drivers/media/platform/omap3isp/ispstat.c b/drivers/media/plat= form/ti/omap3isp/ispstat.c similarity index 100% rename from drivers/media/platform/omap3isp/ispstat.c rename to drivers/media/platform/ti/omap3isp/ispstat.c diff --git a/drivers/media/platform/omap3isp/ispstat.h b/drivers/media/plat= form/ti/omap3isp/ispstat.h similarity index 100% rename from drivers/media/platform/omap3isp/ispstat.h rename to drivers/media/platform/ti/omap3isp/ispstat.h diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/pla= tform/ti/omap3isp/ispvideo.c similarity index 100% rename from drivers/media/platform/omap3isp/ispvideo.c rename to drivers/media/platform/ti/omap3isp/ispvideo.c diff --git a/drivers/media/platform/omap3isp/ispvideo.h b/drivers/media/pla= tform/ti/omap3isp/ispvideo.h similarity index 100% rename from drivers/media/platform/omap3isp/ispvideo.h rename to drivers/media/platform/ti/omap3isp/ispvideo.h diff --git a/drivers/media/platform/omap3isp/luma_enhance_table.h b/drivers= /media/platform/ti/omap3isp/luma_enhance_table.h similarity index 100% rename from drivers/media/platform/omap3isp/luma_enhance_table.h rename to drivers/media/platform/ti/omap3isp/luma_enhance_table.h diff --git a/drivers/media/platform/omap3isp/noise_filter_table.h b/drivers= /media/platform/ti/omap3isp/noise_filter_table.h similarity index 100% rename from drivers/media/platform/omap3isp/noise_filter_table.h rename to drivers/media/platform/ti/omap3isp/noise_filter_table.h diff --git a/drivers/media/platform/omap3isp/omap3isp.h b/drivers/media/pla= tform/ti/omap3isp/omap3isp.h similarity index 100% rename from drivers/media/platform/omap3isp/omap3isp.h rename to drivers/media/platform/ti/omap3isp/omap3isp.h --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDE13C433EF for ; Mon, 14 Mar 2022 07:59:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237291AbiCNIAV (ORCPT ); Mon, 14 Mar 2022 04:00:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236986AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E08D74162A; Mon, 14 Mar 2022 00:56:14 -0700 (PDT) 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 C93C8611DF; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11D02C36B1F; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=sa8b7brGOGN9yHxRgRniVHVGaYs4Y9V4omrOIDbvqzw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mMMm05Uwn+ESXtf+QhzFDjS6tqeOFAH0CRl9ymtqjHOouZ4zu0MMtuFOumIuf4oSV CmGIePgdKqyYCWEs9lhcAWIZsQpeZY7Mo4k2xX1Yc0C7y3ZRH6H1a6I9U2Ay0WUqKN NWExi23DWoAfBks3MwuMS7aH57r+RnQaubvrA7NqIKuL2Qa6J7RNdCDBXFUdnteGIm lbS77HW6ab9EWHUfhkP84qFmFb0etXdNHIuVKFQJ9jaVEHC/LRQTyxCPcCwNmCLKmS qBIGVNYDOsbGWylQI4WSTjquXJhpduBx8T74+aQt5alJxAt1Xu5l5+TBnC96ndfpkP rneZDUl0Gkq1w== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kY3-Sn; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Arnd Bergmann , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Laurent Pinchart , Ming Qian , Peter Ujfalusi , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 60/64] media: platform: rename omap/ to ti/omap/ Date: Mon, 14 Mar 2022 08:55:52 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the end goal is to have platform drivers split by vendor, rename omap/ to ti/omap/. Reviewed-by: Laurent Pinchart 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ =3D> ti}/omap/Kconfig | 0 drivers/media/platform/{ =3D> ti}/omap/Makefile | 0 drivers/media/platform/{ =3D> ti}/omap/omap_vout.c | 0 drivers/media/platform/{ =3D> ti}/omap/omap_vout_vrfb.c | 0 drivers/media/platform/{ =3D> ti}/omap/omap_vout_vrfb.h | 0 drivers/media/platform/{ =3D> ti}/omap/omap_voutdef.h | 0 drivers/media/platform/{ =3D> ti}/omap/omap_voutlib.c | 0 drivers/media/platform/{ =3D> ti}/omap/omap_voutlib.h | 0 10 files changed, 2 insertions(+), 2 deletions(-) rename drivers/media/platform/{ =3D> ti}/omap/Kconfig (100%) rename drivers/media/platform/{ =3D> ti}/omap/Makefile (100%) rename drivers/media/platform/{ =3D> ti}/omap/omap_vout.c (100%) rename drivers/media/platform/{ =3D> ti}/omap/omap_vout_vrfb.c (100%) rename drivers/media/platform/{ =3D> ti}/omap/omap_vout_vrfb.h (100%) rename drivers/media/platform/{ =3D> ti}/omap/omap_voutdef.h (100%) rename drivers/media/platform/{ =3D> ti}/omap/omap_voutlib.c (100%) rename drivers/media/platform/{ =3D> ti}/omap/omap_voutlib.h (100%) diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 22d462f43a21..57094394d30b 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -81,7 +81,6 @@ source "drivers/media/platform/mediatek/mtk-vpu/Kconfig" source "drivers/media/platform/nvidia/tegra-vde/Kconfig" source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/nxp/amphion/Kconfig" -source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/Kconfig" @@ -96,6 +95,7 @@ source "drivers/media/platform/sti/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/ti/am437x/Kconfig" source "drivers/media/platform/ti/davinci/Kconfig" +source "drivers/media/platform/ti/omap/Kconfig" source "drivers/media/platform/ti/omap3isp/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index ef6c00b2ed64..a9740f6021d2 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -21,7 +21,6 @@ obj-y +=3D mediatek/mtk-vpu/ obj-y +=3D nvidia/tegra-vde/ obj-y +=3D nxp/ obj-y +=3D nxp/amphion/ -obj-y +=3D omap/ obj-y +=3D qcom/camss/ obj-y +=3D qcom/venus/ obj-y +=3D renesas/ @@ -41,6 +40,7 @@ obj-y +=3D sti/stm32/ obj-y +=3D ti-vpe/ obj-y +=3D ti/am437x/ obj-y +=3D ti/davinci/ +obj-y +=3D ti/omap/ obj-y +=3D ti/omap3isp/ obj-y +=3D via/ obj-y +=3D xilinx/ diff --git a/drivers/media/platform/omap/Kconfig b/drivers/media/platform/t= i/omap/Kconfig similarity index 100% rename from drivers/media/platform/omap/Kconfig rename to drivers/media/platform/ti/omap/Kconfig diff --git a/drivers/media/platform/omap/Makefile b/drivers/media/platform/= ti/omap/Makefile similarity index 100% rename from drivers/media/platform/omap/Makefile rename to drivers/media/platform/ti/omap/Makefile diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platfo= rm/ti/omap/omap_vout.c similarity index 100% rename from drivers/media/platform/omap/omap_vout.c rename to drivers/media/platform/ti/omap/omap_vout.c diff --git a/drivers/media/platform/omap/omap_vout_vrfb.c b/drivers/media/p= latform/ti/omap/omap_vout_vrfb.c similarity index 100% rename from drivers/media/platform/omap/omap_vout_vrfb.c rename to drivers/media/platform/ti/omap/omap_vout_vrfb.c diff --git a/drivers/media/platform/omap/omap_vout_vrfb.h b/drivers/media/p= latform/ti/omap/omap_vout_vrfb.h similarity index 100% rename from drivers/media/platform/omap/omap_vout_vrfb.h rename to drivers/media/platform/ti/omap/omap_vout_vrfb.h diff --git a/drivers/media/platform/omap/omap_voutdef.h b/drivers/media/pla= tform/ti/omap/omap_voutdef.h similarity index 100% rename from drivers/media/platform/omap/omap_voutdef.h rename to drivers/media/platform/ti/omap/omap_voutdef.h diff --git a/drivers/media/platform/omap/omap_voutlib.c b/drivers/media/pla= tform/ti/omap/omap_voutlib.c similarity index 100% rename from drivers/media/platform/omap/omap_voutlib.c rename to drivers/media/platform/ti/omap/omap_voutlib.c diff --git a/drivers/media/platform/omap/omap_voutlib.h b/drivers/media/pla= tform/ti/omap/omap_voutlib.h similarity index 100% rename from drivers/media/platform/omap/omap_voutlib.h rename to drivers/media/platform/ti/omap/omap_voutlib.h --=20 2.35.1 From nobody Sun Sep 22 07:47:28 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BDAEAC433EF for ; Mon, 14 Mar 2022 08:00:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237184AbiCNIBJ (ORCPT ); Mon, 14 Mar 2022 04:01:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236999AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C9E54163D; Mon, 14 Mar 2022 00:56:17 -0700 (PDT) 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 DCAC5611EC; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DEFFC341DD; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=Dy6Y0LA+hIbdmBEPISD4+Cga8r2Tyh+1mER04UW5/l8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mBaIF5YZDw6Tb8yakdfRDe6KnMBeHnX2xKCiq5uxiDBIn4tuCHZosKNgsxbfIXeGa I98HoeP55ZcXzCTdqF0g5MCSN0Rvy7TMOsbuHMhoKX+oJ7D++qofz7IxdX7OTtDkhJ O45c4DnwjvnyOQbhgDh/K6uRQFMCvqd/xV690e9nwwfZnzfk9iSAfvsFsoyP1MUM4v 1qK1puvFlBtTcRj3T6qBjXjPHlBxquvk08Bwv1cPHoA0QkZ/UgwubOWl2w288K6hRn cIMVMO7kpcNJXy5LoVkEf06tIeF81pid5f9OalC4/gArNa/zUAt8hdqni1RhlN+t5t 9dyNstwGx/m1A== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kY7-UG; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Benoit Parrot , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Laurent Pinchart , Ming Qian , Pratyush Yadav , Sakari Ailus , Tomi Valkeinen , Yang Yingliang , Zhou Qingyang , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 61/64] media: platform: rename ti-vpe/ to ti/vpe/ Date: Mon, 14 Mar 2022 08:55:53 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the end goal is to have platform drivers split by vendor, rename ti-vpe/ to ti/vpe/. Reviewed-by: Laurent Pinchart 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ti-vpe =3D> ti/vpe}/Kconfig | 0 drivers/media/platform/{ti-vpe =3D> ti/vpe}/Makefile | 0 drivers/media/platform/{ti-vpe =3D> ti/vpe}/cal-camerarx.c | 0 drivers/media/platform/{ti-vpe =3D> ti/vpe}/cal-video.c | 0 drivers/media/platform/{ti-vpe =3D> ti/vpe}/cal.c | 0 drivers/media/platform/{ti-vpe =3D> ti/vpe}/cal.h | 0 drivers/media/platform/{ti-vpe =3D> ti/vpe}/cal_regs.h | 0 drivers/media/platform/{ti-vpe =3D> ti/vpe}/csc.c | 0 drivers/media/platform/{ti-vpe =3D> ti/vpe}/csc.h | 0 drivers/media/platform/{ti-vpe =3D> ti/vpe}/sc.c | 0 drivers/media/platform/{ti-vpe =3D> ti/vpe}/sc.h | 0 drivers/media/platform/{ti-vpe =3D> ti/vpe}/sc_coeff.h | 0 drivers/media/platform/{ti-vpe =3D> ti/vpe}/vpdma.c | 0 drivers/media/platform/{ti-vpe =3D> ti/vpe}/vpdma.h | 0 drivers/media/platform/{ti-vpe =3D> ti/vpe}/vpdma_priv.h | 0 drivers/media/platform/{ti-vpe =3D> ti/vpe}/vpe.c | 0 drivers/media/platform/{ti-vpe =3D> ti/vpe}/vpe_regs.h | 0 20 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ti-vpe =3D> ti/vpe}/Kconfig (100%) rename drivers/media/platform/{ti-vpe =3D> ti/vpe}/Makefile (100%) rename drivers/media/platform/{ti-vpe =3D> ti/vpe}/cal-camerarx.c (100%) rename drivers/media/platform/{ti-vpe =3D> ti/vpe}/cal-video.c (100%) rename drivers/media/platform/{ti-vpe =3D> ti/vpe}/cal.c (100%) rename drivers/media/platform/{ti-vpe =3D> ti/vpe}/cal.h (100%) rename drivers/media/platform/{ti-vpe =3D> ti/vpe}/cal_regs.h (100%) rename drivers/media/platform/{ti-vpe =3D> ti/vpe}/csc.c (100%) rename drivers/media/platform/{ti-vpe =3D> ti/vpe}/csc.h (100%) rename drivers/media/platform/{ti-vpe =3D> ti/vpe}/sc.c (100%) rename drivers/media/platform/{ti-vpe =3D> ti/vpe}/sc.h (100%) rename drivers/media/platform/{ti-vpe =3D> ti/vpe}/sc_coeff.h (100%) rename drivers/media/platform/{ti-vpe =3D> ti/vpe}/vpdma.c (100%) rename drivers/media/platform/{ti-vpe =3D> ti/vpe}/vpdma.h (100%) rename drivers/media/platform/{ti-vpe =3D> ti/vpe}/vpdma_priv.h (100%) rename drivers/media/platform/{ti-vpe =3D> ti/vpe}/vpe.c (100%) rename drivers/media/platform/{ti-vpe =3D> ti/vpe}/vpe_regs.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 2a85c98a77e4..031cb2cbecba 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19407,7 +19407,7 @@ W: http://linuxtv.org/ Q: http://patchwork.linuxtv.org/project/linux-media/list/ F: Documentation/devicetree/bindings/media/ti,cal.yaml F: Documentation/devicetree/bindings/media/ti,vpe.yaml -F: drivers/media/platform/ti-vpe/ +F: drivers/media/platform/ti/vpe/ =20 TI WILINK WIRELESS DRIVERS L: linux-wireless@vger.kernel.org diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 57094394d30b..05b720ac0961 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -92,11 +92,11 @@ source "drivers/media/platform/samsung/s5p-jpeg/Kconfig" source "drivers/media/platform/samsung/s5p-mfc/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/sti/stm32/Kconfig" -source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/ti/am437x/Kconfig" source "drivers/media/platform/ti/davinci/Kconfig" source "drivers/media/platform/ti/omap/Kconfig" source "drivers/media/platform/ti/omap3isp/Kconfig" +source "drivers/media/platform/ti/vpe/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" =20 diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index a9740f6021d2..1e62a4009b6c 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -37,11 +37,11 @@ obj-y +=3D sti/c8sectpfe/ obj-y +=3D sti/delta/ obj-y +=3D sti/hva/ obj-y +=3D sti/stm32/ -obj-y +=3D ti-vpe/ obj-y +=3D ti/am437x/ obj-y +=3D ti/davinci/ obj-y +=3D ti/omap/ obj-y +=3D ti/omap3isp/ +obj-y +=3D ti/vpe/ obj-y +=3D via/ obj-y +=3D xilinx/ =20 diff --git a/drivers/media/platform/ti-vpe/Kconfig b/drivers/media/platform= /ti/vpe/Kconfig similarity index 100% rename from drivers/media/platform/ti-vpe/Kconfig rename to drivers/media/platform/ti/vpe/Kconfig diff --git a/drivers/media/platform/ti-vpe/Makefile b/drivers/media/platfor= m/ti/vpe/Makefile similarity index 100% rename from drivers/media/platform/ti-vpe/Makefile rename to drivers/media/platform/ti/vpe/Makefile diff --git a/drivers/media/platform/ti-vpe/cal-camerarx.c b/drivers/media/p= latform/ti/vpe/cal-camerarx.c similarity index 100% rename from drivers/media/platform/ti-vpe/cal-camerarx.c rename to drivers/media/platform/ti/vpe/cal-camerarx.c diff --git a/drivers/media/platform/ti-vpe/cal-video.c b/drivers/media/plat= form/ti/vpe/cal-video.c similarity index 100% rename from drivers/media/platform/ti-vpe/cal-video.c rename to drivers/media/platform/ti/vpe/cal-video.c diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/t= i/vpe/cal.c similarity index 100% rename from drivers/media/platform/ti-vpe/cal.c rename to drivers/media/platform/ti/vpe/cal.c diff --git a/drivers/media/platform/ti-vpe/cal.h b/drivers/media/platform/t= i/vpe/cal.h similarity index 100% rename from drivers/media/platform/ti-vpe/cal.h rename to drivers/media/platform/ti/vpe/cal.h diff --git a/drivers/media/platform/ti-vpe/cal_regs.h b/drivers/media/platf= orm/ti/vpe/cal_regs.h similarity index 100% rename from drivers/media/platform/ti-vpe/cal_regs.h rename to drivers/media/platform/ti/vpe/cal_regs.h diff --git a/drivers/media/platform/ti-vpe/csc.c b/drivers/media/platform/t= i/vpe/csc.c similarity index 100% rename from drivers/media/platform/ti-vpe/csc.c rename to drivers/media/platform/ti/vpe/csc.c diff --git a/drivers/media/platform/ti-vpe/csc.h b/drivers/media/platform/t= i/vpe/csc.h similarity index 100% rename from drivers/media/platform/ti-vpe/csc.h rename to drivers/media/platform/ti/vpe/csc.h diff --git a/drivers/media/platform/ti-vpe/sc.c b/drivers/media/platform/ti= /vpe/sc.c similarity index 100% rename from drivers/media/platform/ti-vpe/sc.c rename to drivers/media/platform/ti/vpe/sc.c diff --git a/drivers/media/platform/ti-vpe/sc.h b/drivers/media/platform/ti= /vpe/sc.h similarity index 100% rename from drivers/media/platform/ti-vpe/sc.h rename to drivers/media/platform/ti/vpe/sc.h diff --git a/drivers/media/platform/ti-vpe/sc_coeff.h b/drivers/media/platf= orm/ti/vpe/sc_coeff.h similarity index 100% rename from drivers/media/platform/ti-vpe/sc_coeff.h rename to drivers/media/platform/ti/vpe/sc_coeff.h diff --git a/drivers/media/platform/ti-vpe/vpdma.c b/drivers/media/platform= /ti/vpe/vpdma.c similarity index 100% rename from drivers/media/platform/ti-vpe/vpdma.c rename to drivers/media/platform/ti/vpe/vpdma.c diff --git a/drivers/media/platform/ti-vpe/vpdma.h b/drivers/media/platform= /ti/vpe/vpdma.h similarity index 100% rename from drivers/media/platform/ti-vpe/vpdma.h rename to drivers/media/platform/ti/vpe/vpdma.h diff --git a/drivers/media/platform/ti-vpe/vpdma_priv.h b/drivers/media/pla= tform/ti/vpe/vpdma_priv.h similarity index 100% rename from drivers/media/platform/ti-vpe/vpdma_priv.h rename to drivers/media/platform/ti/vpe/vpdma_priv.h diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/t= i/vpe/vpe.c similarity index 100% rename from drivers/media/platform/ti-vpe/vpe.c rename to drivers/media/platform/ti/vpe/vpe.c diff --git a/drivers/media/platform/ti-vpe/vpe_regs.h b/drivers/media/platf= orm/ti/vpe/vpe_regs.h similarity index 100% rename from drivers/media/platform/ti-vpe/vpe_regs.h rename to drivers/media/platform/ti/vpe/vpe_regs.h --=20 2.35.1 From nobody Sun Sep 22 07:47:29 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60DE0C433F5 for ; Mon, 14 Mar 2022 07:59:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237311AbiCNIA7 (ORCPT ); Mon, 14 Mar 2022 04:00:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237007AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E077B41980; Mon, 14 Mar 2022 00:56:17 -0700 (PDT) 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 03C61611EE; Mon, 14 Mar 2022 07:56:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28C83C341DF; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=CG9uAjVdPXiUWjH3qQXR/bMbwuprj1OVOqMx1CbvvGk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jTl4znB3nadho8hykHnZnOAG2QHFWqDB2oNfSaw8qzAxqVu98VuJp02nOeS+Lmd2y KeskzAqbZTKS60sGMXAbW/mNA1kC8NQD/pIkePyJzKPu9B6rP27Vqeqjx+Wmtk4UmX VdjLEAVGScnQoL8p0CKFhCMpXS5qGx7U166mb6cEWVnjA3EezB6pAHonzZa2gYmX+D yJkiz1fSniI02cqAzJ1RvfXL79m7OQgy0etwdtqY/q/BrY5lEoElL/lPEcXuxP5f3v qewuwaKhN2+aQu4DfucyL48e7A4ubNq2AkDMzJBm1XdcRZ15OkSHONSgrvrKKQUG0t twuw2AJG7W6eg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kYB-Vh; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , 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 , Shijie Qin , Zhou Peng , 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 62/64] media: platform: Create vendor/{Makefile,Kconfig} files Date: Mon, 14 Mar 2022 08:55:54 +0100 Message-Id: <08f24bffc56840cd2d07905338efcab68872795d.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/media/platform/Kconfig | 27 ++++------------- 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/nxp/amphion/Kconfig | 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 ++++ 18 files changed, 71 insertions(+), 49 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 05b720ac0961..8bd92e4f4d9b 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -62,41 +62,24 @@ config VIDEO_MUX This driver provides support for N:1 video bus multiplexers. =20 # Platform drivers - Please keep it alphabetically sorted - -# TODO: create per-manufacturer directories - 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" =20 diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makef= ile index 1e62a4009b6c..5b14b231140b 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -7,41 +7,22 @@ # (e. g. LC_ALL=3DC sort Makefile) obj-y +=3D allegro-dvt/ obj-y +=3D allwinner/ -obj-y +=3D amlogic/meson-ge2d/ +obj-y +=3D amlogic/ obj-y +=3D aspeed/ obj-y +=3D atmel/ obj-y +=3D cadence/ obj-y +=3D chips-media/ obj-y +=3D intel/ obj-y +=3D marvell/ -obj-y +=3D mediatek/mtk-jpeg/ -obj-y +=3D mediatek/mtk-mdp/ -obj-y +=3D mediatek/mtk-vcodec/ -obj-y +=3D mediatek/mtk-vpu/ -obj-y +=3D nvidia/tegra-vde/ +obj-y +=3D mediatek/ +obj-y +=3D nvidia/ obj-y +=3D nxp/ -obj-y +=3D nxp/amphion/ -obj-y +=3D qcom/camss/ -obj-y +=3D qcom/venus/ +obj-y +=3D qcom/ obj-y +=3D renesas/ -obj-y +=3D rockchip/rga/ -obj-y +=3D rockchip/rkisp1/ -obj-y +=3D samsung/exynos-gsc/ -obj-y +=3D samsung/exynos4-is/ -obj-y +=3D samsung/s3c-camif/ -obj-y +=3D samsung/s5p-g2d/ -obj-y +=3D samsung/s5p-jpeg/ -obj-y +=3D samsung/s5p-mfc/ -obj-y +=3D sti/bdisp/ -obj-y +=3D sti/c8sectpfe/ -obj-y +=3D sti/delta/ -obj-y +=3D sti/hva/ -obj-y +=3D sti/stm32/ -obj-y +=3D ti/am437x/ -obj-y +=3D ti/davinci/ -obj-y +=3D ti/omap/ -obj-y +=3D ti/omap3isp/ -obj-y +=3D ti/vpe/ +obj-y +=3D rockchip/ +obj-y +=3D samsung/ +obj-y +=3D sti/ +obj-y +=3D ti/ obj-y +=3D via/ obj-y +=3D xilinx/ =20 diff --git a/drivers/media/platform/amlogic/Kconfig b/drivers/media/platfor= m/amlogic/Kconfig new file mode 100644 index 000000000000..c67e00df6202 --- /dev/null +++ b/drivers/media/platform/amlogic/Kconfig @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" diff --git a/drivers/media/platform/amlogic/Makefile b/drivers/media/platfo= rm/amlogic/Makefile new file mode 100644 index 000000000000..d3cdb8fa4ddb --- /dev/null +++ b/drivers/media/platform/amlogic/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-y +=3D meson-ge2d/ diff --git a/drivers/media/platform/mediatek/Kconfig b/drivers/media/platfo= rm/mediatek/Kconfig new file mode 100644 index 000000000000..6d74839df3d6 --- /dev/null +++ b/drivers/media/platform/mediatek/Kconfig @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only +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/platf= orm/mediatek/Makefile new file mode 100644 index 000000000000..403d5ecd2b10 --- /dev/null +++ b/drivers/media/platform/mediatek/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-y +=3D mtk-jpeg/ +obj-y +=3D mtk-mdp/ +obj-y +=3D mtk-vcodec/ +obj-y +=3D mtk-vpu/ diff --git a/drivers/media/platform/nvidia/Kconfig b/drivers/media/platform= /nvidia/Kconfig new file mode 100644 index 000000000000..1162e272b5f9 --- /dev/null +++ b/drivers/media/platform/nvidia/Kconfig @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +source "drivers/media/platform/nvidia/tegra-vde/Kconfig" diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nx= p/Kconfig index df52d32ebe50..e82bfcd97ac7 100644 --- a/drivers/media/platform/nxp/Kconfig +++ b/drivers/media/platform/nxp/Kconfig @@ -63,4 +63,5 @@ config VIDEO_MX2_EMMAPRP memory to memory. Operations include resizing and format conversion. =20 +source "drivers/media/platform/nxp/amphion/Kconfig" source "drivers/media/platform/nxp/imx-jpeg/Kconfig" diff --git a/drivers/media/platform/nxp/Makefile b/drivers/media/platform/n= xp/Makefile index efc38c6578ce..c90de5b873ab 100644 --- a/drivers/media/platform/nxp/Makefile +++ b/drivers/media/platform/nxp/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only =20 +obj-y +=3D amphion/ obj-y +=3D imx-jpeg/ =20 obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) +=3D imx-mipi-csis.o diff --git a/drivers/media/platform/nxp/amphion/Kconfig b/drivers/media/pla= tform/nxp/amphion/Kconfig index 13899649f766..679a5f8eb1a1 100644 --- a/drivers/media/platform/nxp/amphion/Kconfig +++ b/drivers/media/platform/nxp/amphion/Kconfig @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only + config VIDEO_AMPHION_VPU tristate "Amphion VPU (Video Processing Unit) Codec IP" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/qcom/Makefile b/drivers/media/platform/= qcom/Makefile new file mode 100644 index 000000000000..4f055c396e04 --- /dev/null +++ b/drivers/media/platform/qcom/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-y +=3D camss/ +obj-y +=3D venus/ diff --git a/drivers/media/platform/rockchip/Makefile b/drivers/media/platf= orm/rockchip/Makefile new file mode 100644 index 000000000000..4f782b876ac9 --- /dev/null +++ b/drivers/media/platform/rockchip/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-y +=3D rga/ +obj-y +=3D rkisp1/ diff --git a/drivers/media/platform/samsung/Kconfig b/drivers/media/platfor= m/samsung/Kconfig new file mode 100644 index 000000000000..94f30c1bca9b --- /dev/null +++ b/drivers/media/platform/samsung/Kconfig @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only +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/platfo= rm/samsung/Makefile new file mode 100644 index 000000000000..21fea3330e4b --- /dev/null +++ b/drivers/media/platform/samsung/Makefile @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-y +=3D exynos-gsc/ +obj-y +=3D exynos4-is/ +obj-y +=3D s3c-camif/ +obj-y +=3D s5p-g2d/ +obj-y +=3D s5p-jpeg/ +obj-y +=3D s5p-mfc/ diff --git a/drivers/media/platform/sti/Kconfig b/drivers/media/platform/st= i/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/s= ti/Makefile new file mode 100644 index 000000000000..f9ce8169b040 --- /dev/null +++ b/drivers/media/platform/sti/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-y +=3D bdisp/ +obj-y +=3D c8sectpfe/ +obj-y +=3D delta/ +obj-y +=3D hva/ +obj-y +=3D stm32/ diff --git a/drivers/media/platform/ti/Kconfig b/drivers/media/platform/ti/= Kconfig new file mode 100644 index 000000000000..f422c68f4a99 --- /dev/null +++ b/drivers/media/platform/ti/Kconfig @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +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..f04e371869a1 --- /dev/null +++ b/drivers/media/platform/ti/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-y +=3D am437x/ +obj-y +=3D davinci/ +obj-y +=3D omap/ +obj-y +=3D omap3isp/ +obj-y +=3D vpe/ --=20 2.35.1 From nobody Sun Sep 22 07:47:29 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A571C433F5 for ; Mon, 14 Mar 2022 07:59:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237349AbiCNIAo (ORCPT ); Mon, 14 Mar 2022 04:00:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237014AbiCNH5v (ORCPT ); Mon, 14 Mar 2022 03:57:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEB2941992; Mon, 14 Mar 2022 00:56:18 -0700 (PDT) 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 0C088611F4; Mon, 14 Mar 2022 07:56:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B48CC341E0; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=jpf8+CIVlqR8P2WBdHaMDbksXFiChRDZHqcPhOPZxpg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k3gOK9FYDSyQTro+KDltlDja6OlqkxpOjkMgAdaFOK+OphpYfcSEUfsaUMj+pKf/2 UDxcfOfWwerG+1YpwVypDQ1pPxBCauqub+I0/CZ05EXFfqJq3ALrN/aBfsPg63uQPl qKQIRKt5dKlzo/tJdKtheIB4SVijvGWkPXL6pXT6TEIfSg8bcplsyimevdBTvMCSrD AL5HNRqybv3LxyDq2uKBvxCHK43gYmGyfSEGFY8jIKw+Qd6HfbmAqepUFuicnw7JHN H2zXm/U66XUY8m6gayq7iCR5nrwmSierMsmQGptUS7QqlPqk4s/yvGGkxONlTwPJHx 7UqZIXhPMMHtw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYf-001kYF-15; Mon, 14 Mar 2022 08:56:01 +0100 From: Mauro Carvalho Chehab 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 63/64] media: platform/*/Kconfig: make manufacturer menus more uniform Date: Mon, 14 Mar 2022 08:55:55 +0100 Message-Id: <39f2340fa38093ace4cfe1bec3209157d3f6e4cf.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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. Reviewed-by: Laurent Pinchart 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@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 | 22 +++++----------------- drivers/media/platform/qcom/Kconfig | 2 ++ 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, 55 insertions(+), 33 deletions(-) diff --git a/drivers/media/platform/allegro-dvt/Kconfig b/drivers/media/pla= tform/allegro-dvt/Kconfig index dd528e9d0958..674d234be5de 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/platfor= m/amlogic/Kconfig index c67e00df6202..c1376ec1fe23 100644 --- a/drivers/media/platform/amlogic/Kconfig +++ b/drivers/media/platform/amlogic/Kconfig @@ -1,2 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only + +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 5025e892844c..153e3e5381d5 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 5122290729ae..cef12629f4ef 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/platfor= m/cadence/Kconfig index 79a7e9fb2575..3ae6f4e51eec 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. =20 - 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" =20 config VIDEO_CADENCE_CSI2RX tristate "Cadence MIPI-CSI2 RX Controller" @@ -34,5 +25,3 @@ config VIDEO_CADENCE_CSI2TX =20 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/pla= tform/chips-media/Kconfig index ae495fd7b25a..adf466a05699 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 aeda421f7248..8a730d9bcf52 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/platfor= m/marvell/Kconfig index bfe655b2cedd..626e0673f12c 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/platfo= rm/mediatek/Kconfig index 6d74839df3d6..aa79626088ec 100644 --- a/drivers/media/platform/mediatek/Kconfig +++ b/drivers/media/platform/mediatek/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +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 1162e272b5f9..597402090680 100644 --- a/drivers/media/platform/nvidia/Kconfig +++ b/drivers/media/platform/nvidia/Kconfig @@ -1,2 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "NVidia drivers" + source "drivers/media/platform/nvidia/tegra-vde/Kconfig" diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nx= p/Kconfig index e82bfcd97ac7..3478b1b45c6c 100644 --- a/drivers/media/platform/nxp/Kconfig +++ b/drivers/media/platform/nxp/Kconfig @@ -2,20 +2,10 @@ =20 # V4L drivers =20 -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 && VIDEO_V4L2 - 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" =20 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. =20 -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_V4L2 && (PPC_MPC512x || COMPILE_TEST) && I2C select VIDEOBUF_DMA_CONTIG @@ -42,7 +30,7 @@ config VIDEO_VIU # mem2mem drivers =20 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 && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST) select VIDEOBUF2_DMA_CONTIG @@ -52,7 +40,7 @@ config VIDEO_IMX_PXP color space conversion, and rotation. =20 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 && VIDEO_V4L2 depends on SOC_IMX27 || COMPILE_TEST diff --git a/drivers/media/platform/qcom/Kconfig b/drivers/media/platform/q= com/Kconfig index 9f6c91cc95ca..4a89587e932d 100644 --- a/drivers/media/platform/qcom/Kconfig +++ b/drivers/media/platform/qcom/Kconfig @@ -1,4 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only =20 +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/platfor= m/renesas/Kconfig index 3f35f1b5106d..2e3a66ea95bd 100644 --- a/drivers/media/platform/renesas/Kconfig +++ b/drivers/media/platform/renesas/Kconfig @@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only =20 +comment "Renesas drivers" + # V4L drivers =20 config VIDEO_RCAR_ISP diff --git a/drivers/media/platform/rockchip/Kconfig b/drivers/media/platfo= rm/rockchip/Kconfig index 2f97c0e0268a..4351e3258d14 100644 --- a/drivers/media/platform/rockchip/Kconfig +++ b/drivers/media/platform/rockchip/Kconfig @@ -1,3 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only + +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/platfor= m/samsung/Kconfig index 94f30c1bca9b..c187cefbec5a 100644 --- a/drivers/media/platform/samsung/Kconfig +++ b/drivers/media/platform/samsung/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +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/st= i/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 f422c68f4a99..d286027ff1c1 100644 --- a/drivers/media/platform/ti/Kconfig +++ b/drivers/media/platform/ti/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +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/vi= a/Kconfig index 1dcf789dce96..f4f4293cf25c 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 a9531d5efd50..47f1eeb5d669 100644 --- a/drivers/media/platform/xilinx/Kconfig +++ b/drivers/media/platform/xilinx/Kconfig @@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 =20 +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 =20 -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 --=20 2.35.1 From nobody Sun Sep 22 07:47:29 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1F57C433EF for ; Mon, 14 Mar 2022 08:01:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237329AbiCNICe (ORCPT ); Mon, 14 Mar 2022 04:02:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237035AbiCNH5v (ORCPT ); Mon, 14 Mar 2022 03:57:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C85E4199A; Mon, 14 Mar 2022 00:56:19 -0700 (PDT) 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 9FDE661219; Mon, 14 Mar 2022 07:56:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F700C341EF; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244564; bh=uUprKlgMBRU+4qEmiAT24whfqds+yT1GhNBTcZ28rds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oNXpemvlSUyxsIHHQuvt4RyLG/nIgxEXgBryt265Hp36yIz8OAwkzOI4AKbBmqNAD CXkl83PV5FmE+Dj6s7TbUaIF9Rgu0iunklXJCosJMWokWKJsHcvgCvPi2NjDuwdjta 1Au9d5BjnAtFJPq5PFUU3IPsBgCnqVqGkQae+mJvYcbLS/0Abn4txMyk0kmNYZMrPz iloCN3Whoij7GeV4r7LTwTVPVhOWJYt9yxQwBzz9+R9MWPo26FQzHAJB8706QMucFp JeikIcotpXOwFCLAsCkvhLejF5P+BQBjRtHi/frsq6FSjdObh96eOi2Ydf4Y9PgYJJ EVdGY27g+ICeQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYf-001kYR-4W; Mon, 14 Mar 2022 08:56:01 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , "Lad, Prabhakar" , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , =?UTF-8?q?=C5=81ukasz=20Stelmach?= , Alexandre Belloni , Alexandre Torgue , Andrew Jeffery , Andrew-CT Chen , Andrey Utkin , Andrzej Hajda , Andrzej Pietrasiewicz , Andy Gross , Andy Walls , Antoine Jacquet , Anton Sviridenko , Antti Palosaari , Benoit Parrot , Bin Liu , Bingbu Cao , Bjorn Andersson , Bluecherry Maintainers , Chen-Yu Tsai , Christian Hemp , Colin Ian King , Corentin Labbe , Dafna Hirschfeld , Dan Scally , Daniele Alessandrelli , Dmitry Osipenko , Dmitry Torokhov , Eddie James , Erik Andren , Eugen Hristev , Ezequiel Garcia , Fabien Dessenne , Fabio Estevam , Felipe Balbi , Florian Fainelli , Geert Uytterhoeven , Giulio Benetti , Greg Kroah-Hartman , Hans Verkuil , Heiko Stuebner , Heungjun Kim , Houlong Wei , Hugues Fruchet , Hyun Kwon , Jacek Anaszewski , Jacob Chen , Jaroslav Kysela , Jean-Christophe Trotin , Jeff LaBundy , Jernej Skrabec , Jerome Brunet , Joe Hung , Joel Stanley , Jonathan Hunter , Kevin Hilman , Kieran Bingham , Krzysztof Kozlowski , Kyungmin Park , Laurent Pinchart , Ludovic Desroches , Marek Szyprowski , Marek Vasut , Martin Blumenstingl , Martina Krasteva , Matthias Brugger , Maxime Coquelin , Maxime Ripard , Michael Grzeschik , Michael Tretter , Michal Simek , Mike Isely , Ming Qian , Minghsiu Tsai , Mirela Rabulea , NXP Linux Team , Neil Armstrong , Nicolas Ferre , Nicolas Saenz Julienne , Olivier Lorin , Paul Kocialkowski , Pavel Machek , Pengutronix Kernel Team , Philipp Zabel , Randy Dunlap , Ray Jui , Rick Chang , Robert Foss , Sakari Ailus , Sascha Hauer , Scott Branden , Sean Young , Shawn Guo , Shawn Tu , Shijie Qin , Shuah Khan , Sowjanya Komatineni , Stanimir Varbanov , Steve Longerbeam , Sylwester Nawrocki , Takashi Iwai , Thierry Reding , Tianshu Qiu , Tiffany Lin , Todor Tomov , Vincent Knecht , Yong Deng , Yong Zhi , Zhou Peng , alsa-devel@alsa-project.org, bcm-kernel-feedback-list@broadcom.com, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-aspeed@lists.ozlabs.org, linux-input@vger.kernel.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-rpi-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-staging@lists.linux.dev, linux-stm32@st-md-mailman.stormreply.com, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org, linux-usb@vger.kernel.org, mjpeg-users@lists.sourceforge.net, openbmc@lists.ozlabs.org Subject: [PATCH 64/64] media: Kconfig: cleanup VIDEO_DEV dependencies Date: Mon, 14 Mar 2022 08:55:56 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" media Kconfig has two entries associated to V4L API: VIDEO_DEV and VIDEO_V4L2. On Kernel 2.6.x, there were two V4L APIs, each one with its own flag. VIDEO_DEV were meant to: 1) enable Video4Linux and make its Kconfig options to appear; 2) it makes the Kernel build the V4L core. while VIDEO_V4L2 where used to distinguish between drivers that implement the newer API and drivers that implemented the former one. With time, such meaning changed, specially after the removal of all V4L version 1 drivers. At the current implementation, VIDEO_DEV only does (1): it enables the media options related to V4L, that now has: menu "Video4Linux options" visible if VIDEO_DEV source "drivers/media/v4l2-core/Kconfig" endmenu but it doesn't affect anymore the V4L core drivers. The rationale is that the V4L2 core has a "soft" dependency at the I2C bus, and now requires to select a number of other Kconfig options: config VIDEO_V4L2 tristate depends on (I2C || I2C=3Dn) && VIDEO_DEV select RATIONAL select VIDEOBUF2_V4L2 if VIDEOBUF2_CORE default (I2C || I2C=3Dn) && VIDEO_DEV In the past, merging them would be tricky, but it seems that it is now possible to merge those symbols, in order to simplify V4L dependencies. Let's keep VIDEO_DEV, as this one is used on some make *defconfig configurations. Suggested-by: Laurent Pinchart Reviewed-by: Laurent Pinchart 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/64] at: https://lore.kernel.org/all/cover.1647242578.git.mche= hab@kernel.org/ drivers/input/rmi4/Kconfig | 2 +- drivers/input/touchscreen/Kconfig | 4 +- drivers/media/Kconfig | 3 + drivers/media/common/saa7146/Kconfig | 2 +- drivers/media/dvb-core/Kconfig | 2 +- drivers/media/dvb-frontends/Kconfig | 4 +- drivers/media/i2c/Kconfig | 250 +++++++++--------- drivers/media/i2c/ccs/Kconfig | 2 +- drivers/media/i2c/cx25840/Kconfig | 2 +- drivers/media/i2c/et8ek8/Kconfig | 2 +- drivers/media/i2c/m5mols/Kconfig | 2 +- drivers/media/pci/Kconfig | 2 +- drivers/media/pci/bt8xx/Kconfig | 2 +- drivers/media/pci/cobalt/Kconfig | 2 +- drivers/media/pci/cx18/Kconfig | 2 +- drivers/media/pci/dt3155/Kconfig | 2 +- drivers/media/pci/intel/ipu3/Kconfig | 2 +- drivers/media/pci/ivtv/Kconfig | 2 +- drivers/media/pci/meye/Kconfig | 2 +- drivers/media/pci/saa7146/Kconfig | 6 +- drivers/media/pci/sta2x11/Kconfig | 2 +- drivers/media/pci/tw5864/Kconfig | 2 +- drivers/media/pci/tw68/Kconfig | 2 +- drivers/media/pci/tw686x/Kconfig | 2 +- drivers/media/platform/Kconfig | 6 +- drivers/media/platform/allegro-dvt/Kconfig | 2 +- .../platform/allwinner/sun4i-csi/Kconfig | 2 +- .../platform/allwinner/sun6i-csi/Kconfig | 2 +- .../media/platform/allwinner/sun8i-di/Kconfig | 2 +- .../platform/allwinner/sun8i-rotate/Kconfig | 2 +- .../media/platform/amlogic/meson-ge2d/Kconfig | 2 +- drivers/media/platform/aspeed/Kconfig | 2 +- drivers/media/platform/atmel/Kconfig | 8 +- drivers/media/platform/cadence/Kconfig | 4 +- drivers/media/platform/chips-media/Kconfig | 2 +- drivers/media/platform/intel/Kconfig | 2 +- drivers/media/platform/marvell/Kconfig | 4 +- .../media/platform/mediatek/mtk-jpeg/Kconfig | 2 +- .../media/platform/mediatek/mtk-mdp/Kconfig | 2 +- .../platform/mediatek/mtk-vcodec/Kconfig | 2 +- .../media/platform/mediatek/mtk-vpu/Kconfig | 2 +- .../media/platform/nvidia/tegra-vde/Kconfig | 2 +- drivers/media/platform/nxp/Kconfig | 6 +- drivers/media/platform/nxp/amphion/Kconfig | 2 +- drivers/media/platform/nxp/imx-jpeg/Kconfig | 2 +- drivers/media/platform/qcom/camss/Kconfig | 2 +- drivers/media/platform/qcom/venus/Kconfig | 2 +- drivers/media/platform/renesas/Kconfig | 30 +-- .../media/platform/renesas/rcar-vin/Kconfig | 4 +- drivers/media/platform/rockchip/rga/Kconfig | 2 +- .../media/platform/rockchip/rkisp1/Kconfig | 2 +- .../media/platform/samsung/exynos-gsc/Kconfig | 2 +- .../media/platform/samsung/exynos4-is/Kconfig | 2 +- .../media/platform/samsung/s3c-camif/Kconfig | 2 +- .../media/platform/samsung/s5p-g2d/Kconfig | 2 +- .../media/platform/samsung/s5p-jpeg/Kconfig | 2 +- .../media/platform/samsung/s5p-mfc/Kconfig | 2 +- drivers/media/platform/sti/bdisp/Kconfig | 2 +- drivers/media/platform/sti/delta/Kconfig | 2 +- drivers/media/platform/sti/hva/Kconfig | 2 +- drivers/media/platform/sti/stm32/Kconfig | 4 +- drivers/media/platform/ti/am437x/Kconfig | 2 +- drivers/media/platform/ti/davinci/Kconfig | 12 +- drivers/media/platform/ti/omap/Kconfig | 2 +- drivers/media/platform/ti/omap3isp/Kconfig | 2 +- drivers/media/platform/ti/vpe/Kconfig | 4 +- drivers/media/platform/via/Kconfig | 2 +- drivers/media/platform/xilinx/Kconfig | 2 +- drivers/media/radio/Kconfig | 54 ++-- drivers/media/radio/si470x/Kconfig | 2 +- drivers/media/radio/wl128x/Kconfig | 2 +- drivers/media/spi/Kconfig | 4 +- drivers/media/test-drivers/Kconfig | 2 +- drivers/media/test-drivers/vicodec/Kconfig | 2 +- drivers/media/test-drivers/vimc/Kconfig | 2 +- drivers/media/test-drivers/vivid/Kconfig | 2 +- drivers/media/tuners/Kconfig | 6 +- drivers/media/tuners/e4000.c | 6 +- drivers/media/tuners/fc2580.c | 6 +- drivers/media/usb/airspy/Kconfig | 2 +- drivers/media/usb/au0828/Kconfig | 6 +- drivers/media/usb/cpia2/Kconfig | 2 +- drivers/media/usb/dvb-usb-v2/Kconfig | 8 +- drivers/media/usb/dvb-usb/Kconfig | 4 +- drivers/media/usb/gspca/Kconfig | 96 +++---- drivers/media/usb/gspca/gl860/Kconfig | 2 +- drivers/media/usb/gspca/m5602/Kconfig | 2 +- drivers/media/usb/hackrf/Kconfig | 2 +- drivers/media/usb/hdpvr/Kconfig | 2 +- drivers/media/usb/msi2500/Kconfig | 2 +- drivers/media/usb/pvrusb2/Kconfig | 2 +- drivers/media/usb/pwc/Kconfig | 2 +- drivers/media/usb/s2255/Kconfig | 2 +- drivers/media/usb/stkwebcam/Kconfig | 2 +- drivers/media/usb/usbtv/Kconfig | 2 +- drivers/media/usb/uvc/Kconfig | 2 +- drivers/media/usb/zr364xx/Kconfig | 2 +- drivers/media/v4l2-core/Kconfig | 12 +- drivers/media/v4l2-core/Makefile | 2 +- drivers/staging/media/atomisp/Kconfig | 2 +- drivers/staging/media/atomisp/i2c/Kconfig | 14 +- drivers/staging/media/hantro/Kconfig | 2 +- drivers/staging/media/imx/Kconfig | 2 +- drivers/staging/media/ipu3/Kconfig | 2 +- drivers/staging/media/max96712/Kconfig | 2 +- drivers/staging/media/meson/vdec/Kconfig | 2 +- drivers/staging/media/omap4iss/Kconfig | 2 +- drivers/staging/media/rkvdec/Kconfig | 2 +- drivers/staging/media/sunxi/cedrus/Kconfig | 2 +- drivers/staging/media/tegra-video/Kconfig | 2 +- drivers/staging/media/zoran/Kconfig | 2 +- drivers/staging/most/video/Kconfig | 2 +- .../vc04_services/bcm2835-camera/Kconfig | 2 +- drivers/usb/gadget/Kconfig | 2 +- drivers/usb/gadget/legacy/Kconfig | 2 +- sound/pci/Kconfig | 4 +- 116 files changed, 371 insertions(+), 376 deletions(-) diff --git a/drivers/input/rmi4/Kconfig b/drivers/input/rmi4/Kconfig index 16119f760d11..c0163b983ce6 100644 --- a/drivers/input/rmi4/Kconfig +++ b/drivers/input/rmi4/Kconfig @@ -110,7 +110,7 @@ config RMI4_F3A =20 config RMI4_F54 bool "RMI4 Function 54 (Analog diagnostics)" - depends on VIDEO_V4L2=3Dy || (RMI4_CORE=3Dm && VIDEO_V4L2=3Dm) + depends on VIDEO_DEV=3Dy || (RMI4_CORE=3Dm && VIDEO_DEV=3Dm) select VIDEOBUF2_VMALLOC select RMI4_F55 help diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/= Kconfig index 2f6adfb7b938..ff7794cecf69 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -131,7 +131,7 @@ config TOUCHSCREEN_ATMEL_MXT config TOUCHSCREEN_ATMEL_MXT_T37 bool "Support T37 Diagnostic Data" depends on TOUCHSCREEN_ATMEL_MXT - depends on VIDEO_V4L2=3Dy || (TOUCHSCREEN_ATMEL_MXT=3Dm && VIDEO_V4L2=3Dm) + depends on VIDEO_DEV=3Dy || (TOUCHSCREEN_ATMEL_MXT=3Dm && VIDEO_DEV=3Dm) select VIDEOBUF2_VMALLOC help Say Y here if you want support to output data from the T37 @@ -1252,7 +1252,7 @@ config TOUCHSCREEN_SUN4I config TOUCHSCREEN_SUR40 tristate "Samsung SUR40 (Surface 2.0/PixelSense) touchscreen" depends on USB && MEDIA_USB_SUPPORT && HAS_DMA - depends on VIDEO_V4L2 + depends on VIDEO_DEV select VIDEOBUF2_DMA_SG help Say Y here if you want support for the Samsung SUR40 touchscreen diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 1a75058df374..ba6592b3dab2 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -160,6 +160,9 @@ menu "Media core support" config VIDEO_DEV tristate "Video4Linux core" default MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SU= PPORT || MEDIA_SDR_SUPPORT || MEDIA_PLATFORM_SUPPORT || MEDIA_TEST_SUPPORT + depends on (I2C || I2C=3Dn) + select RATIONAL + select VIDEOBUF2_V4L2 if VIDEOBUF2_CORE help Enables the V4L2 API, used by cameras, analog TV, video grabbers, radio devices and by some input devices. diff --git a/drivers/media/common/saa7146/Kconfig b/drivers/media/common/sa= a7146/Kconfig index 3e85c0c3fd9a..a0aa155e5d85 100644 --- a/drivers/media/common/saa7146/Kconfig +++ b/drivers/media/common/saa7146/Kconfig @@ -5,6 +5,6 @@ config VIDEO_SAA7146 =20 config VIDEO_SAA7146_VV tristate - depends on VIDEO_V4L2 + depends on VIDEO_DEV select VIDEOBUF_DMA_SG select VIDEO_SAA7146 diff --git a/drivers/media/dvb-core/Kconfig b/drivers/media/dvb-core/Kconfig index 6ffac618417b..8b3f2d53cd62 100644 --- a/drivers/media/dvb-core/Kconfig +++ b/drivers/media/dvb-core/Kconfig @@ -6,7 +6,7 @@ config DVB_MMAP bool "Enable DVB memory-mapped API (EXPERIMENTAL)" depends on DVB_CORE - depends on VIDEO_V4L2=3Dy || VIDEO_V4L2=3DDVB_CORE + depends on VIDEO_DEV=3Dy || VIDEO_DEV=3DDVB_CORE select VIDEOBUF2_VMALLOC help This option enables DVB experimental memory-mapped API, which diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-fronte= nds/Kconfig index 2c1ed98d43c5..4101f9b1e731 100644 --- a/drivers/media/dvb-frontends/Kconfig +++ b/drivers/media/dvb-frontends/Kconfig @@ -510,7 +510,7 @@ config DVB_RTL2832 =20 config DVB_RTL2832_SDR tristate "Realtek RTL2832 SDR" - depends on DVB_CORE && I2C && I2C_MUX && VIDEO_V4L2 && MEDIA_SDR_SUPPORT = && USB + depends on DVB_CORE && I2C && I2C_MUX && VIDEO_DEV && MEDIA_SDR_SUPPORT &= & USB select DVB_RTL2832 select VIDEOBUF2_VMALLOC default m if !MEDIA_SUBDRV_AUTOSELECT @@ -681,7 +681,7 @@ config DVB_AU8522_DTV =20 config DVB_AU8522_V4L tristate "Auvitek AU8522 based ATV demod" - depends on VIDEO_V4L2 && DVB_CORE && I2C + depends on VIDEO_DEV && DVB_CORE && I2C select DVB_AU8522 default m if !MEDIA_SUBDRV_AUTOSELECT help diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index e7194c1be4d2..5abc169f0a5c 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -3,7 +3,7 @@ # Multimedia Video device configuration # =20 -if VIDEO_V4L2 +if VIDEO_DEV =20 comment "IR I2C driver auto-selected by 'Autoselect ancillary drivers'" depends on MEDIA_SUBDRV_AUTOSELECT && I2C && RC_CORE @@ -36,7 +36,7 @@ menu "Audio decoders, processors and mixers" =20 config VIDEO_TVAUDIO tristate "Simple audio decoder chips" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for several audio decoder chips found on some bt8xx boards: Philips: tda9840, tda9873h, tda9874h/a, tda9850, tda985x, tea6300, @@ -48,7 +48,7 @@ config VIDEO_TVAUDIO =20 config VIDEO_TDA7432 tristate "Philips TDA7432 audio processor" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for tda7432 audio decoder chip found on some bt8xx boards. =20 @@ -66,7 +66,7 @@ config VIDEO_TDA9840 =20 config VIDEO_TDA1997X tristate "NXP TDA1997x HDMI receiver" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C depends on SND_SOC select HDMI select SND_PCM @@ -99,7 +99,7 @@ config VIDEO_TEA6420 =20 config VIDEO_MSP3400 tristate "Micronas MSP34xx audio decoders" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Micronas MSP34xx series of audio decoders. =20 @@ -108,7 +108,7 @@ config VIDEO_MSP3400 =20 config VIDEO_CS3308 tristate "Cirrus Logic CS3308 audio ADC" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Cirrus Logic CS3308 High Performance 8-Channel Analog Volume Control @@ -118,7 +118,7 @@ config VIDEO_CS3308 =20 config VIDEO_CS5345 tristate "Cirrus Logic CS5345 audio ADC" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Cirrus Logic CS5345 24-bit, 192 kHz stereo A/D converter. @@ -128,7 +128,7 @@ config VIDEO_CS5345 =20 config VIDEO_CS53L32A tristate "Cirrus Logic CS53L32A audio ADC" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Cirrus Logic CS53L32A low voltage stereo A/D converter. @@ -138,7 +138,7 @@ config VIDEO_CS53L32A =20 config VIDEO_TLV320AIC23B tristate "Texas Instruments TLV320AIC23B audio codec" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Texas Instruments TLV320AIC23B audio codec. =20 @@ -147,7 +147,7 @@ config VIDEO_TLV320AIC23B =20 config VIDEO_UDA1342 tristate "Philips UDA1342 audio codec" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Philips UDA1342 audio codec. =20 @@ -156,7 +156,7 @@ config VIDEO_UDA1342 =20 config VIDEO_WM8775 tristate "Wolfson Microelectronics WM8775 audio ADC with input mixer" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Wolfson Microelectronics WM8775 high performance stereo A/D Converter with a 4 channel input mixer. @@ -166,7 +166,7 @@ config VIDEO_WM8775 =20 config VIDEO_WM8739 tristate "Wolfson Microelectronics WM8739 stereo audio ADC" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Wolfson Microelectronics WM8739 stereo A/D Converter. @@ -176,7 +176,7 @@ config VIDEO_WM8739 =20 config VIDEO_VP27SMPX tristate "Panasonic VP27's internal MPX" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the internal MPX of the Panasonic VP27s tuner. =20 @@ -185,7 +185,7 @@ config VIDEO_VP27SMPX =20 config VIDEO_SONY_BTF_MPX tristate "Sony BTF's internal MPX" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the internal MPX of the Sony BTF-PG472Z tuner. =20 @@ -198,7 +198,7 @@ menu "RDS decoders" =20 config VIDEO_SAA6588 tristate "SAA6588 Radio Chip RDS decoder support" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C =20 help Support for this Radio Data System (RDS) decoder. This allows @@ -214,7 +214,7 @@ menu "Video decoders" =20 config VIDEO_ADV7180 tristate "Analog Devices ADV7180 decoder" - depends on GPIOLIB && VIDEO_V4L2 && I2C + depends on GPIOLIB && VIDEO_DEV && I2C select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_ASYNC @@ -226,7 +226,7 @@ config VIDEO_ADV7180 =20 config VIDEO_ADV7183 tristate "Analog Devices ADV7183 decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help V4l2 subdevice driver for the Analog Devices ADV7183 video decoder. @@ -236,7 +236,7 @@ config VIDEO_ADV7183 =20 config VIDEO_ADV748X tristate "Analog Devices ADV748x decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C depends on OF select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API @@ -251,7 +251,7 @@ config VIDEO_ADV748X =20 config VIDEO_ADV7604 tristate "Analog Devices ADV7604 decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C depends on GPIOLIB || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API @@ -277,7 +277,7 @@ config VIDEO_ADV7604_CEC =20 config VIDEO_ADV7842 tristate "Analog Devices ADV7842 decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select HDMI @@ -300,7 +300,7 @@ config VIDEO_ADV7842_CEC =20 config VIDEO_BT819 tristate "BT819A VideoStream decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for BT819A video decoder. =20 @@ -309,7 +309,7 @@ config VIDEO_BT819 =20 config VIDEO_BT856 tristate "BT856 VideoStream decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for BT856 video decoder. =20 @@ -318,7 +318,7 @@ config VIDEO_BT856 =20 config VIDEO_BT866 tristate "BT866 VideoStream decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for BT866 video decoder. =20 @@ -327,7 +327,7 @@ config VIDEO_BT866 =20 config VIDEO_ISL7998X tristate "Intersil ISL7998x video decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C depends on OF_GPIO select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API @@ -337,7 +337,7 @@ config VIDEO_ISL7998X =20 config VIDEO_KS0127 tristate "KS0127 video decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for KS0127 video decoder. =20 @@ -349,7 +349,7 @@ config VIDEO_KS0127 =20 config VIDEO_ML86V7667 tristate "OKI ML86V7667 video decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the OKI Semiconductor ML86V7667 video decoder. =20 @@ -358,7 +358,7 @@ config VIDEO_ML86V7667 =20 config VIDEO_SAA7110 tristate "Philips SAA7110 video decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Philips SAA7110 video decoders. =20 @@ -367,7 +367,7 @@ config VIDEO_SAA7110 =20 config VIDEO_SAA711X tristate "Philips SAA7111/3/4/5 video decoders" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Philips SAA7111/3/4/5 video decoders. =20 @@ -376,7 +376,7 @@ config VIDEO_SAA711X =20 config VIDEO_TC358743 tristate "Toshiba TC358743 decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select HDMI @@ -397,7 +397,7 @@ config VIDEO_TC358743_CEC =20 config VIDEO_TVP514X tristate "Texas Instruments TVP514x video decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C select V4L2_FWNODE help This is a Video4Linux2 sensor driver for the TI TVP5146/47 @@ -409,7 +409,7 @@ config VIDEO_TVP514X =20 config VIDEO_TVP5150 tristate "Texas Instruments TVP5150 video decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C select V4L2_FWNODE select REGMAP_I2C help @@ -420,7 +420,7 @@ config VIDEO_TVP5150 =20 config VIDEO_TVP7002 tristate "Texas Instruments TVP7002 video decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C select V4L2_FWNODE help Support for the Texas Instruments TVP7002 video decoder. @@ -430,7 +430,7 @@ config VIDEO_TVP7002 =20 config VIDEO_TW2804 tristate "Techwell TW2804 multiple video decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Techwell tw2804 multiple video decoder. =20 @@ -439,7 +439,7 @@ config VIDEO_TW2804 =20 config VIDEO_TW9903 tristate "Techwell TW9903 video decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Techwell tw9903 multi-standard video decoder with high quality down scaler. @@ -449,7 +449,7 @@ config VIDEO_TW9903 =20 config VIDEO_TW9906 tristate "Techwell TW9906 video decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Techwell tw9906 enhanced multi-standard comb filter video decoder with YCbCr input support. @@ -459,7 +459,7 @@ config VIDEO_TW9906 =20 config VIDEO_TW9910 tristate "Techwell TW9910 video decoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C select V4L2_ASYNC help Support for Techwell TW9910 NTSC/PAL/SECAM video decoder. @@ -469,7 +469,7 @@ config VIDEO_TW9910 =20 config VIDEO_VPX3220 tristate "vpx3220a, vpx3216b & vpx3214c video decoders" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for VPX322x video decoders. =20 @@ -479,7 +479,7 @@ config VIDEO_VPX3220 config VIDEO_MAX9286 tristate "Maxim MAX9286 GMSL deserializer support" depends on I2C && I2C_MUX - depends on VIDEO_V4L2 + depends on VIDEO_DEV depends on OF_GPIO select V4L2_FWNODE select VIDEO_V4L2_SUBDEV_API @@ -494,7 +494,7 @@ comment "Video and audio decoders" =20 config VIDEO_SAA717X tristate "Philips SAA7171/3/4 audio/video decoders" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Philips SAA7171/3/4 audio/video decoders. =20 @@ -510,7 +510,7 @@ menu "Video encoders" =20 config VIDEO_SAA7127 tristate "Philips SAA7127/9 digital video encoders" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Philips SAA7127/9 digital video encoders. =20 @@ -519,7 +519,7 @@ config VIDEO_SAA7127 =20 config VIDEO_SAA7185 tristate "Philips SAA7185 video encoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Philips SAA7185 video encoder. =20 @@ -528,7 +528,7 @@ config VIDEO_SAA7185 =20 config VIDEO_ADV7170 tristate "Analog Devices ADV7170 video encoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Analog Devices ADV7170 video encoder driver =20 @@ -537,7 +537,7 @@ config VIDEO_ADV7170 =20 config VIDEO_ADV7175 tristate "Analog Devices ADV7175 video encoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Analog Devices ADV7175 video encoder driver =20 @@ -565,7 +565,7 @@ config VIDEO_ADV7393 =20 config VIDEO_ADV7511 tristate "Analog Devices ADV7511 encoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C depends on DRM_I2C_ADV7511=3Dn || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API @@ -588,7 +588,7 @@ config VIDEO_ADV7511_CEC =20 config VIDEO_AD9389B tristate "Analog Devices AD9389B encoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API =20 @@ -608,7 +608,7 @@ config VIDEO_AK881X =20 config VIDEO_THS8200 tristate "Texas Instruments THS8200 video encoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C select V4L2_ASYNC help Support for the Texas Instruments THS8200 video encoder. @@ -622,7 +622,7 @@ menu "Video improvement chips" =20 config VIDEO_UPD64031A tristate "NEC Electronics uPD64031A Ghost Reduction" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C select V4L2_ASYNC help Support for the NEC Electronics uPD64031A Ghost Reduction @@ -635,7 +635,7 @@ config VIDEO_UPD64031A =20 config VIDEO_UPD64083 tristate "NEC Electronics uPD64083 3-Dimensional Y/C separation" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the NEC Electronics uPD64083 3-Dimensional Y/C separation video chip. It is used to improve the quality of @@ -650,7 +650,7 @@ menu "Audio/Video compression chips" =20 config VIDEO_SAA6752HS tristate "Philips SAA6752HS MPEG-2 Audio/Video Encoder" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C select CRC32 help Support for the Philips SAA6752HS MPEG-2 video and MPEG-audio/AC-3 @@ -666,7 +666,7 @@ menu "SDR tuner chips" =20 config SDR_MAX2175 tristate "Maxim 2175 RF to Bits tuner" - depends on VIDEO_V4L2 && MEDIA_SDR_SUPPORT && I2C + depends on VIDEO_DEV && MEDIA_SDR_SUPPORT && I2C select REGMAP_I2C select V4L2_ASYNC help @@ -684,7 +684,7 @@ menu "Miscellaneous helper chips" =20 config VIDEO_THS7303 tristate "THS7303/53 Video Amplifier" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C select V4L2_ASYNC help Support for TI THS7303/53 video amplifier @@ -694,7 +694,7 @@ config VIDEO_THS7303 =20 config VIDEO_M52790 tristate "Mitsubishi M52790 A/V switch" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Mitsubishi M52790 A/V switch. =20 @@ -703,7 +703,7 @@ config VIDEO_M52790 =20 config VIDEO_I2C tristate "I2C transport video support" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C select VIDEOBUF2_VMALLOC imply HWMON help @@ -717,7 +717,7 @@ config VIDEO_I2C =20 config VIDEO_ST_MIPID02 tristate "STMicroelectronics MIPID02 CSI-2 to PARALLEL bridge" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -745,7 +745,7 @@ config VIDEO_CCS_PLL =20 config VIDEO_HI556 tristate "Hynix Hi-556 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -758,7 +758,7 @@ config VIDEO_HI556 =20 config VIDEO_HI846 tristate "Hynix Hi-846 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -771,7 +771,7 @@ config VIDEO_HI846 =20 config VIDEO_HI847 tristate "Hynix Hi-847 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -784,7 +784,7 @@ config VIDEO_HI847 =20 config VIDEO_IMX208 tristate "Sony IMX208 sensor support" - depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + depends on I2C && VIDEO_DEV && VIDEO_V4L2_SUBDEV_API depends on MEDIA_CAMERA_SUPPORT help This is a Video4Linux2 sensor driver for the Sony @@ -795,7 +795,7 @@ config VIDEO_IMX208 =20 config VIDEO_IMX214 tristate "Sony IMX214 sensor support" - depends on GPIOLIB && I2C && VIDEO_V4L2 + depends on GPIOLIB && I2C && VIDEO_DEV select V4L2_FWNODE select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API @@ -809,7 +809,7 @@ config VIDEO_IMX214 =20 config VIDEO_IMX219 tristate "Sony IMX219 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -822,7 +822,7 @@ config VIDEO_IMX219 =20 config VIDEO_IMX258 tristate "Sony IMX258 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API help @@ -834,7 +834,7 @@ config VIDEO_IMX258 =20 config VIDEO_IMX274 tristate "Sony IMX274 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select REGMAP_I2C @@ -844,7 +844,7 @@ config VIDEO_IMX274 =20 config VIDEO_IMX290 tristate "Sony IMX290 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select REGMAP_I2C @@ -858,7 +858,7 @@ config VIDEO_IMX290 =20 config VIDEO_IMX319 tristate "Sony IMX319 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API help @@ -871,7 +871,7 @@ config VIDEO_IMX319 config VIDEO_IMX334 tristate "Sony IMX334 sensor support" depends on OF_GPIO - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select VIDEO_V4L2_SUBDEV_API select MEDIA_CONTROLLER select V4L2_FWNODE @@ -885,7 +885,7 @@ config VIDEO_IMX334 config VIDEO_IMX335 tristate "Sony IMX335 sensor support" depends on OF_GPIO - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select VIDEO_V4L2_SUBDEV_API select MEDIA_CONTROLLER select V4L2_FWNODE @@ -898,7 +898,7 @@ config VIDEO_IMX335 =20 config VIDEO_IMX355 tristate "Sony IMX355 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API help @@ -911,7 +911,7 @@ config VIDEO_IMX355 config VIDEO_IMX412 tristate "Sony IMX412 sensor support" depends on OF_GPIO - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select VIDEO_V4L2_SUBDEV_API select MEDIA_CONTROLLER select V4L2_FWNODE @@ -924,7 +924,7 @@ config VIDEO_IMX412 =20 config VIDEO_OG01A1B tristate "OmniVision OG01A1B sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -937,7 +937,7 @@ config VIDEO_OG01A1B =20 config VIDEO_OV02A10 tristate "OmniVision OV02A10 sensor support" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -950,7 +950,7 @@ config VIDEO_OV02A10 =20 config VIDEO_OV08D10 tristate "OmniVision OV08D10 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -963,7 +963,7 @@ config VIDEO_OV08D10 =20 config VIDEO_OV2640 tristate "OmniVision OV2640 sensor support" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help This is a Video4Linux2 sensor driver for the OmniVision OV2640 camera. @@ -973,7 +973,7 @@ config VIDEO_OV2640 =20 config VIDEO_OV2659 tristate "OmniVision OV2659 sensor support" - depends on VIDEO_V4L2 && I2C && GPIOLIB + depends on VIDEO_DEV && I2C && GPIOLIB select V4L2_FWNODE help This is a Video4Linux2 sensor driver for the OmniVision @@ -984,7 +984,7 @@ config VIDEO_OV2659 =20 config VIDEO_OV2680 tristate "OmniVision OV2680 sensor support" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C select MEDIA_CONTROLLER select V4L2_FWNODE help @@ -996,7 +996,7 @@ config VIDEO_OV2680 =20 config VIDEO_OV2685 tristate "OmniVision OV2685 sensor support" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C select MEDIA_CONTROLLER select V4L2_FWNODE help @@ -1008,7 +1008,7 @@ config VIDEO_OV2685 =20 config VIDEO_OV2740 tristate "OmniVision OV2740 sensor support" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C depends on ACPI || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API @@ -1024,7 +1024,7 @@ config VIDEO_OV2740 config VIDEO_OV5640 tristate "OmniVision OV5640 sensor support" depends on OF - depends on GPIOLIB && VIDEO_V4L2 && I2C + depends on GPIOLIB && VIDEO_DEV && I2C select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -1035,7 +1035,7 @@ config VIDEO_OV5640 config VIDEO_OV5645 tristate "OmniVision OV5645 sensor support" depends on OF - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -1048,7 +1048,7 @@ config VIDEO_OV5645 =20 config VIDEO_OV5647 tristate "OmniVision OV5647 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -1061,7 +1061,7 @@ config VIDEO_OV5647 =20 config VIDEO_OV5648 tristate "OmniVision OV5648 sensor support" - depends on I2C && PM && VIDEO_V4L2 + depends on I2C && PM && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -1074,7 +1074,7 @@ config VIDEO_OV5648 =20 config VIDEO_OV6650 tristate "OmniVision OV6650 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV help This is a Video4Linux2 sensor driver for the OmniVision OV6650 camera. @@ -1084,7 +1084,7 @@ config VIDEO_OV6650 =20 config VIDEO_OV5670 tristate "OmniVision OV5670 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -1097,7 +1097,7 @@ config VIDEO_OV5670 =20 config VIDEO_OV5675 tristate "OmniVision OV5675 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -1110,7 +1110,7 @@ config VIDEO_OV5675 =20 config VIDEO_OV5693 tristate "OmniVision OV5693 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select V4L2_FWNODE help This is a Video4Linux2 sensor driver for the OmniVision @@ -1121,7 +1121,7 @@ config VIDEO_OV5693 =20 config VIDEO_OV5695 tristate "OmniVision OV5695 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select V4L2_FWNODE help This is a Video4Linux2 sensor driver for the OmniVision @@ -1132,7 +1132,7 @@ config VIDEO_OV5695 =20 config VIDEO_OV7251 tristate "OmniVision OV7251 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -1145,7 +1145,7 @@ config VIDEO_OV7251 =20 config VIDEO_OV772X tristate "OmniVision OV772x sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select REGMAP_SCCB select V4L2_FWNODE help @@ -1157,7 +1157,7 @@ config VIDEO_OV772X =20 config VIDEO_OV7640 tristate "OmniVision OV7640 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV help This is a Video4Linux2 sensor driver for the OmniVision OV7640 camera. @@ -1167,7 +1167,7 @@ config VIDEO_OV7640 =20 config VIDEO_OV7670 tristate "OmniVision OV7670 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select V4L2_FWNODE help This is a Video4Linux2 sensor driver for the OmniVision @@ -1176,7 +1176,7 @@ config VIDEO_OV7670 =20 config VIDEO_OV7740 tristate "OmniVision OV7740 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select REGMAP_SCCB help This is a Video4Linux2 sensor driver for the OmniVision @@ -1184,7 +1184,7 @@ config VIDEO_OV7740 =20 config VIDEO_OV8856 tristate "OmniVision OV8856 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -1197,7 +1197,7 @@ config VIDEO_OV8856 =20 config VIDEO_OV8865 tristate "OmniVision OV8865 sensor support" - depends on I2C && PM && VIDEO_V4L2 + depends on I2C && PM && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -1211,7 +1211,7 @@ config VIDEO_OV8865 config VIDEO_OV9282 tristate "OmniVision OV9282 sensor support" depends on OF_GPIO - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select VIDEO_V4L2_SUBDEV_API select MEDIA_CONTROLLER select V4L2_FWNODE @@ -1224,14 +1224,14 @@ config VIDEO_OV9282 =20 config VIDEO_OV9640 tristate "OmniVision OV9640 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV help This is a Video4Linux2 sensor driver for the OmniVision OV9640 camera sensor. =20 config VIDEO_OV9650 tristate "OmniVision OV9650/OV9652 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select REGMAP_SCCB @@ -1241,7 +1241,7 @@ config VIDEO_OV9650 =20 config VIDEO_OV9734 tristate "OmniVision OV9734 sensor support" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C depends on ACPI || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API @@ -1255,7 +1255,7 @@ config VIDEO_OV9734 =20 config VIDEO_OV13858 tristate "OmniVision OV13858 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -1265,7 +1265,7 @@ config VIDEO_OV13858 =20 config VIDEO_OV13B10 tristate "OmniVision OV13B10 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -1275,7 +1275,7 @@ config VIDEO_OV13B10 =20 config VIDEO_VS6624 tristate "ST VS6624 sensor support" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help This is a Video4Linux2 sensor driver for the ST VS6624 camera. @@ -1285,7 +1285,7 @@ config VIDEO_VS6624 =20 config VIDEO_MT9M001 tristate "mt9m001 support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API help @@ -1294,7 +1294,7 @@ config VIDEO_MT9M001 =20 config VIDEO_MT9M032 tristate "MT9M032 camera sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select VIDEO_APTINA_PLL @@ -1304,7 +1304,7 @@ config VIDEO_MT9M032 =20 config VIDEO_MT9M111 tristate "mt9m111, mt9m112 and mt9m131 support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select V4L2_FWNODE help This driver supports MT9M111, MT9M112 and MT9M131 cameras from @@ -1312,7 +1312,7 @@ config VIDEO_MT9M111 =20 config VIDEO_MT9P031 tristate "Aptina MT9P031 support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select VIDEO_APTINA_PLL @@ -1323,7 +1323,7 @@ config VIDEO_MT9P031 =20 config VIDEO_MT9T001 tristate "Aptina MT9T001 support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API help @@ -1332,7 +1332,7 @@ config VIDEO_MT9T001 =20 config VIDEO_MT9T112 tristate "Aptina MT9T111/MT9T112 support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV help This is a Video4Linux2 sensor driver for the Aptina (Micron) MT9T111 and MT9T112 3 Mpixel camera. @@ -1342,7 +1342,7 @@ config VIDEO_MT9T112 =20 config VIDEO_MT9V011 tristate "Micron mt9v011 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV help This is a Video4Linux2 sensor driver for the Micron mt0v011 1.3 Mpixel camera. It currently only works with the @@ -1350,7 +1350,7 @@ config VIDEO_MT9V011 =20 config VIDEO_MT9V032 tristate "Micron MT9V032 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select REGMAP_I2C @@ -1361,7 +1361,7 @@ config VIDEO_MT9V032 =20 config VIDEO_MT9V111 tristate "Aptina MT9V111 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV help This is a Video4Linux2 sensor driver for the Aptina/Micron MT9V111 sensor. @@ -1371,13 +1371,13 @@ config VIDEO_MT9V111 =20 config VIDEO_SR030PC30 tristate "Siliconfile SR030PC30 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV help This driver supports SR030PC30 VGA camera from Siliconfile =20 config VIDEO_NOON010PC30 tristate "Siliconfile NOON010PC30 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API help @@ -1418,7 +1418,7 @@ config VIDEO_RDACM21 =20 config VIDEO_RJ54N1 tristate "Sharp RJ54N1CB0C sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV help This is a V4L2 sensor driver for Sharp RJ54N1CB0C CMOS image sensor. @@ -1428,7 +1428,7 @@ config VIDEO_RJ54N1 =20 config VIDEO_S5K6AA tristate "Samsung S5K6AAFX sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API help @@ -1437,7 +1437,7 @@ config VIDEO_S5K6AA =20 config VIDEO_S5K6A3 tristate "Samsung S5K6A3 sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API help @@ -1446,7 +1446,7 @@ config VIDEO_S5K6A3 =20 config VIDEO_S5K4ECGX tristate "Samsung S5K4ECGX sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select CRC32 @@ -1456,7 +1456,7 @@ config VIDEO_S5K4ECGX =20 config VIDEO_S5K5BAF tristate "Samsung S5K5BAF sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -1469,7 +1469,7 @@ source "drivers/media/i2c/et8ek8/Kconfig" =20 config VIDEO_S5C73M3 tristate "Samsung S5C73M3 sensor support" - depends on I2C && SPI && VIDEO_V4L2 + depends on I2C && SPI && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -1484,7 +1484,7 @@ menu "Lens drivers" =20 config VIDEO_AD5820 tristate "AD5820 lens voice coil support" - depends on GPIOLIB && I2C && VIDEO_V4L2 + depends on GPIOLIB && I2C && VIDEO_DEV select MEDIA_CONTROLLER select V4L2_ASYNC help @@ -1493,7 +1493,7 @@ config VIDEO_AD5820 =20 config VIDEO_AK7375 tristate "AK7375 lens voice coil support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_ASYNC @@ -1505,7 +1505,7 @@ config VIDEO_AK7375 =20 config VIDEO_DW9714 tristate "DW9714 lens voice coil support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_ASYNC @@ -1517,7 +1517,7 @@ config VIDEO_DW9714 =20 config VIDEO_DW9768 tristate "DW9768 lens voice coil support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -1529,7 +1529,7 @@ config VIDEO_DW9768 =20 config VIDEO_DW9807_VCM tristate "DW9807 lens voice coil support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_ASYNC @@ -1546,7 +1546,7 @@ menu "Flash devices" =20 config VIDEO_ADP1653 tristate "ADP1653 flash support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select V4L2_ASYNC help @@ -1555,7 +1555,7 @@ config VIDEO_ADP1653 =20 config VIDEO_LM3560 tristate "LM3560 dual flash driver support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select REGMAP_I2C select V4L2_ASYNC @@ -1565,7 +1565,7 @@ config VIDEO_LM3560 =20 config VIDEO_LM3646 tristate "LM3646 dual flash driver support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select REGMAP_I2C select V4L2_ASYNC @@ -1574,4 +1574,4 @@ config VIDEO_LM3646 flash, torch LEDs. endmenu =20 -endif # VIDEO_V4L2 +endif # VIDEO_DEV diff --git a/drivers/media/i2c/ccs/Kconfig b/drivers/media/i2c/ccs/Kconfig index 59f35b33ddc1..71671db3d993 100644 --- a/drivers/media/i2c/ccs/Kconfig +++ b/drivers/media/i2c/ccs/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_CCS tristate "MIPI CCS/SMIA++/SMIA sensor support" - depends on I2C && VIDEO_V4L2 && HAVE_CLK + depends on I2C && VIDEO_DEV && HAVE_CLK select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select VIDEO_CCS_PLL diff --git a/drivers/media/i2c/cx25840/Kconfig b/drivers/media/i2c/cx25840/= Kconfig index e392f8e023f6..46f15702cf55 100644 --- a/drivers/media/i2c/cx25840/Kconfig +++ b/drivers/media/i2c/cx25840/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_CX25840 tristate "Conexant CX2584x audio/video decoders" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help Support for the Conexant CX2584x audio/video decoders. =20 diff --git a/drivers/media/i2c/et8ek8/Kconfig b/drivers/media/i2c/et8ek8/Kc= onfig index afcc4ea764f6..398dd4d21df1 100644 --- a/drivers/media/i2c/et8ek8/Kconfig +++ b/drivers/media/i2c/et8ek8/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_ET8EK8 tristate "ET8EK8 camera sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE diff --git a/drivers/media/i2c/m5mols/Kconfig b/drivers/media/i2c/m5mols/Kc= onfig index 6f0ef33b7ee1..7f0af32f4376 100644 --- a/drivers/media/i2c/m5mols/Kconfig +++ b/drivers/media/i2c/m5mols/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_M5MOLS tristate "Fujitsu M-5MOLS 8MP sensor support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API help diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig index 2cd8e328dda9..92b156530d91 100644 --- a/drivers/media/pci/Kconfig +++ b/drivers/media/pci/Kconfig @@ -61,7 +61,7 @@ config VIDEO_PCI_SKELETON tristate "Skeleton PCI V4L2 driver" depends on SAMPLES depends on MEDIA_TEST_SUPPORT - depends on PCI && VIDEO_V4L2 + depends on PCI && VIDEO_DEV select VIDEOBUF2_MEMOPS select VIDEOBUF2_DMA_CONTIG help diff --git a/drivers/media/pci/bt8xx/Kconfig b/drivers/media/pci/bt8xx/Kcon= fig index 3f56decbb681..927190281bd5 100644 --- a/drivers/media/pci/bt8xx/Kconfig +++ b/drivers/media/pci/bt8xx/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_BT848 tristate "BT848 Video For Linux" - depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2 + depends on PCI && I2C && VIDEO_DEV select I2C_ALGOBIT select VIDEOBUF_DMA_SG depends on RC_CORE diff --git a/drivers/media/pci/cobalt/Kconfig b/drivers/media/pci/cobalt/Kc= onfig index d8d9ea6b09bc..e13e36141199 100644 --- a/drivers/media/pci/cobalt/Kconfig +++ b/drivers/media/pci/cobalt/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_COBALT tristate "Cisco Cobalt support" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C depends on PCI_MSI && MTD_COMPLEX_MAPPINGS depends on (GPIOLIB && DRM_I2C_ADV7511=3Dn) || COMPILE_TEST depends on SND diff --git a/drivers/media/pci/cx18/Kconfig b/drivers/media/pci/cx18/Kconfig index 7074a1071302..a4e32fdcfd3d 100644 --- a/drivers/media/pci/cx18/Kconfig +++ b/drivers/media/pci/cx18/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_CX18 tristate "Conexant cx23418 MPEG encoder support" - depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C + depends on VIDEO_DEV && DVB_CORE && PCI && I2C select I2C_ALGOBIT select VIDEOBUF_VMALLOC depends on RC_CORE diff --git a/drivers/media/pci/dt3155/Kconfig b/drivers/media/pci/dt3155/Kc= onfig index a3d24b8a719b..2b76de195aa5 100644 --- a/drivers/media/pci/dt3155/Kconfig +++ b/drivers/media/pci/dt3155/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_DT3155 tristate "DT3155 frame grabber" - depends on PCI && VIDEO_DEV && VIDEO_V4L2 + depends on PCI && VIDEO_DEV select VIDEOBUF2_DMA_CONTIG help Enables dt3155 device driver for the DataTranslation DT3155 frame grabb= er. diff --git a/drivers/media/pci/intel/ipu3/Kconfig b/drivers/media/pci/intel= /ipu3/Kconfig index dce8274c81e6..39bd3be0b43d 100644 --- a/drivers/media/pci/intel/ipu3/Kconfig +++ b/drivers/media/pci/intel/ipu3/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_IPU3_CIO2 tristate "Intel ipu3-cio2 driver" - depends on VIDEO_V4L2 && PCI + depends on VIDEO_DEV && PCI depends on ACPI || COMPILE_TEST depends on X86 select MEDIA_CONTROLLER diff --git a/drivers/media/pci/ivtv/Kconfig b/drivers/media/pci/ivtv/Kconfig index e70502902b73..9be52101bc4f 100644 --- a/drivers/media/pci/ivtv/Kconfig +++ b/drivers/media/pci/ivtv/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_IVTV tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support" - depends on VIDEO_V4L2 && PCI && I2C + depends on VIDEO_DEV && PCI && I2C select I2C_ALGOBIT depends on RC_CORE select VIDEO_TUNER diff --git a/drivers/media/pci/meye/Kconfig b/drivers/media/pci/meye/Kconfig index fed1f4a01817..3e69b66f1a5b 100644 --- a/drivers/media/pci/meye/Kconfig +++ b/drivers/media/pci/meye/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_MEYE tristate "Sony Vaio Picturebook Motion Eye Video For Linux" - depends on PCI && VIDEO_V4L2 + depends on PCI && VIDEO_DEV depends on SONY_LAPTOP depends on X86 || COMPILE_TEST help diff --git a/drivers/media/pci/saa7146/Kconfig b/drivers/media/pci/saa7146/= Kconfig index 8e83cd044075..3bbb68a0ed7b 100644 --- a/drivers/media/pci/saa7146/Kconfig +++ b/drivers/media/pci/saa7146/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_HEXIUM_GEMINI tristate "Hexium Gemini frame grabber" - depends on PCI && VIDEO_V4L2 && I2C + depends on PCI && VIDEO_DEV && I2C select VIDEO_SAA7146_VV help This is a video4linux driver for the Hexium Gemini frame @@ -13,7 +13,7 @@ config VIDEO_HEXIUM_GEMINI =20 config VIDEO_HEXIUM_ORION tristate "Hexium HV-PCI6 and Orion frame grabber" - depends on PCI && VIDEO_V4L2 && I2C + depends on PCI && VIDEO_DEV && I2C select VIDEO_SAA7146_VV help This is a video4linux driver for the Hexium HV-PCI6 and @@ -24,7 +24,7 @@ config VIDEO_HEXIUM_ORION =20 config VIDEO_MXB tristate "Siemens-Nixdorf 'Multimedia eXtension Board'" - depends on PCI && VIDEO_V4L2 && I2C + depends on PCI && VIDEO_DEV && I2C select VIDEO_SAA7146_VV select VIDEO_TUNER select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT diff --git a/drivers/media/pci/sta2x11/Kconfig b/drivers/media/pci/sta2x11/= Kconfig index 27bb78513631..a96e170ab04e 100644 --- a/drivers/media/pci/sta2x11/Kconfig +++ b/drivers/media/pci/sta2x11/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config STA2X11_VIP tristate "STA2X11 VIP Video For Linux" - depends on PCI && VIDEO_V4L2 && VIRT_TO_BUS && I2C + depends on PCI && VIDEO_DEV && VIRT_TO_BUS && I2C depends on STA2X11 || COMPILE_TEST select GPIOLIB if MEDIA_SUBDRV_AUTOSELECT select VIDEO_ADV7180 if MEDIA_SUBDRV_AUTOSELECT diff --git a/drivers/media/pci/tw5864/Kconfig b/drivers/media/pci/tw5864/Kc= onfig index d376d4ed65b9..111da223efb0 100644 --- a/drivers/media/pci/tw5864/Kconfig +++ b/drivers/media/pci/tw5864/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_TW5864 tristate "Techwell TW5864 video/audio grabber and encoder" - depends on VIDEO_DEV && PCI && VIDEO_V4L2 + depends on VIDEO_DEV && PCI select VIDEOBUF2_DMA_CONTIG help Support for boards based on Techwell TW5864 chip which provides diff --git a/drivers/media/pci/tw68/Kconfig b/drivers/media/pci/tw68/Kconfig index af0cb60337bb..ef9c0e886a09 100644 --- a/drivers/media/pci/tw68/Kconfig +++ b/drivers/media/pci/tw68/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_TW68 tristate "Techwell tw68x Video For Linux" - depends on VIDEO_DEV && PCI && VIDEO_V4L2 + depends on VIDEO_DEV && PCI select VIDEOBUF2_DMA_SG help Support for Techwell tw68xx based frame grabber boards. diff --git a/drivers/media/pci/tw686x/Kconfig b/drivers/media/pci/tw686x/Kc= onfig index 631c90868b8b..a4edad6aaf89 100644 --- a/drivers/media/pci/tw686x/Kconfig +++ b/drivers/media/pci/tw686x/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_TW686X tristate "Intersil/Techwell TW686x video capture cards" - depends on PCI && VIDEO_DEV && VIDEO_V4L2 && SND + depends on PCI && VIDEO_DEV && SND select VIDEOBUF2_VMALLOC select VIDEOBUF2_DMA_CONTIG select VIDEOBUF2_DMA_SG diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 8bd92e4f4d9b..d383c348debe 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -30,7 +30,7 @@ config DVB_PLATFORM_DRIVERS =20 config V4L_MEM2MEM_DRIVERS bool "Memory-to-memory multimedia devices" - depends on VIDEO_V4L2 + depends on VIDEO_DEV help Say Y here to enable selecting drivers for V4L devices that use system memory for both source and destination buffers, as opposed @@ -42,7 +42,7 @@ config V4L_MEM2MEM_DRIVERS config VIDEO_MEM2MEM_DEINTERLACE tristate "Deinterlace support" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on HAS_DMA select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV @@ -53,7 +53,7 @@ config VIDEO_MUX tristate "Video Multiplexer" depends on V4L_PLATFORM_DRIVERS select MULTIPLEXER - depends on VIDEO_V4L2 && OF + depends on VIDEO_DEV && OF select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select REGMAP diff --git a/drivers/media/platform/allegro-dvt/Kconfig b/drivers/media/pla= tform/allegro-dvt/Kconfig index 674d234be5de..735440369c5c 100644 --- a/drivers/media/platform/allegro-dvt/Kconfig +++ b/drivers/media/platform/allegro-dvt/Kconfig @@ -5,7 +5,7 @@ comment "Allegro DVT drivers" config VIDEO_ALLEGRO_DVT tristate "Allegro DVT Video IP Core" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_ZYNQMP || COMPILE_TEST select V4L2_MEM2MEM_DEV select VIDEOBUF2_DMA_CONTIG diff --git a/drivers/media/platform/allwinner/sun4i-csi/Kconfig b/drivers/m= edia/platform/allwinner/sun4i-csi/Kconfig index 43ad2dd7da5d..7960e6836f41 100644 --- a/drivers/media/platform/allwinner/sun4i-csi/Kconfig +++ b/drivers/media/platform/allwinner/sun4i-csi/Kconfig @@ -3,7 +3,7 @@ config VIDEO_SUN4I_CSI tristate "Allwinner A10 CMOS Sensor Interface Support" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && COMMON_CLK && HAS_DMA + depends on VIDEO_DEV && COMMON_CLK && HAS_DMA depends on ARCH_SUNXI || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/platform/allwinner/sun6i-csi/Kconfig b/drivers/m= edia/platform/allwinner/sun6i-csi/Kconfig index 6d9cf1963c41..0345901617d4 100644 --- a/drivers/media/platform/allwinner/sun6i-csi/Kconfig +++ b/drivers/media/platform/allwinner/sun6i-csi/Kconfig @@ -2,7 +2,7 @@ config VIDEO_SUN6I_CSI tristate "Allwinner V3s Camera Sensor Interface driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && COMMON_CLK && HAS_DMA + depends on VIDEO_DEV && COMMON_CLK && HAS_DMA depends on ARCH_SUNXI || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/platform/allwinner/sun8i-di/Kconfig b/drivers/me= dia/platform/allwinner/sun8i-di/Kconfig index 8d762e664d45..ff71e06ee2df 100644 --- a/drivers/media/platform/allwinner/sun8i-di/Kconfig +++ b/drivers/media/platform/allwinner/sun8i-di/Kconfig @@ -2,7 +2,7 @@ config VIDEO_SUN8I_DEINTERLACE tristate "Allwinner Deinterlace driver" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_SUNXI || COMPILE_TEST depends on COMMON_CLK && OF depends on PM diff --git a/drivers/media/platform/allwinner/sun8i-rotate/Kconfig b/driver= s/media/platform/allwinner/sun8i-rotate/Kconfig index 64a8ea76e917..cfba29072d75 100644 --- a/drivers/media/platform/allwinner/sun8i-rotate/Kconfig +++ b/drivers/media/platform/allwinner/sun8i-rotate/Kconfig @@ -3,7 +3,7 @@ config VIDEO_SUN8I_ROTATE tristate "Allwinner DE2 rotation driver" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_SUNXI || COMPILE_TEST depends on COMMON_CLK && OF depends on PM diff --git a/drivers/media/platform/amlogic/meson-ge2d/Kconfig b/drivers/me= dia/platform/amlogic/meson-ge2d/Kconfig index 8c3f3b1b6b05..312c4169e3c2 100644 --- a/drivers/media/platform/amlogic/meson-ge2d/Kconfig +++ b/drivers/media/platform/amlogic/meson-ge2d/Kconfig @@ -1,7 +1,7 @@ config VIDEO_MESON_GE2D tristate "Amlogic 2D Graphic Acceleration Unit" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_MESON || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV diff --git a/drivers/media/platform/aspeed/Kconfig b/drivers/media/platform= /aspeed/Kconfig index 153e3e5381d5..af95b08adf46 100644 --- a/drivers/media/platform/aspeed/Kconfig +++ b/drivers/media/platform/aspeed/Kconfig @@ -5,7 +5,7 @@ comment "Aspeed drivers" config VIDEO_ASPEED tristate "Aspeed AST2400 and AST2500 Video Engine driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 + depends on VIDEO_DEV select VIDEOBUF2_DMA_CONTIG help Support for the Aspeed Video Engine (VE) embedded in the Aspeed diff --git a/drivers/media/platform/atmel/Kconfig b/drivers/media/platform/= atmel/Kconfig index cef12629f4ef..ae0fa7f96f66 100644 --- a/drivers/media/platform/atmel/Kconfig +++ b/drivers/media/platform/atmel/Kconfig @@ -5,7 +5,7 @@ comment "Atmel drivers" config VIDEO_ATMEL_ISC tristate "ATMEL Image Sensor Controller (ISC) support" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && COMMON_CLK + depends on VIDEO_DEV && COMMON_CLK depends on ARCH_AT91 || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API @@ -20,7 +20,7 @@ config VIDEO_ATMEL_ISC config VIDEO_ATMEL_XISC tristate "ATMEL eXtended Image Sensor Controller (XISC) support" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && COMMON_CLK && VIDEO_V4L2_SUBDEV_API + depends on VIDEO_DEV && COMMON_CLK && VIDEO_V4L2_SUBDEV_API depends on ARCH_AT91 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG select REGMAP_MMIO @@ -39,7 +39,7 @@ config VIDEO_ATMEL_ISC_BASE config VIDEO_ATMEL_ISI tristate "ATMEL Image Sensor Interface (ISI) support" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && OF + depends on VIDEO_DEV && OF depends on ARCH_AT91 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG select V4L2_FWNODE @@ -50,7 +50,7 @@ config VIDEO_ATMEL_ISI config VIDEO_MICROCHIP_CSI2DC tristate "Microchip CSI2 Demux Controller" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && COMMON_CLK && OF + depends on VIDEO_DEV && COMMON_CLK && OF depends on ARCH_AT91 || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/platform/cadence/Kconfig b/drivers/media/platfor= m/cadence/Kconfig index 3ae6f4e51eec..1a0f2d9a6a28 100644 --- a/drivers/media/platform/cadence/Kconfig +++ b/drivers/media/platform/cadence/Kconfig @@ -4,7 +4,7 @@ comment "Cadence drivers" =20 config VIDEO_CADENCE_CSI2RX tristate "Cadence MIPI-CSI2 RX Controller" - depends on VIDEO_V4L2 + depends on VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE @@ -16,7 +16,7 @@ config VIDEO_CADENCE_CSI2RX =20 config VIDEO_CADENCE_CSI2TX tristate "Cadence MIPI-CSI2 TX Controller" - depends on VIDEO_V4L2 + depends on VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE diff --git a/drivers/media/platform/chips-media/Kconfig b/drivers/media/pla= tform/chips-media/Kconfig index adf466a05699..ea49b3563320 100644 --- a/drivers/media/platform/chips-media/Kconfig +++ b/drivers/media/platform/chips-media/Kconfig @@ -5,7 +5,7 @@ comment "Chips&Media drivers" config VIDEO_CODA tristate "Chips&Media Coda multi-standard codec IP" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 && OF && (ARCH_MXC || COMPILE_TEST) + depends on VIDEO_DEV && OF && (ARCH_MXC || COMPILE_TEST) select SRAM select VIDEOBUF2_DMA_CONTIG select VIDEOBUF2_VMALLOC diff --git a/drivers/media/platform/intel/Kconfig b/drivers/media/platform/= intel/Kconfig index 8a730d9bcf52..091e15f00ef5 100644 --- a/drivers/media/platform/intel/Kconfig +++ b/drivers/media/platform/intel/Kconfig @@ -5,7 +5,7 @@ comment "Intel drivers" config VIDEO_PXA27x tristate "PXA27x Quick Capture Interface driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on PXA27x || COMPILE_TEST select VIDEOBUF2_DMA_SG select SG_SPLIT diff --git a/drivers/media/platform/marvell/Kconfig b/drivers/media/platfor= m/marvell/Kconfig index 626e0673f12c..d7275322fd92 100644 --- a/drivers/media/platform/marvell/Kconfig +++ b/drivers/media/platform/marvell/Kconfig @@ -5,7 +5,7 @@ comment "Marvell drivers" config VIDEO_CAFE_CCIC tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support" depends on V4L_PLATFORM_DRIVERS - depends on PCI && I2C && VIDEO_V4L2 + depends on PCI && I2C && VIDEO_DEV depends on COMMON_CLK select VIDEO_OV7670 select VIDEOBUF2_VMALLOC @@ -19,7 +19,7 @@ config VIDEO_CAFE_CCIC config VIDEO_MMP_CAMERA tristate "Marvell Armada 610 integrated camera controller support" depends on V4L_PLATFORM_DRIVERS - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV depends on ARCH_MMP || COMPILE_TEST depends on COMMON_CLK select VIDEO_OV7670 diff --git a/drivers/media/platform/mediatek/mtk-jpeg/Kconfig b/drivers/med= ia/platform/mediatek/mtk-jpeg/Kconfig index 72ed920b011a..39c4d1bc66ce 100644 --- a/drivers/media/platform/mediatek/mtk-jpeg/Kconfig +++ b/drivers/media/platform/mediatek/mtk-jpeg/Kconfig @@ -3,7 +3,7 @@ config VIDEO_MEDIATEK_JPEG tristate "Mediatek JPEG Codec driver" depends on V4L_MEM2MEM_DRIVERS depends on MTK_IOMMU_V1 || MTK_IOMMU || COMPILE_TEST - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_MEDIATEK || COMPILE_TEST depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=3Dn) select VIDEOBUF2_DMA_CONTIG diff --git a/drivers/media/platform/mediatek/mtk-mdp/Kconfig b/drivers/medi= a/platform/mediatek/mtk-mdp/Kconfig index 0cc743165a1a..9f13a42899bd 100644 --- a/drivers/media/platform/mediatek/mtk-mdp/Kconfig +++ b/drivers/media/platform/mediatek/mtk-mdp/Kconfig @@ -3,7 +3,7 @@ config VIDEO_MEDIATEK_MDP tristate "Mediatek MDP driver" depends on V4L_MEM2MEM_DRIVERS depends on MTK_IOMMU || COMPILE_TEST - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_MEDIATEK || COMPILE_TEST depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=3Dn) select VIDEOBUF2_DMA_CONTIG diff --git a/drivers/media/platform/mediatek/mtk-vcodec/Kconfig b/drivers/m= edia/platform/mediatek/mtk-vcodec/Kconfig index 635801a19d55..c5c76753c626 100644 --- a/drivers/media/platform/mediatek/mtk-vcodec/Kconfig +++ b/drivers/media/platform/mediatek/mtk-vcodec/Kconfig @@ -9,7 +9,7 @@ config VIDEO_MEDIATEK_VCODEC tristate "Mediatek Video Codec driver" depends on V4L_MEM2MEM_DRIVERS depends on MTK_IOMMU || COMPILE_TEST - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_MEDIATEK || COMPILE_TEST depends on VIDEO_MEDIATEK_VPU || MTK_SCP # The two following lines ensure we have the same state ("m" or "y") as diff --git a/drivers/media/platform/mediatek/mtk-vpu/Kconfig b/drivers/medi= a/platform/mediatek/mtk-vpu/Kconfig index df679ea79ed0..2a8443a93ce0 100644 --- a/drivers/media/platform/mediatek/mtk-vpu/Kconfig +++ b/drivers/media/platform/mediatek/mtk-vpu/Kconfig @@ -3,7 +3,7 @@ config VIDEO_MEDIATEK_VPU tristate "Mediatek Video Processor Unit" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_MEDIATEK || COMPILE_TEST help This driver provides downloading VPU firmware and diff --git a/drivers/media/platform/nvidia/tegra-vde/Kconfig b/drivers/medi= a/platform/nvidia/tegra-vde/Kconfig index 584b78d8d66c..f7454823bbbb 100644 --- a/drivers/media/platform/nvidia/tegra-vde/Kconfig +++ b/drivers/media/platform/nvidia/tegra-vde/Kconfig @@ -2,7 +2,7 @@ config VIDEO_TEGRA_VDE tristate "NVIDIA Tegra Video Decoder Engine driver" depends on V4L_MEM2MEM_DRIVERS depends on ARCH_TEGRA || COMPILE_TEST - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV select DMA_SHARED_BUFFER select IOMMU_IOVA select MEDIA_CONTROLLER diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nx= p/Kconfig index 3478b1b45c6c..65357344d5e5 100644 --- a/drivers/media/platform/nxp/Kconfig +++ b/drivers/media/platform/nxp/Kconfig @@ -17,7 +17,7 @@ config VIDEO_IMX_MIPI_CSIS config VIDEO_VIU tristate "NXP VIU Video Driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && (PPC_MPC512x || COMPILE_TEST) && I2C + depends on VIDEO_DEV && (PPC_MPC512x || COMPILE_TEST) && I2C select VIDEOBUF_DMA_CONTIG default y help @@ -32,7 +32,7 @@ config VIDEO_VIU config VIDEO_IMX_PXP tristate "NXP i.MX Pixel Pipeline (PXP)" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST) + depends on VIDEO_DEV && (ARCH_MXC || COMPILE_TEST) select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV help @@ -42,7 +42,7 @@ config VIDEO_IMX_PXP config VIDEO_MX2_EMMAPRP tristate "NXP MX2 eMMa-PrP support" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on SOC_IMX27 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV diff --git a/drivers/media/platform/nxp/amphion/Kconfig b/drivers/media/pla= tform/nxp/amphion/Kconfig index 679a5f8eb1a1..effb66f4b7c7 100644 --- a/drivers/media/platform/nxp/amphion/Kconfig +++ b/drivers/media/platform/nxp/amphion/Kconfig @@ -6,7 +6,7 @@ config VIDEO_AMPHION_VPU depends on ARCH_MXC || COMPILE_TEST depends on MEDIA_SUPPORT depends on VIDEO_DEV - depends on VIDEO_V4L2 + depends on VIDEO_DEV select MEDIA_CONTROLLER select V4L2_MEM2MEM_DEV select VIDEOBUF2_DMA_CONTIG diff --git a/drivers/media/platform/nxp/imx-jpeg/Kconfig b/drivers/media/pl= atform/nxp/imx-jpeg/Kconfig index cbf6101a8b1d..5214dcd7fab5 100644 --- a/drivers/media/platform/nxp/imx-jpeg/Kconfig +++ b/drivers/media/platform/nxp/imx-jpeg/Kconfig @@ -3,7 +3,7 @@ config VIDEO_IMX8_JPEG tristate "IMX8 JPEG Encoder/Decoder" depends on V4L_MEM2MEM_DRIVERS depends on ARCH_MXC || COMPILE_TEST - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV select V4L2_JPEG_HELPER diff --git a/drivers/media/platform/qcom/camss/Kconfig b/drivers/media/plat= form/qcom/camss/Kconfig index 56be91578706..4eda48cb1adf 100644 --- a/drivers/media/platform/qcom/camss/Kconfig +++ b/drivers/media/platform/qcom/camss/Kconfig @@ -1,7 +1,7 @@ config VIDEO_QCOM_CAMSS tristate "Qualcomm V4L2 Camera Subsystem driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 + depends on VIDEO_DEV depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/platform/qcom/venus/Kconfig b/drivers/media/plat= form/qcom/venus/Kconfig index de0fe3f7be5f..bfd50e8f3421 100644 --- a/drivers/media/platform/qcom/venus/Kconfig +++ b/drivers/media/platform/qcom/venus/Kconfig @@ -1,7 +1,7 @@ config VIDEO_QCOM_VENUS tristate "Qualcomm Venus V4L2 encoder/decoder driver" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 && QCOM_SMEM + depends on VIDEO_DEV && QCOM_SMEM depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST select QCOM_MDT_LOADER if ARCH_QCOM select QCOM_SCM diff --git a/drivers/media/platform/renesas/Kconfig b/drivers/media/platfor= m/renesas/Kconfig index 2e3a66ea95bd..1748cc9883ce 100644 --- a/drivers/media/platform/renesas/Kconfig +++ b/drivers/media/platform/renesas/Kconfig @@ -4,10 +4,20 @@ comment "Renesas drivers" =20 # V4L drivers =20 +config VIDEO_RENESAS_CEU + tristate "Renesas Capture Engine Unit (CEU) driver" + depends on V4L_PLATFORM_DRIVERS + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_SHMOBILE || ARCH_R7S72100 || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + select V4L2_FWNODE + help + This is a v4l2 driver for the Renesas CEU Interface + config VIDEO_RCAR_ISP tristate "R-Car Image Signal Processor (ISP)" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && OF + depends on VIDEO_DEV && OF depends on ARCH_RENESAS || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API @@ -21,16 +31,6 @@ config VIDEO_RCAR_ISP To compile this driver as a module, choose M here: the module will be called rcar-isp. =20 -config VIDEO_RENESAS_CEU - tristate "Renesas Capture Engine Unit (CEU) driver" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_SHMOBILE || ARCH_R7S72100 || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - select V4L2_FWNODE - help - This is a v4l2 driver for the Renesas CEU Interface - config VIDEO_SH_VOU tristate "SuperH VOU video output driver" depends on V4L_PLATFORM_DRIVERS @@ -61,7 +61,7 @@ config VIDEO_RENESAS_FCP config VIDEO_RENESAS_FDP1 tristate "Renesas Fine Display Processor" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_RENESAS || COMPILE_TEST depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP select VIDEOBUF2_DMA_CONTIG @@ -76,7 +76,7 @@ config VIDEO_RENESAS_FDP1 config VIDEO_RENESAS_JPU tristate "Renesas JPEG Processing Unit" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_RENESAS || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV @@ -89,7 +89,7 @@ config VIDEO_RENESAS_JPU config VIDEO_RENESAS_VSP1 tristate "Renesas VSP1 Video Processing Engine" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_RENESAS || COMPILE_TEST depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP select MEDIA_CONTROLLER @@ -107,7 +107,7 @@ config VIDEO_RENESAS_VSP1 config VIDEO_RCAR_DRIF tristate "Renesas Digital Radio Interface (DRIF)" depends on SDR_PLATFORM_DRIVERS - depends on VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_RENESAS || COMPILE_TEST select VIDEOBUF2_VMALLOC select V4L2_ASYNC diff --git a/drivers/media/platform/renesas/rcar-vin/Kconfig b/drivers/medi= a/platform/renesas/rcar-vin/Kconfig index 34b7ea6f1246..de55fe63d84c 100644 --- a/drivers/media/platform/renesas/rcar-vin/Kconfig +++ b/drivers/media/platform/renesas/rcar-vin/Kconfig @@ -2,7 +2,7 @@ config VIDEO_RCAR_CSI2 tristate "R-Car MIPI CSI-2 Receiver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && OF + depends on VIDEO_DEV && OF depends on ARCH_RENESAS || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API @@ -18,7 +18,7 @@ config VIDEO_RCAR_CSI2 config VIDEO_RCAR_VIN tristate "R-Car Video Input (VIN) Driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && OF + depends on VIDEO_DEV && OF depends on ARCH_RENESAS || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/platform/rockchip/rga/Kconfig b/drivers/media/pl= atform/rockchip/rga/Kconfig index 0106cc8a93a7..727a0f6ea466 100644 --- a/drivers/media/platform/rockchip/rga/Kconfig +++ b/drivers/media/platform/rockchip/rga/Kconfig @@ -1,7 +1,7 @@ config VIDEO_ROCKCHIP_RGA tristate "Rockchip Raster 2d Graphic Acceleration Unit" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_ROCKCHIP || COMPILE_TEST select VIDEOBUF2_DMA_SG select V4L2_MEM2MEM_DEV diff --git a/drivers/media/platform/rockchip/rkisp1/Kconfig b/drivers/media= /platform/rockchip/rkisp1/Kconfig index c2e464317929..dabd7e42c193 100644 --- a/drivers/media/platform/rockchip/rkisp1/Kconfig +++ b/drivers/media/platform/rockchip/rkisp1/Kconfig @@ -2,7 +2,7 @@ config VIDEO_ROCKCHIP_ISP1 tristate "Rockchip Image Signal Processing v1 Unit driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && OF + depends on VIDEO_DEV && OF depends on ARCH_ROCKCHIP || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/platform/samsung/exynos-gsc/Kconfig b/drivers/me= dia/platform/samsung/exynos-gsc/Kconfig index f9bdffe915b4..7244d63c9646 100644 --- a/drivers/media/platform/samsung/exynos-gsc/Kconfig +++ b/drivers/media/platform/samsung/exynos-gsc/Kconfig @@ -2,7 +2,7 @@ config VIDEO_SAMSUNG_EXYNOS_GSC tristate "Samsung Exynos G-Scaler driver" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_EXYNOS || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV diff --git a/drivers/media/platform/samsung/exynos4-is/Kconfig b/drivers/me= dia/platform/samsung/exynos4-is/Kconfig index 868bb86c7699..da33faa7132e 100644 --- a/drivers/media/platform/samsung/exynos4-is/Kconfig +++ b/drivers/media/platform/samsung/exynos4-is/Kconfig @@ -3,7 +3,7 @@ config VIDEO_SAMSUNG_EXYNOS4_IS tristate "Samsung S5P/EXYNOS4 SoC series Camera Subsystem driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && OF && COMMON_CLK + depends on VIDEO_DEV && OF && COMMON_CLK depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/platform/samsung/s3c-camif/Kconfig b/drivers/med= ia/platform/samsung/s3c-camif/Kconfig index e8ef9e06dc1b..8cb8d1ac3edc 100644 --- a/drivers/media/platform/samsung/s3c-camif/Kconfig +++ b/drivers/media/platform/samsung/s3c-camif/Kconfig @@ -2,7 +2,7 @@ config VIDEO_S3C_CAMIF tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && I2C && PM + depends on VIDEO_DEV && I2C && PM depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/platform/samsung/s5p-g2d/Kconfig b/drivers/media= /platform/samsung/s5p-g2d/Kconfig index 9bc9d90a666a..28ab88fc2d7c 100644 --- a/drivers/media/platform/samsung/s5p-g2d/Kconfig +++ b/drivers/media/platform/samsung/s5p-g2d/Kconfig @@ -1,7 +1,7 @@ config VIDEO_SAMSUNG_S5P_G2D tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV diff --git a/drivers/media/platform/samsung/s5p-jpeg/Kconfig b/drivers/medi= a/platform/samsung/s5p-jpeg/Kconfig index e522860d2b15..11f6e99dec39 100644 --- a/drivers/media/platform/samsung/s5p-jpeg/Kconfig +++ b/drivers/media/platform/samsung/s5p-jpeg/Kconfig @@ -3,7 +3,7 @@ config VIDEO_SAMSUNG_S5P_JPEG tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV diff --git a/drivers/media/platform/samsung/s5p-mfc/Kconfig b/drivers/media= /platform/samsung/s5p-mfc/Kconfig index 34b52b0de304..7ee3b0c8d98b 100644 --- a/drivers/media/platform/samsung/s5p-mfc/Kconfig +++ b/drivers/media/platform/samsung/s5p-mfc/Kconfig @@ -2,7 +2,7 @@ config VIDEO_SAMSUNG_S5P_MFC tristate "Samsung S5P MFC Video Codec" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG help diff --git a/drivers/media/platform/sti/bdisp/Kconfig b/drivers/media/platf= orm/sti/bdisp/Kconfig index e583fb924f52..496f8aedf0a4 100644 --- a/drivers/media/platform/sti/bdisp/Kconfig +++ b/drivers/media/platform/sti/bdisp/Kconfig @@ -2,7 +2,7 @@ config VIDEO_STI_BDISP tristate "STMicroelectronics BDISP 2D blitter driver" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_STI || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV diff --git a/drivers/media/platform/sti/delta/Kconfig b/drivers/media/platf= orm/sti/delta/Kconfig index 0bbc7edce208..efa936b1cc8a 100644 --- a/drivers/media/platform/sti/delta/Kconfig +++ b/drivers/media/platform/sti/delta/Kconfig @@ -2,7 +2,7 @@ config VIDEO_STI_DELTA tristate "STMicroelectronics DELTA multi-format video decoder V4L2 driver" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_STI || COMPILE_TEST help This V4L2 driver enables DELTA multi-format video decoder diff --git a/drivers/media/platform/sti/hva/Kconfig b/drivers/media/platfor= m/sti/hva/Kconfig index 5651667bcc54..46d6f82f648e 100644 --- a/drivers/media/platform/sti/hva/Kconfig +++ b/drivers/media/platform/sti/hva/Kconfig @@ -2,7 +2,7 @@ config VIDEO_STI_HVA tristate "STMicroelectronics HVA multi-format video encoder V4L2 driver" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_STI || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV diff --git a/drivers/media/platform/sti/stm32/Kconfig b/drivers/media/platf= orm/sti/stm32/Kconfig index 60b87e403c7c..b22dd4753496 100644 --- a/drivers/media/platform/sti/stm32/Kconfig +++ b/drivers/media/platform/sti/stm32/Kconfig @@ -4,7 +4,7 @@ config VIDEO_STM32_DCMI tristate "STM32 Digital Camera Memory Interface (DCMI) support" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && OF + depends on VIDEO_DEV && OF depends on ARCH_STM32 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG select MEDIA_CONTROLLER @@ -20,7 +20,7 @@ config VIDEO_STM32_DCMI config VIDEO_STM32_DMA2D tristate "STM32 Chrom-Art Accelerator (DMA2D)" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_STM32 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV diff --git a/drivers/media/platform/ti/am437x/Kconfig b/drivers/media/platf= orm/ti/am437x/Kconfig index 619cefca7590..2e24fff7e625 100644 --- a/drivers/media/platform/ti/am437x/Kconfig +++ b/drivers/media/platform/ti/am437x/Kconfig @@ -2,7 +2,7 @@ config VIDEO_AM437X_VPFE tristate "TI AM437x VPFE video capture driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 + depends on VIDEO_DEV depends on SOC_AM43XX || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/platform/ti/davinci/Kconfig b/drivers/media/plat= form/ti/davinci/Kconfig index 7e5f92b0082a..c61e697aeb12 100644 --- a/drivers/media/platform/ti/davinci/Kconfig +++ b/drivers/media/platform/ti/davinci/Kconfig @@ -2,7 +2,7 @@ config VIDEO_DAVINCI_VPIF_DISPLAY tristate "TI DaVinci VPIF V4L2-Display driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C select VIDEOBUF2_DMA_CONTIG @@ -19,7 +19,7 @@ config VIDEO_DAVINCI_VPIF_DISPLAY config VIDEO_DAVINCI_VPIF_CAPTURE tristate "TI DaVinci VPIF video capture driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C select VIDEOBUF2_DMA_CONTIG @@ -35,7 +35,7 @@ config VIDEO_DAVINCI_VPIF_CAPTURE config VIDEO_DM6446_CCDC tristate "TI DM6446 CCDC video capture driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C select VIDEOBUF_DMA_CONTIG @@ -52,7 +52,7 @@ config VIDEO_DM6446_CCDC config VIDEO_DM355_CCDC tristate "TI DM355 CCDC video capture driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C select VIDEOBUF_DMA_CONTIG @@ -69,7 +69,7 @@ config VIDEO_DM355_CCDC config VIDEO_DM365_ISIF tristate "TI DM365 ISIF video capture driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C select VIDEOBUF_DMA_CONTIG @@ -84,7 +84,7 @@ config VIDEO_DM365_ISIF config VIDEO_DAVINCI_VPBE_DISPLAY tristate "TI DaVinci VPBE V4L2-Display driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 + depends on VIDEO_DEV depends on ARCH_DAVINCI || COMPILE_TEST depends on I2C select VIDEOBUF2_DMA_CONTIG diff --git a/drivers/media/platform/ti/omap/Kconfig b/drivers/media/platfor= m/ti/omap/Kconfig index 789d5e5686c7..a9dbe1097775 100644 --- a/drivers/media/platform/ti/omap/Kconfig +++ b/drivers/media/platform/ti/omap/Kconfig @@ -10,7 +10,7 @@ config VIDEO_OMAP2_VOUT depends on MMU depends on FB_OMAP2 || (COMPILE_TEST && FB_OMAP2=3Dn) depends on ARCH_OMAP2 || ARCH_OMAP3 || COMPILE_TEST - depends on VIDEO_V4L2 + depends on VIDEO_DEV select VIDEOBUF2_DMA_CONTIG select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3 help diff --git a/drivers/media/platform/ti/omap3isp/Kconfig b/drivers/media/pla= tform/ti/omap3isp/Kconfig index 85f0cf063153..f0a680938d5e 100644 --- a/drivers/media/platform/ti/omap3isp/Kconfig +++ b/drivers/media/platform/ti/omap3isp/Kconfig @@ -2,7 +2,7 @@ config VIDEO_OMAP3 tristate "OMAP 3 Camera support" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C depends on (ARCH_OMAP3 && OMAP_IOMMU) || COMPILE_TEST depends on COMMON_CLK && OF select ARM_DMA_USE_IOMMU if OMAP_IOMMU diff --git a/drivers/media/platform/ti/vpe/Kconfig b/drivers/media/platform= /ti/vpe/Kconfig index a9ee0189f2f2..3cc644eab026 100644 --- a/drivers/media/platform/ti/vpe/Kconfig +++ b/drivers/media/platform/ti/vpe/Kconfig @@ -15,7 +15,7 @@ config VIDEO_TI_CSC =20 config VIDEO_TI_CAL tristate "TI CAL (Camera Adaptation Layer) driver" - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on V4L_PLATFORM_DRIVERS select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API @@ -44,7 +44,7 @@ config VIDEO_TI_CAL_MC config VIDEO_TI_VPE tristate "TI VPE (Video Processing Engine) driver" depends on V4L_MEM2MEM_DRIVERS - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on SOC_DRA7XX || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV diff --git a/drivers/media/platform/via/Kconfig b/drivers/media/platform/vi= a/Kconfig index f4f4293cf25c..6077222eb274 100644 --- a/drivers/media/platform/via/Kconfig +++ b/drivers/media/platform/via/Kconfig @@ -5,7 +5,7 @@ comment "VIA drivers" config VIDEO_VIA_CAMERA tristate "VIAFB camera controller support" depends on V4L_PLATFORM_DRIVERS - depends on FB_VIA && VIDEO_V4L2 + depends on FB_VIA && VIDEO_DEV select VIDEOBUF2_DMA_SG select VIDEO_OV7670 help diff --git a/drivers/media/platform/xilinx/Kconfig b/drivers/media/platform= /xilinx/Kconfig index 47f1eeb5d669..0c772d070eb6 100644 --- a/drivers/media/platform/xilinx/Kconfig +++ b/drivers/media/platform/xilinx/Kconfig @@ -5,7 +5,7 @@ comment "Xilinx drivers" config VIDEO_XILINX tristate "Xilinx Video IP (EXPERIMENTAL)" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_V4L2 && OF && HAS_DMA + depends on VIDEO_DEV && OF && HAS_DMA select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API select VIDEOBUF2_DMA_CONTIG diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig index d29e29645e04..9b388e652633 100644 --- a/drivers/media/radio/Kconfig +++ b/drivers/media/radio/Kconfig @@ -5,13 +5,13 @@ =20 menuconfig RADIO_ADAPTERS bool "Radio Adapters" - depends on VIDEO_V4L2 + depends on VIDEO_DEV depends on MEDIA_RADIO_SUPPORT default y help Say Y here to enable selecting AM/FM radio adapters. =20 -if RADIO_ADAPTERS && VIDEO_V4L2 +if RADIO_ADAPTERS && VIDEO_DEV =20 config RADIO_TEA575X tristate @@ -20,13 +20,13 @@ source "drivers/media/radio/si470x/Kconfig" =20 config RADIO_SI4713 tristate "Silicon Labs Si4713 FM Radio with RDS Transmitter support" - depends on VIDEO_V4L2 + depends on VIDEO_DEV =20 source "drivers/media/radio/si4713/Kconfig" =20 config RADIO_SI476X tristate "Silicon Laboratories Si476x I2C FM Radio" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV depends on MFD_SI476X_CORE depends on SND_SOC select SND_SOC_SI476X @@ -43,7 +43,7 @@ config RADIO_SI476X =20 config USB_MR800 tristate "AverMedia MR 800 USB FM radio support" - depends on USB && VIDEO_V4L2 + depends on USB && VIDEO_DEV help Say Y here if you want to connect this type of radio to your computer's USB port. Note that the audio is not digital, and @@ -55,7 +55,7 @@ config USB_MR800 =20 config USB_DSBR tristate "D-Link/GemTek USB FM radio support" - depends on USB && VIDEO_V4L2 + depends on USB && VIDEO_DEV help Say Y here if you want to connect this type of radio to your computer's USB port. Note that the audio is not digital, and @@ -67,7 +67,7 @@ config USB_DSBR =20 config RADIO_MAXIRADIO tristate "Guillemot MAXI Radio FM 2000 radio" - depends on VIDEO_V4L2 && PCI + depends on VIDEO_DEV && PCI select RADIO_TEA575X help Choose Y here if you have this radio card. This card may also be @@ -118,7 +118,7 @@ config RADIO_SHARK2 =20 config USB_KEENE tristate "Keene FM Transmitter USB support" - depends on USB && VIDEO_V4L2 + depends on USB && VIDEO_DEV help Say Y here if you want to connect this type of FM transmitter to your computer's USB port. @@ -128,7 +128,7 @@ config USB_KEENE =20 config USB_RAREMONO tristate "Thanko's Raremono AM/FM/SW radio support" - depends on USB && VIDEO_V4L2 + depends on USB && VIDEO_DEV help The 'Thanko's Raremono' device contains the Si4734 chip from Silicon La= bs Inc. It is one of the very few or perhaps the only consumer USB radio device @@ -142,7 +142,7 @@ config USB_RAREMONO =20 config USB_MA901 tristate "Masterkit MA901 USB FM radio support" - depends on USB && VIDEO_V4L2 + depends on USB && VIDEO_DEV help Say Y here if you want to connect this type of radio to your computer's USB port. Note that the audio is not digital, and @@ -154,7 +154,7 @@ config USB_MA901 =20 config RADIO_TEA5764 tristate "TEA5764 I2C FM radio support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV help Say Y here if you want to use the TEA5764 FM chip found in EZX phones. This FM chip is present in EZX phones from Motorola, @@ -173,7 +173,7 @@ config RADIO_TEA5764_XTAL =20 config RADIO_SAA7706H tristate "SAA7706H Car Radio DSP" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV help Say Y here if you want to use the SAA7706H Car radio Digital Signal Processor, found for instance on the Russellville development @@ -185,7 +185,7 @@ config RADIO_SAA7706H =20 config RADIO_TEF6862 tristate "TEF6862 Car Radio Enhanced Selectivity Tuner" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV help Say Y here if you want to use the TEF6862 Car Radio Enhanced Selectivity Tuner, found for instance on the Russellville development @@ -197,7 +197,7 @@ config RADIO_TEF6862 =20 config RADIO_TIMBERDALE tristate "Enable the Timberdale radio driver" - depends on MFD_TIMBERDALE && VIDEO_V4L2 + depends on MFD_TIMBERDALE && VIDEO_DEV depends on I2C # for RADIO_SAA7706H select RADIO_TEF6862 select RADIO_SAA7706H @@ -208,7 +208,7 @@ config RADIO_TIMBERDALE =20 config RADIO_WL1273 tristate "Texas Instruments WL1273 I2C FM Radio" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV select MFD_CORE select MFD_WL1273_CORE select FW_LOADER @@ -245,7 +245,7 @@ config RADIO_ISA config RADIO_CADET tristate "ADS Cadet AM/FM Tuner" depends on ISA || COMPILE_TEST - depends on VIDEO_V4L2 + depends on VIDEO_DEV help Choose Y here if you have one of these AM/FM radio cards, and then fill in the port address below. @@ -256,7 +256,7 @@ config RADIO_CADET config RADIO_RTRACK tristate "AIMSlab RadioTrack (aka RadioReveal) support" depends on ISA || COMPILE_TEST - depends on VIDEO_V4L2 + depends on VIDEO_DEV select RADIO_ISA help Choose Y here if you have one of these FM radio cards, and then fill @@ -288,7 +288,7 @@ config RADIO_RTRACK_PORT config RADIO_RTRACK2 tristate "AIMSlab RadioTrack II support" depends on ISA || COMPILE_TEST - depends on VIDEO_V4L2 + depends on VIDEO_DEV select RADIO_ISA help Choose Y here if you have this FM radio card, and then fill in the @@ -312,7 +312,7 @@ config RADIO_RTRACK2_PORT config RADIO_AZTECH tristate "Aztech/Packard Bell Radio" depends on ISA || COMPILE_TEST - depends on VIDEO_V4L2 + depends on VIDEO_DEV select RADIO_ISA help Choose Y here if you have one of these FM radio cards, and then fill @@ -333,7 +333,7 @@ config RADIO_AZTECH_PORT config RADIO_GEMTEK tristate "GemTek Radio card (or compatible) support" depends on ISA || COMPILE_TEST - depends on VIDEO_V4L2 + depends on VIDEO_DEV select RADIO_ISA help Choose Y here if you have this FM radio card, and then fill in the @@ -374,7 +374,7 @@ config RADIO_GEMTEK_PROBE config RADIO_MIROPCM20 tristate "miroSOUND PCM20 radio" depends on ISA || COMPILE_TEST - depends on ISA_DMA_API && VIDEO_V4L2 && SND + depends on ISA_DMA_API && VIDEO_DEV && SND select SND_ISA select SND_MIRO help @@ -389,7 +389,7 @@ config RADIO_MIROPCM20 config RADIO_SF16FMI tristate "SF16-FMI/SF16-FMP/SF16-FMD Radio" depends on ISA || COMPILE_TEST - depends on VIDEO_V4L2 + depends on VIDEO_DEV help Choose Y here if you have one of these FM radio cards. =20 @@ -399,7 +399,7 @@ config RADIO_SF16FMI config RADIO_SF16FMR2 tristate "SF16-FMR2/SF16-FMD2 Radio" depends on ISA || COMPILE_TEST - depends on VIDEO_V4L2 + depends on VIDEO_DEV select RADIO_TEA575X help Choose Y here if you have one of these FM radio cards. @@ -410,7 +410,7 @@ config RADIO_SF16FMR2 config RADIO_TERRATEC tristate "TerraTec ActiveRadio ISA Standalone" depends on ISA || COMPILE_TEST - depends on VIDEO_V4L2 + depends on VIDEO_DEV select RADIO_ISA help Choose Y here if you have this FM radio card. @@ -425,7 +425,7 @@ config RADIO_TERRATEC config RADIO_TRUST tristate "Trust FM radio card" depends on ISA || COMPILE_TEST - depends on VIDEO_V4L2 + depends on VIDEO_DEV select RADIO_ISA help This is a driver for the Trust FM radio cards. Say Y if you have @@ -449,7 +449,7 @@ config RADIO_TRUST_PORT config RADIO_TYPHOON tristate "Typhoon Radio (a.k.a. EcoRadio)" depends on ISA || COMPILE_TEST - depends on VIDEO_V4L2 + depends on VIDEO_DEV select RADIO_ISA help Choose Y here if you have one of these FM radio cards, and then fill @@ -484,7 +484,7 @@ config RADIO_TYPHOON_MUTEFREQ config RADIO_ZOLTRIX tristate "Zoltrix Radio" depends on ISA || COMPILE_TEST - depends on VIDEO_V4L2 + depends on VIDEO_DEV select RADIO_ISA help Choose Y here if you have one of these FM radio cards, and then fill diff --git a/drivers/media/radio/si470x/Kconfig b/drivers/media/radio/si470= x/Kconfig index 7161bd6cd13c..9f7d35b04a13 100644 --- a/drivers/media/radio/si470x/Kconfig +++ b/drivers/media/radio/si470x/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config RADIO_SI470X tristate "Silicon Labs Si470x FM Radio Receiver support" - depends on VIDEO_V4L2 + depends on VIDEO_DEV help This is a driver for devices with the Silicon Labs SI470x chip (either via USB or I2C buses). diff --git a/drivers/media/radio/wl128x/Kconfig b/drivers/media/radio/wl128= x/Kconfig index d5ae3388d3db..3e7713872e3f 100644 --- a/drivers/media/radio/wl128x/Kconfig +++ b/drivers/media/radio/wl128x/Kconfig @@ -4,7 +4,7 @@ # config RADIO_WL128X tristate "Texas Instruments WL128x FM Radio" - depends on VIDEO_V4L2 && RFKILL && TTY && TI_ST + depends on VIDEO_DEV && RFKILL && TTY && TI_ST depends on GPIOLIB || COMPILE_TEST help Choose Y here if you have this FM radio chip. diff --git a/drivers/media/spi/Kconfig b/drivers/media/spi/Kconfig index 857ef4ace6e9..01e4e6cce027 100644 --- a/drivers/media/spi/Kconfig +++ b/drivers/media/spi/Kconfig @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -if VIDEO_V4L2 +if VIDEO_DEV =20 comment "SPI I2C drivers auto-selected by 'Autoselect ancillary drivers'" depends on MEDIA_HIDE_ANCILLARY_SUBDRV && SPI @@ -9,7 +9,7 @@ menu "SPI helper chips" =20 config VIDEO_GS1662 tristate "Gennum Serializers video" - depends on SPI && VIDEO_V4L2 + depends on SPI && VIDEO_DEV select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API help diff --git a/drivers/media/test-drivers/Kconfig b/drivers/media/test-driver= s/Kconfig index e27d6602545d..d663d822ec75 100644 --- a/drivers/media/test-drivers/Kconfig +++ b/drivers/media/test-drivers/Kconfig @@ -12,7 +12,7 @@ source "drivers/media/test-drivers/vivid/Kconfig" =20 config VIDEO_VIM2M tristate "Virtual Memory-to-Memory Driver" - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV select VIDEOBUF2_VMALLOC select V4L2_MEM2MEM_DEV select MEDIA_CONTROLLER diff --git a/drivers/media/test-drivers/vicodec/Kconfig b/drivers/media/tes= t-drivers/vicodec/Kconfig index d77c67810c73..a7a828eec2a4 100644 --- a/drivers/media/test-drivers/vicodec/Kconfig +++ b/drivers/media/test-drivers/vicodec/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_VICODEC tristate "Virtual Codec Driver" - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV select VIDEOBUF2_VMALLOC select V4L2_MEM2MEM_DEV select MEDIA_CONTROLLER diff --git a/drivers/media/test-drivers/vimc/Kconfig b/drivers/media/test-d= rivers/vimc/Kconfig index ea37a102dec8..0d5169819cac 100644 --- a/drivers/media/test-drivers/vimc/Kconfig +++ b/drivers/media/test-drivers/vimc/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_VIMC tristate "Virtual Media Controller Driver (VIMC)" - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV select FONT_SUPPORT select FONT_8x16 select MEDIA_CONTROLLER diff --git a/drivers/media/test-drivers/vivid/Kconfig b/drivers/media/test-= drivers/vivid/Kconfig index c3abde2986b2..318799d317ba 100644 --- a/drivers/media/test-drivers/vivid/Kconfig +++ b/drivers/media/test-drivers/vivid/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_VIVID tristate "Virtual Video Test Driver" - depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64 && FB + depends on VIDEO_DEV && !SPARC32 && !SPARC64 && FB depends on HAS_DMA select FONT_SUPPORT select FONT_8x16 diff --git a/drivers/media/tuners/Kconfig b/drivers/media/tuners/Kconfig index 4605bb377574..81d1d56b9317 100644 --- a/drivers/media/tuners/Kconfig +++ b/drivers/media/tuners/Kconfig @@ -85,7 +85,7 @@ config MEDIA_TUNER_TEA5767 =20 config MEDIA_TUNER_MSI001 tristate "Mirics MSi001" - depends on MEDIA_SUPPORT && SPI && VIDEO_V4L2 + depends on MEDIA_SUPPORT && SPI && VIDEO_DEV default m if !MEDIA_SUBDRV_AUTOSELECT help Mirics MSi001 silicon tuner driver. @@ -223,7 +223,7 @@ config MEDIA_TUNER_TDA18212 =20 config MEDIA_TUNER_E4000 tristate "Elonics E4000 silicon tuner" - depends on MEDIA_SUPPORT && I2C && VIDEO_V4L2 + depends on MEDIA_SUPPORT && I2C && VIDEO_DEV select REGMAP_I2C default m if !MEDIA_SUBDRV_AUTOSELECT help @@ -231,7 +231,7 @@ config MEDIA_TUNER_E4000 =20 config MEDIA_TUNER_FC2580 tristate "FCI FC2580 silicon tuner" - depends on MEDIA_SUPPORT && I2C && VIDEO_V4L2 + depends on MEDIA_SUPPORT && I2C && VIDEO_DEV select REGMAP_I2C default m if !MEDIA_SUBDRV_AUTOSELECT help diff --git a/drivers/media/tuners/e4000.c b/drivers/media/tuners/e4000.c index 3f1f9af92bc9..a3a8d051dc6c 100644 --- a/drivers/media/tuners/e4000.c +++ b/drivers/media/tuners/e4000.c @@ -257,7 +257,7 @@ static int e4000_set_params(struct e4000_dev *dev) /* * V4L2 API */ -#if IS_ENABLED(CONFIG_VIDEO_V4L2) +#if IS_ENABLED(CONFIG_VIDEO_DEV) static const struct v4l2_frequency_band bands[] =3D { { .type =3D V4L2_TUNER_RF, @@ -654,7 +654,7 @@ static int e4000_probe(struct i2c_client *client, if (ret) goto err_kfree; =20 -#if IS_ENABLED(CONFIG_VIDEO_V4L2) +#if IS_ENABLED(CONFIG_VIDEO_DEV) /* Register controls */ v4l2_ctrl_handler_init(&dev->hdl, 9); dev->bandwidth_auto =3D v4l2_ctrl_new_std(&dev->hdl, &e4000_ctrl_ops, @@ -713,7 +713,7 @@ static int e4000_remove(struct i2c_client *client) =20 dev_dbg(&client->dev, "\n"); =20 -#if IS_ENABLED(CONFIG_VIDEO_V4L2) +#if IS_ENABLED(CONFIG_VIDEO_DEV) v4l2_ctrl_handler_free(&dev->hdl); #endif kfree(dev); diff --git a/drivers/media/tuners/fc2580.c b/drivers/media/tuners/fc2580.c index 7639a305048f..1b5961bdf2d5 100644 --- a/drivers/media/tuners/fc2580.c +++ b/drivers/media/tuners/fc2580.c @@ -357,7 +357,7 @@ static const struct dvb_tuner_ops fc2580_dvb_tuner_ops = =3D { /* * V4L2 API */ -#if IS_ENABLED(CONFIG_VIDEO_V4L2) +#if IS_ENABLED(CONFIG_VIDEO_DEV) static const struct v4l2_frequency_band bands[] =3D { { .type =3D V4L2_TUNER_RF, @@ -552,7 +552,7 @@ static int fc2580_probe(struct i2c_client *client, goto err_kfree; } =20 -#if IS_ENABLED(CONFIG_VIDEO_V4L2) +#if IS_ENABLED(CONFIG_VIDEO_DEV) /* Register controls */ v4l2_ctrl_handler_init(&dev->hdl, 2); dev->bandwidth_auto =3D v4l2_ctrl_new_std(&dev->hdl, &fc2580_ctrl_ops, @@ -594,7 +594,7 @@ static int fc2580_remove(struct i2c_client *client) =20 dev_dbg(&client->dev, "\n"); =20 -#if IS_ENABLED(CONFIG_VIDEO_V4L2) +#if IS_ENABLED(CONFIG_VIDEO_DEV) v4l2_ctrl_handler_free(&dev->hdl); #endif kfree(dev); diff --git a/drivers/media/usb/airspy/Kconfig b/drivers/media/usb/airspy/Kc= onfig index 458345217f78..0662d8701c44 100644 --- a/drivers/media/usb/airspy/Kconfig +++ b/drivers/media/usb/airspy/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config USB_AIRSPY tristate "AirSpy" - depends on VIDEO_V4L2 + depends on VIDEO_DEV select VIDEOBUF2_VMALLOC help This is a video4linux2 driver for AirSpy SDR device. diff --git a/drivers/media/usb/au0828/Kconfig b/drivers/media/usb/au0828/Kc= onfig index 05cc6c48c26f..31799b6ff91f 100644 --- a/drivers/media/usb/au0828/Kconfig +++ b/drivers/media/usb/au0828/Kconfig @@ -2,12 +2,12 @@ =20 config VIDEO_AU0828 tristate "Auvitek AU0828 support" - depends on I2C && INPUT && DVB_CORE && USB && VIDEO_V4L2 + depends on I2C && INPUT && DVB_CORE && USB && VIDEO_DEV select MEDIA_CONTROLLER select MEDIA_CONTROLLER_DVB select I2C_ALGOBIT select VIDEO_TVEEPROM - select VIDEOBUF2_VMALLOC if VIDEO_V4L2 + select VIDEOBUF2_VMALLOC if VIDEO_DEV select DVB_AU8522_DTV if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_XC5000 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_MXL5007T if MEDIA_SUBDRV_AUTOSELECT @@ -22,7 +22,7 @@ config VIDEO_AU0828 config VIDEO_AU0828_V4L2 bool "Auvitek AU0828 v4l2 analog video support" depends on VIDEO_AU0828 - depends on VIDEO_V4L2=3Dy || VIDEO_V4L2=3DVIDEO_AU0828 + depends on VIDEO_DEV=3Dy || VIDEO_DEV=3DVIDEO_AU0828 select DVB_AU8522_V4L if MEDIA_SUBDRV_AUTOSELECT select VIDEO_TUNER default y diff --git a/drivers/media/usb/cpia2/Kconfig b/drivers/media/usb/cpia2/Kcon= fig index e2c18ab0262b..da2c6862b4a2 100644 --- a/drivers/media/usb/cpia2/Kconfig +++ b/drivers/media/usb/cpia2/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_CPIA2 tristate "CPiA2 Video For Linux" - depends on VIDEO_DEV && USB && VIDEO_V4L2 + depends on USB && VIDEO_DEV help This is the video4linux driver for cameras based on Vision's CPiA2 (Colour Processor Interface ASIC), such as the Digital Blue QX5 diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-u= sb-v2/Kconfig index 60ca8b9d070b..a4600a97d1fd 100644 --- a/drivers/media/usb/dvb-usb-v2/Kconfig +++ b/drivers/media/usb/dvb-usb-v2/Kconfig @@ -40,7 +40,7 @@ config DVB_USB_AF9035 select MEDIA_TUNER_FC0011 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_MXL5007T if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_TDA18218 if MEDIA_SUBDRV_AUTOSELECT - select MEDIA_TUNER_FC2580 if (MEDIA_SUBDRV_AUTOSELECT && VIDEO_V4L2) + select MEDIA_TUNER_FC2580 if (MEDIA_SUBDRV_AUTOSELECT && VIDEO_DEV) select MEDIA_TUNER_IT913X if MEDIA_SUBDRV_AUTOSELECT help Say Y here to support the Afatech AF9035 based DVB USB receiver. @@ -139,12 +139,12 @@ config DVB_USB_RTL28XXU select DVB_CXD2841ER if MEDIA_SUBDRV_AUTOSELECT select DVB_RTL2830 select DVB_RTL2832 - select DVB_RTL2832_SDR if (MEDIA_SUBDRV_AUTOSELECT && MEDIA_SDR_SUPPORT &= & VIDEO_V4L2) + select DVB_RTL2832_SDR if (MEDIA_SUBDRV_AUTOSELECT && MEDIA_SDR_SUPPORT &= & VIDEO_DEV) select DVB_SI2168 if MEDIA_SUBDRV_AUTOSELECT - select MEDIA_TUNER_E4000 if (MEDIA_SUBDRV_AUTOSELECT && VIDEO_V4L2) + select MEDIA_TUNER_E4000 if (MEDIA_SUBDRV_AUTOSELECT && VIDEO_DEV) select MEDIA_TUNER_FC0012 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_FC0013 if MEDIA_SUBDRV_AUTOSELECT - select MEDIA_TUNER_FC2580 if (MEDIA_SUBDRV_AUTOSELECT && VIDEO_V4L2) + select MEDIA_TUNER_FC2580 if (MEDIA_SUBDRV_AUTOSELECT && VIDEO_DEV) select MEDIA_TUNER_MT2060 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_MXL5005S if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_QT1010 if MEDIA_SUBDRV_AUTOSELECT diff --git a/drivers/media/usb/dvb-usb/Kconfig b/drivers/media/usb/dvb-usb/= Kconfig index 7498110142e4..6df96c2bf569 100644 --- a/drivers/media/usb/dvb-usb/Kconfig +++ b/drivers/media/usb/dvb-usb/Kconfig @@ -150,8 +150,8 @@ config DVB_USB_CXUSB =20 config DVB_USB_CXUSB_ANALOG bool "Analog support for the Conexant USB2.0 hybrid reference design" - depends on DVB_USB_CXUSB && VIDEO_V4L2 - depends on VIDEO_V4L2=3Dy || VIDEO_V4L2=3DDVB_USB_CXUSB + depends on DVB_USB_CXUSB && VIDEO_DEV + depends on VIDEO_DEV=3Dy || VIDEO_DEV=3DDVB_USB_CXUSB select VIDEO_CX25840 select VIDEOBUF2_VMALLOC help diff --git a/drivers/media/usb/gspca/Kconfig b/drivers/media/usb/gspca/Kcon= fig index dca4e16ed133..2b106a7fcf4c 100644 --- a/drivers/media/usb/gspca/Kconfig +++ b/drivers/media/usb/gspca/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only menuconfig USB_GSPCA tristate "GSPCA based webcams" - depends on VIDEO_V4L2 + depends on VIDEO_DEV depends on INPUT || INPUT=3Dn select VIDEOBUF2_VMALLOC help @@ -17,7 +17,7 @@ menuconfig USB_GSPCA module will be called gspca_main. =20 =20 -if USB_GSPCA && VIDEO_V4L2 +if USB_GSPCA && VIDEO_DEV =20 source "drivers/media/usb/gspca/m5602/Kconfig" source "drivers/media/usb/gspca/stv06xx/Kconfig" @@ -25,7 +25,7 @@ source "drivers/media/usb/gspca/gl860/Kconfig" =20 config USB_GSPCA_BENQ tristate "Benq USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for the Benq DC E300 camera. =20 @@ -34,7 +34,7 @@ config USB_GSPCA_BENQ =20 config USB_GSPCA_CONEX tristate "Conexant Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the Conexant chip. =20 @@ -43,7 +43,7 @@ config USB_GSPCA_CONEX =20 config USB_GSPCA_CPIA1 tristate "cpia CPiA (version 1) Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for USB cameras based on the cpia CPiA chip. Note that you need at least version 0.6.4 of libv4l for @@ -54,7 +54,7 @@ config USB_GSPCA_CPIA1 =20 config USB_GSPCA_DTCS033 tristate "DTCS033 (Scopium) USB Astro-Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for the Scopium camera for planetary astrophotography. @@ -64,7 +64,7 @@ config USB_GSPCA_DTCS033 =20 config USB_GSPCA_ETOMS tristate "Etoms USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the Etoms chip. =20 @@ -73,7 +73,7 @@ config USB_GSPCA_ETOMS =20 config USB_GSPCA_FINEPIX tristate "Fujifilm FinePix USB V4L2 driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the FinePix chip. =20 @@ -82,7 +82,7 @@ config USB_GSPCA_FINEPIX =20 config USB_GSPCA_JEILINJ tristate "Jeilin JPEG USB V4L2 driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on this Jeilin chip. =20 @@ -91,7 +91,7 @@ config USB_GSPCA_JEILINJ =20 config USB_GSPCA_JL2005BCD tristate "JL2005B/C/D USB V4L2 driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based the JL2005B, JL2005C, or JL2005D chip. @@ -101,7 +101,7 @@ config USB_GSPCA_JL2005BCD =20 config USB_GSPCA_KINECT tristate "Kinect sensor device USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for the Microsoft Kinect sensor device. =20 @@ -110,7 +110,7 @@ config USB_GSPCA_KINECT =20 config USB_GSPCA_KONICA tristate "Konica USB Camera V4L2 driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the Konica chip. =20 @@ -119,7 +119,7 @@ config USB_GSPCA_KONICA =20 config USB_GSPCA_MARS tristate "Mars USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the Mars chip. =20 @@ -128,7 +128,7 @@ config USB_GSPCA_MARS =20 config USB_GSPCA_MR97310A tristate "Mars-Semi MR97310A USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the MR97310A chip. =20 @@ -137,7 +137,7 @@ config USB_GSPCA_MR97310A =20 config USB_GSPCA_NW80X tristate "Divio based (NW80x) USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the NW80x chips. =20 @@ -146,7 +146,7 @@ config USB_GSPCA_NW80X =20 config USB_GSPCA_OV519 tristate "OV51x / OVFX2 / W996xCF USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on one of these: OV511(+), OV518(+), OV519, OVFX2, W9967CF, W9968CF @@ -156,7 +156,7 @@ config USB_GSPCA_OV519 =20 config USB_GSPCA_OV534 tristate "OV534 OV772x USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the OV534 chip and sensor OV772x (e.g. Sony Playstation EYE) @@ -166,7 +166,7 @@ config USB_GSPCA_OV534 =20 config USB_GSPCA_OV534_9 tristate "OV534 OV965x USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the OV534 chip and sensor OV965x (e.g. Hercules Dualpix) @@ -176,7 +176,7 @@ config USB_GSPCA_OV534_9 =20 config USB_GSPCA_PAC207 tristate "Pixart PAC207 USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the PAC207 chip. =20 @@ -185,7 +185,7 @@ config USB_GSPCA_PAC207 =20 config USB_GSPCA_PAC7302 tristate "Pixart PAC7302 USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the PAC7302 chip. =20 @@ -194,7 +194,7 @@ config USB_GSPCA_PAC7302 =20 config USB_GSPCA_PAC7311 tristate "Pixart PAC7311 USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the PAC7311 chip. =20 @@ -203,7 +203,7 @@ config USB_GSPCA_PAC7311 =20 config USB_GSPCA_SE401 tristate "SE401 USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the Endpoints (formerly known as AOX) se401 chip. @@ -213,7 +213,7 @@ config USB_GSPCA_SE401 =20 config USB_GSPCA_SN9C2028 tristate "SONIX Dual-Mode USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want streaming support for Sonix SN9C2028 cameras. These are supported as stillcams in libgphoto2/camlibs/sonix. @@ -223,7 +223,7 @@ config USB_GSPCA_SN9C2028 =20 config USB_GSPCA_SN9C20X tristate "SN9C20X USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the sn9c20x chips (SN9C201 and SN9C202). @@ -233,7 +233,7 @@ config USB_GSPCA_SN9C20X =20 config USB_GSPCA_SONIXB tristate "SONIX Bayer USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the Sonix chips with Bayer format (SN9C101, SN9C102 and SN9C103). @@ -243,7 +243,7 @@ config USB_GSPCA_SONIXB =20 config USB_GSPCA_SONIXJ tristate "SONIX JPEG USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the Sonix chips with JPEG format (SN9C102P, SN9C105 and >=3D SN9C110). @@ -253,7 +253,7 @@ config USB_GSPCA_SONIXJ =20 config USB_GSPCA_SPCA500 tristate "SPCA500 USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the SPCA500 chip. =20 @@ -262,7 +262,7 @@ config USB_GSPCA_SPCA500 =20 config USB_GSPCA_SPCA501 tristate "SPCA501 USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the SPCA501 chip. =20 @@ -271,7 +271,7 @@ config USB_GSPCA_SPCA501 =20 config USB_GSPCA_SPCA505 tristate "SPCA505 USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the SPCA505 chip. =20 @@ -280,7 +280,7 @@ config USB_GSPCA_SPCA505 =20 config USB_GSPCA_SPCA506 tristate "SPCA506 USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the SPCA506 chip. =20 @@ -289,7 +289,7 @@ config USB_GSPCA_SPCA506 =20 config USB_GSPCA_SPCA508 tristate "SPCA508 USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the SPCA508 chip. =20 @@ -298,7 +298,7 @@ config USB_GSPCA_SPCA508 =20 config USB_GSPCA_SPCA561 tristate "SPCA561 USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the SPCA561 chip. =20 @@ -307,7 +307,7 @@ config USB_GSPCA_SPCA561 =20 config USB_GSPCA_SPCA1528 tristate "SPCA1528 USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the SPCA1528 chip. =20 @@ -316,7 +316,7 @@ config USB_GSPCA_SPCA1528 =20 config USB_GSPCA_SQ905 tristate "SQ Technologies SQ905 based USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the SQ905 chip. =20 @@ -325,7 +325,7 @@ config USB_GSPCA_SQ905 =20 config USB_GSPCA_SQ905C tristate "SQ Technologies SQ905C based USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the SQ905C chip. =20 @@ -334,7 +334,7 @@ config USB_GSPCA_SQ905C =20 config USB_GSPCA_SQ930X tristate "SQ Technologies SQ930X based USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the SQ930X chip. =20 @@ -343,7 +343,7 @@ config USB_GSPCA_SQ930X =20 config USB_GSPCA_STK014 tristate "Syntek DV4000 (STK014) USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the STK014 chip. =20 @@ -352,7 +352,7 @@ config USB_GSPCA_STK014 =20 config USB_GSPCA_STK1135 tristate "Syntek STK1135 USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the STK1135 chip. =20 @@ -361,7 +361,7 @@ config USB_GSPCA_STK1135 =20 config USB_GSPCA_STV0680 tristate "STV0680 USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the STV0680 chip. =20 @@ -370,7 +370,7 @@ config USB_GSPCA_STV0680 =20 config USB_GSPCA_SUNPLUS tristate "SUNPLUS USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the Sunplus SPCA504(abc) SPCA533 SPCA536 chips. @@ -380,7 +380,7 @@ config USB_GSPCA_SUNPLUS =20 config USB_GSPCA_T613 tristate "T613 (JPEG Compliance) USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the T613 chip. =20 @@ -389,7 +389,7 @@ config USB_GSPCA_T613 =20 config USB_GSPCA_TOPRO tristate "TOPRO USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the TP6800 and TP6810 Topro chips. @@ -399,7 +399,7 @@ config USB_GSPCA_TOPRO =20 config USB_GSPCA_TOUPTEK tristate "Touptek USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the ToupTek UCMOS / AmScope MU series camera. @@ -409,7 +409,7 @@ config USB_GSPCA_TOUPTEK =20 config USB_GSPCA_TV8532 tristate "TV8532 USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the TV8531 chip. =20 @@ -418,7 +418,7 @@ config USB_GSPCA_TV8532 =20 config USB_GSPCA_VC032X tristate "VC032X USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the VC032X chip. =20 @@ -427,7 +427,7 @@ config USB_GSPCA_VC032X =20 config USB_GSPCA_VICAM tristate "ViCam USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for the 3com homeconnect camera (vicam). @@ -437,7 +437,7 @@ config USB_GSPCA_VICAM =20 config USB_GSPCA_XIRLINK_CIT tristate "Xirlink C-It USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for Xirlink C-It bases cameras. =20 @@ -446,7 +446,7 @@ config USB_GSPCA_XIRLINK_CIT =20 config USB_GSPCA_ZC3XX tristate "ZC3XX USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the ZC3XX chip. =20 diff --git a/drivers/media/usb/gspca/gl860/Kconfig b/drivers/media/usb/gspc= a/gl860/Kconfig index 2dfd2704c915..e5a35ca72b60 100644 --- a/drivers/media/usb/gspca/gl860/Kconfig +++ b/drivers/media/usb/gspca/gl860/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config USB_GL860 tristate "GL860 USB Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the GL860 chip. =20 diff --git a/drivers/media/usb/gspca/m5602/Kconfig b/drivers/media/usb/gspc= a/m5602/Kconfig index 0a250652d717..d616408b67d9 100644 --- a/drivers/media/usb/gspca/m5602/Kconfig +++ b/drivers/media/usb/gspca/m5602/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config USB_M5602 tristate "ALi USB m5602 Camera Driver" - depends on VIDEO_V4L2 && USB_GSPCA + depends on VIDEO_DEV && USB_GSPCA help Say Y here if you want support for cameras based on the ALi m5602 connected to various image sensors. diff --git a/drivers/media/usb/hackrf/Kconfig b/drivers/media/usb/hackrf/Kc= onfig index 2267cebfdecb..1cf9b4d3a514 100644 --- a/drivers/media/usb/hackrf/Kconfig +++ b/drivers/media/usb/hackrf/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config USB_HACKRF tristate "HackRF" - depends on VIDEO_V4L2 + depends on VIDEO_DEV select VIDEOBUF2_VMALLOC help This is a video4linux2 driver for HackRF SDR device. diff --git a/drivers/media/usb/hdpvr/Kconfig b/drivers/media/usb/hdpvr/Kcon= fig index 617400b27314..ee45a89aa607 100644 --- a/drivers/media/usb/hdpvr/Kconfig +++ b/drivers/media/usb/hdpvr/Kconfig @@ -2,7 +2,7 @@ =20 config VIDEO_HDPVR tristate "Hauppauge HD PVR support" - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV help This is a video4linux driver for Hauppauge's HD PVR USB device. =20 diff --git a/drivers/media/usb/msi2500/Kconfig b/drivers/media/usb/msi2500/= Kconfig index b403603bcc81..c2ded6482a5b 100644 --- a/drivers/media/usb/msi2500/Kconfig +++ b/drivers/media/usb/msi2500/Kconfig @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only config USB_MSI2500 tristate "Mirics MSi2500" - depends on VIDEO_V4L2 && SPI + depends on VIDEO_DEV && SPI select VIDEOBUF2_VMALLOC select MEDIA_TUNER_MSI001 diff --git a/drivers/media/usb/pvrusb2/Kconfig b/drivers/media/usb/pvrusb2/= Kconfig index e6a4f730591b..f2b64e49c5a2 100644 --- a/drivers/media/usb/pvrusb2/Kconfig +++ b/drivers/media/usb/pvrusb2/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_PVRUSB2 tristate "Hauppauge WinTV-PVR USB2 support" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C select VIDEO_TUNER select VIDEO_TVEEPROM select VIDEO_CX2341X diff --git a/drivers/media/usb/pwc/Kconfig b/drivers/media/usb/pwc/Kconfig index 7cebf6314a67..2078bd5ecf41 100644 --- a/drivers/media/usb/pwc/Kconfig +++ b/drivers/media/usb/pwc/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config USB_PWC tristate "USB Philips Cameras" - depends on VIDEO_V4L2 + depends on VIDEO_DEV select VIDEOBUF2_VMALLOC help Say Y or M here if you want to use one of these Philips & OEM diff --git a/drivers/media/usb/s2255/Kconfig b/drivers/media/usb/s2255/Kcon= fig index e4a0c914d9c3..889593b21889 100644 --- a/drivers/media/usb/s2255/Kconfig +++ b/drivers/media/usb/s2255/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config USB_S2255 tristate "USB Sensoray 2255 video capture device" - depends on VIDEO_V4L2 + depends on VIDEO_DEV select VIDEOBUF2_VMALLOC help Say Y here if you want support for the Sensoray 2255 USB device. diff --git a/drivers/media/usb/stkwebcam/Kconfig b/drivers/media/usb/stkweb= cam/Kconfig index 775a5151539c..d94d023f1aa0 100644 --- a/drivers/media/usb/stkwebcam/Kconfig +++ b/drivers/media/usb/stkwebcam/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config USB_STKWEBCAM tristate "USB Syntek DC1125 Camera support" - depends on VIDEO_V4L2 + depends on VIDEO_DEV help Say Y here if you want to use this type of camera. Supported devices are typically found in some Asus laptops, diff --git a/drivers/media/usb/usbtv/Kconfig b/drivers/media/usb/usbtv/Kcon= fig index 84799c7203d3..578a0e693f8b 100644 --- a/drivers/media/usb/usbtv/Kconfig +++ b/drivers/media/usb/usbtv/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_USBTV tristate "USBTV007 video capture support" - depends on VIDEO_V4L2 && SND + depends on VIDEO_DEV && SND select SND_PCM select VIDEOBUF2_VMALLOC =20 diff --git a/drivers/media/usb/uvc/Kconfig b/drivers/media/usb/uvc/Kconfig index 4c2f4a3216f2..ca51ee8e45f3 100644 --- a/drivers/media/usb/uvc/Kconfig +++ b/drivers/media/usb/uvc/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config USB_VIDEO_CLASS tristate "USB Video Class (UVC)" - depends on VIDEO_V4L2 + depends on VIDEO_DEV select VIDEOBUF2_VMALLOC help Support for the USB Video Class (UVC). Currently only video diff --git a/drivers/media/usb/zr364xx/Kconfig b/drivers/media/usb/zr364xx/= Kconfig index 49b4257487bb..a9fb02566c4b 100644 --- a/drivers/media/usb/zr364xx/Kconfig +++ b/drivers/media/usb/zr364xx/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config USB_ZR364XX tristate "USB ZR364XX Camera support" - depends on VIDEO_V4L2 + depends on VIDEO_DEV select VIDEOBUF_GEN select VIDEOBUF_VMALLOC help diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kcon= fig index 6ee75c6c820e..1be9a2cc947a 100644 --- a/drivers/media/v4l2-core/Kconfig +++ b/drivers/media/v4l2-core/Kconfig @@ -3,17 +3,9 @@ # Generic video config states # =20 -# Enable the V4L2 core and API -config VIDEO_V4L2 - tristate - depends on (I2C || I2C=3Dn) && VIDEO_DEV - select RATIONAL - select VIDEOBUF2_V4L2 if VIDEOBUF2_CORE - default (I2C || I2C=3Dn) && VIDEO_DEV - config VIDEO_V4L2_I2C bool - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV default y =20 config VIDEO_V4L2_SUBDEV_API @@ -64,7 +56,7 @@ config V4L2_MEM2MEM_DEV # Used by LED subsystem flash drivers config V4L2_FLASH_LED_CLASS tristate "V4L2 flash API for LED flash class devices" - depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + depends on VIDEO_DEV && VIDEO_V4L2_SUBDEV_API depends on LEDS_CLASS_FLASH select V4L2_ASYNC help diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Mak= efile index 1ec7e9cae1fa..41d91bd10cf2 100644 --- a/drivers/media/v4l2-core/Makefile +++ b/drivers/media/v4l2-core/Makefile @@ -38,4 +38,4 @@ obj-$(CONFIG_VIDEOBUF_GEN) +=3D videobuf-core.o obj-$(CONFIG_VIDEOBUF_VMALLOC) +=3D videobuf-vmalloc.o =20 obj-$(CONFIG_VIDEO_TUNER) +=3D tuner.o -obj-$(CONFIG_VIDEO_V4L2) +=3D v4l2-dv-timings.o videodev.o +obj-$(CONFIG_VIDEO_DEV) +=3D v4l2-dv-timings.o videodev.o diff --git a/drivers/staging/media/atomisp/Kconfig b/drivers/staging/media/= atomisp/Kconfig index aeed5803dfb1..2c8d7fdcc5f7 100644 --- a/drivers/staging/media/atomisp/Kconfig +++ b/drivers/staging/media/atomisp/Kconfig @@ -11,7 +11,7 @@ menuconfig INTEL_ATOMISP =20 config VIDEO_ATOMISP tristate "Intel Atom Image Signal Processor Driver" - depends on VIDEO_V4L2 && INTEL_ATOMISP + depends on VIDEO_DEV && INTEL_ATOMISP depends on PMIC_OPREGION select IOSF_MBI select VIDEOBUF_VMALLOC diff --git a/drivers/staging/media/atomisp/i2c/Kconfig b/drivers/staging/me= dia/atomisp/i2c/Kconfig index a772b833a85f..e726101b24e4 100644 --- a/drivers/staging/media/atomisp/i2c/Kconfig +++ b/drivers/staging/media/atomisp/i2c/Kconfig @@ -6,7 +6,7 @@ config VIDEO_ATOMISP_OV2722 tristate "OVT ov2722 sensor support" depends on ACPI - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV help This is a Video4Linux2 sensor-level driver for the OVT OV2722 raw camera. @@ -18,7 +18,7 @@ config VIDEO_ATOMISP_OV2722 config VIDEO_ATOMISP_GC2235 tristate "Galaxy gc2235 sensor support" depends on ACPI - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV help This is a Video4Linux2 sensor-level driver for the OVT GC2235 raw camera. @@ -40,7 +40,7 @@ config VIDEO_ATOMISP_MSRLIST_HELPER config VIDEO_ATOMISP_MT9M114 tristate "Aptina mt9m114 sensor support" depends on ACPI - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV help This is a Video4Linux2 sensor-level driver for the Micron mt9m114 1.3 Mpixel camera. @@ -52,7 +52,7 @@ config VIDEO_ATOMISP_MT9M114 config VIDEO_ATOMISP_GC0310 tristate "GC0310 sensor support" depends on ACPI - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV help This is a Video4Linux2 sensor-level driver for the Galaxycore GC0310 0.3MP sensor. @@ -60,7 +60,7 @@ config VIDEO_ATOMISP_GC0310 config VIDEO_ATOMISP_OV2680 tristate "Omnivision OV2680 sensor support" depends on ACPI - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV help This is a Video4Linux2 sensor-level driver for the Omnivision OV2680 raw camera. @@ -72,7 +72,7 @@ config VIDEO_ATOMISP_OV2680 config VIDEO_ATOMISP_OV5693 tristate "Omnivision ov5693 sensor support" depends on ACPI - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_DEV help This is a Video4Linux2 sensor-level driver for the Micron ov5693 5 Mpixel camera. @@ -88,7 +88,7 @@ config VIDEO_ATOMISP_OV5693 config VIDEO_ATOMISP_LM3554 tristate "LM3554 flash light driver" depends on ACPI - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C help This is a Video4Linux2 sub-dev driver for the LM3554 flash light driver. diff --git a/drivers/staging/media/hantro/Kconfig b/drivers/staging/media/h= antro/Kconfig index 3c5d833322c8..0172a6822ec2 100644 --- a/drivers/staging/media/hantro/Kconfig +++ b/drivers/staging/media/hantro/Kconfig @@ -2,7 +2,7 @@ config VIDEO_HANTRO tristate "Hantro VPU driver" depends on ARCH_MXC || ARCH_ROCKCHIP || ARCH_AT91 || ARCH_SUNXI || COMPIL= E_TEST - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV select MEDIA_CONTROLLER select MEDIA_CONTROLLER_REQUEST_API select VIDEOBUF2_DMA_CONTIG diff --git a/drivers/staging/media/imx/Kconfig b/drivers/staging/media/imx/= Kconfig index c3bf433ba3e3..0bacac302d7e 100644 --- a/drivers/staging/media/imx/Kconfig +++ b/drivers/staging/media/imx/Kconfig @@ -4,7 +4,7 @@ config VIDEO_IMX_MEDIA depends on ARCH_MXC || COMPILE_TEST depends on HAS_DMA depends on VIDEO_DEV - depends on VIDEO_V4L2 + depends on VIDEO_DEV select MEDIA_CONTROLLER select V4L2_FWNODE select V4L2_MEM2MEM_DEV diff --git a/drivers/staging/media/ipu3/Kconfig b/drivers/staging/media/ipu= 3/Kconfig index 3e9640523e50..114a1d8e7cc8 100644 --- a/drivers/staging/media/ipu3/Kconfig +++ b/drivers/staging/media/ipu3/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 config VIDEO_IPU3_IMGU tristate "Intel ipu3-imgu driver" - depends on PCI && VIDEO_V4L2 + depends on PCI && VIDEO_DEV depends on X86 select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API diff --git a/drivers/staging/media/max96712/Kconfig b/drivers/staging/media= /max96712/Kconfig index acde14fd5c4d..117fadf81bd0 100644 --- a/drivers/staging/media/max96712/Kconfig +++ b/drivers/staging/media/max96712/Kconfig @@ -3,7 +3,7 @@ config VIDEO_MAX96712 tristate "Maxim MAX96712 Quad GMSL2 Deserializer support" depends on I2C depends on OF_GPIO - depends on VIDEO_V4L2 + depends on VIDEO_DEV select V4L2_FWNODE select VIDEO_V4L2_SUBDEV_API select MEDIA_CONTROLLER diff --git a/drivers/staging/media/meson/vdec/Kconfig b/drivers/staging/med= ia/meson/vdec/Kconfig index 9e1450193392..19ffea987b89 100644 --- a/drivers/staging/media/meson/vdec/Kconfig +++ b/drivers/staging/media/meson/vdec/Kconfig @@ -2,7 +2,7 @@ =20 config VIDEO_MESON_VDEC tristate "Amlogic video decoder driver" - depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA + depends on VIDEO_DEV && HAS_DMA depends on ARCH_MESON || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV diff --git a/drivers/staging/media/omap4iss/Kconfig b/drivers/staging/media= /omap4iss/Kconfig index 6c254907a27b..6d1f55b09132 100644 --- a/drivers/staging/media/omap4iss/Kconfig +++ b/drivers/staging/media/omap4iss/Kconfig @@ -2,7 +2,7 @@ =20 config VIDEO_OMAP4 tristate "OMAP 4 Camera support" - depends on VIDEO_V4L2 && I2C + depends on VIDEO_DEV && I2C depends on ARCH_OMAP4 || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API diff --git a/drivers/staging/media/rkvdec/Kconfig b/drivers/staging/media/r= kvdec/Kconfig index dc7292f346fa..e963d60cc6ad 100644 --- a/drivers/staging/media/rkvdec/Kconfig +++ b/drivers/staging/media/rkvdec/Kconfig @@ -2,7 +2,7 @@ config VIDEO_ROCKCHIP_VDEC tristate "Rockchip Video Decoder driver" depends on ARCH_ROCKCHIP || COMPILE_TEST - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV select MEDIA_CONTROLLER select MEDIA_CONTROLLER_REQUEST_API select VIDEOBUF2_DMA_CONTIG diff --git a/drivers/staging/media/sunxi/cedrus/Kconfig b/drivers/staging/m= edia/sunxi/cedrus/Kconfig index da369950bbf2..21c13f9b6e33 100644 --- a/drivers/staging/media/sunxi/cedrus/Kconfig +++ b/drivers/staging/media/sunxi/cedrus/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 config VIDEO_SUNXI_CEDRUS tristate "Allwinner Cedrus VPU driver" - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV depends on HAS_DMA depends on OF select MEDIA_CONTROLLER diff --git a/drivers/staging/media/tegra-video/Kconfig b/drivers/staging/me= dia/tegra-video/Kconfig index 1f35da4b134e..df1b2cff2417 100644 --- a/drivers/staging/media/tegra-video/Kconfig +++ b/drivers/staging/media/tegra-video/Kconfig @@ -2,7 +2,7 @@ config VIDEO_TEGRA tristate "NVIDIA Tegra VI driver" depends on TEGRA_HOST1X - depends on VIDEO_V4L2 + depends on VIDEO_DEV select MEDIA_CONTROLLER select VIDEOBUF2_DMA_CONTIG select V4L2_FWNODE diff --git a/drivers/staging/media/zoran/Kconfig b/drivers/staging/media/zo= ran/Kconfig index faef008b8554..3fb3e27e04a8 100644 --- a/drivers/staging/media/zoran/Kconfig +++ b/drivers/staging/media/zoran/Kconfig @@ -1,6 +1,6 @@ config VIDEO_ZORAN tristate "Zoran ZR36057/36067 Video For Linux (Deprecated)" - depends on PCI && I2C_ALGOBIT && VIDEO_V4L2 + depends on PCI && I2C_ALGOBIT && VIDEO_DEV depends on !ALPHA depends on DEBUG_FS select VIDEOBUF2_DMA_CONTIG diff --git a/drivers/staging/most/video/Kconfig b/drivers/staging/most/vide= o/Kconfig index e0964ca5e7b3..e16cc5e104b7 100644 --- a/drivers/staging/most/video/Kconfig +++ b/drivers/staging/most/video/Kconfig @@ -5,7 +5,7 @@ =20 config MOST_VIDEO tristate "Video" - depends on VIDEO_V4L2 + depends on VIDEO_DEV help Say Y here if you want to commumicate via Video 4 Linux. =20 diff --git a/drivers/staging/vc04_services/bcm2835-camera/Kconfig b/drivers= /staging/vc04_services/bcm2835-camera/Kconfig index d0653d1ed3c7..dcda565f9b38 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/Kconfig +++ b/drivers/staging/vc04_services/bcm2835-camera/Kconfig @@ -2,7 +2,7 @@ config VIDEO_BCM2835 tristate "BCM2835 Camera" depends on MEDIA_SUPPORT - depends on VIDEO_V4L2 && (ARCH_BCM2835 || COMPILE_TEST) + depends on VIDEO_DEV && (ARCH_BCM2835 || COMPILE_TEST) select BCM2835_VCHIQ select BCM2835_VCHIQ_MMAL select VIDEOBUF2_VMALLOC diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index dd58094f0b85..4fa2ddf322b4 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -448,7 +448,7 @@ config USB_CONFIGFS_F_HID config USB_CONFIGFS_F_UVC bool "USB Webcam function" depends on USB_CONFIGFS - depends on VIDEO_V4L2 + depends on VIDEO_DEV depends on VIDEO_DEV select VIDEOBUF2_DMA_SG select VIDEOBUF2_VMALLOC diff --git a/drivers/usb/gadget/legacy/Kconfig b/drivers/usb/gadget/legacy/= Kconfig index de6668e58481..0a7b382fbe27 100644 --- a/drivers/usb/gadget/legacy/Kconfig +++ b/drivers/usb/gadget/legacy/Kconfig @@ -500,7 +500,7 @@ endif # or video class gadget drivers), or specific hardware, here. config USB_G_WEBCAM tristate "USB Webcam Gadget" - depends on VIDEO_V4L2 + depends on VIDEO_DEV select USB_LIBCOMPOSITE select VIDEOBUF2_DMA_SG select VIDEOBUF2_VMALLOC diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 41ce12597177..a55836225401 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -559,7 +559,7 @@ config SND_ES1968_RADIO bool "Enable TEA5757 radio tuner support for es1968" depends on SND_ES1968 depends on MEDIA_RADIO_SUPPORT - depends on VIDEO_V4L2=3Dy || VIDEO_V4L2=3DSND_ES1968 + depends on VIDEO_DEV=3Dy || VIDEO_DEV=3DSND_ES1968 select RADIO_ADAPTERS select RADIO_TEA575X =20 @@ -583,7 +583,7 @@ config SND_FM801_TEA575X_BOOL bool "ForteMedia FM801 + TEA5757 tuner" depends on SND_FM801 depends on MEDIA_RADIO_SUPPORT - depends on VIDEO_V4L2=3Dy || VIDEO_V4L2=3DSND_FM801 + depends on VIDEO_DEV=3Dy || VIDEO_DEV=3DSND_FM801 select RADIO_ADAPTERS select RADIO_TEA575X help --=20 2.35.1