From patchwork Tue Mar 24 14:26:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455661 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 411FC159A for ; Tue, 24 Mar 2020 14:26:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A9CA2080C for ; Tue, 24 Mar 2020 14:26:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059998; bh=X/F1qWsmyNf72Fejws4IM6/sAtChB+ci2BuEUkaM1RI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=m33ua/LmEUJPQEEZDnOfpRgTzj39ytuohg3a85vP4/2lTmq61S+D1NmuvHaGKfzSE 7t2HtIUKSXpv6Vs7gsfWvIkBWSefIa6JkJZQAlNAaBOXK3RneXFmv4K9k5A8jPz+Uu +jNrS8xnrhmPpKS4pN5qjQA9eHPW14ARLayIKXQU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727938AbgCXO00 (ORCPT ); Tue, 24 Mar 2020 10:26:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:35646 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727605AbgCXO0Z (ORCPT ); Tue, 24 Mar 2020 10:26:25 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3F8C020789; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059985; bh=X/F1qWsmyNf72Fejws4IM6/sAtChB+ci2BuEUkaM1RI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OSBhrdUmcLXsZRF9L7osBM39/yI/Ll/+WST+kCfLXxhPUX9wwGPdqeuZupcZc+7di IGcUI02/vyAx29oI3Q5bsLt2jgyIwQ4SZZOhsVgR0qGiGOlKYdsCo0BcIau4F3Zt7A KGl5FkWsPYik1eeDrmP9tOtXFeeB4y7RYnw25Uro= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVb-00266P-Fu; Tue, 24 Mar 2020 15:26:23 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab Subject: [PATCH v2 01/20] media: dvb-usb: auto-select CYPRESS_FIRMWARE Date: Tue, 24 Mar 2020 15:26:02 +0100 Message-Id: <712ca59ba2e1185fc505b52eba9eb3575467f393.1585059896.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org At least some of the supported boards by dvb-usb driver need to load the cypress firmware, so select it, as otherwise missing dependencies may popup. Also, as the cypress firmware load routines are needed only by the dvb-usb, dvb-usb-v2 and go7007 drivers, and those all (now) select it, there's no need to ask the user for manually select it. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/common/Kconfig | 2 +- drivers/media/usb/dvb-usb/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig index 1990b7f09454..4ea03b7899a8 100644 --- a/drivers/media/common/Kconfig +++ b/drivers/media/common/Kconfig @@ -14,7 +14,7 @@ config VIDEO_TVEEPROM depends on I2C config CYPRESS_FIRMWARE - tristate "Cypress firmware helper routines" + tristate depends on USB source "drivers/media/common/videobuf2/Kconfig" diff --git a/drivers/media/usb/dvb-usb/Kconfig b/drivers/media/usb/dvb-usb/Kconfig index 1a3e5f965ae4..42334a02cdce 100644 --- a/drivers/media/usb/dvb-usb/Kconfig +++ b/drivers/media/usb/dvb-usb/Kconfig @@ -2,6 +2,7 @@ config DVB_USB tristate "Support for various USB DVB devices" depends on DVB_CORE && USB && I2C && RC_CORE + select CYPRESS_FIRMWARE help By enabling this you will be able to choose the various supported USB1.1 and USB2.0 DVB devices. From patchwork Tue Mar 24 14:26:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455625 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 92D961667 for ; Tue, 24 Mar 2020 14:26:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 70A03208DB for ; Tue, 24 Mar 2020 14:26:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059987; bh=PMZLvau6l0DTq6hZbaVXDrSebT6xY40VOvUd+dhMy3g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=b4/ae7L/ZhwprjLiBA1zZ+L90PAGes+5g6+5CDholdY8JqL5xp9O6JZTGh3dckmJp rZccJ7hEAqQTWEqRgn68Wo5icyqNVthDlMvz3+OmnHai8wub9SzHVDA4zldZsZvSA7 imjM1AE8z6nCIJPWURReQ9W3aHm4G9NYu2vBFU80= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728227AbgCXO00 (ORCPT ); Tue, 24 Mar 2020 10:26:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:35676 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727708AbgCXO0Z (ORCPT ); Tue, 24 Mar 2020 10:26:25 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 507712080C; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059985; bh=PMZLvau6l0DTq6hZbaVXDrSebT6xY40VOvUd+dhMy3g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KEfGxndlwReoMWinWpkgMISRaygsaKm0Q4pXckZY232Qw7a9aiyD8xWq1fdN02G12 Q0vrbrTB/0QygkF2lrr1O+4VG8CtYAjhTNTYAz4sGMtQyRwPIGHDHGkBL/gKNjC7Y9 VA/EhXz2L1GR+E9cxdtPmtoaDyOm3gA9qyXYLcfA= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVb-00266T-HL; Tue, 24 Mar 2020 15:26:23 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab Subject: [PATCH v2 02/20] media: Kconfig: not all V4L2 platform drivers are for camera Date: Tue, 24 Mar 2020 15:26:03 +0100 Message-Id: X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org When the platform drivers got added, they were all part of complex camera support. This is not the case anymore, as we now have codecs and other stuff there too. So, fix the dependencies, in order to not require users to manually select something that it doesn't make sense. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/Kconfig | 3 +-- drivers/media/platform/Kconfig | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 9dfea5c4b6ab..4af21fa73fcf 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -99,8 +99,7 @@ source "drivers/media/mc/Kconfig" config VIDEO_DEV tristate depends on MEDIA_SUPPORT - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT - default y + default MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT || V4L_PLATFORM_DRIVERS config VIDEO_V4L2_SUBDEV_API bool "V4L2 sub-device userspace API" diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index e01bbb9dd1c1..34f40c2c8c45 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -5,7 +5,6 @@ menuconfig V4L_PLATFORM_DRIVERS bool "V4L platform devices" - depends on MEDIA_CAMERA_SUPPORT help Say Y here to enable support for platform-specific V4L drivers. From patchwork Tue Mar 24 14:26:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455639 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7C1E1159A for ; Tue, 24 Mar 2020 14:26:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5276120B1F for ; Tue, 24 Mar 2020 14:26:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059991; bh=Ng776RDVUtwc7KQiVz21I8I2Wgral1f/GNSOxXixasQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2NJdoWxrT22mocAgj5V6cSMV5/TWbt0k9rYcahw3xzK0c3T2Ut8cAXgSeKhIJ3Aod rM7ohFPQnxIC+H2qRrSDPJMD9lYrNvkzuzE6+8miSQ8bkZRCyy8F5Sb2VNkuxEeYzX oqpamnP7d0l1wg379Mva1OkgpVNA+1DxHHiQItUM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728281AbgCXO01 (ORCPT ); Tue, 24 Mar 2020 10:26:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:35686 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727718AbgCXO00 (ORCPT ); Tue, 24 Mar 2020 10:26:26 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 54D4920870; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059985; bh=Ng776RDVUtwc7KQiVz21I8I2Wgral1f/GNSOxXixasQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bZfIBNLhoTZ6J6sIw47+r67TcOA2qEe4GBEFTvOXONJ8ly2pIXuqVjjoJgzNCsQrL Jq24oR4q97gKlSV2YimkEt0tRN0/TMmXEwJ2Rib/E2qsqAnakhoIgrUbGphOtorAM6 E/lmyNfMUyZkWS/TtokRqq8w11UGr0+Vubw9p1nk= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVb-00266Y-JP; Tue, 24 Mar 2020 15:26:23 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab Subject: [PATCH v2 03/20] media: pci: move VIDEO_PCI_SKELETON to a different Kconfig Date: Tue, 24 Mar 2020 15:26:04 +0100 Message-Id: X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The V4L2 PCI skeleton is not part of the V4L2 core. Move it to appear together with the other PCI drivers, at the end, as this is something that normal users don't even need to bother. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/pci/Kconfig | 10 ++++++++++ drivers/media/v4l2-core/Kconfig | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig index dcb3719f440e..9336f8446cf0 100644 --- a/drivers/media/pci/Kconfig +++ b/drivers/media/pci/Kconfig @@ -56,5 +56,15 @@ endif source "drivers/media/pci/intel/ipu3/Kconfig" +config VIDEO_PCI_SKELETON + tristate "Skeleton PCI V4L2 driver" + depends on PCI + depends on SAMPLES + depends on VIDEO_V4L2 && VIDEOBUF2_CORE + depends on VIDEOBUF2_MEMOPS && VIDEOBUF2_DMA_CONTIG + help + Enable build of the skeleton PCI driver, used as a reference + when developing new drivers. + endif #MEDIA_PCI_SUPPORT endif #PCI diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig index 39e3fb30ba0b..26276b257eae 100644 --- a/drivers/media/v4l2-core/Kconfig +++ b/drivers/media/v4l2-core/Kconfig @@ -31,16 +31,6 @@ config VIDEO_FIXED_MINOR_RANGES When in doubt, say N. -config VIDEO_PCI_SKELETON - tristate "Skeleton PCI V4L2 driver" - depends on PCI - depends on SAMPLES - depends on VIDEO_V4L2 && VIDEOBUF2_CORE - depends on VIDEOBUF2_MEMOPS && VIDEOBUF2_DMA_CONTIG - help - Enable build of the skeleton PCI driver, used as a reference - when developing new drivers. - # Used by drivers that need tuner.ko config VIDEO_TUNER tristate From patchwork Tue Mar 24 14:26:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455627 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D720A17EF for ; Tue, 24 Mar 2020 14:26:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B8CC9208E0 for ; Tue, 24 Mar 2020 14:26:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059987; bh=mvF+8DJswgww3SrqFXIL4DAo4Hpgzr3yTYJuJvmcW+8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PSBpKdeb5aedg7srbujTSmL6LqdN0udoXgnp39zwRsytJyX2lx/w12t5R/hqLdCQY /4/dBT6jOPLkv9G7ei51dmiO8kzLuU3WSbSWWWvafFD/cRkHyrIn2riJaZuF6GdtQE Rli2GynYwsr93NqcMkqN5aqrAQbjVh9x/cktX49s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728341AbgCXO01 (ORCPT ); Tue, 24 Mar 2020 10:26:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:35696 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727742AbgCXO0Z (ORCPT ); Tue, 24 Mar 2020 10:26:25 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 65FC5208C3; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059985; bh=mvF+8DJswgww3SrqFXIL4DAo4Hpgzr3yTYJuJvmcW+8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nbP/ERdGenbWCgZTWsCzwAOTeOrMq1jmLhcQMDO4fCBT+5ee3pnHIGdUP/flmmKJ2 GsPBIConn75+DZSMTMPXu5fERvQMch67wMS44PRp7uUuSWVqhC3kGvyugL49e9vBaj gIbqNfq3775nTXDfV6J4DAkae6Iemn6yiqAdT990= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVb-00266e-Km; Tue, 24 Mar 2020 15:26:23 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab Subject: [PATCH v2 04/20] media: reorganize the drivers menu options Date: Tue, 24 Mar 2020 15:26:05 +0100 Message-Id: <3b18b5ba614d354fead81fce1bbcd3f94026d1e8.1585059896.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The comments before some of the drivers support look weird, because their Kconfig have their own "comment" directive inside it. So, rearrange them to make it look a little nicer for the ones with are not too familiar with the media system. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/Kconfig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 4af21fa73fcf..586d8931d9fc 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -87,6 +87,8 @@ config MEDIA_CEC_SUPPORT Say Y when you have an HDMI receiver, transmitter or a USB CEC adapter that supports HDMI CEC. +comment "Media core options" + source "drivers/media/cec/Kconfig" source "drivers/media/mc/Kconfig" @@ -166,17 +168,17 @@ comment "Media drivers" source "drivers/media/usb/Kconfig" source "drivers/media/pci/Kconfig" +source "drivers/media/radio/Kconfig" + +# Common driver options +source "drivers/media/common/Kconfig" source "drivers/media/platform/Kconfig" source "drivers/media/mmc/Kconfig" -source "drivers/media/radio/Kconfig" comment "Supported FireWire (IEEE 1394) Adapters" depends on DVB_CORE && FIREWIRE source "drivers/media/firewire/Kconfig" -# Common driver options -source "drivers/media/common/Kconfig" - comment "Media ancillary drivers (tuners, sensors, i2c, spi, frontends)" # From patchwork Tue Mar 24 14:26:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455629 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C9F0D159A for ; Tue, 24 Mar 2020 14:26:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A0F70208E0 for ; Tue, 24 Mar 2020 14:26:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059988; bh=cL0BLqma9/afGrVRw6wv2HjXvWZfwS9SlngDwmWrnZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=o/YohFho2GXgPBWW0bzmzhx5of6PPiAlULuc02K7nrkKS9xOelcV2a5AQpIpks2XY nCRcsnSmN7iJ4l8vbEUSImiioQqgByLumnua4I8bey+yZAnJDyvYwaCFcem51hDE2C LSvWksW/0QDKiXJiU608wk50xUQjZvBcISCyKOCg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728355AbgCXO01 (ORCPT ); Tue, 24 Mar 2020 10:26:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:35806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727894AbgCXO00 (ORCPT ); Tue, 24 Mar 2020 10:26:26 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 76CD4208E0; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059985; bh=cL0BLqma9/afGrVRw6wv2HjXvWZfwS9SlngDwmWrnZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uXM6P83Dsxuo6s/hfOhIyrIi42bB1fXrK4HAFIrBK0e77IjeI2WsCTRywAS6xWdmR MMvUzAJ4UDHnwhTrQ7RoAKaRCqYy7zVqgUqR0IHb+Egs091+RrG5gSS4hvhF69n+t9 6Vm/9OerIEiPn6rPTbQ1gf53q7GcyBh6vUgO95nc= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVb-00266j-MC; Tue, 24 Mar 2020 15:26:23 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab Subject: [PATCH v2 05/20] media: Kconfig: update the MEDIA_SUPPORT help message Date: Tue, 24 Mar 2020 15:26:06 +0100 Message-Id: X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org There are more things than just cameras and TV devices on media. Update the help message accordingly. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/Kconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 586d8931d9fc..18dea82d76d7 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -18,8 +18,10 @@ menuconfig MEDIA_SUPPORT tristate "Multimedia support" depends on HAS_IOMEM help - If you want to use Webcams, Video grabber devices and/or TV devices - enable this option and other options below. + If you want to use media devices, including Webcams, Video grabber + devices and/or TV devices, V4L2 codecs, etc, enable this option + and other options below. + Additional info and docs are available on the web at From patchwork Tue Mar 24 14:26:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455649 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 892651667 for ; Tue, 24 Mar 2020 14:26:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6BDBB20870 for ; Tue, 24 Mar 2020 14:26:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059994; bh=BJ2Wn1y+AKLeMhXpjgpfv7bwnUWM8CBInq+znT5z4d8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=s4097YaldDJyiUMU26Vet0gmyo1i9JI7P0ARqw5MWXvw9ZeXg6BpCSj4C2BdbZHNT 91YMbbR0wlrA6J3j0EO7kKR2RtIjWcxvlEpybKXZvQCQCOU71sNiuT087nJmpxjSam okLDkfbgapX3y12u/uMHadvre92h1IN0HuHYC8sM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728503AbgCXO0d (ORCPT ); Tue, 24 Mar 2020 10:26:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:35804 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727868AbgCXO00 (ORCPT ); Tue, 24 Mar 2020 10:26:26 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 75313208DB; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059985; bh=BJ2Wn1y+AKLeMhXpjgpfv7bwnUWM8CBInq+znT5z4d8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pKyDtPwj1X6h2VX0vT9wE9oDRm16EbIia3QeY4FY/t32oj1cXKH2WDMm6GSSATqR9 i50emKmRSYgOSdzngNlK2wk5lmyuekle29n0oTIbvMPveYJ4FmyhVP6GsnBjakMzGg 9O19WrIzgseBKog9bH3X8NZvH+ZLZS40zAUDwIxs= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVb-00266o-N8; Tue, 24 Mar 2020 15:26:23 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab Subject: [PATCH v2 06/20] media: Kconfig: use a sub-menu to select supported devices Date: Tue, 24 Mar 2020 15:26:07 +0100 Message-Id: <72a1168a8d48bd603ef1e13350bbc49bdc036544.1585059896.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The media subsystem has hundreds of driver-specific options. The *_SUPPORT config options work as a sort of filter, allowing to reduce its complexity for users that won't want to dig into thousands of options they don't need. Yet, it the filtering options are becoming large. So, let's place it on a sub-menu. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/Kconfig | 22 +++++++++++++--------- drivers/media/mmc/Kconfig | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 18dea82d76d7..e266d1afa912 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -25,22 +25,21 @@ menuconfig MEDIA_SUPPORT Additional info and docs are available on the web at -if MEDIA_SUPPORT - -comment "Multimedia core support" +menu "Types of devices to be supported" + depends on MEDIA_SUPPORT # # Multimedia support - automatically enable V4L2 and DVB core # config MEDIA_CAMERA_SUPPORT - bool "Cameras/video grabbers support" + bool "Cameras and video grabbers" help Enable support for webcams and video grabbers. Say Y when you have a webcam or a video capture grabber board. config MEDIA_ANALOG_TV_SUPPORT - bool "Analog TV support" + bool "Analog TV" help Enable analog TV support. @@ -52,7 +51,7 @@ config MEDIA_ANALOG_TV_SUPPORT will disable support for them. config MEDIA_DIGITAL_TV_SUPPORT - bool "Digital TV support" + bool "Digital TV" help Enable digital TV support. @@ -60,7 +59,7 @@ config MEDIA_DIGITAL_TV_SUPPORT hybrid digital TV and analog TV. config MEDIA_RADIO_SUPPORT - bool "AM/FM radio receivers/transmitters support" + bool "AM/FM radio receivers/transmitters" help Enable AM/FM radio support. @@ -74,7 +73,7 @@ config MEDIA_RADIO_SUPPORT disable support for them. config MEDIA_SDR_SUPPORT - bool "Software defined radio support" + bool "Software defined radio" help Enable software defined radio support. @@ -89,6 +88,10 @@ config MEDIA_CEC_SUPPORT Say Y when you have an HDMI receiver, transmitter or a USB CEC adapter that supports HDMI CEC. +endmenu # media support types + +if MEDIA_SUPPORT + comment "Media core options" source "drivers/media/cec/Kconfig" @@ -177,7 +180,8 @@ source "drivers/media/common/Kconfig" source "drivers/media/platform/Kconfig" source "drivers/media/mmc/Kconfig" -comment "Supported FireWire (IEEE 1394) Adapters" + +comment "FireWire (IEEE 1394) Adapters" depends on DVB_CORE && FIREWIRE source "drivers/media/firewire/Kconfig" diff --git a/drivers/media/mmc/Kconfig b/drivers/media/mmc/Kconfig index de0528c6994a..5217f5bd205e 100644 --- a/drivers/media/mmc/Kconfig +++ b/drivers/media/mmc/Kconfig @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -comment "Supported MMC/SDIO adapters" +comment "MMC/SDIO adapters" source "drivers/media/mmc/siano/Kconfig" From patchwork Tue Mar 24 14:26:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455665 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0B423159A for ; Tue, 24 Mar 2020 14:26:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DF9B62080C for ; Tue, 24 Mar 2020 14:26:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059998; bh=Wn32YEXlsFeyH0U1lHQAPIpXDBsqxsEtcqAGcnsGtIA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rkbzSyaUBmhLkQLoc/HBJyE6xXK0Se+bMn/wejKixtPZjz7qo/OlWBoAuE8tt4u8S Ghry9cqzVysO+oK93/AUwT7zOE5oBJjV32883tZYEBAGL3n7J9Xy+6g6PJnsJP1plI +R8u1W0lBJnfz5iOaCrZR6AoCg2gUMpdaCQ5oyYM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728786AbgCXO0h (ORCPT ); Tue, 24 Mar 2020 10:26:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:35808 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727530AbgCXO00 (ORCPT ); Tue, 24 Mar 2020 10:26:26 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7D2C820BED; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059985; bh=Wn32YEXlsFeyH0U1lHQAPIpXDBsqxsEtcqAGcnsGtIA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fihTGl90BKi+65Fzmf7DFqZlEO3aGNIa40bKpITjIjISSNmUYylROagHhISTGIZbp 7o4hZ8ATFf77BLNAkGlSuxSZtGsEZv/liY4S5BVX5ckufFHC7U3ZCH0PzCVdw493+b nSS7+073w3GscAeJ+Oo6eHVk6VsHTFbYl/+O5dWM= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVb-00266t-O5; Tue, 24 Mar 2020 15:26:23 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab Subject: [PATCH v2 07/20] media: Kconfig: add an option to filter in/out the embedded drivers Date: Tue, 24 Mar 2020 15:26:08 +0100 Message-Id: <23242586947faec259eabc545415592a5ea9ac92.1585059896.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Most systems don't need support for those, while others only need those, instead of the others. So, add an option to filter in/out the SoC specific drivers. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/Kconfig | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index e266d1afa912..a57e2198b2db 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -88,6 +88,14 @@ config MEDIA_CEC_SUPPORT Say Y when you have an HDMI receiver, transmitter or a USB CEC adapter that supports HDMI CEC. +config MEDIA_EMBEDDED_SUPPORT + bool "Embedded devices (SoC)" + help + Enable support for complex cameras, codecs, and other hardware + found on Embedded hardware (SoC). + + Say Y when you have a software defined radio device. + endmenu # media support types if MEDIA_SUPPORT @@ -177,9 +185,13 @@ source "drivers/media/radio/Kconfig" # Common driver options source "drivers/media/common/Kconfig" + +if MEDIA_EMBEDDED_SUPPORT + source "drivers/media/platform/Kconfig" source "drivers/media/mmc/Kconfig" +endif # MEDIA_EMBEDDED_SUPPORT comment "FireWire (IEEE 1394) Adapters" depends on DVB_CORE && FIREWIRE From patchwork Tue Mar 24 14:26:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455655 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8067617EF for ; Tue, 24 Mar 2020 14:26:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CA832080C for ; Tue, 24 Mar 2020 14:26:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059996; bh=t1w/3Bl96M1rY+RCdhgbjvz6MFvhbbrlo4PX8E/mjGw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iUwC7s935JJx9ucLdXQT1om5pRLxk13ZcfC7nsDqdO7mG05uvdKOKtGHmjSdIaks8 pPaAH7diez9OujA9xQTkHTZHUYtpDfqqR59CRIIKVn3YW6VqZUjzuNF1BsRAmfCeYQ PhydXShNz/O5AwCarHYNHr1iS7d2dp145Y1mqrCs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728590AbgCXO0e (ORCPT ); Tue, 24 Mar 2020 10:26:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:35828 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728134AbgCXO00 (ORCPT ); Tue, 24 Mar 2020 10:26:26 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8D9C52137B; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059985; bh=t1w/3Bl96M1rY+RCdhgbjvz6MFvhbbrlo4PX8E/mjGw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xdf2IQ57EgTDM8nxRJ5VW8kaijq3ywgOWh1wEsI8BTzd1D+g0JiZXgOpyVMkctOv3 9PAm7G5L08w++tRDs/heb17AdLBRVnP36m6NtPov+pDnjIUcyRaxE5UDG4SBFFIQgh 3uPI3b31PUSqYKnrYzI4KNnxY+c8OwQJDCo5vNm4= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVb-00266z-Pr; Tue, 24 Mar 2020 15:26:23 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab , Hans Verkuil , Helen Koike , Shuah Khan Subject: [PATCH v2 08/20] media: split test drivers from platform directory Date: Tue, 24 Mar 2020 15:26:09 +0100 Message-Id: <6b351f5bd73890d4ba85a5e73ae7169fe9772439.1585059896.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org When the first test device was added (vivi.c), there were just one file. I was too lazy on that time to create a separate directory just for it, so I kept it together with platform. Now, we have vivid, vicodec, vim2m and vimc. Also, a new virtual driver has been prepared to support DVB API. So, it is time to solve this mess, by placing test stuff on a separate directory. It should be noticed that we also have some skeleton drivers (for V4L and for DVB). For now, we'll keep them separate, as they're not really test drivers, but instead, just examples. The DVB frontend ones will likely be part of a new DVB test driver. By that time, it should make sense to move them here as well. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/Kconfig | 12 ++++++++ drivers/media/platform/Kconfig | 23 --------------- drivers/media/platform/Makefile | 5 ---- drivers/media/test_drivers/Kconfig | 28 +++++++++++++++++++ drivers/media/test_drivers/Makefile | 9 ++++++ .../vicodec/Kconfig | 0 .../vicodec/Makefile | 0 .../vicodec/codec-fwht.c | 0 .../vicodec/codec-fwht.h | 0 .../vicodec/codec-v4l2-fwht.c | 0 .../vicodec/codec-v4l2-fwht.h | 0 .../vicodec/vicodec-core.c | 0 .../media/{platform => test_drivers}/vim2m.c | 0 .../{platform => test_drivers}/vimc/Kconfig | 0 .../{platform => test_drivers}/vimc/Makefile | 0 .../vimc/vimc-capture.c | 0 .../vimc/vimc-common.c | 0 .../vimc/vimc-common.h | 0 .../vimc/vimc-core.c | 0 .../vimc/vimc-debayer.c | 0 .../vimc/vimc-scaler.c | 0 .../vimc/vimc-sensor.c | 0 .../vimc/vimc-streamer.c | 0 .../vimc/vimc-streamer.h | 0 .../{platform => test_drivers}/vivid/Kconfig | 0 .../{platform => test_drivers}/vivid/Makefile | 0 .../vivid/vivid-cec.c | 0 .../vivid/vivid-cec.h | 0 .../vivid/vivid-core.c | 0 .../vivid/vivid-core.h | 0 .../vivid/vivid-ctrls.c | 0 .../vivid/vivid-ctrls.h | 0 .../vivid/vivid-kthread-cap.c | 0 .../vivid/vivid-kthread-cap.h | 0 .../vivid/vivid-kthread-out.c | 0 .../vivid/vivid-kthread-out.h | 0 .../vivid/vivid-kthread-touch.c | 0 .../vivid/vivid-kthread-touch.h | 0 .../vivid/vivid-meta-cap.c | 0 .../vivid/vivid-meta-cap.h | 0 .../vivid/vivid-meta-out.c | 0 .../vivid/vivid-meta-out.h | 0 .../vivid/vivid-osd.c | 0 .../vivid/vivid-osd.h | 0 .../vivid/vivid-radio-common.c | 0 .../vivid/vivid-radio-common.h | 0 .../vivid/vivid-radio-rx.c | 0 .../vivid/vivid-radio-rx.h | 0 .../vivid/vivid-radio-tx.c | 0 .../vivid/vivid-radio-tx.h | 0 .../vivid/vivid-rds-gen.c | 0 .../vivid/vivid-rds-gen.h | 0 .../vivid/vivid-sdr-cap.c | 0 .../vivid/vivid-sdr-cap.h | 0 .../vivid/vivid-touch-cap.c | 0 .../vivid/vivid-touch-cap.h | 0 .../vivid/vivid-vbi-cap.c | 0 .../vivid/vivid-vbi-cap.h | 0 .../vivid/vivid-vbi-gen.c | 0 .../vivid/vivid-vbi-gen.h | 0 .../vivid/vivid-vbi-out.c | 0 .../vivid/vivid-vbi-out.h | 0 .../vivid/vivid-vid-cap.c | 0 .../vivid/vivid-vid-cap.h | 0 .../vivid/vivid-vid-common.c | 0 .../vivid/vivid-vid-common.h | 0 .../vivid/vivid-vid-out.c | 0 .../vivid/vivid-vid-out.h | 0 68 files changed, 49 insertions(+), 28 deletions(-) create mode 100644 drivers/media/test_drivers/Kconfig create mode 100644 drivers/media/test_drivers/Makefile rename drivers/media/{platform => test_drivers}/vicodec/Kconfig (100%) rename drivers/media/{platform => test_drivers}/vicodec/Makefile (100%) rename drivers/media/{platform => test_drivers}/vicodec/codec-fwht.c (100%) rename drivers/media/{platform => test_drivers}/vicodec/codec-fwht.h (100%) rename drivers/media/{platform => test_drivers}/vicodec/codec-v4l2-fwht.c (100%) rename drivers/media/{platform => test_drivers}/vicodec/codec-v4l2-fwht.h (100%) rename drivers/media/{platform => test_drivers}/vicodec/vicodec-core.c (100%) rename drivers/media/{platform => test_drivers}/vim2m.c (100%) rename drivers/media/{platform => test_drivers}/vimc/Kconfig (100%) rename drivers/media/{platform => test_drivers}/vimc/Makefile (100%) rename drivers/media/{platform => test_drivers}/vimc/vimc-capture.c (100%) rename drivers/media/{platform => test_drivers}/vimc/vimc-common.c (100%) rename drivers/media/{platform => test_drivers}/vimc/vimc-common.h (100%) rename drivers/media/{platform => test_drivers}/vimc/vimc-core.c (100%) rename drivers/media/{platform => test_drivers}/vimc/vimc-debayer.c (100%) rename drivers/media/{platform => test_drivers}/vimc/vimc-scaler.c (100%) rename drivers/media/{platform => test_drivers}/vimc/vimc-sensor.c (100%) rename drivers/media/{platform => test_drivers}/vimc/vimc-streamer.c (100%) rename drivers/media/{platform => test_drivers}/vimc/vimc-streamer.h (100%) rename drivers/media/{platform => test_drivers}/vivid/Kconfig (100%) rename drivers/media/{platform => test_drivers}/vivid/Makefile (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-cec.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-cec.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-core.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-core.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-ctrls.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-ctrls.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-kthread-cap.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-kthread-cap.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-kthread-out.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-kthread-out.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-kthread-touch.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-kthread-touch.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-meta-cap.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-meta-cap.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-meta-out.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-meta-out.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-osd.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-osd.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-radio-common.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-radio-common.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-radio-rx.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-radio-rx.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-radio-tx.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-radio-tx.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-rds-gen.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-rds-gen.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-sdr-cap.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-sdr-cap.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-touch-cap.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-touch-cap.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-vbi-cap.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-vbi-cap.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-vbi-gen.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-vbi-gen.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-vbi-out.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-vbi-out.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-vid-cap.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-vid-cap.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-vid-common.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-vid-common.h (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-vid-out.c (100%) rename drivers/media/{platform => test_drivers}/vivid/vivid-vid-out.h (100%) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index a57e2198b2db..4c06728a4ab7 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -96,6 +96,17 @@ config MEDIA_EMBEDDED_SUPPORT Say Y when you have a software defined radio device. +config MEDIA_TEST_SUPPORT + bool "Test drivers" + help + Those drivers should not be used on production Kernels, but + can be useful on debug ones. It enables several dummy drivers + that simulate a real hardware. Very useful to test userspace + applications and to validate if the subsystem core is doesn't + have regressions. + + Say Y when you have a software defined radio device. + endmenu # media support types if MEDIA_SUPPORT @@ -185,6 +196,7 @@ source "drivers/media/radio/Kconfig" # Common driver options source "drivers/media/common/Kconfig" +source "drivers/media/test_drivers/Kconfig" if MEDIA_EMBEDDED_SUPPORT diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 34f40c2c8c45..057bccc29a38 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -531,29 +531,6 @@ config VIDEO_TI_SC config VIDEO_TI_CSC tristate -menuconfig V4L_TEST_DRIVERS - bool "Media test drivers" - depends on MEDIA_CAMERA_SUPPORT - -if V4L_TEST_DRIVERS - -source "drivers/media/platform/vimc/Kconfig" - -source "drivers/media/platform/vivid/Kconfig" - -config VIDEO_VIM2M - tristate "Virtual Memory-to-Memory Driver" - depends on VIDEO_DEV && VIDEO_V4L2 - select VIDEOBUF2_VMALLOC - select V4L2_MEM2MEM_DEV - help - This is a virtual test device for the memory-to-memory driver - framework. - -source "drivers/media/platform/vicodec/Kconfig" - -endif #V4L_TEST_DRIVERS - menuconfig DVB_PLATFORM_DRIVERS bool "DVB platform devices" depends on MEDIA_DIGITAL_TV_SUPPORT diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index d13db96e3015..a0194ef1211f 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -14,11 +14,6 @@ obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o -obj-$(CONFIG_VIDEO_VIMC) += vimc/ -obj-$(CONFIG_VIDEO_VIVID) += vivid/ -obj-$(CONFIG_VIDEO_VIM2M) += vim2m.o -obj-$(CONFIG_VIDEO_VICODEC) += vicodec/ - obj-y += ti-vpe/ obj-$(CONFIG_VIDEO_MX2_EMMAPRP) += mx2_emmaprp.o diff --git a/drivers/media/test_drivers/Kconfig b/drivers/media/test_drivers/Kconfig new file mode 100644 index 000000000000..258a4d36c0d3 --- /dev/null +++ b/drivers/media/test_drivers/Kconfig @@ -0,0 +1,28 @@ +# SPDX-License-Identifier: GPL-2.0-only + +if MEDIA_TEST_SUPPORT + +menuconfig V4L_TEST_DRIVERS + bool "V4L test drivers" + depends on MEDIA_CAMERA_SUPPORT + +if V4L_TEST_DRIVERS + +source "drivers/media/test_drivers/vimc/Kconfig" + +source "drivers/media/test_drivers/vivid/Kconfig" + +config VIDEO_VIM2M + tristate "Virtual Memory-to-Memory Driver" + depends on VIDEO_DEV && VIDEO_V4L2 + select VIDEOBUF2_VMALLOC + select V4L2_MEM2MEM_DEV + help + This is a virtual test device for the memory-to-memory driver + framework. + +source "drivers/media/test_drivers/vicodec/Kconfig" + +endif #V4L_TEST_DRIVERS + +endif #MEDIA_TEST_SUPPORT diff --git a/drivers/media/test_drivers/Makefile b/drivers/media/test_drivers/Makefile new file mode 100644 index 000000000000..74410d3a9f2d --- /dev/null +++ b/drivers/media/test_drivers/Makefile @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for the test drivers. +# + +obj-$(CONFIG_VIDEO_VIMC) += vimc/ +obj-$(CONFIG_VIDEO_VIVID) += vivid/ +obj-$(CONFIG_VIDEO_VIM2M) += vim2m.o +obj-$(CONFIG_VIDEO_VICODEC) += vicodec/ diff --git a/drivers/media/platform/vicodec/Kconfig b/drivers/media/test_drivers/vicodec/Kconfig similarity index 100% rename from drivers/media/platform/vicodec/Kconfig rename to drivers/media/test_drivers/vicodec/Kconfig diff --git a/drivers/media/platform/vicodec/Makefile b/drivers/media/test_drivers/vicodec/Makefile similarity index 100% rename from drivers/media/platform/vicodec/Makefile rename to drivers/media/test_drivers/vicodec/Makefile diff --git a/drivers/media/platform/vicodec/codec-fwht.c b/drivers/media/test_drivers/vicodec/codec-fwht.c similarity index 100% rename from drivers/media/platform/vicodec/codec-fwht.c rename to drivers/media/test_drivers/vicodec/codec-fwht.c diff --git a/drivers/media/platform/vicodec/codec-fwht.h b/drivers/media/test_drivers/vicodec/codec-fwht.h similarity index 100% rename from drivers/media/platform/vicodec/codec-fwht.h rename to drivers/media/test_drivers/vicodec/codec-fwht.h diff --git a/drivers/media/platform/vicodec/codec-v4l2-fwht.c b/drivers/media/test_drivers/vicodec/codec-v4l2-fwht.c similarity index 100% rename from drivers/media/platform/vicodec/codec-v4l2-fwht.c rename to drivers/media/test_drivers/vicodec/codec-v4l2-fwht.c diff --git a/drivers/media/platform/vicodec/codec-v4l2-fwht.h b/drivers/media/test_drivers/vicodec/codec-v4l2-fwht.h similarity index 100% rename from drivers/media/platform/vicodec/codec-v4l2-fwht.h rename to drivers/media/test_drivers/vicodec/codec-v4l2-fwht.h diff --git a/drivers/media/platform/vicodec/vicodec-core.c b/drivers/media/test_drivers/vicodec/vicodec-core.c similarity index 100% rename from drivers/media/platform/vicodec/vicodec-core.c rename to drivers/media/test_drivers/vicodec/vicodec-core.c diff --git a/drivers/media/platform/vim2m.c b/drivers/media/test_drivers/vim2m.c similarity index 100% rename from drivers/media/platform/vim2m.c rename to drivers/media/test_drivers/vim2m.c diff --git a/drivers/media/platform/vimc/Kconfig b/drivers/media/test_drivers/vimc/Kconfig similarity index 100% rename from drivers/media/platform/vimc/Kconfig rename to drivers/media/test_drivers/vimc/Kconfig diff --git a/drivers/media/platform/vimc/Makefile b/drivers/media/test_drivers/vimc/Makefile similarity index 100% rename from drivers/media/platform/vimc/Makefile rename to drivers/media/test_drivers/vimc/Makefile diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/test_drivers/vimc/vimc-capture.c similarity index 100% rename from drivers/media/platform/vimc/vimc-capture.c rename to drivers/media/test_drivers/vimc/vimc-capture.c diff --git a/drivers/media/platform/vimc/vimc-common.c b/drivers/media/test_drivers/vimc/vimc-common.c similarity index 100% rename from drivers/media/platform/vimc/vimc-common.c rename to drivers/media/test_drivers/vimc/vimc-common.c diff --git a/drivers/media/platform/vimc/vimc-common.h b/drivers/media/test_drivers/vimc/vimc-common.h similarity index 100% rename from drivers/media/platform/vimc/vimc-common.h rename to drivers/media/test_drivers/vimc/vimc-common.h diff --git a/drivers/media/platform/vimc/vimc-core.c b/drivers/media/test_drivers/vimc/vimc-core.c similarity index 100% rename from drivers/media/platform/vimc/vimc-core.c rename to drivers/media/test_drivers/vimc/vimc-core.c diff --git a/drivers/media/platform/vimc/vimc-debayer.c b/drivers/media/test_drivers/vimc/vimc-debayer.c similarity index 100% rename from drivers/media/platform/vimc/vimc-debayer.c rename to drivers/media/test_drivers/vimc/vimc-debayer.c diff --git a/drivers/media/platform/vimc/vimc-scaler.c b/drivers/media/test_drivers/vimc/vimc-scaler.c similarity index 100% rename from drivers/media/platform/vimc/vimc-scaler.c rename to drivers/media/test_drivers/vimc/vimc-scaler.c diff --git a/drivers/media/platform/vimc/vimc-sensor.c b/drivers/media/test_drivers/vimc/vimc-sensor.c similarity index 100% rename from drivers/media/platform/vimc/vimc-sensor.c rename to drivers/media/test_drivers/vimc/vimc-sensor.c diff --git a/drivers/media/platform/vimc/vimc-streamer.c b/drivers/media/test_drivers/vimc/vimc-streamer.c similarity index 100% rename from drivers/media/platform/vimc/vimc-streamer.c rename to drivers/media/test_drivers/vimc/vimc-streamer.c diff --git a/drivers/media/platform/vimc/vimc-streamer.h b/drivers/media/test_drivers/vimc/vimc-streamer.h similarity index 100% rename from drivers/media/platform/vimc/vimc-streamer.h rename to drivers/media/test_drivers/vimc/vimc-streamer.h diff --git a/drivers/media/platform/vivid/Kconfig b/drivers/media/test_drivers/vivid/Kconfig similarity index 100% rename from drivers/media/platform/vivid/Kconfig rename to drivers/media/test_drivers/vivid/Kconfig diff --git a/drivers/media/platform/vivid/Makefile b/drivers/media/test_drivers/vivid/Makefile similarity index 100% rename from drivers/media/platform/vivid/Makefile rename to drivers/media/test_drivers/vivid/Makefile diff --git a/drivers/media/platform/vivid/vivid-cec.c b/drivers/media/test_drivers/vivid/vivid-cec.c similarity index 100% rename from drivers/media/platform/vivid/vivid-cec.c rename to drivers/media/test_drivers/vivid/vivid-cec.c diff --git a/drivers/media/platform/vivid/vivid-cec.h b/drivers/media/test_drivers/vivid/vivid-cec.h similarity index 100% rename from drivers/media/platform/vivid/vivid-cec.h rename to drivers/media/test_drivers/vivid/vivid-cec.h diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/test_drivers/vivid/vivid-core.c similarity index 100% rename from drivers/media/platform/vivid/vivid-core.c rename to drivers/media/test_drivers/vivid/vivid-core.c diff --git a/drivers/media/platform/vivid/vivid-core.h b/drivers/media/test_drivers/vivid/vivid-core.h similarity index 100% rename from drivers/media/platform/vivid/vivid-core.h rename to drivers/media/test_drivers/vivid/vivid-core.h diff --git a/drivers/media/platform/vivid/vivid-ctrls.c b/drivers/media/test_drivers/vivid/vivid-ctrls.c similarity index 100% rename from drivers/media/platform/vivid/vivid-ctrls.c rename to drivers/media/test_drivers/vivid/vivid-ctrls.c diff --git a/drivers/media/platform/vivid/vivid-ctrls.h b/drivers/media/test_drivers/vivid/vivid-ctrls.h similarity index 100% rename from drivers/media/platform/vivid/vivid-ctrls.h rename to drivers/media/test_drivers/vivid/vivid-ctrls.h diff --git a/drivers/media/platform/vivid/vivid-kthread-cap.c b/drivers/media/test_drivers/vivid/vivid-kthread-cap.c similarity index 100% rename from drivers/media/platform/vivid/vivid-kthread-cap.c rename to drivers/media/test_drivers/vivid/vivid-kthread-cap.c diff --git a/drivers/media/platform/vivid/vivid-kthread-cap.h b/drivers/media/test_drivers/vivid/vivid-kthread-cap.h similarity index 100% rename from drivers/media/platform/vivid/vivid-kthread-cap.h rename to drivers/media/test_drivers/vivid/vivid-kthread-cap.h diff --git a/drivers/media/platform/vivid/vivid-kthread-out.c b/drivers/media/test_drivers/vivid/vivid-kthread-out.c similarity index 100% rename from drivers/media/platform/vivid/vivid-kthread-out.c rename to drivers/media/test_drivers/vivid/vivid-kthread-out.c diff --git a/drivers/media/platform/vivid/vivid-kthread-out.h b/drivers/media/test_drivers/vivid/vivid-kthread-out.h similarity index 100% rename from drivers/media/platform/vivid/vivid-kthread-out.h rename to drivers/media/test_drivers/vivid/vivid-kthread-out.h diff --git a/drivers/media/platform/vivid/vivid-kthread-touch.c b/drivers/media/test_drivers/vivid/vivid-kthread-touch.c similarity index 100% rename from drivers/media/platform/vivid/vivid-kthread-touch.c rename to drivers/media/test_drivers/vivid/vivid-kthread-touch.c diff --git a/drivers/media/platform/vivid/vivid-kthread-touch.h b/drivers/media/test_drivers/vivid/vivid-kthread-touch.h similarity index 100% rename from drivers/media/platform/vivid/vivid-kthread-touch.h rename to drivers/media/test_drivers/vivid/vivid-kthread-touch.h diff --git a/drivers/media/platform/vivid/vivid-meta-cap.c b/drivers/media/test_drivers/vivid/vivid-meta-cap.c similarity index 100% rename from drivers/media/platform/vivid/vivid-meta-cap.c rename to drivers/media/test_drivers/vivid/vivid-meta-cap.c diff --git a/drivers/media/platform/vivid/vivid-meta-cap.h b/drivers/media/test_drivers/vivid/vivid-meta-cap.h similarity index 100% rename from drivers/media/platform/vivid/vivid-meta-cap.h rename to drivers/media/test_drivers/vivid/vivid-meta-cap.h diff --git a/drivers/media/platform/vivid/vivid-meta-out.c b/drivers/media/test_drivers/vivid/vivid-meta-out.c similarity index 100% rename from drivers/media/platform/vivid/vivid-meta-out.c rename to drivers/media/test_drivers/vivid/vivid-meta-out.c diff --git a/drivers/media/platform/vivid/vivid-meta-out.h b/drivers/media/test_drivers/vivid/vivid-meta-out.h similarity index 100% rename from drivers/media/platform/vivid/vivid-meta-out.h rename to drivers/media/test_drivers/vivid/vivid-meta-out.h diff --git a/drivers/media/platform/vivid/vivid-osd.c b/drivers/media/test_drivers/vivid/vivid-osd.c similarity index 100% rename from drivers/media/platform/vivid/vivid-osd.c rename to drivers/media/test_drivers/vivid/vivid-osd.c diff --git a/drivers/media/platform/vivid/vivid-osd.h b/drivers/media/test_drivers/vivid/vivid-osd.h similarity index 100% rename from drivers/media/platform/vivid/vivid-osd.h rename to drivers/media/test_drivers/vivid/vivid-osd.h diff --git a/drivers/media/platform/vivid/vivid-radio-common.c b/drivers/media/test_drivers/vivid/vivid-radio-common.c similarity index 100% rename from drivers/media/platform/vivid/vivid-radio-common.c rename to drivers/media/test_drivers/vivid/vivid-radio-common.c diff --git a/drivers/media/platform/vivid/vivid-radio-common.h b/drivers/media/test_drivers/vivid/vivid-radio-common.h similarity index 100% rename from drivers/media/platform/vivid/vivid-radio-common.h rename to drivers/media/test_drivers/vivid/vivid-radio-common.h diff --git a/drivers/media/platform/vivid/vivid-radio-rx.c b/drivers/media/test_drivers/vivid/vivid-radio-rx.c similarity index 100% rename from drivers/media/platform/vivid/vivid-radio-rx.c rename to drivers/media/test_drivers/vivid/vivid-radio-rx.c diff --git a/drivers/media/platform/vivid/vivid-radio-rx.h b/drivers/media/test_drivers/vivid/vivid-radio-rx.h similarity index 100% rename from drivers/media/platform/vivid/vivid-radio-rx.h rename to drivers/media/test_drivers/vivid/vivid-radio-rx.h diff --git a/drivers/media/platform/vivid/vivid-radio-tx.c b/drivers/media/test_drivers/vivid/vivid-radio-tx.c similarity index 100% rename from drivers/media/platform/vivid/vivid-radio-tx.c rename to drivers/media/test_drivers/vivid/vivid-radio-tx.c diff --git a/drivers/media/platform/vivid/vivid-radio-tx.h b/drivers/media/test_drivers/vivid/vivid-radio-tx.h similarity index 100% rename from drivers/media/platform/vivid/vivid-radio-tx.h rename to drivers/media/test_drivers/vivid/vivid-radio-tx.h diff --git a/drivers/media/platform/vivid/vivid-rds-gen.c b/drivers/media/test_drivers/vivid/vivid-rds-gen.c similarity index 100% rename from drivers/media/platform/vivid/vivid-rds-gen.c rename to drivers/media/test_drivers/vivid/vivid-rds-gen.c diff --git a/drivers/media/platform/vivid/vivid-rds-gen.h b/drivers/media/test_drivers/vivid/vivid-rds-gen.h similarity index 100% rename from drivers/media/platform/vivid/vivid-rds-gen.h rename to drivers/media/test_drivers/vivid/vivid-rds-gen.h diff --git a/drivers/media/platform/vivid/vivid-sdr-cap.c b/drivers/media/test_drivers/vivid/vivid-sdr-cap.c similarity index 100% rename from drivers/media/platform/vivid/vivid-sdr-cap.c rename to drivers/media/test_drivers/vivid/vivid-sdr-cap.c diff --git a/drivers/media/platform/vivid/vivid-sdr-cap.h b/drivers/media/test_drivers/vivid/vivid-sdr-cap.h similarity index 100% rename from drivers/media/platform/vivid/vivid-sdr-cap.h rename to drivers/media/test_drivers/vivid/vivid-sdr-cap.h diff --git a/drivers/media/platform/vivid/vivid-touch-cap.c b/drivers/media/test_drivers/vivid/vivid-touch-cap.c similarity index 100% rename from drivers/media/platform/vivid/vivid-touch-cap.c rename to drivers/media/test_drivers/vivid/vivid-touch-cap.c diff --git a/drivers/media/platform/vivid/vivid-touch-cap.h b/drivers/media/test_drivers/vivid/vivid-touch-cap.h similarity index 100% rename from drivers/media/platform/vivid/vivid-touch-cap.h rename to drivers/media/test_drivers/vivid/vivid-touch-cap.h diff --git a/drivers/media/platform/vivid/vivid-vbi-cap.c b/drivers/media/test_drivers/vivid/vivid-vbi-cap.c similarity index 100% rename from drivers/media/platform/vivid/vivid-vbi-cap.c rename to drivers/media/test_drivers/vivid/vivid-vbi-cap.c diff --git a/drivers/media/platform/vivid/vivid-vbi-cap.h b/drivers/media/test_drivers/vivid/vivid-vbi-cap.h similarity index 100% rename from drivers/media/platform/vivid/vivid-vbi-cap.h rename to drivers/media/test_drivers/vivid/vivid-vbi-cap.h diff --git a/drivers/media/platform/vivid/vivid-vbi-gen.c b/drivers/media/test_drivers/vivid/vivid-vbi-gen.c similarity index 100% rename from drivers/media/platform/vivid/vivid-vbi-gen.c rename to drivers/media/test_drivers/vivid/vivid-vbi-gen.c diff --git a/drivers/media/platform/vivid/vivid-vbi-gen.h b/drivers/media/test_drivers/vivid/vivid-vbi-gen.h similarity index 100% rename from drivers/media/platform/vivid/vivid-vbi-gen.h rename to drivers/media/test_drivers/vivid/vivid-vbi-gen.h diff --git a/drivers/media/platform/vivid/vivid-vbi-out.c b/drivers/media/test_drivers/vivid/vivid-vbi-out.c similarity index 100% rename from drivers/media/platform/vivid/vivid-vbi-out.c rename to drivers/media/test_drivers/vivid/vivid-vbi-out.c diff --git a/drivers/media/platform/vivid/vivid-vbi-out.h b/drivers/media/test_drivers/vivid/vivid-vbi-out.h similarity index 100% rename from drivers/media/platform/vivid/vivid-vbi-out.h rename to drivers/media/test_drivers/vivid/vivid-vbi-out.h diff --git a/drivers/media/platform/vivid/vivid-vid-cap.c b/drivers/media/test_drivers/vivid/vivid-vid-cap.c similarity index 100% rename from drivers/media/platform/vivid/vivid-vid-cap.c rename to drivers/media/test_drivers/vivid/vivid-vid-cap.c diff --git a/drivers/media/platform/vivid/vivid-vid-cap.h b/drivers/media/test_drivers/vivid/vivid-vid-cap.h similarity index 100% rename from drivers/media/platform/vivid/vivid-vid-cap.h rename to drivers/media/test_drivers/vivid/vivid-vid-cap.h diff --git a/drivers/media/platform/vivid/vivid-vid-common.c b/drivers/media/test_drivers/vivid/vivid-vid-common.c similarity index 100% rename from drivers/media/platform/vivid/vivid-vid-common.c rename to drivers/media/test_drivers/vivid/vivid-vid-common.c diff --git a/drivers/media/platform/vivid/vivid-vid-common.h b/drivers/media/test_drivers/vivid/vivid-vid-common.h similarity index 100% rename from drivers/media/platform/vivid/vivid-vid-common.h rename to drivers/media/test_drivers/vivid/vivid-vid-common.h diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/test_drivers/vivid/vivid-vid-out.c similarity index 100% rename from drivers/media/platform/vivid/vivid-vid-out.c rename to drivers/media/test_drivers/vivid/vivid-vid-out.c diff --git a/drivers/media/platform/vivid/vivid-vid-out.h b/drivers/media/test_drivers/vivid/vivid-vid-out.h similarity index 100% rename from drivers/media/platform/vivid/vivid-vid-out.h rename to drivers/media/test_drivers/vivid/vivid-vid-out.h From patchwork Tue Mar 24 14:26:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455663 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9B45F17EF for ; Tue, 24 Mar 2020 14:26:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7CFE620789 for ; Tue, 24 Mar 2020 14:26:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059998; bh=KtgJAxR58+iyYhu/eeIY2qJxXV//i43mYb7/aiW9CN4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KaWGG3s9YmR8Yfzxrjb4aIsWbIcO0BCFAnkIrMt1GS82HrdZoZuhVpNY4z1sGtkpA ulz4Ef3id+S4xt/vpaz2usSaROP9Ea9cr1feTto8WpwT+HLASCc9noVDF7ZpQPICZk 1U4boTIZup1gPE4RoPxXCauxq1BdYMvvIkyneVIE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728643AbgCXO0h (ORCPT ); Tue, 24 Mar 2020 10:26:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:35810 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727930AbgCXO00 (ORCPT ); Tue, 24 Mar 2020 10:26:26 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9388221473; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059985; bh=KtgJAxR58+iyYhu/eeIY2qJxXV//i43mYb7/aiW9CN4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rAH0LzIDFh5eLS3+/JJ/obSS4vopeKSzigeWUVe86La5D9ZFoB6siWdLeF+p+L0Rk p3/Tmi+PP8/PZ5ywh7t4zxJ+91QUZep/hL5H7stN170oCdTULt9Slj6ij8lEdZSqVK dmXAXvpKf0VXHQGgbz3vJ+eSfMZJsaPempFxuHMg= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVb-002673-R6; Tue, 24 Mar 2020 15:26:23 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab Subject: [PATCH v2 09/20] media: Kconfig: make filtering devices optional Date: Tue, 24 Mar 2020 15:26:10 +0100 Message-Id: <751a1be8d03e1c30d5af17cfd659ffc6a5721a35.1585059897.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The per-device option selection is a feature that some developers love, while others hate... So, let's make both happy by making it optional. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/Kconfig | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 4c06728a4ab7..e372029ac41f 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -25,14 +25,32 @@ menuconfig MEDIA_SUPPORT Additional info and docs are available on the web at -menu "Types of devices to be supported" +if MEDIA_SUPPORT + +config MEDIA_SUPPORT_FILTER + bool "Filter devices by their types" depends on MEDIA_SUPPORT + help + Configuring the media subsystem can be complex, as there are + hundreds of drivers and other config options. + + This menu offers option that will help the Kernel's config + system to hide drivers that are out of the scope of the + user needs, and disabling core support for unused APIs. + + If not selected, all non-optional media core functionality + needed to support media drivers will be enabled. Also, all + media device drivers should be shown. + +menu "Media device types" + visible if MEDIA_SUPPORT_FILTER # # Multimedia support - automatically enable V4L2 and DVB core # config MEDIA_CAMERA_SUPPORT bool "Cameras and video grabbers" + default y if !MEDIA_SUPPORT_FILTER help Enable support for webcams and video grabbers. @@ -40,6 +58,7 @@ config MEDIA_CAMERA_SUPPORT config MEDIA_ANALOG_TV_SUPPORT bool "Analog TV" + default y if !MEDIA_SUPPORT_FILTER help Enable analog TV support. @@ -52,6 +71,7 @@ config MEDIA_ANALOG_TV_SUPPORT config MEDIA_DIGITAL_TV_SUPPORT bool "Digital TV" + default y if !MEDIA_SUPPORT_FILTER help Enable digital TV support. @@ -60,6 +80,7 @@ config MEDIA_DIGITAL_TV_SUPPORT config MEDIA_RADIO_SUPPORT bool "AM/FM radio receivers/transmitters" + default y if !MEDIA_SUPPORT_FILTER help Enable AM/FM radio support. @@ -74,6 +95,7 @@ config MEDIA_RADIO_SUPPORT config MEDIA_SDR_SUPPORT bool "Software defined radio" + default y if !MEDIA_SUPPORT_FILTER help Enable software defined radio support. @@ -81,6 +103,7 @@ config MEDIA_SDR_SUPPORT config MEDIA_CEC_SUPPORT bool "HDMI CEC support" + default y if !MEDIA_SUPPORT_FILTER help Enable support for HDMI CEC (Consumer Electronics Control), which is an optional HDMI feature. @@ -90,6 +113,7 @@ config MEDIA_CEC_SUPPORT config MEDIA_EMBEDDED_SUPPORT bool "Embedded devices (SoC)" + default y if !MEDIA_SUPPORT_FILTER help Enable support for complex cameras, codecs, and other hardware found on Embedded hardware (SoC). @@ -98,6 +122,7 @@ config MEDIA_EMBEDDED_SUPPORT config MEDIA_TEST_SUPPORT bool "Test drivers" + default y if !MEDIA_SUPPORT_FILTER help Those drivers should not be used on production Kernels, but can be useful on debug ones. It enables several dummy drivers @@ -106,10 +131,7 @@ config MEDIA_TEST_SUPPORT have regressions. Say Y when you have a software defined radio device. - -endmenu # media support types - -if MEDIA_SUPPORT +endmenu # media device types comment "Media core options" From patchwork Tue Mar 24 14:26:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455657 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 23E1E1667 for ; Tue, 24 Mar 2020 14:26:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0071820870 for ; Tue, 24 Mar 2020 14:26:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059997; bh=ck4OjCQbq8LRXFZxql73LnIMALqdecyTNuiDYT5obuk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Cl+EQwDvNWQOQVeyRxE2zlnN2bInTf0vzsbsqnyK/KV1FRJw322XhgAc5tmbrx2d+ NiffbiKq6pKq3TyJ5gEV8viza3fB87x2kEE7kKuHRyoENVgNPR77U32QNC+57e/LRY GzrWhHDNoAqfAc/3cli1gtMpDOnhrv0E9VoZu6+Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728606AbgCXO0g (ORCPT ); Tue, 24 Mar 2020 10:26:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:35812 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727966AbgCXO00 (ORCPT ); Tue, 24 Mar 2020 10:26:26 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9BF1E214D8; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059985; bh=ck4OjCQbq8LRXFZxql73LnIMALqdecyTNuiDYT5obuk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WtiEa/pogUigQ/t5Ov2VnFpA/Hc3TUzGt1UwQlDVvRIFKuRKZfDJ+QecYabgXzela +ZKYUDlyiavSbyR9dhcmURTJ6NYpDmdgUORhhrdV6CE4OV+nQvMJ6jDP79uTHljcjB CRKELxjYybw6z4n24soKAe4twfSfb9UroKHUY0mw= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVb-002678-Sc; Tue, 24 Mar 2020 15:26:23 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab , Hans Verkuil Subject: [PATCH v2 10/20] media: Kconfig: move CEC-specific options to cec/Kconfig Date: Tue, 24 Mar 2020 15:26:11 +0100 Message-Id: <1a8216c3ab6a58cd22b71a55b7ee4221ba4eba91.1585059897.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org There's no need to have the CEC definitions inside the media Kconfig, as the Kconfig parser doesn't require symbols to be declared before their usages. With that, the main Kconfig menu becomes cleaner. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/Kconfig | 9 --------- drivers/media/cec/Kconfig | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index e372029ac41f..2f4360faed03 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -3,15 +3,6 @@ # Multimedia device configuration # -config CEC_CORE - tristate - -config CEC_NOTIFIER - bool - -config CEC_PIN - bool - source "drivers/media/rc/Kconfig" menuconfig MEDIA_SUPPORT diff --git a/drivers/media/cec/Kconfig b/drivers/media/cec/Kconfig index c01919713ab9..31417feaa213 100644 --- a/drivers/media/cec/Kconfig +++ b/drivers/media/cec/Kconfig @@ -1,4 +1,14 @@ # SPDX-License-Identifier: GPL-2.0-only + +config CEC_CORE + tristate + +config CEC_NOTIFIER + bool + +config CEC_PIN + bool + config MEDIA_CEC_RC bool "HDMI CEC RC integration" depends on CEC_CORE && RC_CORE From patchwork Tue Mar 24 14:26:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455635 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 636D5159A for ; Tue, 24 Mar 2020 14:26:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3935120B1F for ; Tue, 24 Mar 2020 14:26:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059990; bh=kXBgL77aKBseXgTmvFFT2dzAuc5r0P2z+w2gjYWQYQQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oyJfbGMeV8vDAyGC9d1mC3S7xjHIeJTUkkroWUavDsA6R9aVXVBjmgfxmDidTUzzV +WELQVSBw5AVRrS9TkRq7IhriBghzZQZVBicNzICVZiWhJGDsLoG086vHLoVKbdxq8 KyqQRM9JOIEulUzdvtvuywbxIL8nA2XluwRIFZlA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728352AbgCXO01 (ORCPT ); Tue, 24 Mar 2020 10:26:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:35816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728026AbgCXO00 (ORCPT ); Tue, 24 Mar 2020 10:26:26 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A93CE21556; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059985; bh=kXBgL77aKBseXgTmvFFT2dzAuc5r0P2z+w2gjYWQYQQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aYtFA/MUacrLYrhXAz+VU3UTrdp7Tb6IVDBx8o0ou9vsdqbG4ZwOHJJ48AdFV6Ege niQ/ExewfOICYNwMIZEc7nhaaIFe3PAhv7C/pQr/05lDZaVXA7/H9Q87GiwSJ01snS WxFqP6HoVp8QH6vKQSlLbgP+BhP4Oq5oZ0FzImb8= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVb-00267D-Tp; Tue, 24 Mar 2020 15:26:23 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab Subject: [PATCH v2 11/20] media: Kconfig: move comment to siano include Date: Tue, 24 Mar 2020 15:26:12 +0100 Message-Id: X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Showing this comment without showing the Siano mmc option is very weird! Place the option together, and make it visible only when showing Siano configuration. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/mmc/Kconfig | 1 - drivers/media/mmc/siano/Kconfig | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/mmc/Kconfig b/drivers/media/mmc/Kconfig index 5217f5bd205e..75aa6de08d53 100644 --- a/drivers/media/mmc/Kconfig +++ b/drivers/media/mmc/Kconfig @@ -1,3 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only -comment "MMC/SDIO adapters" source "drivers/media/mmc/siano/Kconfig" diff --git a/drivers/media/mmc/siano/Kconfig b/drivers/media/mmc/siano/Kconfig index 1919f6fea8b1..570696019a9e 100644 --- a/drivers/media/mmc/siano/Kconfig +++ b/drivers/media/mmc/siano/Kconfig @@ -2,6 +2,8 @@ # # Siano Mobile Silicon Digital TV device configuration # +comment "MMC/SDIO DVB adapters" + depends on DVB_CORE && HAS_DMA && MMC config SMS_SDIO_DRV tristate "Siano SMS1xxx based MDTV via SDIO interface" From patchwork Tue Mar 24 14:26:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455651 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 00D1217EF for ; Tue, 24 Mar 2020 14:26:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D64D920870 for ; Tue, 24 Mar 2020 14:26:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059994; bh=Z4NTAwq0iX+fSarX+OK5e9Qzq8rS5PhgyAmDd4W8YA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=akGU/cxYysLqw+heL9Rh2aOJIc2BJKzwDjBfozJG22cRecRGGNMP0Z0Z8GoypnpG6 VLp24Q3MC7xZwnXocm6OVQPA1UQYZRQojV9DYv90CxujMRzX0jN/Fm1dks9vTK9Un+ WwEzyvxyeGch83Yb+grDCvRatwxrRepVz4rudYjA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728535AbgCXO0e (ORCPT ); Tue, 24 Mar 2020 10:26:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:35818 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727995AbgCXO00 (ORCPT ); Tue, 24 Mar 2020 10:26:26 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B0720215A4; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059985; bh=Z4NTAwq0iX+fSarX+OK5e9Qzq8rS5PhgyAmDd4W8YA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lYbMyOFG9SEKUpaBKLyjIFEgeq7VTAxCdjI+Pk2J1a1ayaDnTxL0oBdVgtu1w1WL1 Djk1GtVR+Cayre2JfDuAYkvo1M4jInjGZYlF8gYJQ5kMYf6PDvxRQ7xRyKRYLb3/Wx s+Bl3cM9Qs6x4KCNCl4F4gHDDPDeuRoJG6MYIifU= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVb-00267I-VO; Tue, 24 Mar 2020 15:26:23 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab Subject: [PATCH v2 12/20] media: Kconfig: move DVB-specific options to dvb-core/Kconfig Date: Tue, 24 Mar 2020 15:26:13 +0100 Message-Id: <05153eacab4ccb6cc2ca36dbd43e8c761c2d65c5.1585059897.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org In order to cleanup the main media Kconfig, move the DVB-core specific options to dvb-core/Kconfig. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/Kconfig | 21 --------------------- drivers/media/dvb-core/Kconfig | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 2f4360faed03..44aceb5e5b63 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -164,31 +164,10 @@ config DVB_CORE default y select CRC32 -config DVB_MMAP - bool "Enable DVB memory-mapped API (EXPERIMENTAL)" - depends on DVB_CORE - depends on VIDEO_V4L2=y || VIDEO_V4L2=DVB_CORE - select VIDEOBUF2_VMALLOC help - This option enables DVB experimental memory-mapped API, which - reduces the number of context switches to read DVB buffers, as - the buffers can use mmap() syscalls. - Support for it is experimental. Use with care. If unsure, - say N. -config DVB_NET - bool "DVB Network Support" - default (NET && INET) - depends on NET && INET && DVB_CORE - help - This option enables DVB Network Support which is a part of the DVB - standard. It is used, for example, by automatic firmware updates used - on Set-Top-Boxes. It can also be used to access the Internet via the - DVB card, if the network provider supports it. - You may want to disable the network support on embedded devices. If - unsure say Y. # This Kconfig option is used by both PCI and USB drivers config TTPCI_EEPROM diff --git a/drivers/media/dvb-core/Kconfig b/drivers/media/dvb-core/Kconfig index 90e038d5ffd9..0f8e53692b86 100644 --- a/drivers/media/dvb-core/Kconfig +++ b/drivers/media/dvb-core/Kconfig @@ -3,6 +3,32 @@ # DVB device configuration # +config DVB_MMAP + bool "Enable DVB memory-mapped API (EXPERIMENTAL)" + depends on DVB_CORE + depends on VIDEO_V4L2=y || VIDEO_V4L2=DVB_CORE + select VIDEOBUF2_VMALLOC + help + This option enables DVB experimental memory-mapped API, which + reduces the number of context switches to read DVB buffers, as + the buffers can use mmap() syscalls. + + Support for it is experimental. Use with care. If unsure, + say N. + +config DVB_NET + bool "DVB Network Support" + default (NET && INET) + depends on NET && INET && DVB_CORE + help + This option enables DVB Network Support which is a part of the DVB + standard. It is used, for example, by automatic firmware updates used + on Set-Top-Boxes. It can also be used to access the Internet via the + DVB card, if the network provider supports it. + + You may want to disable the network support on embedded devices. If + unsure say Y. + config DVB_MAX_ADAPTERS int "maximum number of DVB/ATSC adapters" depends on DVB_CORE From patchwork Tue Mar 24 14:26:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455633 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0839717EF for ; Tue, 24 Mar 2020 14:26:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D558E20B1F for ; Tue, 24 Mar 2020 14:26:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059989; bh=PIDxz4PON1tXTrgxL90qolW3m/5TZ0UEZSh0QEWn66Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=j64odklZXXruN9TtWhckRW0aTdxBFaaXbbghjBxvjOjA1teOjLysTkqRr4GO0Wm3o +jb7YfF5ccZuQ28rx0/5QFXYJ4Jyjsc5fT8BKp4jwFmxcJNXr7qnKswi9KDkQ7L0YP 1+BGBhW1PSOUJUUzO0NLFxpVNA9SwXpfFSSaJPOo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728405AbgCXO02 (ORCPT ); Tue, 24 Mar 2020 10:26:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:35826 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728144AbgCXO00 (ORCPT ); Tue, 24 Mar 2020 10:26:26 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BAEAE2173E; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059985; bh=PIDxz4PON1tXTrgxL90qolW3m/5TZ0UEZSh0QEWn66Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NTjSvsQYlZ/4OMGLrODOVB2mRbA/T9UknCnJK5WLUK01rMo45Zd6tzOwv9ftzrBP4 KlJ6lVWycjW0fCNOE0IwAvp6ShHWd1I+72T37BqP4uHEAI5/FK3JP85xfOE8QdpDd+ vkNlP7lEZMJeh1Qgmq/CV9xV+WXdWDW/rNLb+Dqo= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVc-00267N-0F; Tue, 24 Mar 2020 15:26:24 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab Subject: [PATCH v2 13/20] media: Kconfig: move V4L2 subdev API to v4l2-core/Kconfig Date: Tue, 24 Mar 2020 15:26:14 +0100 Message-Id: <0d4e432860f3f56e13d5dcda414f5f142831c04a.1585059897.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This option is part of V4L2 API extra functionality set. Move it to be at the v4l2-core/Kconfig, where it belongs, cleaning the main Kconfig file. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/Kconfig | 9 --------- drivers/media/v4l2-core/Kconfig | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 44aceb5e5b63..d6fb8411a8de 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -140,15 +140,6 @@ config VIDEO_DEV depends on MEDIA_SUPPORT default MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT || V4L_PLATFORM_DRIVERS -config VIDEO_V4L2_SUBDEV_API - bool "V4L2 sub-device userspace API" - depends on VIDEO_DEV && MEDIA_CONTROLLER - help - Enables the V4L2 sub-device pad-level userspace API used to configure - video format, size and frame rate between hardware blocks. - - This API is mostly used by camera interfaces in embedded platforms. - source "drivers/media/v4l2-core/Kconfig" # diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig index 26276b257eae..33aa7fe571f8 100644 --- a/drivers/media/v4l2-core/Kconfig +++ b/drivers/media/v4l2-core/Kconfig @@ -16,6 +16,15 @@ config VIDEO_V4L2_I2C depends on I2C && VIDEO_V4L2 default y +config VIDEO_V4L2_SUBDEV_API + bool "V4L2 sub-device userspace API" + depends on VIDEO_DEV && MEDIA_CONTROLLER + help + Enables the V4L2 sub-device pad-level userspace API used to configure + video format, size and frame rate between hardware blocks. + + This API is mostly used by camera interfaces in embedded platforms. + config VIDEO_ADV_DEBUG bool "Enable advanced debug functionality on V4L2 drivers" help From patchwork Tue Mar 24 14:26:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455659 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 82C9F17EF for ; Tue, 24 Mar 2020 14:26:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 59612208E0 for ; Tue, 24 Mar 2020 14:26:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059997; bh=Iudx1SaPuA77OwushIhw/636atSAbLZx+o4BpBYw51M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=M3Bv0iyjxMOLSBVTWVbTN0s2iLKaxWaH15u6XXDxZg19RvCnzexDt6q1gQJEOM4xV H2/AdNSjhcaj9EZe4ObWyTccA7oJzRhgWqMO18eDkyTeJbNYy01noeVcJSMkHesa+W FXBi3xgxRkFO5Srknv0N/calOKwvkvD11HEApfDQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728075AbgCXO0g (ORCPT ); Tue, 24 Mar 2020 10:26:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:35820 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728080AbgCXO00 (ORCPT ); Tue, 24 Mar 2020 10:26:26 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B9E8021707; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059985; bh=Iudx1SaPuA77OwushIhw/636atSAbLZx+o4BpBYw51M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UjMeGcPx0IEajHJHjjOfA/FlMpSZcIVAs0BNM96Cl0X+19rG0tHIkuPKHzU2LgTh6 ulBDQyE87Wpat36uLgS0DDnuGoHNGT/9MmTSHMBYf3mawiQujo7a/TW1WbwfkKIASE sUgm6DCVM5pMXHRZ9++xplmC0F2wlOMBf7vJyzrU= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVc-00267S-1c; Tue, 24 Mar 2020 15:26:24 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab Subject: [PATCH v2 14/20] media: Kconfig: move drivers-specific TTPCI_EEPROM Kconfig var Date: Tue, 24 Mar 2020 15:26:15 +0100 Message-Id: X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This option is used only by av7110 and by an USB driver. As the av7110 is the first DVB hardware, hardly found those days, let's opt to place it at usb/Kconfig, as the driver with needs it might have a longer lifetime. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/Kconfig | 8 -------- drivers/media/usb/Kconfig | 6 ++++++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index d6fb8411a8de..54daeba339b7 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -157,14 +157,6 @@ config DVB_CORE help - - - -# This Kconfig option is used by both PCI and USB drivers -config TTPCI_EEPROM - tristate - depends on I2C - source "drivers/media/dvb-core/Kconfig" comment "Media drivers" diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig index e678d3d11467..bf08393e38d1 100644 --- a/drivers/media/usb/Kconfig +++ b/drivers/media/usb/Kconfig @@ -1,4 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-only + +# This Kconfig option is also used by the legacy av7110 driver +config TTPCI_EEPROM + tristate + depends on I2C + if USB && MEDIA_SUPPORT menuconfig MEDIA_USB_SUPPORT From patchwork Tue Mar 24 14:26:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455647 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 01C4D17EF for ; Tue, 24 Mar 2020 14:26:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D7F0020870 for ; Tue, 24 Mar 2020 14:26:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059993; bh=F8p/ub/kl1GPEtJH80f/2Zq9thwe8Qbz3WN8Z13xJRo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gkwFAiTQXCsHR+faI9tpb+TyZpRbhZNRN/DPGgTx/jWqiP2vjDjhUOdJgsUU5rXPw CmcpSSNSnKN3qWfzBkvkuzJ3e1jVv4ZjRdC0h8Z1nxWAq5+H/E0bn3nQatX0PnMCY0 p7rIzf9ra9krAwZYvJ+NCxAUVq1f11H84yWImf+Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728248AbgCXO0c (ORCPT ); Tue, 24 Mar 2020 10:26:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:35830 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728218AbgCXO00 (ORCPT ); Tue, 24 Mar 2020 10:26:26 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D27EC217D8; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059986; bh=F8p/ub/kl1GPEtJH80f/2Zq9thwe8Qbz3WN8Z13xJRo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AxOjn3XNSGCbQ/5vHpqlynBuiT+AX0D6DgKmvxEFTlpCdzN1YotNHrM7q6/C6bgVj iirDrMnBKNQc5o/1n+hPMwzMjIuNCOVjYLbLqT/+5/aqUG9ABrlYsm3/bG2do6ADyi FqlN7XTXcl81jPncM1NdMQh77dtlF+z89yvU1et4= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVc-00267X-2g; Tue, 24 Mar 2020 15:26:24 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab , Sakari Ailus , Laurent Pinchart Subject: [PATCH v2 15/20] media: Kconfig: move media controller core select to main Kconfig Date: Tue, 24 Mar 2020 15:26:16 +0100 Message-Id: <84ab3635bd37b47fc01197e1024bbb0287a1f264.1585059897.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Let's place the main API selections at the media/Kconfig file, as this way we can better organize things. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/Kconfig | 9 +++++++++ drivers/media/mc/Kconfig | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 54daeba339b7..86cf4f12a70d 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -140,6 +140,15 @@ config VIDEO_DEV depends on MEDIA_SUPPORT default MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT || V4L_PLATFORM_DRIVERS +config MEDIA_CONTROLLER + bool "Media Controller API" + depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT + help + Enable the media controller API used to query media devices internal + topology and configure it dynamically. + + This API is mostly used by camera interfaces in embedded platforms. + source "drivers/media/v4l2-core/Kconfig" # diff --git a/drivers/media/mc/Kconfig b/drivers/media/mc/Kconfig index 3b9795cfcb36..b3579d6c9e32 100644 --- a/drivers/media/mc/Kconfig +++ b/drivers/media/mc/Kconfig @@ -3,15 +3,6 @@ # Selectable only for webcam/grabbers, as other drivers don't use it # -config MEDIA_CONTROLLER - bool "Media Controller API" - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT - help - Enable the media controller API used to query media devices internal - topology and configure it dynamically. - - This API is mostly used by camera interfaces in embedded platforms. - config MEDIA_CONTROLLER_DVB bool "Enable Media controller for DVB (EXPERIMENTAL)" depends on MEDIA_CONTROLLER && DVB_CORE From patchwork Tue Mar 24 14:26:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455653 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1462D159A for ; Tue, 24 Mar 2020 14:26:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DF5012080C for ; Tue, 24 Mar 2020 14:26:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059996; bh=zox53D8AS0dECcLfbWUc6+iE0tL+4cdEzB4u0Q7B4a8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Yehp0WNHnQCATMpPpsNEPsZdPKhqm5Tu2V7JEhC7kz6n14vrwt4NbUvPyYIOaNQ5I V5loM35MerC428mfTFNBtxFnW1c51+8rLC7o1BQe8BKzrf3hF4DkuTLhDxvvs0Y7fY 6jCn/jVNn2wjqDKZ0s8ks0/uqGDgsI7T7kHCD3IQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728624AbgCXO0f (ORCPT ); Tue, 24 Mar 2020 10:26:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:35816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727605AbgCXO00 (ORCPT ); Tue, 24 Mar 2020 10:26:26 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D3F6C21841; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059986; bh=zox53D8AS0dECcLfbWUc6+iE0tL+4cdEzB4u0Q7B4a8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PWp8U0q5Z5D+y6YRmGpMlVtiq9EuFW1Sn277equPMJFxKzSbA2XbAowtjgU3jeerC /UieKb+2arYZJmQNZU5wckROq+/RJTFe+NNG2DtHrbZ/wEohPZvxPfyq2GWny4FD4F TMgWrjDe9Mmd8vbiu9QcpjPUAG0pwg6Nx1QrXFQ0= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVc-00267c-47; Tue, 24 Mar 2020 15:26:24 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab Subject: [PATCH v2 16/20] media: Kconfig: better organize menu items Date: Tue, 24 Mar 2020 15:26:17 +0100 Message-Id: <39461aec16de5b70a23f4fc353bc41cf995a4c42.1585059897.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Place all API specific bits together Signed-off-by: Mauro Carvalho Chehab --- drivers/media/Kconfig | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 86cf4f12a70d..7d4088cfe3ef 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -126,10 +126,6 @@ endmenu # media device types comment "Media core options" -source "drivers/media/cec/Kconfig" - -source "drivers/media/mc/Kconfig" - # # Video4Linux support # Only enables if one of the V4L2 types (ATV, webcam, radio) is selected @@ -149,8 +145,6 @@ config MEDIA_CONTROLLER This API is mostly used by camera interfaces in embedded platforms. -source "drivers/media/v4l2-core/Kconfig" - # # DVB Core # Only enables if one of DTV is selected @@ -166,7 +160,10 @@ config DVB_CORE help +source "drivers/media/v4l2-core/Kconfig" +source "drivers/media/mc/Kconfig" source "drivers/media/dvb-core/Kconfig" +source "drivers/media/cec/Kconfig" comment "Media drivers" From patchwork Tue Mar 24 14:26:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455645 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9365D159A for ; Tue, 24 Mar 2020 14:26:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6B14320870 for ; Tue, 24 Mar 2020 14:26:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059993; bh=siNRHVsZSzIvazHmR1WEv2+cQMZrL0G006nOx0Nkxo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pxxraq+xRIcN1l3ZebZPBdsSt8bDPOX9M1nOKPYHwN9UtRecdlNCSGCrBrjXH7/ny I5qslSlE2rZ4yJhZMx0XLKd08dCCbBEXBnQIm0J3dRaScNcDeRvhitthGgG8DPEnEF mard1uU6aGMbLFakqNVRFAIj+Q01kPIuGBdNjKxk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728495AbgCXO0c (ORCPT ); Tue, 24 Mar 2020 10:26:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:35806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728171AbgCXO00 (ORCPT ); Tue, 24 Mar 2020 10:26:26 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DF19D218AC; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059986; bh=siNRHVsZSzIvazHmR1WEv2+cQMZrL0G006nOx0Nkxo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i8tKfJ1A6co6Qh1YEAA3jDwoogMKcUN8vf2mma/c3wzMnyzgOVheRkO+lO7GTpaae 9hJ8xqLCDJDGBZdM36xRI5BMi5cdKtmryy6UtFSCStQl8K5DVimyowQzXPUPWBqsjU hiITxwMGnKG/nwYwucJH9/Qhj8+kxvEdG789iK3w= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVc-00267h-5A; Tue, 24 Mar 2020 15:26:24 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab , Stefan Richter , linux1394-devel@lists.sourceforge.net Subject: [PATCH v2 17/20] media: Kconfig: mode firewire comment to firewire/Kconfig Date: Tue, 24 Mar 2020 15:26:18 +0100 Message-Id: <3ffedfd6d10ff653ebcb5c8c6f72e27e627e446e.1585059897.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This comment should only be visible if the DVB_FIREDTV config will show. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/Kconfig | 2 -- drivers/media/firewire/Kconfig | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 7d4088cfe3ef..026a1151273c 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -186,8 +186,6 @@ source "drivers/media/mmc/Kconfig" endif # MEDIA_EMBEDDED_SUPPORT -comment "FireWire (IEEE 1394) Adapters" - depends on DVB_CORE && FIREWIRE source "drivers/media/firewire/Kconfig" comment "Media ancillary drivers (tuners, sensors, i2c, spi, frontends)" diff --git a/drivers/media/firewire/Kconfig b/drivers/media/firewire/Kconfig index e7837da5905b..0c1f326f581f 100644 --- a/drivers/media/firewire/Kconfig +++ b/drivers/media/firewire/Kconfig @@ -1,7 +1,9 @@ # SPDX-License-Identifier: GPL-2.0-only +if DVB_CORE && FIREWIRE +comment "FireWire (IEEE 1394) Adapters" + config DVB_FIREDTV tristate "FireDTV and FloppyDTV" - depends on DVB_CORE && FIREWIRE help Support for DVB receivers from Digital Everywhere which are connected via IEEE 1394 (FireWire). @@ -18,3 +20,4 @@ config DVB_FIREDTV_INPUT def_bool INPUT = y || (INPUT = m && DVB_FIREDTV = m) endif # DVB_FIREDTV +endif # DVB_CORE && FIREWIRE From patchwork Tue Mar 24 14:26:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455641 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EEAAB1667 for ; Tue, 24 Mar 2020 14:26:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF52920789 for ; Tue, 24 Mar 2020 14:26:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059991; bh=oSsb+HN55pEmPfT+clNvUwcyNluPUo3+cd4CjUseYKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lfXU0LeYDiMdUwyyvrFSbX1WcSnuy4zfuOmnHFaTs2FMSwwDepaGDTzixuleaesvu NTsB4n87D0hkB77+QfnaErnDCQQG0QAZZyOZtsPJ9lJ60nC3lIsK4vRsipCBwgMLh9 52Ujzwu45vliJitSSsMhYm8cfCyk5Hb7dCZNfrjU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728249AbgCXO0a (ORCPT ); Tue, 24 Mar 2020 10:26:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:35832 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728224AbgCXO01 (ORCPT ); Tue, 24 Mar 2020 10:26:27 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E429821927; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059986; bh=oSsb+HN55pEmPfT+clNvUwcyNluPUo3+cd4CjUseYKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XQspI4/GUWC57HDEi4kc7G8lOmzKMvC+tIu6V8hOzBACbS/WfiNzhn5Dk9is66W5F udumSTrak+I25S72IJsuhQi6xa5sAT27ULzfUqTOYallAYbCZ5+VlrgbwLxXBnXZ7f 17XNeUCUUUYxxiXwfH/QiZDXV5JZo7HAhlenzBcM= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVc-00267m-6e; Tue, 24 Mar 2020 15:26:24 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab Subject: [PATCH v2 18/20] media: Kconfig: place all options under a sub-menu Date: Tue, 24 Mar 2020 15:26:19 +0100 Message-Id: <967506cc001ad7f194ee24e823a398c293b352ab.1585059897.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org That should make easier for people setting the media subsystem config options, as they'll be split by the type of functionality that will be enabled. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/Kconfig | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 026a1151273c..6c55d20458ee 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -124,48 +124,49 @@ config MEDIA_TEST_SUPPORT Say Y when you have a software defined radio device. endmenu # media device types -comment "Media core options" - -# -# Video4Linux support -# Only enables if one of the V4L2 types (ATV, webcam, radio) is selected -# +menu "Media core support" + visible if !MEDIA_SUPPORT_FILTER config VIDEO_DEV - tristate + tristate "Video4Linux core" depends on MEDIA_SUPPORT default MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT || V4L_PLATFORM_DRIVERS + help + Enables the V4L2 API, used by cameras, analog TV, video grabbers, + radio devices and by some input devices. config MEDIA_CONTROLLER bool "Media Controller API" - depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT + default MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_EMBEDDED_SUPPORT help Enable the media controller API used to query media devices internal topology and configure it dynamically. This API is mostly used by camera interfaces in embedded platforms. -# -# DVB Core -# Only enables if one of DTV is selected -# - config DVB_CORE - tristate + tristate "Digital TV core" depends on MEDIA_SUPPORT - depends on MEDIA_DIGITAL_TV_SUPPORT + default MEDIA_DIGITAL_TV_SUPPORT depends on (I2C || I2C=n) - default y select CRC32 - help + Enables the DVB API, used by Digital TV devices. Supports several + standards, including DVB, ATSC, ISDB and CMDB. +endmenu # Media core support + +# +# Extra per-media API core functionality + +menu "Media core additional options" source "drivers/media/v4l2-core/Kconfig" source "drivers/media/mc/Kconfig" source "drivers/media/dvb-core/Kconfig" source "drivers/media/cec/Kconfig" +endmenu -comment "Media drivers" +menu "Media drivers" # # V4L platform/mem2mem drivers @@ -188,7 +189,9 @@ endif # MEDIA_EMBEDDED_SUPPORT source "drivers/media/firewire/Kconfig" -comment "Media ancillary drivers (tuners, sensors, i2c, spi, frontends)" +endmenu + +menu "Media ancillary drivers (tuners, sensors, i2c, spi, frontends)" # # Ancillary drivers (tuners, i2c, spi, frontends) @@ -233,4 +236,6 @@ source "drivers/media/spi/Kconfig" source "drivers/media/tuners/Kconfig" source "drivers/media/dvb-frontends/Kconfig" +endmenu + endif # MEDIA_SUPPORT From patchwork Tue Mar 24 14:26:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455643 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E452F1667 for ; Tue, 24 Mar 2020 14:26:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C5CFA20870 for ; Tue, 24 Mar 2020 14:26:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059992; bh=UlVlNM0FLSUH7YYtNY9HtjBUnh0YugA1ybPJXdnSUj4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NWhPmcjaQSABAMtjIFWIFUIyW7cV57QXqgbckWotMHw8dcgIojreLS9eslzZPBhU5 yZizMhVatHyv6pN71EZyWVdSzNRrwd9Js2Z4uoElQ+ElYXmBQsvMTkFdPHcdf94DXd i1gXRhmPfeUm5LGONV2/IUcxSJpkVLgbMfCZxiNA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728430AbgCXO0b (ORCPT ); Tue, 24 Mar 2020 10:26:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:35810 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728248AbgCXO01 (ORCPT ); Tue, 24 Mar 2020 10:26:27 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EC71921973; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059986; bh=UlVlNM0FLSUH7YYtNY9HtjBUnh0YugA1ybPJXdnSUj4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P2+3g0q8BP9yKCyv9M1QFWlA3cCGCsnGIbxOzb7gD6L14RRBhRXDR7mnZLRUo7Bah tXOa6rqbi6gy/OWn5JfCzrGxJW1/EozGNYKahnmeNTOhfkZvqGLZThdljFlmG/cZlL Xdw+4ao8XVOJH5OZ4N5QwWfybb8F9oB+psOKnq68= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVc-00267r-7h; Tue, 24 Mar 2020 15:26:24 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab Subject: [PATCH v2 19/20] media: Kconfig: move the position of sub-driver autoselection Date: Tue, 24 Mar 2020 15:26:20 +0100 Message-Id: X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Let's place the sub-driver-autoselection option just below the device filtering one, as it also controls a filter menu, with is not even visible if !EXPERT && !EMBEDDED. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/Kconfig | 50 +++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 6c55d20458ee..81259287ffa3 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -33,6 +33,28 @@ config MEDIA_SUPPORT_FILTER needed to support media drivers will be enabled. Also, all media device drivers should be shown. +config MEDIA_SUBDRV_AUTOSELECT + bool "Autoselect ancillary drivers (tuners, sensors, i2c, spi, frontends)" + depends on HAS_IOMEM + select I2C + select I2C_MUX + default y if MEDIA_SUPPORT_FILTER + help + By default, a media driver auto-selects all possible ancillary + devices such as tuners, sensors, video encoders/decoders and + frontends, that are used by any of the supported devices. + + This is generally the right thing to do, except when there + are strict constraints with regards to the kernel size, + like on embedded systems. + + Use this option with care, as deselecting ancillary drivers which + are, in fact, necessary will result in the lack of the needed + functionality for your device (it may not tune or may not have + the needed demodulators). + + If unsure say Y. + menu "Media device types" visible if MEDIA_SUPPORT_FILTER @@ -191,40 +213,18 @@ source "drivers/media/firewire/Kconfig" endmenu -menu "Media ancillary drivers (tuners, sensors, i2c, spi, frontends)" - # # Ancillary drivers (tuners, i2c, spi, frontends) # -config MEDIA_SUBDRV_AUTOSELECT - bool "Autoselect ancillary drivers (tuners, sensors, i2c, spi, frontends)" - depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_CAMERA_SUPPORT || MEDIA_SDR_SUPPORT - depends on HAS_IOMEM - select I2C - select I2C_MUX - default y if !EMBEDDED - help - By default, a media driver auto-selects all possible ancillary - devices such as tuners, sensors, video encoders/decoders and - frontends, that are used by any of the supported devices. - - This is generally the right thing to do, except when there - are strict constraints with regards to the kernel size, - like on embedded systems. - - Use this option with care, as deselecting ancillary drivers which - are, in fact, necessary will result in the lack of the needed - functionality for your device (it may not tune or may not have - the needed demodulators). - - If unsure say Y. - config MEDIA_HIDE_ANCILLARY_SUBDRV bool depends on MEDIA_SUBDRV_AUTOSELECT && !COMPILE_TEST && !EXPERT default y +menu "Media ancillary drivers" + visible if !MEDIA_HIDE_ANCILLARY_SUBDRV + config MEDIA_ATTACH bool depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT From patchwork Tue Mar 24 14:26:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11455631 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AACDC1667 for ; Tue, 24 Mar 2020 14:26:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 826CF208E0 for ; Tue, 24 Mar 2020 14:26:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059989; bh=1nHoIlvAAtgS9/1HbiXy6FKLACLGKOljzYG5G1rnyUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pw3EF9pUm+jJ9bebhktCQxAT1FVXQalgUzhwJYYMGHRJgT11Fmjh8gL0K8BdznMQM vL2g8lCQLnTTeoJyBu3t4f6s0tehEDJBLYgEj8+9g4n6ljTd47LURHVllOBFPGAObp t2AqzzTdzXFf6D+FWZhxFpYZIfL5gUxlprktHcEE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728413AbgCXO02 (ORCPT ); Tue, 24 Mar 2020 10:26:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:35820 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728249AbgCXO01 (ORCPT ); Tue, 24 Mar 2020 10:26:27 -0400 Received: from mail.kernel.org (ip5f5ad4e9.dynamic.kabel-deutschland.de [95.90.212.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F3D9D21D6C; Tue, 24 Mar 2020 14:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585059986; bh=1nHoIlvAAtgS9/1HbiXy6FKLACLGKOljzYG5G1rnyUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N1cWzNTB3GLEgmvB7w1KElmTOUn95wHzSId7TmEnIB8Nswn1aMuingmgvpnXGvD4g p2NsUJFvcOmLshjpu5D71Ztim0Yk4c/r4arKJLi9iC+rMIls7ucInmUqJ2JKx0Vgj4 yE7JTU05tb2LTjamqXRYaPhALfpq2O9M2frusrqM= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jGkVc-00267w-8j; Tue, 24 Mar 2020 15:26:24 +0100 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab Subject: [PATCH v2 20/20] media: Kconfig: on !EMBEDDED && !EXPERT, enable driver filtering Date: Tue, 24 Mar 2020 15:26:21 +0100 Message-Id: X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Advanced and embedded users know what to do, so, by default, they will likely want to be able to open the entire set of Kconfig media options. Normal "poor" users usually needs more help when setting stuff, so let's open an more simplified version to them by default. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 81259287ffa3..ef71cc03c1c5 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -21,6 +21,7 @@ if MEDIA_SUPPORT config MEDIA_SUPPORT_FILTER bool "Filter devices by their types" depends on MEDIA_SUPPORT + default y if !EMBEDDED && !EXPERT help Configuring the media subsystem can be complex, as there are hundreds of drivers and other config options.