From patchwork Sun Mar 13 10:51:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779137 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 208E0C433EF for ; Sun, 13 Mar 2022 10:53:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234313AbiCMKyP (ORCPT ); Sun, 13 Mar 2022 06:54:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234278AbiCMKyI (ORCPT ); Sun, 13 Mar 2022 06:54:08 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 664D73F882; Sun, 13 Mar 2022 03:52:43 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id BB1C2B80CA8; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23BF7C340F4; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=uFEvkPWpSddUhfYe1RpIZuE2XRFVlkHyCaieWvn26LI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=psAx6IpvS3YT/dVe05PUlxLbjTQuWFjqroHNw/mOHL8FP9hTVEcdpUeNIPMA4RBhd qjhFEk2Yn/itSZk90OKmIwmvxdxvvpSGVxuRQQow4VhCbjGEPc4zhtW2VZ72VCKdqX ugFyS2PWw9qLk/CZ6MGH3zv0Hyxwf9Lxk9qq5UESTQeMxJOUgssa6xHTmAKOGl+wpe WxohI33oM/tX17gMg4JToTDgZPW4YWkXPqsueZnUsYv5sxCXkVN1e8iWijmo/f/4Tn 0w1UqxWkCdnXC7Ne5hgjQ82nD6rBRmGeAQ9Yc4g9LPAXhCdtSQnsw8WPHiVEKZzLwo V9RTWC6cdg38Q== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpW-001I1I-Ni; Sun, 13 Mar 2022 11:52:06 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Cai Huoqing , Dmitry Osipenko , Eugen Hristev , Fabio Estevam , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Jiasheng Jiang , Lad Prabhakar , Laurent Pinchart , Marco Felsch , Martin Weber , Miaoqian Lin , Ming Qian , NXP Linux Team , Pengutronix Kernel Team , Philipp Zabel , Sakari Ailus , Sascha Hauer , Shawn Guo , Wolfram Sang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 01/24] media: platform: rename coda/ to chips-media/ Date: Sun, 13 Mar 2022 11:51:42 +0100 Message-Id: <1b1da16fb226e619e5b7c533eb8f1153f76eb189.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename coda/ to chips-media/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 4 ++-- drivers/media/platform/{coda => chips-media}/Kconfig | 0 drivers/media/platform/{coda => chips-media}/Makefile | 0 drivers/media/platform/{coda => chips-media}/coda-bit.c | 0 drivers/media/platform/{coda => chips-media}/coda-common.c | 0 drivers/media/platform/{coda => chips-media}/coda-gdi.c | 0 drivers/media/platform/{coda => chips-media}/coda-h264.c | 0 drivers/media/platform/{coda => chips-media}/coda-jpeg.c | 0 drivers/media/platform/{coda => chips-media}/coda-mpeg2.c | 0 drivers/media/platform/{coda => chips-media}/coda-mpeg4.c | 0 drivers/media/platform/{coda => chips-media}/coda.h | 0 drivers/media/platform/{coda => chips-media}/coda_regs.h | 2 +- drivers/media/platform/{coda => chips-media}/imx-vdoa.c | 0 drivers/media/platform/{coda => chips-media}/imx-vdoa.h | 0 drivers/media/platform/{coda => chips-media}/trace.h | 2 +- 17 files changed, 6 insertions(+), 6 deletions(-) rename drivers/media/platform/{coda => chips-media}/Kconfig (100%) rename drivers/media/platform/{coda => chips-media}/Makefile (100%) rename drivers/media/platform/{coda => chips-media}/coda-bit.c (100%) rename drivers/media/platform/{coda => chips-media}/coda-common.c (100%) rename drivers/media/platform/{coda => chips-media}/coda-gdi.c (100%) rename drivers/media/platform/{coda => chips-media}/coda-h264.c (100%) rename drivers/media/platform/{coda => chips-media}/coda-jpeg.c (100%) rename drivers/media/platform/{coda => chips-media}/coda-mpeg2.c (100%) rename drivers/media/platform/{coda => chips-media}/coda-mpeg4.c (100%) rename drivers/media/platform/{coda => chips-media}/coda.h (100%) rename drivers/media/platform/{coda => chips-media}/coda_regs.h (99%) rename drivers/media/platform/{coda => chips-media}/imx-vdoa.c (100%) rename drivers/media/platform/{coda => chips-media}/imx-vdoa.h (100%) rename drivers/media/platform/{coda => chips-media}/trace.h (98%) diff --git a/MAINTAINERS b/MAINTAINERS index 848640546398..84bc106acc57 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4771,7 +4771,7 @@ M: Philipp Zabel L: linux-media@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/media/coda.yaml -F: drivers/media/platform/coda/ +F: drivers/media/platform/chips-media/ CODE OF CONDUCT M: Greg Kroah-Hartman diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index f15ab9739823..615736ac117c 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -71,7 +71,7 @@ source "drivers/media/platform/amphion/Kconfig" source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/cadence/Kconfig" -source "drivers/media/platform/coda/Kconfig" +source "drivers/media/platform/chips-media/Kconfig" source "drivers/media/platform/davinci/Kconfig" source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/exynos4-is/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 20b07ae3ebf1..8d6e15fad0b1 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -6,12 +6,12 @@ # Place here, alphabetically sorted by directory # (e. g. LC_ALL=C sort Makefile) obj-y += allegro-dvt/ -obj-y += aspeed/ obj-y += am437x/ obj-y += amphion/ +obj-y += aspeed/ obj-y += atmel/ obj-y += cadence/ -obj-y += coda/ +obj-y += chips-media/ obj-y += davinci/ obj-y += exynos-gsc/ obj-y += exynos4-is/ diff --git a/drivers/media/platform/coda/Kconfig b/drivers/media/platform/chips-media/Kconfig similarity index 100% rename from drivers/media/platform/coda/Kconfig rename to drivers/media/platform/chips-media/Kconfig diff --git a/drivers/media/platform/coda/Makefile b/drivers/media/platform/chips-media/Makefile similarity index 100% rename from drivers/media/platform/coda/Makefile rename to drivers/media/platform/chips-media/Makefile diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/chips-media/coda-bit.c similarity index 100% rename from drivers/media/platform/coda/coda-bit.c rename to drivers/media/platform/chips-media/coda-bit.c diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/chips-media/coda-common.c similarity index 100% rename from drivers/media/platform/coda/coda-common.c rename to drivers/media/platform/chips-media/coda-common.c diff --git a/drivers/media/platform/coda/coda-gdi.c b/drivers/media/platform/chips-media/coda-gdi.c similarity index 100% rename from drivers/media/platform/coda/coda-gdi.c rename to drivers/media/platform/chips-media/coda-gdi.c diff --git a/drivers/media/platform/coda/coda-h264.c b/drivers/media/platform/chips-media/coda-h264.c similarity index 100% rename from drivers/media/platform/coda/coda-h264.c rename to drivers/media/platform/chips-media/coda-h264.c diff --git a/drivers/media/platform/coda/coda-jpeg.c b/drivers/media/platform/chips-media/coda-jpeg.c similarity index 100% rename from drivers/media/platform/coda/coda-jpeg.c rename to drivers/media/platform/chips-media/coda-jpeg.c diff --git a/drivers/media/platform/coda/coda-mpeg2.c b/drivers/media/platform/chips-media/coda-mpeg2.c similarity index 100% rename from drivers/media/platform/coda/coda-mpeg2.c rename to drivers/media/platform/chips-media/coda-mpeg2.c diff --git a/drivers/media/platform/coda/coda-mpeg4.c b/drivers/media/platform/chips-media/coda-mpeg4.c similarity index 100% rename from drivers/media/platform/coda/coda-mpeg4.c rename to drivers/media/platform/chips-media/coda-mpeg4.c diff --git a/drivers/media/platform/coda/coda.h b/drivers/media/platform/chips-media/coda.h similarity index 100% rename from drivers/media/platform/coda/coda.h rename to drivers/media/platform/chips-media/coda.h diff --git a/drivers/media/platform/coda/coda_regs.h b/drivers/media/platform/chips-media/coda_regs.h similarity index 99% rename from drivers/media/platform/coda/coda_regs.h rename to drivers/media/platform/chips-media/coda_regs.h index da5bb3212528..db81a904cf3f 100644 --- a/drivers/media/platform/coda/coda_regs.h +++ b/drivers/media/platform/chips-media/coda_regs.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/coda/coda_regs.h + * linux/drivers/media/platform/chips-media/coda_regs.h * * Copyright (C) 2012 Vista Silicon SL * Javier Martin diff --git a/drivers/media/platform/coda/imx-vdoa.c b/drivers/media/platform/chips-media/imx-vdoa.c similarity index 100% rename from drivers/media/platform/coda/imx-vdoa.c rename to drivers/media/platform/chips-media/imx-vdoa.c diff --git a/drivers/media/platform/coda/imx-vdoa.h b/drivers/media/platform/chips-media/imx-vdoa.h similarity index 100% rename from drivers/media/platform/coda/imx-vdoa.h rename to drivers/media/platform/chips-media/imx-vdoa.h diff --git a/drivers/media/platform/coda/trace.h b/drivers/media/platform/chips-media/trace.h similarity index 98% rename from drivers/media/platform/coda/trace.h rename to drivers/media/platform/chips-media/trace.h index c0791c847f7c..19f98e6dafb9 100644 --- a/drivers/media/platform/coda/trace.h +++ b/drivers/media/platform/chips-media/trace.h @@ -167,7 +167,7 @@ DEFINE_EVENT(coda_buf_class, coda_jpeg_done, #endif /* __CODA_TRACE_H__ */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../../drivers/media/platform/coda +#define TRACE_INCLUDE_PATH ../../drivers/media/platform/chips-media #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE trace From patchwork Sun Mar 13 10:51:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779130 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 660B5C4332F for ; Sun, 13 Mar 2022 10:52:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234229AbiCMKxt (ORCPT ); Sun, 13 Mar 2022 06:53:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234466AbiCMKxk (ORCPT ); Sun, 13 Mar 2022 06:53:40 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF73412D23A; Sun, 13 Mar 2022 03:52:16 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B456F60FDC; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E126C340E8; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=CQ9LgKO1frbxjKVYlT5MfqhQYAIpf8icl+IVeeyHnfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nss3uD+HzQzPCqQb9GU9AABubzjAR+XiWJftRvl12hnVtsSSwyOjqiYwtt6sdrj5H EMQ3EGWTcvAibxIQubkTAwPStIKzUFNxUnuRQH9kxPiIY7UE4SDp/RckjdeFzoXduW Odx7dCg6FvROt+fn2DcS+noZL0AklBqzrn+LXUShcr2IekY5oAyQw1VJt1eWiYLZbJ gDyD19YSULU2ZNfZ66yVxUkNYNmzx2ll45aJ8W3K/NhJsNGMkjQgGyqXjsRE87EYWn ZE8Y8qKgKYpb951l7IHFqar61eT0bQeCcCnAfnU1uQsaoqilnEnU7tYFxumzrqIhIo iU3tuUKsOIHzg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpW-001I1L-PA; Sun, 13 Mar 2022 11:52:06 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Dmitry Osipenko , Eugen Hristev , Evgeny Novikov , Hans Verkuil , Herman , Jacopo Mondi , Jernej Skrabec , Lad Prabhakar , Laurent Pinchart , Leon Romanovsky , Ming Qian , Rui Miguel Silva , Sakari Ailus , Tomi Valkeinen , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 02/24] media: platform: rename marvell-ccic/ to marvell/ Date: Sun, 13 Mar 2022 11:51:43 +0100 Message-Id: <8e17438e4290f4e43addd4742d350748d4939f73.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename marvell-ccic/ to marvell/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{marvell-ccic => marvell}/Kconfig | 0 drivers/media/platform/{marvell-ccic => marvell}/Makefile | 0 drivers/media/platform/{marvell-ccic => marvell}/cafe-driver.c | 0 drivers/media/platform/{marvell-ccic => marvell}/mcam-core.c | 0 drivers/media/platform/{marvell-ccic => marvell}/mcam-core.h | 0 drivers/media/platform/{marvell-ccic => marvell}/mmp-driver.c | 0 9 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{marvell-ccic => marvell}/Kconfig (100%) rename drivers/media/platform/{marvell-ccic => marvell}/Makefile (100%) rename drivers/media/platform/{marvell-ccic => marvell}/cafe-driver.c (100%) rename drivers/media/platform/{marvell-ccic => marvell}/mcam-core.c (100%) rename drivers/media/platform/{marvell-ccic => marvell}/mcam-core.h (100%) rename drivers/media/platform/{marvell-ccic => marvell}/mmp-driver.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 84bc106acc57..b83cf0eb99ce 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4248,7 +4248,7 @@ L: linux-media@vger.kernel.org S: Orphan T: git git://linuxtv.org/media_tree.git F: Documentation/admin-guide/media/cafe_ccic* -F: drivers/media/platform/marvell-ccic/ +F: drivers/media/platform/marvell/ CAIF NETWORK LAYER L: netdev@vger.kernel.org diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 615736ac117c..5e7cb24038fe 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -76,7 +76,7 @@ source "drivers/media/platform/davinci/Kconfig" source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/exynos4-is/Kconfig" source "drivers/media/platform/intel/Kconfig" -source "drivers/media/platform/marvell-ccic/Kconfig" +source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/meson/ge2d/Kconfig" source "drivers/media/platform/mtk-jpeg/Kconfig" source "drivers/media/platform/mtk-mdp/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 8d6e15fad0b1..8b2deba4b62c 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -16,7 +16,7 @@ obj-y += davinci/ obj-y += exynos-gsc/ obj-y += exynos4-is/ obj-y += intel/ -obj-y += marvell-ccic/ +obj-y += marvell/ obj-y += meson/ge2d/ obj-y += mtk-jpeg/ obj-y += mtk-mdp/ diff --git a/drivers/media/platform/marvell-ccic/Kconfig b/drivers/media/platform/marvell/Kconfig similarity index 100% rename from drivers/media/platform/marvell-ccic/Kconfig rename to drivers/media/platform/marvell/Kconfig diff --git a/drivers/media/platform/marvell-ccic/Makefile b/drivers/media/platform/marvell/Makefile similarity index 100% rename from drivers/media/platform/marvell-ccic/Makefile rename to drivers/media/platform/marvell/Makefile diff --git a/drivers/media/platform/marvell-ccic/cafe-driver.c b/drivers/media/platform/marvell/cafe-driver.c similarity index 100% rename from drivers/media/platform/marvell-ccic/cafe-driver.c rename to drivers/media/platform/marvell/cafe-driver.c diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell/mcam-core.c similarity index 100% rename from drivers/media/platform/marvell-ccic/mcam-core.c rename to drivers/media/platform/marvell/mcam-core.c diff --git a/drivers/media/platform/marvell-ccic/mcam-core.h b/drivers/media/platform/marvell/mcam-core.h similarity index 100% rename from drivers/media/platform/marvell-ccic/mcam-core.h rename to drivers/media/platform/marvell/mcam-core.h diff --git a/drivers/media/platform/marvell-ccic/mmp-driver.c b/drivers/media/platform/marvell/mmp-driver.c similarity index 100% rename from drivers/media/platform/marvell-ccic/mmp-driver.c rename to drivers/media/platform/marvell/mmp-driver.c From patchwork Sun Mar 13 10:51:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779136 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C26B2C433F5 for ; Sun, 13 Mar 2022 10:53:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233372AbiCMKyO (ORCPT ); Sun, 13 Mar 2022 06:54:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234374AbiCMKyH (ORCPT ); Sun, 13 Mar 2022 06:54:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D45512BF79; Sun, 13 Mar 2022 03:52:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C09D46100D; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30102C340F7; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=W69KfAaV/x9MojJ5lep1344Lp1qLReJ8o0lhh/8yBRc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OIMJAooM6omo5X4Gqi45gpj3VZ7X+WBgKbfTvJnyygcOiJF7/O2y3HLGtDhl5jdjo 61EW/CApIUmLWT4xbumk2Ey4ejb1qPTAFGG8pDz+muO98gx7bPbHuGFnNMfhTaecvy /hKGUWfI7OBeEG5oe2ES3RXZmzzMOmBRuJgErdcT8UtBfBSzoBHdKoHusuYLSiSYLf e0L735nLGs52jYVVAL9bTxs7Vcg3UIDzeX7H1aIlSd9ZethMfEsvmBJMt/JPtxfn0J EC9oAZQi6m6Nk7kn7ujd2KCPBk5HE/qbR51SzUPa0bZbM74OPgFFWxmNJKNnl4VFC2 Ku+ZsQ+s9WhpQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpW-001I1O-Qk; Sun, 13 Mar 2022 11:52:06 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Cai Huoqing , Christophe JAILLET , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Jerome Brunet , Kevin Hilman , Laurent Pinchart , Martin Blumenstingl , Ming Qian , Neil Armstrong , Sakari Ailus , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 03/24] media: platform: rename meson/ge2d/ to amlogic/meson-ge2d/ Date: Sun, 13 Mar 2022 11:51:44 +0100 Message-Id: <95c86693bd6dc0ebd92b3466069af9b23d6a6b95.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename meson/ge2d/ to amlogic/meson-ge2d/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- .../media/platform/{meson/ge2d => amlogic/meson-ge2d}/Kconfig | 0 .../media/platform/{meson/ge2d => amlogic/meson-ge2d}/Makefile | 0 .../platform/{meson/ge2d => amlogic/meson-ge2d}/ge2d-regs.h | 0 .../media/platform/{meson/ge2d => amlogic/meson-ge2d}/ge2d.c | 0 7 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{meson/ge2d => amlogic/meson-ge2d}/Kconfig (100%) rename drivers/media/platform/{meson/ge2d => amlogic/meson-ge2d}/Makefile (100%) rename drivers/media/platform/{meson/ge2d => amlogic/meson-ge2d}/ge2d-regs.h (100%) rename drivers/media/platform/{meson/ge2d => amlogic/meson-ge2d}/ge2d.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index b83cf0eb99ce..09b0e60da4e9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12523,7 +12523,7 @@ L: linux-amlogic@lists.infradead.org S: Supported T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml -F: drivers/media/platform/meson/ge2d/ +F: drivers/media/platform/amlogic/meson-ge2d/ MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS M: Liang Yang diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 5e7cb24038fe..d8436923aebe 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -67,6 +67,7 @@ config VIDEO_MUX source "drivers/media/platform/allegro-dvt/Kconfig" source "drivers/media/platform/am437x/Kconfig" +source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" source "drivers/media/platform/amphion/Kconfig" source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/atmel/Kconfig" @@ -77,7 +78,6 @@ source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/exynos4-is/Kconfig" source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" -source "drivers/media/platform/meson/ge2d/Kconfig" source "drivers/media/platform/mtk-jpeg/Kconfig" source "drivers/media/platform/mtk-mdp/Kconfig" source "drivers/media/platform/mtk-vcodec/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 8b2deba4b62c..48531f93d92f 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -7,6 +7,7 @@ # (e. g. LC_ALL=C sort Makefile) obj-y += allegro-dvt/ obj-y += am437x/ +obj-y += amlogic/meson-ge2d/ obj-y += amphion/ obj-y += aspeed/ obj-y += atmel/ @@ -17,7 +18,6 @@ obj-y += exynos-gsc/ obj-y += exynos4-is/ obj-y += intel/ obj-y += marvell/ -obj-y += meson/ge2d/ obj-y += mtk-jpeg/ obj-y += mtk-mdp/ obj-y += mtk-vcodec/ diff --git a/drivers/media/platform/meson/ge2d/Kconfig b/drivers/media/platform/amlogic/meson-ge2d/Kconfig similarity index 100% rename from drivers/media/platform/meson/ge2d/Kconfig rename to drivers/media/platform/amlogic/meson-ge2d/Kconfig diff --git a/drivers/media/platform/meson/ge2d/Makefile b/drivers/media/platform/amlogic/meson-ge2d/Makefile similarity index 100% rename from drivers/media/platform/meson/ge2d/Makefile rename to drivers/media/platform/amlogic/meson-ge2d/Makefile diff --git a/drivers/media/platform/meson/ge2d/ge2d-regs.h b/drivers/media/platform/amlogic/meson-ge2d/ge2d-regs.h similarity index 100% rename from drivers/media/platform/meson/ge2d/ge2d-regs.h rename to drivers/media/platform/amlogic/meson-ge2d/ge2d-regs.h diff --git a/drivers/media/platform/meson/ge2d/ge2d.c b/drivers/media/platform/amlogic/meson-ge2d/ge2d.c similarity index 100% rename from drivers/media/platform/meson/ge2d/ge2d.c rename to drivers/media/platform/amlogic/meson-ge2d/ge2d.c From patchwork Sun Mar 13 10:51:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779134 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28C36C4332F for ; Sun, 13 Mar 2022 10:53:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234406AbiCMKyN (ORCPT ); Sun, 13 Mar 2022 06:54:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234373AbiCMKyH (ORCPT ); Sun, 13 Mar 2022 06:54:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3FA412BF73; Sun, 13 Mar 2022 03:52:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E81CD6100E; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C4E8C340F6; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=kuQsLLv+qQVtZ3MO89AZs58u9elVJ+hwK+IWxbSMv/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KV6SZze7o4rV4F4Txlqkh3maE5DLk7jQJN7FJOmjtaGAk8FhYXkZNHNKUL5WCkl/t S0KRtY2ksH1k7Uib3pufKaleJHxFra7nP2+0fRB/Db7JsGF3pCyQBsLJ8FPtGCmyjC axV5C7Ft/3SN5UaW2OE3GfXZf5BCQ57mYiuf+VK1EEtTYBdwK9AVdaRBb87YvUBOD5 wV2MN99soEITO8oFiw3p/omOK4BXMkWE3+QCBLIBrDv0Tw7JrXrRmpKE1qzq7Gdmh/ BwpzVIbCbPFh6NcNCpBqNmGd30No2d+Xtcqx/MThmwVpChW4YOTumEMHSLYv3Opp0d JzXBHdQxa3zAA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpW-001I1U-SL; Sun, 13 Mar 2022 11:52:06 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , AngeloGioacchino Del Regno , Bin Liu , Cai Huoqing , Colin Ian King , Dafna Hirschfeld , Dmitry Osipenko , Eugen Hristev , Evan Green , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Laurent Pinchart , Matthias Brugger , Ming Qian , Rick Chang , Sakari Ailus , Xu Wang , Yong Wu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH 04/24] media: platform: rename mtk-jpeg/ to mediatek/mtk-jpeg/ Date: Sun, 13 Mar 2022 11:51:45 +0100 Message-Id: <3c8f6cd0c95b7be3ddcea487028ebef8ae92ad68.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename mtk-jpeg/ to mediatek/mtk-jpeg/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => mediatek}/mtk-jpeg/Kconfig | 0 drivers/media/platform/{ => mediatek}/mtk-jpeg/Makefile | 0 drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.c | 0 drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.h | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.c | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.h | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.c | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.h | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_reg.h | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.c | 0 .../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.h | 0 14 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/Kconfig (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/Makefile (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_reg.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 09b0e60da4e9..fa0a3de3865f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12130,7 +12130,7 @@ M: Rick Chang M: Bin Liu S: Supported F: Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt -F: drivers/media/platform/mtk-jpeg/ +F: drivers/media/platform/mediatek/mtk-jpeg/ MEDIATEK MDP DRIVER M: Minghsiu Tsai diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index d8436923aebe..fdb4e1a8aa81 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -78,7 +78,7 @@ source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/exynos4-is/Kconfig" source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" -source "drivers/media/platform/mtk-jpeg/Kconfig" +source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" source "drivers/media/platform/mtk-mdp/Kconfig" source "drivers/media/platform/mtk-vcodec/Kconfig" source "drivers/media/platform/mtk-vpu/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 48531f93d92f..c792f6216918 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -18,7 +18,7 @@ obj-y += exynos-gsc/ obj-y += exynos4-is/ obj-y += intel/ obj-y += marvell/ -obj-y += mtk-jpeg/ +obj-y += mediatek/mtk-jpeg/ obj-y += mtk-mdp/ obj-y += mtk-vcodec/ obj-y += mtk-vpu/ diff --git a/drivers/media/platform/mtk-jpeg/Kconfig b/drivers/media/platform/mediatek/mtk-jpeg/Kconfig similarity index 100% rename from drivers/media/platform/mtk-jpeg/Kconfig rename to drivers/media/platform/mediatek/mtk-jpeg/Kconfig diff --git a/drivers/media/platform/mtk-jpeg/Makefile b/drivers/media/platform/mediatek/mtk-jpeg/Makefile similarity index 100% rename from drivers/media/platform/mtk-jpeg/Makefile rename to drivers/media/platform/mediatek/mtk-jpeg/Makefile diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.c similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.c diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.h similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.h diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.c similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.c diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.h similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.h diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.c similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.c rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.c diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.h similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.h rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.h diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_reg.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_reg.h similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_reg.h rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_reg.h diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.c similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.c diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.h similarity index 100% rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.h From patchwork Sun Mar 13 10:51:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779138 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05984C4332F for ; Sun, 13 Mar 2022 10:53:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234432AbiCMKyS (ORCPT ); Sun, 13 Mar 2022 06:54:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234259AbiCMKyI (ORCPT ); Sun, 13 Mar 2022 06:54:08 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 663523E5F9; Sun, 13 Mar 2022 03:52:43 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0B030B80CA9; Sun, 13 Mar 2022 10:52:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FC21C340FD; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=VWp9rNO5VHb/uQlqyJjbKMngzlNKF6477cOMkAGw5n0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nLWn4BafK98HHe4zRU/FzGDR73fzyLeIJlCphwr00zvP4MPjBUa75TVkRC4Cwb9+y l1ZUIWgZR1cDrKKSAkOqz6Ar3lWWQwF3AdGM+DBTVdAu92xBovniezvxSxYZGa1BNJ saYsQ8XjmWUFa9G5b4U2DznXqhpjCAtOv98jWsuMnF1C0c+2oYX7WrbU3Jn4EnMw+/ qrUBzl2tfEitgp/KA0wMo7cKmB7IAPFTK7Wx4V90uvEjxxy00rPr4UIAHo4OKYBa+H TigXgzoInJdX1ESk+F+XI8ss+Lpcy+MXT9ABjsQda9Ql4h16x47czbMw+LFryriJ9q M1vsehf/a2yXw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpW-001I1Y-Tw; Sun, 13 Mar 2022 11:52:06 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Andrew-CT Chen , AngeloGioacchino Del Regno , Dafna Hirschfeld , Dmitry Osipenko , Eugen Hristev , Evan Green , Hans Verkuil , Houlong Wei , Jacopo Mondi , Jernej Skrabec , Jonathan Cameron , Laurent Pinchart , Matthias Brugger , Ming Qian , Minghsiu Tsai , Sakari Ailus , Xu Wang , Yong Wu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH 05/24] media: platform: rename mtk-mdp/ to mediatek/mtk-mdp/ Date: Sun, 13 Mar 2022 11:51:46 +0100 Message-Id: <834b10510c01800e171e34c06a9d82c8e072fbc9.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename mtk-mdp/ to mediatek/mtk-mdp/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => mediatek}/mtk-mdp/Kconfig | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/Makefile | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.c | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.h | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.c | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.h | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_ipi.h | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.c | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.h | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.c | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.h | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.c | 0 drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.h | 0 16 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ => mediatek}/mtk-mdp/Kconfig (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/Makefile (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_ipi.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index fa0a3de3865f..2203d98bbcf1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12138,7 +12138,7 @@ M: Houlong Wei M: Andrew-CT Chen S: Supported F: Documentation/devicetree/bindings/media/mediatek-mdp.txt -F: drivers/media/platform/mtk-mdp/ +F: drivers/media/platform/mediatek/mtk-mdp/ F: drivers/media/platform/mtk-vpu/ MEDIATEK MEDIA DRIVER diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index fdb4e1a8aa81..a45fd3fe103e 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -79,7 +79,7 @@ source "drivers/media/platform/exynos4-is/Kconfig" source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" -source "drivers/media/platform/mtk-mdp/Kconfig" +source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" source "drivers/media/platform/mtk-vcodec/Kconfig" source "drivers/media/platform/mtk-vpu/Kconfig" source "drivers/media/platform/nxp/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index c792f6216918..6f5d09cd8f9b 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -19,7 +19,7 @@ obj-y += exynos4-is/ obj-y += intel/ obj-y += marvell/ obj-y += mediatek/mtk-jpeg/ -obj-y += mtk-mdp/ +obj-y += mediatek/mtk-mdp/ obj-y += mtk-vcodec/ obj-y += mtk-vpu/ obj-y += nxp/ diff --git a/drivers/media/platform/mtk-mdp/Kconfig b/drivers/media/platform/mediatek/mtk-mdp/Kconfig similarity index 100% rename from drivers/media/platform/mtk-mdp/Kconfig rename to drivers/media/platform/mediatek/mtk-mdp/Kconfig diff --git a/drivers/media/platform/mtk-mdp/Makefile b/drivers/media/platform/mediatek/mtk-mdp/Makefile similarity index 100% rename from drivers/media/platform/mtk-mdp/Makefile rename to drivers/media/platform/mediatek/mtk-mdp/Makefile diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_comp.c rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_comp.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_core.c rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_core.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_regs.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_regs.c rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_regs.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_regs.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h similarity index 100% rename from drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h From patchwork Sun Mar 13 10:51:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779143 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B52DC4332F for ; Sun, 13 Mar 2022 10:53:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233318AbiCMKye (ORCPT ); Sun, 13 Mar 2022 06:54:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234317AbiCMKx4 (ORCPT ); Sun, 13 Mar 2022 06:53:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3877118622; Sun, 13 Mar 2022 03:52:33 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9C01261019; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5DD89C340FA; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=HoopYOEpxuaYPaONTVhJjIO5eFHfFTSdNlpQocjOuNc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KKBcRn2CzfXUR2sCEdms5vFAj4K7/mxfXAjBMFBzPriFIVdBakehntZwv0MjYlH+1 LwkFzfobDbTnM02r2u9H7yAjufCIVkWG/gEQZSis4evNXz4RTOqCXPT1nePiPCb3AE cz+6+DyiIOnwDj+1ZtIkXl2aEscOA4Ztvy7+MjaoXMWvbP7FJln/8bOFDbJGwlUYsP p6uRpEHMJeS86/2BiCxws0uux7QpuAyPXG6HHd1nH2dGXNp9f402zxk1C+h6iQ68H1 APjZ7d+IAbafL/Dgn9UBN8pz2RrkTMCdCImmQCtk9SOTJbr3JCEGMTShMqIJTmByG6 TS17BB0kYuVrQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpW-001I1c-Vd; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Alexandre Courbot , Andrew-CT Chen , AngeloGioacchino Del Regno , Benjamin Gaignard , Christophe JAILLET , Dafna Hirschfeld , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Hirokazu Honda , Hsin-Yi Wang , Irui Wang , Jacopo Mondi , Jernej Skrabec , Jiasheng Jiang , Jonathan Cameron , Laurent Pinchart , Matthias Brugger , Ming Qian , Nicolas Dufresne , Sakari Ailus , Steve Cho , Tiffany Lin , Tzung-Bi Shih , Yong Wu , Yunfei Dong , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH 06/24] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/ Date: Sun, 13 Mar 2022 11:51:47 +0100 Message-Id: <53a632ce79c9d02673d7540e18d681f123afb801.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename mtk-vcodec/ to mediatek/mtk-vcodec/. Signed-off-by: Mauro Carvalho Chehab Acked-by: Nicolas Dufresne --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h | 0 .../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c | 0 .../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c | 0 .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h | 0 .../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c | 0 .../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h | 0 .../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h | 0 .../platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c | 0 .../media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c | 0 drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h | 0 49 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 2203d98bbcf1..bfe014870a77 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12147,7 +12147,7 @@ M: Andrew-CT Chen S: Supported F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt F: Documentation/devicetree/bindings/media/mediatek-vpu.txt -F: drivers/media/platform/mtk-vcodec/ +F: drivers/media/platform/mediatek/mtk-vcodec/ F: drivers/media/platform/mtk-vpu/ MEDIATEK MMC/SD/SDIO DRIVER diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index a45fd3fe103e..8ba10b657164 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -80,7 +80,7 @@ source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" -source "drivers/media/platform/mtk-vcodec/Kconfig" +source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" source "drivers/media/platform/mtk-vpu/Kconfig" source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/omap/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 6f5d09cd8f9b..637a3a7ac036 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -20,7 +20,7 @@ obj-y += intel/ obj-y += marvell/ obj-y += mediatek/mtk-jpeg/ obj-y += mediatek/mtk-mdp/ -obj-y += mtk-vcodec/ +obj-y += mediatek/mtk-vcodec/ obj-y += mtk-vpu/ obj-y += nxp/ obj-y += omap/ diff --git a/drivers/media/platform/mtk-vcodec/Kconfig b/drivers/media/platform/mediatek/mtk-vcodec/Kconfig similarity index 100% rename from drivers/media/platform/mtk-vcodec/Kconfig rename to drivers/media/platform/mediatek/mtk-vcodec/Kconfig diff --git a/drivers/media/platform/mtk-vcodec/Makefile b/drivers/media/platform/mediatek/mtk-vcodec/Makefile similarity index 100% rename from drivers/media/platform/mtk-vcodec/Makefile rename to drivers/media/platform/mediatek/mtk-vcodec/Makefile diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_drv_base.h rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.h rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h diff --git a/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.h rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.h rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_drv_base.h rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_drv_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_drv_if.h rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h diff --git a/drivers/media/platform/mtk-vcodec/venc_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_ipi_msg.h rename to drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.c rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h similarity index 100% rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.h rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h From patchwork Sun Mar 13 10:51:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779139 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EFC6C433EF for ; Sun, 13 Mar 2022 10:53:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234367AbiCMKyW (ORCPT ); Sun, 13 Mar 2022 06:54:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234390AbiCMKyI (ORCPT ); Sun, 13 Mar 2022 06:54:08 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 554E539179; Sun, 13 Mar 2022 03:52:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C937BB80CAB; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C8ACC340FC; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=+XUrxUNJJc78O+G+Ztb+zSl+5Iq7rWoIkMhUhvOheWI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IG+X9wJ1YQpuJ79qHtaVUuZ9k1cWgA9Wts6EoW3UWDux4fElQnuv8sKbU14YuK1GF +7tjg3rOVRRUOL8EnEjnGZQ3K4XaRAY6gquOqf38M1Uh+tfb02Bzo3uk8GCd841ziJ 7m+U+2fjAlX4wGc1vXBNrhSeJdJhTc4qrjK9C+JgDYsB2bHztmCiQ7AooqFtI8wNuC yXxgYNwmlPZJM9A5cCQ6NAyWusoFXMB617ie3O+eOS31X8c3Mi3k6Un4FhGRK9orQC rCN3UFOL04S0mnfDKB2n7ahehABI471RPQrJ9M9ikQKym0WsK+zqGzvoxj9yZh3j5x TcgdOEQfIJ4pQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I1g-1I; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Andrew-CT Chen , Christophe JAILLET , Dafna Hirschfeld , Ding Senjie , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Houlong Wei , Jacopo Mondi , Jernej Skrabec , Lad Prabhakar , Laurent Pinchart , Matthias Brugger , Ming Qian , Minghsiu Tsai , Sakari Ailus , Tiffany Lin , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH 07/24] media: platform: rename mtk-vpu/ to mediatek/mtk-vpu/ Date: Sun, 13 Mar 2022 11:51:48 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename mtk-vpu/ to mediatek/mtk-vpu/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 4 ++-- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/mediatek/mtk-mdp/Makefile | 2 +- drivers/media/platform/{ => mediatek}/mtk-vpu/Kconfig | 0 drivers/media/platform/{ => mediatek}/mtk-vpu/Makefile | 0 drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.c | 0 drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.h | 0 8 files changed, 5 insertions(+), 5 deletions(-) rename drivers/media/platform/{ => mediatek}/mtk-vpu/Kconfig (100%) rename drivers/media/platform/{ => mediatek}/mtk-vpu/Makefile (100%) rename drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.c (100%) rename drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index bfe014870a77..58e0d42b1278 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12139,7 +12139,7 @@ M: Andrew-CT Chen S: Supported F: Documentation/devicetree/bindings/media/mediatek-mdp.txt F: drivers/media/platform/mediatek/mtk-mdp/ -F: drivers/media/platform/mtk-vpu/ +F: drivers/media/platform/mediatek/mtk-vpu/ MEDIATEK MEDIA DRIVER M: Tiffany Lin @@ -12148,7 +12148,7 @@ S: Supported F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt F: Documentation/devicetree/bindings/media/mediatek-vpu.txt F: drivers/media/platform/mediatek/mtk-vcodec/ -F: drivers/media/platform/mtk-vpu/ +F: drivers/media/platform/mediatek/mtk-vpu/ MEDIATEK MMC/SD/SDIO DRIVER M: Chaotian Jing diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 8ba10b657164..33f8f41b2771 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -81,7 +81,7 @@ source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" -source "drivers/media/platform/mtk-vpu/Kconfig" +source "drivers/media/platform/mediatek/mtk-vpu/Kconfig" source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/omap3isp/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 637a3a7ac036..954ad8f2cde1 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -21,7 +21,7 @@ obj-y += marvell/ obj-y += mediatek/mtk-jpeg/ obj-y += mediatek/mtk-mdp/ obj-y += mediatek/mtk-vcodec/ -obj-y += mtk-vpu/ +obj-y += mediatek/mtk-vpu/ obj-y += nxp/ obj-y += omap/ obj-y += omap3isp/ diff --git a/drivers/media/platform/mediatek/mtk-mdp/Makefile b/drivers/media/platform/mediatek/mtk-mdp/Makefile index 5982d65c9971..eab6f984aeea 100644 --- a/drivers/media/platform/mediatek/mtk-mdp/Makefile +++ b/drivers/media/platform/mediatek/mtk-mdp/Makefile @@ -7,4 +7,4 @@ mtk-mdp-y += mtk_mdp_vpu.o obj-$(CONFIG_VIDEO_MEDIATEK_MDP) += mtk-mdp.o -ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vpu +ccflags-y += -I$(srctree)/drivers/media/platform/mediatek/mtk-vpu diff --git a/drivers/media/platform/mtk-vpu/Kconfig b/drivers/media/platform/mediatek/mtk-vpu/Kconfig similarity index 100% rename from drivers/media/platform/mtk-vpu/Kconfig rename to drivers/media/platform/mediatek/mtk-vpu/Kconfig diff --git a/drivers/media/platform/mtk-vpu/Makefile b/drivers/media/platform/mediatek/mtk-vpu/Makefile similarity index 100% rename from drivers/media/platform/mtk-vpu/Makefile rename to drivers/media/platform/mediatek/mtk-vpu/Makefile diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c similarity index 100% rename from drivers/media/platform/mtk-vpu/mtk_vpu.c rename to drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.h b/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h similarity index 100% rename from drivers/media/platform/mtk-vpu/mtk_vpu.h rename to drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h From patchwork Sun Mar 13 10:51:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779131 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4AEC0C433F5 for ; Sun, 13 Mar 2022 10:52:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233429AbiCMKxv (ORCPT ); Sun, 13 Mar 2022 06:53:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233768AbiCMKxm (ORCPT ); Sun, 13 Mar 2022 06:53:42 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 330CF119F1C; Sun, 13 Mar 2022 03:52:20 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 43A4DB80CAD; Sun, 13 Mar 2022 10:52:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45E51C340F5; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=rfDcIoqp2tGMvmOQbEgCFtaPOjgURb3ipd/yJK7UfsI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PMfG2oQ0fFiqexOiozq7XbiwPzMh4v7Es5DCBb+R7x/8CB9O7+6wH7+GNHwzZekPA UwUGZLB0RmXLtpXKqcBgp61vsTre7SxRCXcVg3c9tGaA0yFzwId6oufDT1rMejbIQs /YT2nQztF7pd9QxT4fjccJGMK8c2Xie2WOq6LTfCL834Az0ZneGWidCWC5iaqfZU34 2thxi7j5T+U4KQeCp0S6/cSqiGW1FcduGTStqyfFIwi0h79SxGKblwkeLOBtoXTAJB S3ePUJunkXbjKYEemsl+IpTd9pEB0uqNLv+hf/nRe1VRUhjESlHG70AHGcR88Onfzo 37tiFscqx0f7A== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I1k-2j; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Cai Huoqing , Chen-Yu Tsai , Dinghao Liu , Dmitry Osipenko , Eugen Hristev , Ezequiel Garcia , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Jia-Ju Bai , Jonathan Cameron , Laurent Pinchart , Maxime Ripard , Mikhail Rudenko , Ming Qian , Ondrej Jirman , Robert Foss , Rui Miguel Silva , Sakari Ailus , Tomi Valkeinen , Yong Deng , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 08/24] media: platform: rename sunxi/ to allwinner/ Date: Sun, 13 Mar 2022 11:51:49 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename sunxi/ to allwinner/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 8 ++++---- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/allwinner/Kconfig | 6 ++++++ drivers/media/platform/{sunxi => allwinner}/Makefile | 0 .../media/platform/{sunxi => allwinner}/sun4i-csi/Kconfig | 0 .../platform/{sunxi => allwinner}/sun4i-csi/Makefile | 0 .../platform/{sunxi => allwinner}/sun4i-csi/sun4i_csi.c | 0 .../platform/{sunxi => allwinner}/sun4i-csi/sun4i_csi.h | 0 .../platform/{sunxi => allwinner}/sun4i-csi/sun4i_dma.c | 0 .../platform/{sunxi => allwinner}/sun4i-csi/sun4i_v4l2.c | 0 .../media/platform/{sunxi => allwinner}/sun6i-csi/Kconfig | 0 .../platform/{sunxi => allwinner}/sun6i-csi/Makefile | 0 .../platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi.c | 0 .../platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi.h | 0 .../{sunxi => allwinner}/sun6i-csi/sun6i_csi_reg.h | 0 .../platform/{sunxi => allwinner}/sun6i-csi/sun6i_video.c | 0 .../platform/{sunxi => allwinner}/sun6i-csi/sun6i_video.h | 0 .../media/platform/{sunxi => allwinner}/sun8i-di/Kconfig | 0 .../media/platform/{sunxi => allwinner}/sun8i-di/Makefile | 0 .../platform/{sunxi => allwinner}/sun8i-di/sun8i-di.c | 0 .../platform/{sunxi => allwinner}/sun8i-di/sun8i-di.h | 0 .../platform/{sunxi => allwinner}/sun8i-rotate/Kconfig | 0 .../platform/{sunxi => allwinner}/sun8i-rotate/Makefile | 0 .../{sunxi => allwinner}/sun8i-rotate/sun8i-formats.h | 0 .../{sunxi => allwinner}/sun8i-rotate/sun8i-rotate.h | 0 .../{sunxi => allwinner}/sun8i-rotate/sun8i_formats.c | 0 .../{sunxi => allwinner}/sun8i-rotate/sun8i_rotate.c | 0 drivers/media/platform/sunxi/Kconfig | 6 ------ 29 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 drivers/media/platform/allwinner/Kconfig rename drivers/media/platform/{sunxi => allwinner}/Makefile (100%) rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/Kconfig (100%) rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/Makefile (100%) rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/sun4i_csi.c (100%) rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/sun4i_csi.h (100%) rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/sun4i_dma.c (100%) rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/sun4i_v4l2.c (100%) rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/Kconfig (100%) rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/Makefile (100%) rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi.c (100%) rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi.h (100%) rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi_reg.h (100%) rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_video.c (100%) rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_video.h (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-di/Kconfig (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-di/Makefile (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-di/sun8i-di.c (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-di/sun8i-di.h (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/Kconfig (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/Makefile (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/sun8i-formats.h (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/sun8i-rotate.h (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/sun8i_formats.c (100%) rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/sun8i_rotate.c (100%) delete mode 100644 drivers/media/platform/sunxi/Kconfig diff --git a/MAINTAINERS b/MAINTAINERS index 58e0d42b1278..f29195850c16 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -750,7 +750,7 @@ L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml -F: drivers/media/platform/sunxi/sun4i-csi/ +F: drivers/media/platform/allwinner/sun4i-csi/ ALLWINNER CPUFREQ DRIVER M: Yangtao Li @@ -5114,7 +5114,7 @@ L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml -F: drivers/media/platform/sunxi/sun6i-csi/ +F: drivers/media/platform/allwinner/sun6i-csi/ CW1200 WLAN driver M: Solomon Peachy @@ -5391,7 +5391,7 @@ L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml -F: drivers/media/platform/sunxi/sun8i-di/ +F: drivers/media/platform/allwinner/sun8i-di/ DELL LAPTOP DRIVER M: Matthew Garrett @@ -16746,7 +16746,7 @@ L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml -F: drivers/media/platform/sunxi/sun8i-rotate/ +F: drivers/media/platform/allwinner/sun8i-rotate/ RPMSG TTY DRIVER M: Arnaud Pouliquen diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 33f8f41b2771..5ffbbd6c6f91 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -66,6 +66,7 @@ config VIDEO_MUX # TODO: create per-manufacturer directories source "drivers/media/platform/allegro-dvt/Kconfig" +source "drivers/media/platform/allwinner/Kconfig" source "drivers/media/platform/am437x/Kconfig" source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" source "drivers/media/platform/amphion/Kconfig" @@ -94,7 +95,6 @@ source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" -source "drivers/media/platform/sunxi/Kconfig" source "drivers/media/platform/tegra/vde/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/via/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 954ad8f2cde1..88519e902919 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -6,6 +6,7 @@ # Place here, alphabetically sorted by directory # (e. g. LC_ALL=C sort Makefile) obj-y += allegro-dvt/ +obj-y += allwinner/ obj-y += am437x/ obj-y += amlogic/meson-ge2d/ obj-y += amphion/ @@ -39,7 +40,6 @@ obj-y += sti/c8sectpfe/ obj-y += sti/delta/ obj-y += sti/hva/ obj-y += stm32/ -obj-y += sunxi/ obj-y += tegra/vde/ obj-y += ti-vpe/ obj-y += via/ diff --git a/drivers/media/platform/allwinner/Kconfig b/drivers/media/platform/allwinner/Kconfig new file mode 100644 index 000000000000..88bffb055528 --- /dev/null +++ b/drivers/media/platform/allwinner/Kconfig @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 + +source "drivers/media/platform/allwinner/sun4i-csi/Kconfig" +source "drivers/media/platform/allwinner/sun6i-csi/Kconfig" +source "drivers/media/platform/allwinner/sun8i-di/Kconfig" +source "drivers/media/platform/allwinner/sun8i-rotate/Kconfig" diff --git a/drivers/media/platform/sunxi/Makefile b/drivers/media/platform/allwinner/Makefile similarity index 100% rename from drivers/media/platform/sunxi/Makefile rename to drivers/media/platform/allwinner/Makefile diff --git a/drivers/media/platform/sunxi/sun4i-csi/Kconfig b/drivers/media/platform/allwinner/sun4i-csi/Kconfig similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/Kconfig rename to drivers/media/platform/allwinner/sun4i-csi/Kconfig diff --git a/drivers/media/platform/sunxi/sun4i-csi/Makefile b/drivers/media/platform/allwinner/sun4i-csi/Makefile similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/Makefile rename to drivers/media/platform/allwinner/sun4i-csi/Makefile diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c b/drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.c similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.c diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h b/drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.h similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.h diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c b/drivers/media/platform/allwinner/sun4i-csi/sun4i_dma.c similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_dma.c diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c b/drivers/media/platform/allwinner/sun4i-csi/sun4i_v4l2.c similarity index 100% rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_v4l2.c diff --git a/drivers/media/platform/sunxi/sun6i-csi/Kconfig b/drivers/media/platform/allwinner/sun6i-csi/Kconfig similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/Kconfig rename to drivers/media/platform/allwinner/sun6i-csi/Kconfig diff --git a/drivers/media/platform/sunxi/sun6i-csi/Makefile b/drivers/media/platform/allwinner/sun6i-csi/Makefile similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/Makefile rename to drivers/media/platform/allwinner/sun6i-csi/Makefile diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.c similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.c diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h b/drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.h similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.h diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h b/drivers/media/platform/allwinner/sun6i-csi/sun6i_csi_reg.h similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_csi_reg.h diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c b/drivers/media/platform/allwinner/sun6i-csi/sun6i_video.c similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_video.c diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h b/drivers/media/platform/allwinner/sun6i-csi/sun6i_video.h similarity index 100% rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_video.h diff --git a/drivers/media/platform/sunxi/sun8i-di/Kconfig b/drivers/media/platform/allwinner/sun8i-di/Kconfig similarity index 100% rename from drivers/media/platform/sunxi/sun8i-di/Kconfig rename to drivers/media/platform/allwinner/sun8i-di/Kconfig diff --git a/drivers/media/platform/sunxi/sun8i-di/Makefile b/drivers/media/platform/allwinner/sun8i-di/Makefile similarity index 100% rename from drivers/media/platform/sunxi/sun8i-di/Makefile rename to drivers/media/platform/allwinner/sun8i-di/Makefile diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c b/drivers/media/platform/allwinner/sun8i-di/sun8i-di.c similarity index 100% rename from drivers/media/platform/sunxi/sun8i-di/sun8i-di.c rename to drivers/media/platform/allwinner/sun8i-di/sun8i-di.c diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.h b/drivers/media/platform/allwinner/sun8i-di/sun8i-di.h similarity index 100% rename from drivers/media/platform/sunxi/sun8i-di/sun8i-di.h rename to drivers/media/platform/allwinner/sun8i-di/sun8i-di.h diff --git a/drivers/media/platform/sunxi/sun8i-rotate/Kconfig b/drivers/media/platform/allwinner/sun8i-rotate/Kconfig similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/Kconfig rename to drivers/media/platform/allwinner/sun8i-rotate/Kconfig diff --git a/drivers/media/platform/sunxi/sun8i-rotate/Makefile b/drivers/media/platform/allwinner/sun8i-rotate/Makefile similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/Makefile rename to drivers/media/platform/allwinner/sun8i-rotate/Makefile diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i-formats.h b/drivers/media/platform/allwinner/sun8i-rotate/sun8i-formats.h similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i-formats.h rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i-formats.h diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i-rotate.h b/drivers/media/platform/allwinner/sun8i-rotate/sun8i-rotate.h similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i-rotate.h rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i-rotate.h diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_formats.c b/drivers/media/platform/allwinner/sun8i-rotate/sun8i_formats.c similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i_formats.c rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i_formats.c diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c b/drivers/media/platform/allwinner/sun8i-rotate/sun8i_rotate.c similarity index 100% rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i_rotate.c diff --git a/drivers/media/platform/sunxi/Kconfig b/drivers/media/platform/sunxi/Kconfig deleted file mode 100644 index a10032215b08..000000000000 --- a/drivers/media/platform/sunxi/Kconfig +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - -source "drivers/media/platform/sunxi/sun4i-csi/Kconfig" -source "drivers/media/platform/sunxi/sun6i-csi/Kconfig" -source "drivers/media/platform/sunxi/sun8i-di/Kconfig" -source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig" From patchwork Sun Mar 13 10:51:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779188 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CF0EC4321E for ; Sun, 13 Mar 2022 10:54:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234586AbiCMKzb (ORCPT ); Sun, 13 Mar 2022 06:55:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234527AbiCMKys (ORCPT ); Sun, 13 Mar 2022 06:54:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04F90473A9; Sun, 13 Mar 2022 03:53:20 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5F88861013; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6FF0AC34103; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=IuZ8jbiRQ/d5pH8t422vBJM0XgKJRYkfxT7Kfz741sw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uZqEFca17NxQqHpvQO6iYZ0MJ7TcCXf/hdRqAYDqQGxVR2WklTZYIfIjkBDI49PCD lZfzoi3sVBGiqEcqYs/Y4irig1nPCKSE1dz+6xDQkgDvNy0/i7+lvbeRRxIga5ia4k WI6GltQBhIvAvQS1/cyMdXKQ6OK/EzLFf4x6Oe9LZdwqVfJZKGBa1ikCJKwEkc93Ud ewrv6uCKAgJU38WBQoMuw3jLxE0D42UBMit5FFPNuXEfB2MY7/yGw3xZnEkWbxDCPr adFiIk2cQIGOYizs85JKMUIlwV8Pyx286YG3se/5MTV4VxuOWmNxjxvGcug6NVCRBv ZAHZQOPf6Q8Gg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I1o-4I; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Christian_K=C3=B6n?= =?utf-8?q?ig?= , =?utf-8?q?Niklas_S=C3=B6derlund?= , Arnd Bergmann , Dmitry Osipenko , Eugen Hristev , Greg Kroah-Hartman , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Jonathan Hunter , Laurent Pinchart , Ming Qian , Sakari Ailus , Thierry Reding , Ulf Hansson , Yang Yingliang , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH 09/24] media: platform: rename tegra/vde/ to nvidia/tegra-vde/ Date: Sun, 13 Mar 2022 11:51:50 +0100 Message-Id: <904431a92f3ed111d094e002a6c5961dbaf9c069.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename tegra/vde/ to nvidia/tegra-vde/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/Kconfig | 0 drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/Makefile | 0 .../platform/{tegra/vde => nvidia/tegra-vde}/dmabuf-cache.c | 0 drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/h264.c | 0 drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/iommu.c | 0 drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/trace.h | 2 +- drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/v4l2.c | 0 drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/vde.c | 0 drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/vde.h | 0 12 files changed, 4 insertions(+), 4 deletions(-) rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/Kconfig (100%) rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/Makefile (100%) rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/dmabuf-cache.c (100%) rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/h264.c (100%) rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/iommu.c (100%) rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/trace.h (97%) rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/v4l2.c (100%) rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/vde.c (100%) rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/vde.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index f29195850c16..c9333d46047e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11964,7 +11964,7 @@ L: linux-tegra@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt -F: drivers/media/platform/tegra/vde/ +F: drivers/media/platform/nvidia/tegra-vde/ MEDIA DRIVERS FOR RENESAS - CEU M: Jacopo Mondi diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 5ffbbd6c6f91..f07ab9a98e3b 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -83,6 +83,7 @@ source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" source "drivers/media/platform/mediatek/mtk-vpu/Kconfig" +source "drivers/media/platform/nvidia/tegra-vde/Kconfig" source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/omap3isp/Kconfig" @@ -95,7 +96,6 @@ source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" -source "drivers/media/platform/tegra/vde/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 88519e902919..ce9909534218 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -23,6 +23,7 @@ obj-y += mediatek/mtk-jpeg/ obj-y += mediatek/mtk-mdp/ obj-y += mediatek/mtk-vcodec/ obj-y += mediatek/mtk-vpu/ +obj-y += nvidia/tegra-vde/ obj-y += nxp/ obj-y += omap/ obj-y += omap3isp/ @@ -40,7 +41,6 @@ obj-y += sti/c8sectpfe/ obj-y += sti/delta/ obj-y += sti/hva/ obj-y += stm32/ -obj-y += tegra/vde/ obj-y += ti-vpe/ obj-y += via/ obj-y += xilinx/ diff --git a/drivers/media/platform/tegra/vde/Kconfig b/drivers/media/platform/nvidia/tegra-vde/Kconfig similarity index 100% rename from drivers/media/platform/tegra/vde/Kconfig rename to drivers/media/platform/nvidia/tegra-vde/Kconfig diff --git a/drivers/media/platform/tegra/vde/Makefile b/drivers/media/platform/nvidia/tegra-vde/Makefile similarity index 100% rename from drivers/media/platform/tegra/vde/Makefile rename to drivers/media/platform/nvidia/tegra-vde/Makefile diff --git a/drivers/media/platform/tegra/vde/dmabuf-cache.c b/drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c similarity index 100% rename from drivers/media/platform/tegra/vde/dmabuf-cache.c rename to drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c diff --git a/drivers/media/platform/tegra/vde/h264.c b/drivers/media/platform/nvidia/tegra-vde/h264.c similarity index 100% rename from drivers/media/platform/tegra/vde/h264.c rename to drivers/media/platform/nvidia/tegra-vde/h264.c diff --git a/drivers/media/platform/tegra/vde/iommu.c b/drivers/media/platform/nvidia/tegra-vde/iommu.c similarity index 100% rename from drivers/media/platform/tegra/vde/iommu.c rename to drivers/media/platform/nvidia/tegra-vde/iommu.c diff --git a/drivers/media/platform/tegra/vde/trace.h b/drivers/media/platform/nvidia/tegra-vde/trace.h similarity index 97% rename from drivers/media/platform/tegra/vde/trace.h rename to drivers/media/platform/nvidia/tegra-vde/trace.h index 77358ddfdb8f..7853ab095ca4 100644 --- a/drivers/media/platform/tegra/vde/trace.h +++ b/drivers/media/platform/nvidia/tegra-vde/trace.h @@ -90,6 +90,6 @@ TRACE_EVENT(vde_ref_l1, /* This part must be outside protection */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../../drivers/media/platform/tegra/vde +#define TRACE_INCLUDE_PATH ../../drivers/media/platform/nvidia/tegra-vde #define TRACE_INCLUDE_FILE trace #include diff --git a/drivers/media/platform/tegra/vde/v4l2.c b/drivers/media/platform/nvidia/tegra-vde/v4l2.c similarity index 100% rename from drivers/media/platform/tegra/vde/v4l2.c rename to drivers/media/platform/nvidia/tegra-vde/v4l2.c diff --git a/drivers/media/platform/tegra/vde/vde.c b/drivers/media/platform/nvidia/tegra-vde/vde.c similarity index 100% rename from drivers/media/platform/tegra/vde/vde.c rename to drivers/media/platform/nvidia/tegra-vde/vde.c diff --git a/drivers/media/platform/tegra/vde/vde.h b/drivers/media/platform/nvidia/tegra-vde/vde.h similarity index 100% rename from drivers/media/platform/tegra/vde/vde.h rename to drivers/media/platform/nvidia/tegra-vde/vde.h From patchwork Sun Mar 13 10:51:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779189 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3413C433EF for ; Sun, 13 Mar 2022 10:54:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234428AbiCMKzs (ORCPT ); Sun, 13 Mar 2022 06:55:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234496AbiCMKyu (ORCPT ); Sun, 13 Mar 2022 06:54:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D686574BB; Sun, 13 Mar 2022 03:53:28 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 87C7061015; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 79D09C340FE; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=ASdp7uDAiQJpkzCYmeyxzp8ccqtSa3Qn5Tb22jbj8F0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WPzN+HGZM58Ijwwn4obWA6brXE1R8vL81PZkgDEPPrUGoS6ykjos8ZlSiJTP61DEF GG59cVIA+boStqcWR9QxfvnK60Luoeoi0V/LqbIwakW1rozP5u95KhYGRTz/Uei+mA fiHUGRkt/COFJD/SnGObFeaOzWZkupHJwGE7f/MhDYRqhdSzSuWCl/ZXg57a/sNc88 eGzAzaFkvJBRh/My2KZ4S4qr47PMnJod3NABvXnpJZGpvAvGJfwRPGI73KSpOuEZXt 6CExmcUiFxOFhT4k8/SOR4A7SAtuwznJWL2GFl8vBoGuyot4ZBI83qZ9SgLdzRIPdA dis8O4CYlA/jw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I1s-5h; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Dmitry Osipenko , Eugen Hristev , Fabio Estevam , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Laurent Pinchart , Ming Qian , NXP Linux Team , Pengutronix Kernel Team , Sakari Ailus , Sascha Hauer , Shawn Guo , Shijie Qin , Zhou Peng , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 10/24] media: platform: rename amphion/ to nxp/amphion/ Date: Sun, 13 Mar 2022 11:51:51 +0100 Message-Id: <74af5c2eb40369185a5a233b106513cbc14401c0.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename amphion/ to nxp/amphion/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => nxp}/amphion/Kconfig | 0 drivers/media/platform/{ => nxp}/amphion/Makefile | 0 drivers/media/platform/{ => nxp}/amphion/vdec.c | 0 drivers/media/platform/{ => nxp}/amphion/venc.c | 0 drivers/media/platform/{ => nxp}/amphion/vpu.h | 0 drivers/media/platform/{ => nxp}/amphion/vpu_cmds.c | 0 drivers/media/platform/{ => nxp}/amphion/vpu_cmds.h | 0 drivers/media/platform/{ => nxp}/amphion/vpu_codec.h | 0 drivers/media/platform/{ => nxp}/amphion/vpu_color.c | 0 drivers/media/platform/{ => nxp}/amphion/vpu_core.c | 0 drivers/media/platform/{ => nxp}/amphion/vpu_core.h | 0 drivers/media/platform/{ => nxp}/amphion/vpu_dbg.c | 0 drivers/media/platform/{ => nxp}/amphion/vpu_defs.h | 0 drivers/media/platform/{ => nxp}/amphion/vpu_drv.c | 0 drivers/media/platform/{ => nxp}/amphion/vpu_helpers.c | 0 drivers/media/platform/{ => nxp}/amphion/vpu_helpers.h | 0 drivers/media/platform/{ => nxp}/amphion/vpu_imx8q.c | 0 drivers/media/platform/{ => nxp}/amphion/vpu_imx8q.h | 0 drivers/media/platform/{ => nxp}/amphion/vpu_malone.c | 0 drivers/media/platform/{ => nxp}/amphion/vpu_malone.h | 0 drivers/media/platform/{ => nxp}/amphion/vpu_mbox.c | 0 drivers/media/platform/{ => nxp}/amphion/vpu_mbox.h | 0 drivers/media/platform/{ => nxp}/amphion/vpu_msgs.c | 0 drivers/media/platform/{ => nxp}/amphion/vpu_msgs.h | 0 drivers/media/platform/{ => nxp}/amphion/vpu_rpc.c | 0 drivers/media/platform/{ => nxp}/amphion/vpu_rpc.h | 0 drivers/media/platform/{ => nxp}/amphion/vpu_v4l2.c | 0 drivers/media/platform/{ => nxp}/amphion/vpu_v4l2.h | 0 drivers/media/platform/{ => nxp}/amphion/vpu_windsor.c | 0 drivers/media/platform/{ => nxp}/amphion/vpu_windsor.h | 0 33 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ => nxp}/amphion/Kconfig (100%) rename drivers/media/platform/{ => nxp}/amphion/Makefile (100%) rename drivers/media/platform/{ => nxp}/amphion/vdec.c (100%) rename drivers/media/platform/{ => nxp}/amphion/venc.c (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu.h (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_cmds.c (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_cmds.h (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_codec.h (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_color.c (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_core.c (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_core.h (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_dbg.c (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_defs.h (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_drv.c (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_helpers.c (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_helpers.h (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_imx8q.c (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_imx8q.h (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_malone.c (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_malone.h (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_mbox.c (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_mbox.h (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_msgs.c (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_msgs.h (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_rpc.c (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_rpc.h (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_v4l2.c (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_v4l2.h (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_windsor.c (100%) rename drivers/media/platform/{ => nxp}/amphion/vpu_windsor.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index c9333d46047e..74901acf8f06 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1037,7 +1037,7 @@ M: Zhou Peng L: linux-media@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/media/amphion,vpu.yaml -F: drivers/media/platform/amphion/ +F: drivers/media/platform/nxp/amphion/ AMS AS73211 DRIVER M: Christian Eggers diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index f07ab9a98e3b..2e3925408aa0 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -69,7 +69,6 @@ source "drivers/media/platform/allegro-dvt/Kconfig" source "drivers/media/platform/allwinner/Kconfig" source "drivers/media/platform/am437x/Kconfig" source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" -source "drivers/media/platform/amphion/Kconfig" source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/cadence/Kconfig" @@ -85,6 +84,7 @@ source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" source "drivers/media/platform/mediatek/mtk-vpu/Kconfig" source "drivers/media/platform/nvidia/tegra-vde/Kconfig" source "drivers/media/platform/nxp/Kconfig" +source "drivers/media/platform/nxp/amphion/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/qcom/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index ce9909534218..7a28b60dbbe6 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -9,7 +9,6 @@ obj-y += allegro-dvt/ obj-y += allwinner/ obj-y += am437x/ obj-y += amlogic/meson-ge2d/ -obj-y += amphion/ obj-y += aspeed/ obj-y += atmel/ obj-y += cadence/ @@ -25,6 +24,7 @@ obj-y += mediatek/mtk-vcodec/ obj-y += mediatek/mtk-vpu/ obj-y += nvidia/tegra-vde/ obj-y += nxp/ +obj-y += nxp/amphion/ obj-y += omap/ obj-y += omap3isp/ obj-y += qcom/camss/ diff --git a/drivers/media/platform/amphion/Kconfig b/drivers/media/platform/nxp/amphion/Kconfig similarity index 100% rename from drivers/media/platform/amphion/Kconfig rename to drivers/media/platform/nxp/amphion/Kconfig diff --git a/drivers/media/platform/amphion/Makefile b/drivers/media/platform/nxp/amphion/Makefile similarity index 100% rename from drivers/media/platform/amphion/Makefile rename to drivers/media/platform/nxp/amphion/Makefile diff --git a/drivers/media/platform/amphion/vdec.c b/drivers/media/platform/nxp/amphion/vdec.c similarity index 100% rename from drivers/media/platform/amphion/vdec.c rename to drivers/media/platform/nxp/amphion/vdec.c diff --git a/drivers/media/platform/amphion/venc.c b/drivers/media/platform/nxp/amphion/venc.c similarity index 100% rename from drivers/media/platform/amphion/venc.c rename to drivers/media/platform/nxp/amphion/venc.c diff --git a/drivers/media/platform/amphion/vpu.h b/drivers/media/platform/nxp/amphion/vpu.h similarity index 100% rename from drivers/media/platform/amphion/vpu.h rename to drivers/media/platform/nxp/amphion/vpu.h diff --git a/drivers/media/platform/amphion/vpu_cmds.c b/drivers/media/platform/nxp/amphion/vpu_cmds.c similarity index 100% rename from drivers/media/platform/amphion/vpu_cmds.c rename to drivers/media/platform/nxp/amphion/vpu_cmds.c diff --git a/drivers/media/platform/amphion/vpu_cmds.h b/drivers/media/platform/nxp/amphion/vpu_cmds.h similarity index 100% rename from drivers/media/platform/amphion/vpu_cmds.h rename to drivers/media/platform/nxp/amphion/vpu_cmds.h diff --git a/drivers/media/platform/amphion/vpu_codec.h b/drivers/media/platform/nxp/amphion/vpu_codec.h similarity index 100% rename from drivers/media/platform/amphion/vpu_codec.h rename to drivers/media/platform/nxp/amphion/vpu_codec.h diff --git a/drivers/media/platform/amphion/vpu_color.c b/drivers/media/platform/nxp/amphion/vpu_color.c similarity index 100% rename from drivers/media/platform/amphion/vpu_color.c rename to drivers/media/platform/nxp/amphion/vpu_color.c diff --git a/drivers/media/platform/amphion/vpu_core.c b/drivers/media/platform/nxp/amphion/vpu_core.c similarity index 100% rename from drivers/media/platform/amphion/vpu_core.c rename to drivers/media/platform/nxp/amphion/vpu_core.c diff --git a/drivers/media/platform/amphion/vpu_core.h b/drivers/media/platform/nxp/amphion/vpu_core.h similarity index 100% rename from drivers/media/platform/amphion/vpu_core.h rename to drivers/media/platform/nxp/amphion/vpu_core.h diff --git a/drivers/media/platform/amphion/vpu_dbg.c b/drivers/media/platform/nxp/amphion/vpu_dbg.c similarity index 100% rename from drivers/media/platform/amphion/vpu_dbg.c rename to drivers/media/platform/nxp/amphion/vpu_dbg.c diff --git a/drivers/media/platform/amphion/vpu_defs.h b/drivers/media/platform/nxp/amphion/vpu_defs.h similarity index 100% rename from drivers/media/platform/amphion/vpu_defs.h rename to drivers/media/platform/nxp/amphion/vpu_defs.h diff --git a/drivers/media/platform/amphion/vpu_drv.c b/drivers/media/platform/nxp/amphion/vpu_drv.c similarity index 100% rename from drivers/media/platform/amphion/vpu_drv.c rename to drivers/media/platform/nxp/amphion/vpu_drv.c diff --git a/drivers/media/platform/amphion/vpu_helpers.c b/drivers/media/platform/nxp/amphion/vpu_helpers.c similarity index 100% rename from drivers/media/platform/amphion/vpu_helpers.c rename to drivers/media/platform/nxp/amphion/vpu_helpers.c diff --git a/drivers/media/platform/amphion/vpu_helpers.h b/drivers/media/platform/nxp/amphion/vpu_helpers.h similarity index 100% rename from drivers/media/platform/amphion/vpu_helpers.h rename to drivers/media/platform/nxp/amphion/vpu_helpers.h diff --git a/drivers/media/platform/amphion/vpu_imx8q.c b/drivers/media/platform/nxp/amphion/vpu_imx8q.c similarity index 100% rename from drivers/media/platform/amphion/vpu_imx8q.c rename to drivers/media/platform/nxp/amphion/vpu_imx8q.c diff --git a/drivers/media/platform/amphion/vpu_imx8q.h b/drivers/media/platform/nxp/amphion/vpu_imx8q.h similarity index 100% rename from drivers/media/platform/amphion/vpu_imx8q.h rename to drivers/media/platform/nxp/amphion/vpu_imx8q.h diff --git a/drivers/media/platform/amphion/vpu_malone.c b/drivers/media/platform/nxp/amphion/vpu_malone.c similarity index 100% rename from drivers/media/platform/amphion/vpu_malone.c rename to drivers/media/platform/nxp/amphion/vpu_malone.c diff --git a/drivers/media/platform/amphion/vpu_malone.h b/drivers/media/platform/nxp/amphion/vpu_malone.h similarity index 100% rename from drivers/media/platform/amphion/vpu_malone.h rename to drivers/media/platform/nxp/amphion/vpu_malone.h diff --git a/drivers/media/platform/amphion/vpu_mbox.c b/drivers/media/platform/nxp/amphion/vpu_mbox.c similarity index 100% rename from drivers/media/platform/amphion/vpu_mbox.c rename to drivers/media/platform/nxp/amphion/vpu_mbox.c diff --git a/drivers/media/platform/amphion/vpu_mbox.h b/drivers/media/platform/nxp/amphion/vpu_mbox.h similarity index 100% rename from drivers/media/platform/amphion/vpu_mbox.h rename to drivers/media/platform/nxp/amphion/vpu_mbox.h diff --git a/drivers/media/platform/amphion/vpu_msgs.c b/drivers/media/platform/nxp/amphion/vpu_msgs.c similarity index 100% rename from drivers/media/platform/amphion/vpu_msgs.c rename to drivers/media/platform/nxp/amphion/vpu_msgs.c diff --git a/drivers/media/platform/amphion/vpu_msgs.h b/drivers/media/platform/nxp/amphion/vpu_msgs.h similarity index 100% rename from drivers/media/platform/amphion/vpu_msgs.h rename to drivers/media/platform/nxp/amphion/vpu_msgs.h diff --git a/drivers/media/platform/amphion/vpu_rpc.c b/drivers/media/platform/nxp/amphion/vpu_rpc.c similarity index 100% rename from drivers/media/platform/amphion/vpu_rpc.c rename to drivers/media/platform/nxp/amphion/vpu_rpc.c diff --git a/drivers/media/platform/amphion/vpu_rpc.h b/drivers/media/platform/nxp/amphion/vpu_rpc.h similarity index 100% rename from drivers/media/platform/amphion/vpu_rpc.h rename to drivers/media/platform/nxp/amphion/vpu_rpc.h diff --git a/drivers/media/platform/amphion/vpu_v4l2.c b/drivers/media/platform/nxp/amphion/vpu_v4l2.c similarity index 100% rename from drivers/media/platform/amphion/vpu_v4l2.c rename to drivers/media/platform/nxp/amphion/vpu_v4l2.c diff --git a/drivers/media/platform/amphion/vpu_v4l2.h b/drivers/media/platform/nxp/amphion/vpu_v4l2.h similarity index 100% rename from drivers/media/platform/amphion/vpu_v4l2.h rename to drivers/media/platform/nxp/amphion/vpu_v4l2.h diff --git a/drivers/media/platform/amphion/vpu_windsor.c b/drivers/media/platform/nxp/amphion/vpu_windsor.c similarity index 100% rename from drivers/media/platform/amphion/vpu_windsor.c rename to drivers/media/platform/nxp/amphion/vpu_windsor.c diff --git a/drivers/media/platform/amphion/vpu_windsor.h b/drivers/media/platform/nxp/amphion/vpu_windsor.h similarity index 100% rename from drivers/media/platform/amphion/vpu_windsor.h rename to drivers/media/platform/nxp/amphion/vpu_windsor.h From patchwork Sun Mar 13 10:51:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779135 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA671C433EF for ; Sun, 13 Mar 2022 10:53:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234254AbiCMKyK (ORCPT ); Sun, 13 Mar 2022 06:54:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234353AbiCMKyE (ORCPT ); Sun, 13 Mar 2022 06:54:04 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 623BE11EF10; Sun, 13 Mar 2022 03:52:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id B9790B80CB8; Sun, 13 Mar 2022 10:52:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6FF49C34104; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=pcVRRvth+vF8A4ryQQR+z13x2KwSCUMB6wuY3kqe1k8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QMRNBHsPYOKJCZ3GHbRZP+QXA1PsN5ySzDIVssGX3nIwCW7LVEdf7BrSi42c92xct Cwpc7ryi0wllGea8sYckSGMIjavWy0ViswGJLw7ewPDrLBi++qdMj++ZsTKukRolDA xaHcxtu32zVTp3BnvaYTXTqBa2FDmik3U78sHB3N1X2cE05s0LAdze8Q4JYT9EVkxH 74AAK2s5p9uhYAMB40Mqog+5ZGs5d/eH7L6mSZdmWaGCzI/mTaIKDXh/Gm4KQ3nbBu /Mi+Dt06X8hDP0XH3JSlCiWgM0YDcIEKRbb+6cpdVHpQGZIQHWqpCQjzNj1Xn4bMVC abfcfYChr4GsA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I1w-7P; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Cai Huoqing , Dmitry Osipenko , Eugen Hristev , Greg Kroah-Hartman , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Krzysztof Kozlowski , Lad Prabhakar , Laurent Pinchart , Lee Jones , Lv Yunlong , Ming Qian , Sakari Ailus , Shawn Guo , Sylwester Nawrocki , Tomi Valkeinen , Yang Li , Zhen Lei , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 11/24] media: platform: rename exynos4-is/ to samsung/exynos4-is/ Date: Sun, 13 Mar 2022 11:51:52 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename exynos4-is/ to samsung/exynos4-is/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ Documentation/admin-guide/media/fimc.rst | 2 +- .../driver-api/media/drivers/fimc-devel.rst | 14 +++++++------- MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- .../platform/{ => samsung}/exynos4-is/Kconfig | 0 .../platform/{ => samsung}/exynos4-is/Makefile | 0 .../platform/{ => samsung}/exynos4-is/common.c | 0 .../platform/{ => samsung}/exynos4-is/common.h | 0 .../{ => samsung}/exynos4-is/fimc-capture.c | 0 .../platform/{ => samsung}/exynos4-is/fimc-core.c | 0 .../platform/{ => samsung}/exynos4-is/fimc-core.h | 0 .../{ => samsung}/exynos4-is/fimc-is-command.h | 0 .../{ => samsung}/exynos4-is/fimc-is-errno.c | 0 .../{ => samsung}/exynos4-is/fimc-is-errno.h | 0 .../{ => samsung}/exynos4-is/fimc-is-i2c.c | 0 .../{ => samsung}/exynos4-is/fimc-is-i2c.h | 0 .../{ => samsung}/exynos4-is/fimc-is-param.c | 0 .../{ => samsung}/exynos4-is/fimc-is-param.h | 0 .../{ => samsung}/exynos4-is/fimc-is-regs.c | 0 .../{ => samsung}/exynos4-is/fimc-is-regs.h | 0 .../{ => samsung}/exynos4-is/fimc-is-sensor.c | 0 .../{ => samsung}/exynos4-is/fimc-is-sensor.h | 0 .../platform/{ => samsung}/exynos4-is/fimc-is.c | 0 .../platform/{ => samsung}/exynos4-is/fimc-is.h | 0 .../{ => samsung}/exynos4-is/fimc-isp-video.c | 0 .../{ => samsung}/exynos4-is/fimc-isp-video.h | 0 .../platform/{ => samsung}/exynos4-is/fimc-isp.c | 0 .../platform/{ => samsung}/exynos4-is/fimc-isp.h | 0 .../{ => samsung}/exynos4-is/fimc-lite-reg.c | 0 .../{ => samsung}/exynos4-is/fimc-lite-reg.h | 0 .../platform/{ => samsung}/exynos4-is/fimc-lite.c | 0 .../platform/{ => samsung}/exynos4-is/fimc-lite.h | 0 .../platform/{ => samsung}/exynos4-is/fimc-m2m.c | 0 .../platform/{ => samsung}/exynos4-is/fimc-reg.c | 0 .../platform/{ => samsung}/exynos4-is/fimc-reg.h | 0 .../platform/{ => samsung}/exynos4-is/media-dev.c | 0 .../platform/{ => samsung}/exynos4-is/media-dev.h | 0 .../platform/{ => samsung}/exynos4-is/mipi-csis.c | 0 .../platform/{ => samsung}/exynos4-is/mipi-csis.h | 0 40 files changed, 11 insertions(+), 11 deletions(-) rename drivers/media/platform/{ => samsung}/exynos4-is/Kconfig (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/Makefile (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/common.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/common.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-capture.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-core.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-core.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-command.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-errno.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-errno.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-i2c.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-i2c.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-param.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-param.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-regs.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-regs.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-sensor.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-sensor.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-isp-video.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-isp-video.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-isp.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-isp.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-lite-reg.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-lite-reg.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-lite.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-lite.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-m2m.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-reg.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-reg.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/media-dev.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/media-dev.h (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/mipi-csis.c (100%) rename drivers/media/platform/{ => samsung}/exynos4-is/mipi-csis.h (100%) diff --git a/Documentation/admin-guide/media/fimc.rst b/Documentation/admin-guide/media/fimc.rst index 56b149d9a527..267ef52fe387 100644 --- a/Documentation/admin-guide/media/fimc.rst +++ b/Documentation/admin-guide/media/fimc.rst @@ -14,7 +14,7 @@ data from LCD controller (FIMD) through the SoC internal writeback data path. There are multiple FIMC instances in the SoCs (up to 4), having slightly different capabilities, like pixel alignment constraints, rotator availability, LCD writeback support, etc. The driver is located at -drivers/media/platform/exynos4-is directory. +drivers/media/platform/samsung/exynos4-is directory. Supported SoCs -------------- diff --git a/Documentation/driver-api/media/drivers/fimc-devel.rst b/Documentation/driver-api/media/drivers/fimc-devel.rst index 956e3a9901f8..4c6b7c8be19f 100644 --- a/Documentation/driver-api/media/drivers/fimc-devel.rst +++ b/Documentation/driver-api/media/drivers/fimc-devel.rst @@ -12,22 +12,22 @@ Files partitioning - media device driver - drivers/media/platform/exynos4-is/media-dev.[ch] + drivers/media/platform/samsung/exynos4-is/media-dev.[ch] - camera capture video device driver - drivers/media/platform/exynos4-is/fimc-capture.c + drivers/media/platform/samsung/exynos4-is/fimc-capture.c - MIPI-CSI2 receiver subdev - drivers/media/platform/exynos4-is/mipi-csis.[ch] + drivers/media/platform/samsung/exynos4-is/mipi-csis.[ch] - video post-processor (mem-to-mem) - drivers/media/platform/exynos4-is/fimc-core.c + drivers/media/platform/samsung/exynos4-is/fimc-core.c - common files - drivers/media/platform/exynos4-is/fimc-core.h - drivers/media/platform/exynos4-is/fimc-reg.h - drivers/media/platform/exynos4-is/regs-fimc.h + drivers/media/platform/samsung/exynos4-is/fimc-core.h + drivers/media/platform/samsung/exynos4-is/fimc-reg.h + drivers/media/platform/samsung/exynos4-is/regs-fimc.h diff --git a/MAINTAINERS b/MAINTAINERS index 74901acf8f06..b1418853d56f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17103,7 +17103,7 @@ M: Sylwester Nawrocki L: linux-media@vger.kernel.org S: Supported Q: https://patchwork.linuxtv.org/project/linux-media/list/ -F: drivers/media/platform/exynos4-is/ +F: drivers/media/platform/samsung/exynos4-is/ SAMSUNG SOC CLOCK DRIVERS M: Sylwester Nawrocki diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 2e3925408aa0..1bbada840723 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -75,7 +75,6 @@ source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/chips-media/Kconfig" source "drivers/media/platform/davinci/Kconfig" source "drivers/media/platform/exynos-gsc/Kconfig" -source "drivers/media/platform/exynos4-is/Kconfig" source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" @@ -94,6 +93,7 @@ source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/Kconfig" +source "drivers/media/platform/samsung/exynos4-is/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 7a28b60dbbe6..613ca6a3efa7 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -15,7 +15,6 @@ obj-y += cadence/ obj-y += chips-media/ obj-y += davinci/ obj-y += exynos-gsc/ -obj-y += exynos4-is/ obj-y += intel/ obj-y += marvell/ obj-y += mediatek/mtk-jpeg/ @@ -36,6 +35,7 @@ obj-y += s3c-camif/ obj-y += s5p-g2d/ obj-y += s5p-jpeg/ obj-y += s5p-mfc/ +obj-y += samsung/exynos4-is/ obj-y += sti/bdisp/ obj-y += sti/c8sectpfe/ obj-y += sti/delta/ diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/samsung/exynos4-is/Kconfig similarity index 100% rename from drivers/media/platform/exynos4-is/Kconfig rename to drivers/media/platform/samsung/exynos4-is/Kconfig diff --git a/drivers/media/platform/exynos4-is/Makefile b/drivers/media/platform/samsung/exynos4-is/Makefile similarity index 100% rename from drivers/media/platform/exynos4-is/Makefile rename to drivers/media/platform/samsung/exynos4-is/Makefile diff --git a/drivers/media/platform/exynos4-is/common.c b/drivers/media/platform/samsung/exynos4-is/common.c similarity index 100% rename from drivers/media/platform/exynos4-is/common.c rename to drivers/media/platform/samsung/exynos4-is/common.c diff --git a/drivers/media/platform/exynos4-is/common.h b/drivers/media/platform/samsung/exynos4-is/common.h similarity index 100% rename from drivers/media/platform/exynos4-is/common.h rename to drivers/media/platform/samsung/exynos4-is/common.h diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/samsung/exynos4-is/fimc-capture.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-capture.c rename to drivers/media/platform/samsung/exynos4-is/fimc-capture.c diff --git a/drivers/media/platform/exynos4-is/fimc-core.c b/drivers/media/platform/samsung/exynos4-is/fimc-core.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-core.c rename to drivers/media/platform/samsung/exynos4-is/fimc-core.c diff --git a/drivers/media/platform/exynos4-is/fimc-core.h b/drivers/media/platform/samsung/exynos4-is/fimc-core.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-core.h rename to drivers/media/platform/samsung/exynos4-is/fimc-core.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-command.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-command.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-command.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-command.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-errno.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-errno.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-errno.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is-errno.c diff --git a/drivers/media/platform/exynos4-is/fimc-is-errno.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-errno.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-errno.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-errno.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-i2c.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-i2c.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.c diff --git a/drivers/media/platform/exynos4-is/fimc-is-i2c.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-i2c.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-param.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-param.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-param.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is-param.c diff --git a/drivers/media/platform/exynos4-is/fimc-is-param.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-param.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-param.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-param.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-regs.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-regs.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-regs.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is-regs.c diff --git a/drivers/media/platform/exynos4-is/fimc-is-regs.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-regs.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-regs.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-regs.h diff --git a/drivers/media/platform/exynos4-is/fimc-is-sensor.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-sensor.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.c diff --git a/drivers/media/platform/exynos4-is/fimc-is-sensor.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is-sensor.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.h diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/samsung/exynos4-is/fimc-is.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is.c rename to drivers/media/platform/samsung/exynos4-is/fimc-is.c diff --git a/drivers/media/platform/exynos4-is/fimc-is.h b/drivers/media/platform/samsung/exynos4-is/fimc-is.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-is.h rename to drivers/media/platform/samsung/exynos4-is/fimc-is.h diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/samsung/exynos4-is/fimc-isp-video.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-isp-video.c rename to drivers/media/platform/samsung/exynos4-is/fimc-isp-video.c diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.h b/drivers/media/platform/samsung/exynos4-is/fimc-isp-video.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-isp-video.h rename to drivers/media/platform/samsung/exynos4-is/fimc-isp-video.h diff --git a/drivers/media/platform/exynos4-is/fimc-isp.c b/drivers/media/platform/samsung/exynos4-is/fimc-isp.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-isp.c rename to drivers/media/platform/samsung/exynos4-is/fimc-isp.c diff --git a/drivers/media/platform/exynos4-is/fimc-isp.h b/drivers/media/platform/samsung/exynos4-is/fimc-isp.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-isp.h rename to drivers/media/platform/samsung/exynos4-is/fimc-isp.h diff --git a/drivers/media/platform/exynos4-is/fimc-lite-reg.c b/drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-lite-reg.c rename to drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.c diff --git a/drivers/media/platform/exynos4-is/fimc-lite-reg.h b/drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-lite-reg.h rename to drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.h diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/samsung/exynos4-is/fimc-lite.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-lite.c rename to drivers/media/platform/samsung/exynos4-is/fimc-lite.c diff --git a/drivers/media/platform/exynos4-is/fimc-lite.h b/drivers/media/platform/samsung/exynos4-is/fimc-lite.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-lite.h rename to drivers/media/platform/samsung/exynos4-is/fimc-lite.h diff --git a/drivers/media/platform/exynos4-is/fimc-m2m.c b/drivers/media/platform/samsung/exynos4-is/fimc-m2m.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-m2m.c rename to drivers/media/platform/samsung/exynos4-is/fimc-m2m.c diff --git a/drivers/media/platform/exynos4-is/fimc-reg.c b/drivers/media/platform/samsung/exynos4-is/fimc-reg.c similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-reg.c rename to drivers/media/platform/samsung/exynos4-is/fimc-reg.c diff --git a/drivers/media/platform/exynos4-is/fimc-reg.h b/drivers/media/platform/samsung/exynos4-is/fimc-reg.h similarity index 100% rename from drivers/media/platform/exynos4-is/fimc-reg.h rename to drivers/media/platform/samsung/exynos4-is/fimc-reg.h diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/samsung/exynos4-is/media-dev.c similarity index 100% rename from drivers/media/platform/exynos4-is/media-dev.c rename to drivers/media/platform/samsung/exynos4-is/media-dev.c diff --git a/drivers/media/platform/exynos4-is/media-dev.h b/drivers/media/platform/samsung/exynos4-is/media-dev.h similarity index 100% rename from drivers/media/platform/exynos4-is/media-dev.h rename to drivers/media/platform/samsung/exynos4-is/media-dev.h diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/samsung/exynos4-is/mipi-csis.c similarity index 100% rename from drivers/media/platform/exynos4-is/mipi-csis.c rename to drivers/media/platform/samsung/exynos4-is/mipi-csis.c diff --git a/drivers/media/platform/exynos4-is/mipi-csis.h b/drivers/media/platform/samsung/exynos4-is/mipi-csis.h similarity index 100% rename from drivers/media/platform/exynos4-is/mipi-csis.h rename to drivers/media/platform/samsung/exynos4-is/mipi-csis.h From patchwork Sun Mar 13 10:51:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779133 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B9C8C43217 for ; Sun, 13 Mar 2022 10:53:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234370AbiCMKyG (ORCPT ); Sun, 13 Mar 2022 06:54:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234395AbiCMKxl (ORCPT ); Sun, 13 Mar 2022 06:53:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D4CA12D925; Sun, 13 Mar 2022 03:52:18 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 57CDA6100F; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80889C34105; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=H6riGIBHtNh9i24lR1ghBv7IWPMVqrM/Sm5wev2DUhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WVtAdKkqtZ5ZA+NofFZGNPilI5nhFHIelynGP6u9aLDHjlnnZI8mhfuvhe8RcyeFC KcB7E119SVcPvrk4Zja01XLAEa5gesea29Ew1WRq/Wey6Ca4f3uQEv/dY+CHYsROzs BwVCM1dEzzCv3Z3PQKmIS+PHtVup2fnL5YjStCNasCHMbChQ5SB8Ox7hHgU8nLCjlV CRl0rM8ylwr/PXDaBNJ4EiSrZBeTrMFi/KUuRGIKu2j6V+6sh1j1w+198r8MX3pH6K Pzd+Gp7tRLWlPF6UiFJE3MOKeIhR73JubY+rz/5hGv80/844Nk2PPYb+GwapuffzUf 6tZVVEXk0Ky/Q== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I20-94; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Cai Huoqing , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Jonathan Cameron , Krzysztof Kozlowski , Lad Prabhakar , Laurent Pinchart , Ming Qian , Sakari Ailus , Sylwester Nawrocki , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 12/24] media: platform: rename exynos-gsc/ to samsung/exynos-gsc/ Date: Sun, 13 Mar 2022 11:51:53 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename exynos-gsc/ to samsung/exynos-gsc/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => samsung}/exynos-gsc/Kconfig | 0 drivers/media/platform/{ => samsung}/exynos-gsc/Makefile | 0 drivers/media/platform/{ => samsung}/exynos-gsc/gsc-core.c | 0 drivers/media/platform/{ => samsung}/exynos-gsc/gsc-core.h | 0 drivers/media/platform/{ => samsung}/exynos-gsc/gsc-m2m.c | 0 drivers/media/platform/{ => samsung}/exynos-gsc/gsc-regs.c | 0 drivers/media/platform/{ => samsung}/exynos-gsc/gsc-regs.h | 0 9 files changed, 2 insertions(+), 2 deletions(-) rename drivers/media/platform/{ => samsung}/exynos-gsc/Kconfig (100%) rename drivers/media/platform/{ => samsung}/exynos-gsc/Makefile (100%) rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-core.c (100%) rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-core.h (100%) rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-m2m.c (100%) rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-regs.c (100%) rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-regs.h (100%) diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 1bbada840723..81888d348149 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -74,7 +74,6 @@ source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/chips-media/Kconfig" source "drivers/media/platform/davinci/Kconfig" -source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" @@ -93,6 +92,7 @@ source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/Kconfig" +source "drivers/media/platform/samsung/exynos-gsc/Kconfig" source "drivers/media/platform/samsung/exynos4-is/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 613ca6a3efa7..848cbd6147ae 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -14,7 +14,6 @@ obj-y += atmel/ obj-y += cadence/ obj-y += chips-media/ obj-y += davinci/ -obj-y += exynos-gsc/ obj-y += intel/ obj-y += marvell/ obj-y += mediatek/mtk-jpeg/ @@ -35,6 +34,7 @@ obj-y += s3c-camif/ obj-y += s5p-g2d/ obj-y += s5p-jpeg/ obj-y += s5p-mfc/ +obj-y += samsung/exynos-gsc/ obj-y += samsung/exynos4-is/ obj-y += sti/bdisp/ obj-y += sti/c8sectpfe/ diff --git a/drivers/media/platform/exynos-gsc/Kconfig b/drivers/media/platform/samsung/exynos-gsc/Kconfig similarity index 100% rename from drivers/media/platform/exynos-gsc/Kconfig rename to drivers/media/platform/samsung/exynos-gsc/Kconfig diff --git a/drivers/media/platform/exynos-gsc/Makefile b/drivers/media/platform/samsung/exynos-gsc/Makefile similarity index 100% rename from drivers/media/platform/exynos-gsc/Makefile rename to drivers/media/platform/samsung/exynos-gsc/Makefile diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/samsung/exynos-gsc/gsc-core.c similarity index 100% rename from drivers/media/platform/exynos-gsc/gsc-core.c rename to drivers/media/platform/samsung/exynos-gsc/gsc-core.c diff --git a/drivers/media/platform/exynos-gsc/gsc-core.h b/drivers/media/platform/samsung/exynos-gsc/gsc-core.h similarity index 100% rename from drivers/media/platform/exynos-gsc/gsc-core.h rename to drivers/media/platform/samsung/exynos-gsc/gsc-core.h diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c similarity index 100% rename from drivers/media/platform/exynos-gsc/gsc-m2m.c rename to drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c diff --git a/drivers/media/platform/exynos-gsc/gsc-regs.c b/drivers/media/platform/samsung/exynos-gsc/gsc-regs.c similarity index 100% rename from drivers/media/platform/exynos-gsc/gsc-regs.c rename to drivers/media/platform/samsung/exynos-gsc/gsc-regs.c diff --git a/drivers/media/platform/exynos-gsc/gsc-regs.h b/drivers/media/platform/samsung/exynos-gsc/gsc-regs.h similarity index 100% rename from drivers/media/platform/exynos-gsc/gsc-regs.h rename to drivers/media/platform/samsung/exynos-gsc/gsc-regs.h From patchwork Sun Mar 13 10:51:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779132 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EBB8C433EF for ; Sun, 13 Mar 2022 10:53:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234333AbiCMKyB (ORCPT ); Sun, 13 Mar 2022 06:54:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234418AbiCMKxl (ORCPT ); Sun, 13 Mar 2022 06:53:41 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C608412E150; Sun, 13 Mar 2022 03:52:19 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 22504B80CAE; Sun, 13 Mar 2022 10:52:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D67CC34106; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=tGu7bQT0kjgdt+9soh7Njfucu1RtXJqYP6JxRUeck8s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fa+RU51c/TfvS163ZdETR6tbP5dgmOuT/avDdn29IvJ2tc5Xo7gxMsRuvg4TCEUhI SnnqtbXRzOnxqnbHimSzLTMAMj3p+S/ibvsndj/Tl391yzk2tvHfJdLg2rJdEAMH9Q jcfCfSNWRTsq/gTl2sc4sdT1uKKejJq6Jko6oz55qWjERJlciQ6djGbbEIw4rrjGcx YXFDDMTk5ZT4/AW2tsuPGKqrm2+Fxdgg8eVWWN5fwZ6s2Zt3XjNf/RyPf5SB6yQIef zv2ZP0/DLE1+Jx1JGqzPXROjEVK1kcaH6uDdqDat5yFE87DRirG+Rsi8LphgU7wuh0 gNdCj42zhs01g== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I24-AN; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Cai Huoqing , Dmitry Osipenko , Dongliang Mu , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Krzysztof Kozlowski , Laurent Pinchart , Ming Qian , Randy Dunlap , Sakari Ailus , Sylwester Nawrocki , Tomi Valkeinen , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 13/24] media: platform: rename s3c-camif/ to samsung/s3c-camif/ Date: Sun, 13 Mar 2022 11:51:54 +0100 Message-Id: <829b44d692bf8fd06eb584809ad9c2c0540f9812.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename s3c-camif/ to samsung/s3c-camif/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => samsung}/s3c-camif/Kconfig | 0 drivers/media/platform/{ => samsung}/s3c-camif/Makefile | 0 drivers/media/platform/{ => samsung}/s3c-camif/camif-capture.c | 0 drivers/media/platform/{ => samsung}/s3c-camif/camif-core.c | 0 drivers/media/platform/{ => samsung}/s3c-camif/camif-core.h | 0 drivers/media/platform/{ => samsung}/s3c-camif/camif-regs.c | 0 drivers/media/platform/{ => samsung}/s3c-camif/camif-regs.h | 0 10 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ => samsung}/s3c-camif/Kconfig (100%) rename drivers/media/platform/{ => samsung}/s3c-camif/Makefile (100%) rename drivers/media/platform/{ => samsung}/s3c-camif/camif-capture.c (100%) rename drivers/media/platform/{ => samsung}/s3c-camif/camif-core.c (100%) rename drivers/media/platform/{ => samsung}/s3c-camif/camif-core.h (100%) rename drivers/media/platform/{ => samsung}/s3c-camif/camif-regs.c (100%) rename drivers/media/platform/{ => samsung}/s3c-camif/camif-regs.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index b1418853d56f..8ce4894699cc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17063,7 +17063,7 @@ M: Sylwester Nawrocki L: linux-media@vger.kernel.org L: linux-samsung-soc@vger.kernel.org S: Maintained -F: drivers/media/platform/s3c-camif/ +F: drivers/media/platform/samsung/s3c-camif/ F: include/media/drv-intf/s3c_camif.h SAMSUNG S3FWRN5 NFC DRIVER diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 81888d348149..0a87d835b2f5 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -88,12 +88,12 @@ source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/Kconfig" -source "drivers/media/platform/s3c-camif/Kconfig" source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/Kconfig" source "drivers/media/platform/samsung/exynos-gsc/Kconfig" source "drivers/media/platform/samsung/exynos4-is/Kconfig" +source "drivers/media/platform/samsung/s3c-camif/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 848cbd6147ae..c3dfe40b2def 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -30,12 +30,12 @@ obj-y += qcom/venus/ obj-y += renesas/ obj-y += rockchip/rga/ obj-y += rockchip/rkisp1/ -obj-y += s3c-camif/ obj-y += s5p-g2d/ obj-y += s5p-jpeg/ obj-y += s5p-mfc/ obj-y += samsung/exynos-gsc/ obj-y += samsung/exynos4-is/ +obj-y += samsung/s3c-camif/ obj-y += sti/bdisp/ obj-y += sti/c8sectpfe/ obj-y += sti/delta/ diff --git a/drivers/media/platform/s3c-camif/Kconfig b/drivers/media/platform/samsung/s3c-camif/Kconfig similarity index 100% rename from drivers/media/platform/s3c-camif/Kconfig rename to drivers/media/platform/samsung/s3c-camif/Kconfig diff --git a/drivers/media/platform/s3c-camif/Makefile b/drivers/media/platform/samsung/s3c-camif/Makefile similarity index 100% rename from drivers/media/platform/s3c-camif/Makefile rename to drivers/media/platform/samsung/s3c-camif/Makefile diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/samsung/s3c-camif/camif-capture.c similarity index 100% rename from drivers/media/platform/s3c-camif/camif-capture.c rename to drivers/media/platform/samsung/s3c-camif/camif-capture.c diff --git a/drivers/media/platform/s3c-camif/camif-core.c b/drivers/media/platform/samsung/s3c-camif/camif-core.c similarity index 100% rename from drivers/media/platform/s3c-camif/camif-core.c rename to drivers/media/platform/samsung/s3c-camif/camif-core.c diff --git a/drivers/media/platform/s3c-camif/camif-core.h b/drivers/media/platform/samsung/s3c-camif/camif-core.h similarity index 100% rename from drivers/media/platform/s3c-camif/camif-core.h rename to drivers/media/platform/samsung/s3c-camif/camif-core.h diff --git a/drivers/media/platform/s3c-camif/camif-regs.c b/drivers/media/platform/samsung/s3c-camif/camif-regs.c similarity index 100% rename from drivers/media/platform/s3c-camif/camif-regs.c rename to drivers/media/platform/samsung/s3c-camif/camif-regs.c diff --git a/drivers/media/platform/s3c-camif/camif-regs.h b/drivers/media/platform/samsung/s3c-camif/camif-regs.h similarity index 100% rename from drivers/media/platform/s3c-camif/camif-regs.h rename to drivers/media/platform/samsung/s3c-camif/camif-regs.h From patchwork Sun Mar 13 10:51:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779147 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDD1CC433F5 for ; Sun, 13 Mar 2022 10:53:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234348AbiCMKyv (ORCPT ); Sun, 13 Mar 2022 06:54:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234489AbiCMKyp (ORCPT ); Sun, 13 Mar 2022 06:54:45 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13F9B2559C; Sun, 13 Mar 2022 03:53:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9F79D61011; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9AB75C3410A; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=Ea4tHUcZzHsvC8jPMtrVZPIkBJInNtKqb5Sb0WE9bIc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HSB3ZxefIF271ut1IN6g5rfalil4XIjf84z14M+L3+E6OZPXPl4t5w8D0zdxhp9S5 sr3j4BWvtUeE2oBl3gfszEHbvjlY8ANbpZ8dJZoN9aPS+qB2o2k+Ete/rFM+Zh4fPn 7ImG4H20lRVq9xQZX/1yZIU+nEIj4hGm0AUyuymCVOjarBBkG30FkZ1qPYEsBRZbog /NKtKBa6M1cJmF0Og7vvmobrkz5sn5sKIPhOMcjtvE2rNtw9oMriP7/eJGFaNdvzAR pjbKsPveGaf7ULAGmtp8HK1kcgtizGotAJet5tss5buAtXbMHqKAQaA2cKbc5PVdVt 3vvtkaa8JI99Q== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I28-CU; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , =?utf-8?q?=C5=81u?= =?utf-8?q?kasz_Stelmach?= , Cai Huoqing , Dillon Min , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Lad Prabhakar , Laurent Pinchart , Ming Qian , Sakari Ailus , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 14/24] media: platform: rename s5p-g2d/ to samsung/s5p-g2d/ Date: Sun, 13 Mar 2022 11:51:55 +0100 Message-Id: <64b2de2b91994d66a405d08d43feb96d876098df.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename s5p-g2d/ to samsung/s5p-g2d/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => samsung}/s5p-g2d/Kconfig | 0 drivers/media/platform/{ => samsung}/s5p-g2d/Makefile | 0 drivers/media/platform/{ => samsung}/s5p-g2d/g2d-hw.c | 0 drivers/media/platform/{ => samsung}/s5p-g2d/g2d-regs.h | 0 drivers/media/platform/{ => samsung}/s5p-g2d/g2d.c | 0 drivers/media/platform/{ => samsung}/s5p-g2d/g2d.h | 0 9 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ => samsung}/s5p-g2d/Kconfig (100%) rename drivers/media/platform/{ => samsung}/s5p-g2d/Makefile (100%) rename drivers/media/platform/{ => samsung}/s5p-g2d/g2d-hw.c (100%) rename drivers/media/platform/{ => samsung}/s5p-g2d/g2d-regs.h (100%) rename drivers/media/platform/{ => samsung}/s5p-g2d/g2d.c (100%) rename drivers/media/platform/{ => samsung}/s5p-g2d/g2d.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 8ce4894699cc..4c4be0d7ec14 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2616,7 +2616,7 @@ M: Łukasz Stelmach L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-media@vger.kernel.org S: Maintained -F: drivers/media/platform/s5p-g2d/ +F: drivers/media/platform/samsung/s5p-g2d/ ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT M: Marek Szyprowski diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 0a87d835b2f5..f70fc95e4195 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -88,12 +88,12 @@ source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/Kconfig" -source "drivers/media/platform/s5p-g2d/Kconfig" source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/Kconfig" source "drivers/media/platform/samsung/exynos-gsc/Kconfig" source "drivers/media/platform/samsung/exynos4-is/Kconfig" source "drivers/media/platform/samsung/s3c-camif/Kconfig" +source "drivers/media/platform/samsung/s5p-g2d/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index c3dfe40b2def..a5a068e18492 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -30,12 +30,12 @@ obj-y += qcom/venus/ obj-y += renesas/ obj-y += rockchip/rga/ obj-y += rockchip/rkisp1/ -obj-y += s5p-g2d/ obj-y += s5p-jpeg/ obj-y += s5p-mfc/ obj-y += samsung/exynos-gsc/ obj-y += samsung/exynos4-is/ obj-y += samsung/s3c-camif/ +obj-y += samsung/s5p-g2d/ obj-y += sti/bdisp/ obj-y += sti/c8sectpfe/ obj-y += sti/delta/ diff --git a/drivers/media/platform/s5p-g2d/Kconfig b/drivers/media/platform/samsung/s5p-g2d/Kconfig similarity index 100% rename from drivers/media/platform/s5p-g2d/Kconfig rename to drivers/media/platform/samsung/s5p-g2d/Kconfig diff --git a/drivers/media/platform/s5p-g2d/Makefile b/drivers/media/platform/samsung/s5p-g2d/Makefile similarity index 100% rename from drivers/media/platform/s5p-g2d/Makefile rename to drivers/media/platform/samsung/s5p-g2d/Makefile diff --git a/drivers/media/platform/s5p-g2d/g2d-hw.c b/drivers/media/platform/samsung/s5p-g2d/g2d-hw.c similarity index 100% rename from drivers/media/platform/s5p-g2d/g2d-hw.c rename to drivers/media/platform/samsung/s5p-g2d/g2d-hw.c diff --git a/drivers/media/platform/s5p-g2d/g2d-regs.h b/drivers/media/platform/samsung/s5p-g2d/g2d-regs.h similarity index 100% rename from drivers/media/platform/s5p-g2d/g2d-regs.h rename to drivers/media/platform/samsung/s5p-g2d/g2d-regs.h diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/samsung/s5p-g2d/g2d.c similarity index 100% rename from drivers/media/platform/s5p-g2d/g2d.c rename to drivers/media/platform/samsung/s5p-g2d/g2d.c diff --git a/drivers/media/platform/s5p-g2d/g2d.h b/drivers/media/platform/samsung/s5p-g2d/g2d.h similarity index 100% rename from drivers/media/platform/s5p-g2d/g2d.h rename to drivers/media/platform/samsung/s5p-g2d/g2d.h From patchwork Sun Mar 13 10:51:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779142 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B95A9C433F5 for ; Sun, 13 Mar 2022 10:53:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234280AbiCMKyd (ORCPT ); Sun, 13 Mar 2022 06:54:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234331AbiCMKyA (ORCPT ); Sun, 13 Mar 2022 06:54:00 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 162D4118638; Sun, 13 Mar 2022 03:52:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CD1B461022; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ACE67C36AE2; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=jwv8ECpmlsFDQjEMfHc1SJzxTIp5vrc+oZowwq5UCIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sMxQ3de4blXzW+4Lq0YKb2uf0F3cfxVwatKanRUZs5LUvzM7TUqio+VDrCMU0zZPo DZEgnXt9JJT6bbiVYHKMWrt/OkVRLehbiPWgW0z75UtzW7VM7SjUXXK8I0qxnWo6Gx RCuyb1ufoeOhIN58YI6VfpNt5+Wvyba2GUhnwKI/XlciWZwvZgKQb0j2PYapKl93k6 2sliVc3HutAwkL7ihZm0AQVRmUwFIMbEjTB2dUEQGL6+1h3l8D65x9ToyHGqAfKSSm KP/9OwfLnrxcF/vcX8KPP2kTYyuIHSudadd/+XTatcrcJahlHRHcwBwmtFFQ/NNcNN xK5/i2tVTPHIA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I2C-Em; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Andrzej Pietrasiewicz , Cai Huoqing , Colin Ian King , Dmitry Osipenko , Eugen Hristev , Fabio Estevam , Hans Verkuil , Jacek Anaszewski , Jacopo Mondi , Jernej Skrabec , Krzysztof Kozlowski , Laurent Pinchart , Laurentiu Palcu , Mikhail Ulyanov , Ming Qian , Mirela Rabulea , NXP Linux Team , Pengutronix Kernel Team , Randy Dunlap , Rikard Falkeborn , Sakari Ailus , Sascha Hauer , Shawn Guo , Sylwester Nawrocki , Wei Yongjun , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 15/24] media: platform: rename s5p-jpeg/ to samsung/s5p-jpeg/ Date: Sun, 13 Mar 2022 11:51:56 +0100 Message-Id: <4be1962723cfc2ad1c1031c3885ea53023fae642.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename s5p-jpeg/ to samsung/s5p-jpeg/. Signed-off-by: Mauro Carvalho Chehab Acked-by: Andrzej Pietrasiewicz --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 2 +- drivers/media/platform/renesas/rcar_jpu.c | 2 +- drivers/media/platform/{ => samsung}/s5p-jpeg/Kconfig | 0 drivers/media/platform/{ => samsung}/s5p-jpeg/Makefile | 0 drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.c | 2 +- drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.h | 2 +- .../media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.c | 0 .../media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.h | 2 +- drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.c | 0 drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.h | 0 drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.c | 2 +- drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.h | 2 +- drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-regs.h | 2 +- 16 files changed, 11 insertions(+), 11 deletions(-) rename drivers/media/platform/{ => samsung}/s5p-jpeg/Kconfig (100%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/Makefile (100%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.c (99%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.h (99%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.c (100%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.h (97%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.c (100%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.h (100%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.c (99%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.h (97%) rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-regs.h (99%) diff --git a/MAINTAINERS b/MAINTAINERS index 4c4be0d7ec14..dfd490369d48 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2633,7 +2633,7 @@ M: Sylwester Nawrocki L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-media@vger.kernel.org S: Maintained -F: drivers/media/platform/s5p-jpeg/ +F: drivers/media/platform/samsung/s5p-jpeg/ ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT M: Marek Szyprowski diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index f70fc95e4195..0af01626c008 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -88,12 +88,12 @@ source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/Kconfig" -source "drivers/media/platform/s5p-jpeg/Kconfig" source "drivers/media/platform/s5p-mfc/Kconfig" source "drivers/media/platform/samsung/exynos-gsc/Kconfig" source "drivers/media/platform/samsung/exynos4-is/Kconfig" source "drivers/media/platform/samsung/s3c-camif/Kconfig" source "drivers/media/platform/samsung/s5p-g2d/Kconfig" +source "drivers/media/platform/samsung/s5p-jpeg/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index a5a068e18492..94bdd5d94bb2 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -30,12 +30,12 @@ obj-y += qcom/venus/ obj-y += renesas/ obj-y += rockchip/rga/ obj-y += rockchip/rkisp1/ -obj-y += s5p-jpeg/ obj-y += s5p-mfc/ obj-y += samsung/exynos-gsc/ obj-y += samsung/exynos4-is/ obj-y += samsung/s3c-camif/ obj-y += samsung/s5p-g2d/ +obj-y += samsung/s5p-jpeg/ obj-y += sti/bdisp/ obj-y += sti/c8sectpfe/ obj-y += sti/delta/ diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c index 3b892c5792b4..d1ec1f4b506b 100644 --- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c @@ -35,7 +35,7 @@ * it, enable dynamic debug for this module and: * echo 1 > /sys/module/mxc_jpeg_encdec/parameters/jpeg_tracing * - * This is inspired by the drivers/media/platform/s5p-jpeg driver + * This is inspired by the drivers/media/platform/samsung/s5p-jpeg driver * * Copyright 2018-2019 NXP */ diff --git a/drivers/media/platform/renesas/rcar_jpu.c b/drivers/media/platform/renesas/rcar_jpu.c index 56bb464629ed..293beba131e2 100644 --- a/drivers/media/platform/renesas/rcar_jpu.c +++ b/drivers/media/platform/renesas/rcar_jpu.c @@ -4,7 +4,7 @@ * Copyright (C) 2014-2015 Cogent Embedded, Inc. * Copyright (C) 2014-2015 Renesas Electronics Corporation * - * This is based on the drivers/media/platform/s5p-jpeg driver by + * This is based on the drivers/media/platform/samsung/s5p-jpeg driver by * Andrzej Pietrasiewicz and Jacek Anaszewski. * Some portions of code inspired by VSP1 driver by Laurent Pinchart. * diff --git a/drivers/media/platform/s5p-jpeg/Kconfig b/drivers/media/platform/samsung/s5p-jpeg/Kconfig similarity index 100% rename from drivers/media/platform/s5p-jpeg/Kconfig rename to drivers/media/platform/samsung/s5p-jpeg/Kconfig diff --git a/drivers/media/platform/s5p-jpeg/Makefile b/drivers/media/platform/samsung/s5p-jpeg/Makefile similarity index 100% rename from drivers/media/platform/s5p-jpeg/Makefile rename to drivers/media/platform/samsung/s5p-jpeg/Makefile diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c similarity index 99% rename from drivers/media/platform/s5p-jpeg/jpeg-core.c rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c index a8d9159d5ed8..5479bc8d474d 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* linux/drivers/media/platform/s5p-jpeg/jpeg-core.c +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c * * Copyright (c) 2011-2014 Samsung Electronics Co., Ltd. * http://www.samsung.com diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h similarity index 99% rename from drivers/media/platform/s5p-jpeg/jpeg-core.h rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h index 4a5fb1b15455..5570c79f122f 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.h +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* linux/drivers/media/platform/s5p-jpeg/jpeg-core.h +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h * * Copyright (c) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.c similarity index 100% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.c diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h similarity index 97% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h index 68160befce39..15af928fad76 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h * * Copyright (c) 2014 Samsung Electronics Co., Ltd. * http://www.samsung.com diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.c similarity index 100% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.c diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.h similarity index 100% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.h diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c similarity index 99% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c index 491e9248286c..01b47b3df1e7 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw.h +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw.h * * Copyright (c) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h similarity index 97% rename from drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h index 98ddf7097562..f068d52c66b7 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw.h +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw.h * * Copyright (c) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com diff --git a/drivers/media/platform/s5p-jpeg/jpeg-regs.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h similarity index 99% rename from drivers/media/platform/s5p-jpeg/jpeg-regs.h rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h index 86f376b50581..c2298b680022 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-regs.h +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* linux/drivers/media/platform/s5p-jpeg/jpeg-regs.h +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h * * Register definition file for Samsung JPEG codec driver * From patchwork Sun Mar 13 10:51:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779148 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F10DC433EF for ; Sun, 13 Mar 2022 10:53:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234497AbiCMKyu (ORCPT ); Sun, 13 Mar 2022 06:54:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233696AbiCMKy2 (ORCPT ); Sun, 13 Mar 2022 06:54:28 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8D91220C5; Sun, 13 Mar 2022 03:53:03 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4045461031; Sun, 13 Mar 2022 10:52:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC304C3410D; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168730; bh=dy0YDtB1eEq6JOMk5LjTV+xg4fZL4Zdbgg2XBEFQKJU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P2sMLhUQshH6DPmjDGfHuzcOnsXaVzoi20Cw/58PiZWiO6TUSXgIAbmJjLZeDp2Q/ S8oXut3j+gGNhvK4JVQX1L0EMu0QdSwGvWVMcRSzfwTTDt0WtIFiPrbiX+4kwPWVLC 2WOAuQCBALnsz85rbh9HOkTwWniUR8sXN3AdF3h8/w/v3CEiV1xSsd0g5D9x/624p9 Syw4215D1ft2mFoPtSf2TgGz9L/UER6O61yRfS5omZ1ng6LYzeqp9BAISw1I5w9ebi Q4IDVgowUCuShMTKReyWTzAEh6WwCaCIOsJAWqvxAYbSa4kp0v4lEsLdCkDnRTSrbh k5uAT86lO8ILw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I2G-Gd; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Andrzej Hajda , Cai Huoqing , Christophe JAILLET , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Herman , Jacopo Mondi , Jernej Skrabec , Lad Prabhakar , Laurent Pinchart , Marek Szyprowski , Maxime Jourdan , Ming Qian , Nadezda Lutovinova , Paul Kocialkowski , Sakari Ailus , Stanimir Varbanov , Sylwester Nawrocki , Tuo Li , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 16/24] media: platform: rename s5p-mfc/ to samsung/s5p-mfc/ Date: Sun, 13 Mar 2022 11:51:57 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename s5p-mfc/ to samsung/s5p-mfc/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/Kconfig | 0 drivers/media/platform/{ => samsung}/s5p-mfc/Makefile | 0 drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v10.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v6.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v7.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v8.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc.c | 0 drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_common.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_ctrl.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_ctrl.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_debug.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_dec.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_dec.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_enc.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_enc.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_intr.c | 0 drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_intr.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_iommu.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.c | 0 drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.h | 0 drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.h | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_pm.c | 2 +- drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_pm.h | 2 +- 36 files changed, 22 insertions(+), 22 deletions(-) rename drivers/media/platform/{ => samsung}/s5p-mfc/Kconfig (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/Makefile (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v10.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v6.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v7.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v8.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc.c (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd.c (89%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd.h (92%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.c (98%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.h (82%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.c (98%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.h (82%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_common.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_ctrl.c (99%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_ctrl.h (92%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_debug.h (95%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_dec.c (99%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_dec.h (90%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_enc.c (99%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_enc.h (90%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_intr.c (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_intr.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_iommu.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr.c (98%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr.h (99%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.c (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.h (100%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.c (99%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.h (96%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_pm.c (97%) rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_pm.h (87%) diff --git a/MAINTAINERS b/MAINTAINERS index dfd490369d48..7711a5ea125e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2641,7 +2641,7 @@ M: Andrzej Hajda L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-media@vger.kernel.org S: Maintained -F: drivers/media/platform/s5p-mfc/ +F: drivers/media/platform/samsung/s5p-mfc/ ARM/SHMOBILE ARM ARCHITECTURE M: Geert Uytterhoeven diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 0af01626c008..c3594807f8d7 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -88,12 +88,12 @@ source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/Kconfig" -source "drivers/media/platform/s5p-mfc/Kconfig" source "drivers/media/platform/samsung/exynos-gsc/Kconfig" source "drivers/media/platform/samsung/exynos4-is/Kconfig" source "drivers/media/platform/samsung/s3c-camif/Kconfig" source "drivers/media/platform/samsung/s5p-g2d/Kconfig" source "drivers/media/platform/samsung/s5p-jpeg/Kconfig" +source "drivers/media/platform/samsung/s5p-mfc/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 94bdd5d94bb2..6a766acfbe37 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -30,12 +30,12 @@ obj-y += qcom/venus/ obj-y += renesas/ obj-y += rockchip/rga/ obj-y += rockchip/rkisp1/ -obj-y += s5p-mfc/ obj-y += samsung/exynos-gsc/ obj-y += samsung/exynos4-is/ obj-y += samsung/s3c-camif/ obj-y += samsung/s5p-g2d/ obj-y += samsung/s5p-jpeg/ +obj-y += samsung/s5p-mfc/ obj-y += sti/bdisp/ obj-y += sti/c8sectpfe/ obj-y += sti/delta/ diff --git a/drivers/media/platform/s5p-mfc/Kconfig b/drivers/media/platform/samsung/s5p-mfc/Kconfig similarity index 100% rename from drivers/media/platform/s5p-mfc/Kconfig rename to drivers/media/platform/samsung/s5p-mfc/Kconfig diff --git a/drivers/media/platform/s5p-mfc/Makefile b/drivers/media/platform/samsung/s5p-mfc/Makefile similarity index 100% rename from drivers/media/platform/s5p-mfc/Makefile rename to drivers/media/platform/samsung/s5p-mfc/Makefile diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v10.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc-v10.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v10.h diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v6.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v6.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc-v6.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v6.h diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v7.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v7.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc-v7.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v7.h diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v8.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v8.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc-v8.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v8.h diff --git a/drivers/media/platform/s5p-mfc/regs-mfc.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc.h similarity index 100% rename from drivers/media/platform/s5p-mfc/regs-mfc.h rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c similarity index 89% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c index 0e88c28f4ad3..774c573dc075 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c * * Copyright (C) 2012 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h similarity index 92% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h index ed4e32a12552..945d12fdceb7 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h * * Copyright (C) 2012 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c similarity index 98% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c index 1ea4eda9c8e0..327e54e70611 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h similarity index 82% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h index 917854bffe9f..6eafa514aebc 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c similarity index 98% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c index 1f42130cc865..f8588e52dfc8 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c * * Copyright (c) 2012 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h similarity index 82% rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h index c19884ea2bfc..9dc44460cc38 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_common.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c index da138c314963..72d70984e99a 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c * * Copyright (c) 2010 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h similarity index 92% rename from drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h index 7f32ef8a6b61..653ba5f3d048 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h * * Copyright (c) 2010 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h similarity index 95% rename from drivers/media/platform/s5p-mfc/s5p_mfc_debug.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h index 752bbe4fe48e..bba5dad6dbff 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * drivers/media/platform/s5p-mfc/s5p_mfc_debug.h + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h * * Header file for Samsung MFC (Multi Function Codec - FIMV) driver * This file contains debug macros diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_dec.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c index c0798811755c..4b89df8bfd18 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h similarity index 90% rename from drivers/media/platform/s5p-mfc/s5p_mfc_dec.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h index 0e9a0e3bbbe7..0c52ab46cff7 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_enc.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c index 1fad99edb091..a8877d805b29 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c * * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h similarity index 90% rename from drivers/media/platform/s5p-mfc/s5p_mfc_enc.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h index cacd1ca43e19..3f1b1a037a4f 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_intr.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.c similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_intr.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.c diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_intr.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.h similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_intr.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_iommu.h similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_iommu.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c similarity index 98% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c index bb65671eea91..673962301173 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * drivers/media/platform/s5p-mfc/s5p_mfc_opr.c + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c * * Samsung MFC (Multi Function Codec - FIMV) driver * This file contains hw related functions. diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h index 1c5d2d4c0543..b9831275f3ab 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * drivers/media/platform/s5p-mfc/s5p_mfc_opr.h + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h * * Header file for Samsung MFC (Multi Function Codec - FIMV) driver * Contains declarations of hw related functions. diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.c similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.c diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.h similarity index 100% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.h diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c similarity index 99% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c index a1453053e31a..8227004f6746 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c * * Samsung MFC (Multi Function Codec - FIMV) driver * This file contains hw related functions. diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h similarity index 96% rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h index 8ca514bf5e37..e4dd03c5454c 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h + * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h * * Header file for Samsung MFC (Multi Function Codec - FIMV) driver * Contains declarations of hw related functions. diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c similarity index 97% rename from drivers/media/platform/s5p-mfc/s5p_mfc_pm.c rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c index 88b7d33c9197..72a901e99450 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c * * Copyright (c) 2010 Samsung Electronics Co., Ltd. * http://www.samsung.com/ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h similarity index 87% rename from drivers/media/platform/s5p-mfc/s5p_mfc_pm.h rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h index 3d26443189a2..4159d2364e87 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * linux/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h + * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h * * Copyright (C) 2011 Samsung Electronics Co., Ltd. * http://www.samsung.com/ From patchwork Sun Mar 13 10:51:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779149 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EC15C433F5 for ; Sun, 13 Mar 2022 10:53:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234278AbiCMKy4 (ORCPT ); Sun, 13 Mar 2022 06:54:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234488AbiCMKyo (ORCPT ); Sun, 13 Mar 2022 06:54:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D4071A80B; Sun, 13 Mar 2022 03:53:05 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C696460FFA; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9090C36AEA; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=SXIXVsi92d7TTgQSfMh1FbNBtB+/BjvkX1VTtXotizw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZMNpfwTaqQk9Zq25A29N/K6B8c5COAid1ZPnABf0MEvyq9YSYOekuONniA9p6B41a +8qooFFUo5mrQKln1KIwS0+icW5E/CiEOMr51zUwXyetlhGChSQE7/Y3PkxjBxUDbA lcPtztIfTIdJx5LP7n7RnvR/U0YhH0CFzP6jHEyKuUt5rKa61TKG1Ybdl6u6kcvyzC GsI9QwpDNrhWTMFpvotSUSMHZp9GYYINqLh4JWJmkX20OY6D8KmO+ODYsyF5DGiHMb 1HKsWPPjoGxX6C07OqxDAF9O0bjphmPXnYWx+FTmxedokGkJWOCnJ27elMn2zLSld7 Dqk7uva2OAn+Q== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I2K-IY; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Alain Volmat , Alexandre Torgue , Alexey Khoroshilov , Dillon Min , Dmitriy Ulitin , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Hugues Fruchet , Jacopo Mondi , Jernej Skrabec , Lad Prabhakar , Laurent Pinchart , Leon Romanovsky , Maxime Coquelin , Ming Qian , Sakari Ailus , Tomi Valkeinen , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH 17/24] media: platform: rename stm32/ to sti/stm32/ Date: Sun, 13 Mar 2022 11:51:58 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename stm32/ to sti/stm32/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => sti}/stm32/Kconfig | 0 drivers/media/platform/{ => sti}/stm32/Makefile | 0 drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c | 0 drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h | 0 drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c | 0 drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h | 0 drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c | 0 10 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ => sti}/stm32/Kconfig (100%) rename drivers/media/platform/{ => sti}/stm32/Makefile (100%) rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c (100%) rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h (100%) rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c (100%) rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h (100%) rename drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 7711a5ea125e..620705e0f043 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12046,7 +12046,7 @@ L: linux-media@vger.kernel.org S: Supported T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml -F: drivers/media/platform/stm32/stm32-dcmi.c +F: drivers/media/platform/sti/stm32/stm32-dcmi.c MEDIA INPUT INFRASTRUCTURE (V4L/DVB) M: Mauro Carvalho Chehab diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index c3594807f8d7..cf373bfbca1b 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -95,7 +95,7 @@ source "drivers/media/platform/samsung/s5p-g2d/Kconfig" source "drivers/media/platform/samsung/s5p-jpeg/Kconfig" source "drivers/media/platform/samsung/s5p-mfc/Kconfig" source "drivers/media/platform/sti/Kconfig" -source "drivers/media/platform/stm32/Kconfig" +source "drivers/media/platform/sti/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 6a766acfbe37..e3dd2331003a 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -40,7 +40,7 @@ obj-y += sti/bdisp/ obj-y += sti/c8sectpfe/ obj-y += sti/delta/ obj-y += sti/hva/ -obj-y += stm32/ +obj-y += sti/stm32/ obj-y += ti-vpe/ obj-y += via/ obj-y += xilinx/ diff --git a/drivers/media/platform/stm32/Kconfig b/drivers/media/platform/sti/stm32/Kconfig similarity index 100% rename from drivers/media/platform/stm32/Kconfig rename to drivers/media/platform/sti/stm32/Kconfig diff --git a/drivers/media/platform/stm32/Makefile b/drivers/media/platform/sti/stm32/Makefile similarity index 100% rename from drivers/media/platform/stm32/Makefile rename to drivers/media/platform/sti/stm32/Makefile diff --git a/drivers/media/platform/stm32/dma2d/dma2d-hw.c b/drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c similarity index 100% rename from drivers/media/platform/stm32/dma2d/dma2d-hw.c rename to drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c diff --git a/drivers/media/platform/stm32/dma2d/dma2d-regs.h b/drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h similarity index 100% rename from drivers/media/platform/stm32/dma2d/dma2d-regs.h rename to drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h diff --git a/drivers/media/platform/stm32/dma2d/dma2d.c b/drivers/media/platform/sti/stm32/dma2d/dma2d.c similarity index 100% rename from drivers/media/platform/stm32/dma2d/dma2d.c rename to drivers/media/platform/sti/stm32/dma2d/dma2d.c diff --git a/drivers/media/platform/stm32/dma2d/dma2d.h b/drivers/media/platform/sti/stm32/dma2d/dma2d.h similarity index 100% rename from drivers/media/platform/stm32/dma2d/dma2d.h rename to drivers/media/platform/sti/stm32/dma2d/dma2d.h diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/sti/stm32/stm32-dcmi.c similarity index 100% rename from drivers/media/platform/stm32/stm32-dcmi.c rename to drivers/media/platform/sti/stm32/stm32-dcmi.c From patchwork Sun Mar 13 10:51:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779144 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C71C9C433EF for ; Sun, 13 Mar 2022 10:53:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234520AbiCMKyr (ORCPT ); Sun, 13 Mar 2022 06:54:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234441AbiCMKyT (ORCPT ); Sun, 13 Mar 2022 06:54:19 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E750212AA0; Sun, 13 Mar 2022 03:52:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 328CC6102C; Sun, 13 Mar 2022 10:52:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCE7DC36AEC; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168729; bh=ZkNojXzsGEU91eSV3LurH3PSoT6FxXkxfB7Pf4I4UcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HpawflnX/HroQc7CiHd4ruTMyfiNBBXy7zLlsM0z5we0ijERAkh4itRsWOj2JUR+r 6VjrTQvdwj8tvOPeB+hotqpTqvZV3ZpESPlEuvVwTexZwyZiYCXsikXMnX5enVcx7Q ZATXQgrUpTLT3LUrNT4ZEJ99/n3C7V4udHhSq/wSK8FF9LSlMMzoC/21rTV2BA+2+W oHhCUGb2yIxlI2Kg6ajOa4Z8sn/p6Fu0wL/GZlkcZFJdGbG/zuKHNwqpm69UNvMHuJ ryQJv9CxgVbv20fn69rfqotjmjN4nfqizGGyS7X+GF9hf5l+JYYSVI+tIdeihsvZ1P Lh0G/atDPiHOA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I2O-Jq; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , "Lad, Prabhakar" , =?utf-8?q?Niklas_S=C3=B6derlund?= , Cai Huoqing , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Laurent Pinchart , Ming Qian , Rui Miguel Silva , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 18/24] media: platform: rename am437x/ to ti/am437x/ Date: Sun, 13 Mar 2022 11:51:59 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename am437x/ to ti/am437x/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => ti}/am437x/Kconfig | 0 drivers/media/platform/{ => ti}/am437x/Makefile | 0 drivers/media/platform/{ => ti}/am437x/am437x-vpfe.c | 0 drivers/media/platform/{ => ti}/am437x/am437x-vpfe.h | 0 drivers/media/platform/{ => ti}/am437x/am437x-vpfe_regs.h | 0 8 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ => ti}/am437x/Kconfig (100%) rename drivers/media/platform/{ => ti}/am437x/Makefile (100%) rename drivers/media/platform/{ => ti}/am437x/am437x-vpfe.c (100%) rename drivers/media/platform/{ => ti}/am437x/am437x-vpfe.h (100%) rename drivers/media/platform/{ => ti}/am437x/am437x-vpfe_regs.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 620705e0f043..a8599cb4091e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19262,7 +19262,7 @@ S: Maintained W: https://linuxtv.org Q: http://patchwork.linuxtv.org/project/linux-media/list/ T: git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git -F: drivers/media/platform/am437x/ +F: drivers/media/platform/ti/am437x/ TI BANDGAP AND THERMAL DRIVER M: Eduardo Valentin diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index cf373bfbca1b..b3dde9c3cfc4 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -67,7 +67,6 @@ config VIDEO_MUX source "drivers/media/platform/allegro-dvt/Kconfig" source "drivers/media/platform/allwinner/Kconfig" -source "drivers/media/platform/am437x/Kconfig" source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/atmel/Kconfig" @@ -97,6 +96,7 @@ source "drivers/media/platform/samsung/s5p-mfc/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/sti/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" +source "drivers/media/platform/ti/am437x/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index e3dd2331003a..a34278911145 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -7,7 +7,6 @@ # (e. g. LC_ALL=C sort Makefile) obj-y += allegro-dvt/ obj-y += allwinner/ -obj-y += am437x/ obj-y += amlogic/meson-ge2d/ obj-y += aspeed/ obj-y += atmel/ @@ -42,6 +41,7 @@ obj-y += sti/delta/ obj-y += sti/hva/ obj-y += sti/stm32/ obj-y += ti-vpe/ +obj-y += ti/am437x/ obj-y += via/ obj-y += xilinx/ diff --git a/drivers/media/platform/am437x/Kconfig b/drivers/media/platform/ti/am437x/Kconfig similarity index 100% rename from drivers/media/platform/am437x/Kconfig rename to drivers/media/platform/ti/am437x/Kconfig diff --git a/drivers/media/platform/am437x/Makefile b/drivers/media/platform/ti/am437x/Makefile similarity index 100% rename from drivers/media/platform/am437x/Makefile rename to drivers/media/platform/ti/am437x/Makefile diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/ti/am437x/am437x-vpfe.c similarity index 100% rename from drivers/media/platform/am437x/am437x-vpfe.c rename to drivers/media/platform/ti/am437x/am437x-vpfe.c diff --git a/drivers/media/platform/am437x/am437x-vpfe.h b/drivers/media/platform/ti/am437x/am437x-vpfe.h similarity index 100% rename from drivers/media/platform/am437x/am437x-vpfe.h rename to drivers/media/platform/ti/am437x/am437x-vpfe.h diff --git a/drivers/media/platform/am437x/am437x-vpfe_regs.h b/drivers/media/platform/ti/am437x/am437x-vpfe_regs.h similarity index 100% rename from drivers/media/platform/am437x/am437x-vpfe_regs.h rename to drivers/media/platform/ti/am437x/am437x-vpfe_regs.h From patchwork Sun Mar 13 10:52:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779145 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3509C433F5 for ; Sun, 13 Mar 2022 10:53:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234373AbiCMKys (ORCPT ); Sun, 13 Mar 2022 06:54:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234465AbiCMKyW (ORCPT ); Sun, 13 Mar 2022 06:54:22 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 210A11EC46; Sun, 13 Mar 2022 03:52:56 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D8AB661021; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F3278C34117; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168730; bh=+Y3G+nuTtdIJf00pXppXleGBXkybw5av3IQASzDnjwQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gGVjv+Nu4wXdbfJhiI3NAf8DPSyetPIS4wignQzOIrlPO4+/97RNC/8s4bUXMZn1C MfKUuMFoI+tGZRxo1n8EdZOqe5w97J4NAO7lWUnTWPKebx/AIP/bGY7Jy83XhHqcsS xxnqY6klAF3YDKyC61xsG9mNBFufuvxF6t07Qd4yjgedefzp4AMq0icK458WtV5i5d z60SrbivLJDnLNQ6eAEJGArKiOBsIdxQA7oBLXFH5/H35HQwpt5JlGCbYkeIt/4vAD FkyQAp5sPEBBNvH5SbRJ1jfqyQrIHjj7I6KiQBM/MyutATUH6CUvb6XkARVHTOBgSJ MoSfD7TnDYJOg== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I2S-LK; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , "Lad, Prabhakar" , =?utf-8?q?Niklas_S=C3=B6derlund?= , Arnd Bergmann , Cai Huoqing , Colin Ian King , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Herman , Jacopo Mondi , Jernej Skrabec , Johan Hovold , Lad Prabhakar , Laurent Pinchart , Ming Qian , Nathan Chancellor , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 19/24] media: platform: rename davinci/ to ti/davinci/ Date: Sun, 13 Mar 2022 11:52:00 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename davinci/ to ti/davinci/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ .../media/drivers/davinci-vpbe-devel.rst | 20 +++++++++---------- MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- .../media/platform/{ => ti}/davinci/Kconfig | 0 .../media/platform/{ => ti}/davinci/Makefile | 0 .../{ => ti}/davinci/ccdc_hw_device.h | 0 .../platform/{ => ti}/davinci/dm355_ccdc.c | 0 .../{ => ti}/davinci/dm355_ccdc_regs.h | 0 .../platform/{ => ti}/davinci/dm644x_ccdc.c | 0 .../{ => ti}/davinci/dm644x_ccdc_regs.h | 0 .../media/platform/{ => ti}/davinci/isif.c | 0 .../platform/{ => ti}/davinci/isif_regs.h | 0 .../media/platform/{ => ti}/davinci/vpbe.c | 0 .../platform/{ => ti}/davinci/vpbe_display.c | 0 .../platform/{ => ti}/davinci/vpbe_osd.c | 0 .../platform/{ => ti}/davinci/vpbe_osd_regs.h | 0 .../platform/{ => ti}/davinci/vpbe_venc.c | 0 .../{ => ti}/davinci/vpbe_venc_regs.h | 0 .../platform/{ => ti}/davinci/vpfe_capture.c | 0 .../media/platform/{ => ti}/davinci/vpif.c | 0 .../media/platform/{ => ti}/davinci/vpif.h | 0 .../platform/{ => ti}/davinci/vpif_capture.c | 0 .../platform/{ => ti}/davinci/vpif_capture.h | 0 .../platform/{ => ti}/davinci/vpif_display.c | 0 .../platform/{ => ti}/davinci/vpif_display.h | 0 .../media/platform/{ => ti}/davinci/vpss.c | 0 27 files changed, 13 insertions(+), 13 deletions(-) rename drivers/media/platform/{ => ti}/davinci/Kconfig (100%) rename drivers/media/platform/{ => ti}/davinci/Makefile (100%) rename drivers/media/platform/{ => ti}/davinci/ccdc_hw_device.h (100%) rename drivers/media/platform/{ => ti}/davinci/dm355_ccdc.c (100%) rename drivers/media/platform/{ => ti}/davinci/dm355_ccdc_regs.h (100%) rename drivers/media/platform/{ => ti}/davinci/dm644x_ccdc.c (100%) rename drivers/media/platform/{ => ti}/davinci/dm644x_ccdc_regs.h (100%) rename drivers/media/platform/{ => ti}/davinci/isif.c (100%) rename drivers/media/platform/{ => ti}/davinci/isif_regs.h (100%) rename drivers/media/platform/{ => ti}/davinci/vpbe.c (100%) rename drivers/media/platform/{ => ti}/davinci/vpbe_display.c (100%) rename drivers/media/platform/{ => ti}/davinci/vpbe_osd.c (100%) rename drivers/media/platform/{ => ti}/davinci/vpbe_osd_regs.h (100%) rename drivers/media/platform/{ => ti}/davinci/vpbe_venc.c (100%) rename drivers/media/platform/{ => ti}/davinci/vpbe_venc_regs.h (100%) rename drivers/media/platform/{ => ti}/davinci/vpfe_capture.c (100%) rename drivers/media/platform/{ => ti}/davinci/vpif.c (100%) rename drivers/media/platform/{ => ti}/davinci/vpif.h (100%) rename drivers/media/platform/{ => ti}/davinci/vpif_capture.c (100%) rename drivers/media/platform/{ => ti}/davinci/vpif_capture.h (100%) rename drivers/media/platform/{ => ti}/davinci/vpif_display.c (100%) rename drivers/media/platform/{ => ti}/davinci/vpif_display.h (100%) rename drivers/media/platform/{ => ti}/davinci/vpss.c (100%) diff --git a/Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst b/Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst index f0961672e6a3..4e87bdbc7ae4 100644 --- a/Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst +++ b/Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst @@ -7,22 +7,22 @@ File partitioning ----------------- V4L2 display device driver - drivers/media/platform/davinci/vpbe_display.c - drivers/media/platform/davinci/vpbe_display.h + drivers/media/platform/ti/davinci/vpbe_display.c + drivers/media/platform/ti/davinci/vpbe_display.h VPBE display controller - drivers/media/platform/davinci/vpbe.c - drivers/media/platform/davinci/vpbe.h + drivers/media/platform/ti/davinci/vpbe.c + drivers/media/platform/ti/davinci/vpbe.h VPBE venc sub device driver - drivers/media/platform/davinci/vpbe_venc.c - drivers/media/platform/davinci/vpbe_venc.h - drivers/media/platform/davinci/vpbe_venc_regs.h + drivers/media/platform/ti/davinci/vpbe_venc.c + drivers/media/platform/ti/davinci/vpbe_venc.h + drivers/media/platform/ti/davinci/vpbe_venc_regs.h VPBE osd driver - drivers/media/platform/davinci/vpbe_osd.c - drivers/media/platform/davinci/vpbe_osd.h - drivers/media/platform/davinci/vpbe_osd_regs.h + drivers/media/platform/ti/davinci/vpbe_osd.c + drivers/media/platform/ti/davinci/vpbe_osd.h + drivers/media/platform/ti/davinci/vpbe_osd_regs.h To be done ---------- diff --git a/MAINTAINERS b/MAINTAINERS index a8599cb4091e..801391246c87 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19321,7 +19321,7 @@ S: Maintained W: https://linuxtv.org Q: http://patchwork.linuxtv.org/project/linux-media/list/ T: git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git -F: drivers/media/platform/davinci/ +F: drivers/media/platform/ti/davinci/ F: include/media/davinci/ TI ENHANCED QUADRATURE ENCODER PULSE (eQEP) DRIVER diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index b3dde9c3cfc4..4d4d8e120731 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -72,7 +72,6 @@ source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/chips-media/Kconfig" -source "drivers/media/platform/davinci/Kconfig" source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" @@ -97,6 +96,7 @@ source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/sti/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/ti/am437x/Kconfig" +source "drivers/media/platform/ti/davinci/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index a34278911145..4e063935f061 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -12,7 +12,6 @@ obj-y += aspeed/ obj-y += atmel/ obj-y += cadence/ obj-y += chips-media/ -obj-y += davinci/ obj-y += intel/ obj-y += marvell/ obj-y += mediatek/mtk-jpeg/ @@ -42,6 +41,7 @@ obj-y += sti/hva/ obj-y += sti/stm32/ obj-y += ti-vpe/ obj-y += ti/am437x/ +obj-y += ti/davinci/ obj-y += via/ obj-y += xilinx/ diff --git a/drivers/media/platform/davinci/Kconfig b/drivers/media/platform/ti/davinci/Kconfig similarity index 100% rename from drivers/media/platform/davinci/Kconfig rename to drivers/media/platform/ti/davinci/Kconfig diff --git a/drivers/media/platform/davinci/Makefile b/drivers/media/platform/ti/davinci/Makefile similarity index 100% rename from drivers/media/platform/davinci/Makefile rename to drivers/media/platform/ti/davinci/Makefile diff --git a/drivers/media/platform/davinci/ccdc_hw_device.h b/drivers/media/platform/ti/davinci/ccdc_hw_device.h similarity index 100% rename from drivers/media/platform/davinci/ccdc_hw_device.h rename to drivers/media/platform/ti/davinci/ccdc_hw_device.h diff --git a/drivers/media/platform/davinci/dm355_ccdc.c b/drivers/media/platform/ti/davinci/dm355_ccdc.c similarity index 100% rename from drivers/media/platform/davinci/dm355_ccdc.c rename to drivers/media/platform/ti/davinci/dm355_ccdc.c diff --git a/drivers/media/platform/davinci/dm355_ccdc_regs.h b/drivers/media/platform/ti/davinci/dm355_ccdc_regs.h similarity index 100% rename from drivers/media/platform/davinci/dm355_ccdc_regs.h rename to drivers/media/platform/ti/davinci/dm355_ccdc_regs.h diff --git a/drivers/media/platform/davinci/dm644x_ccdc.c b/drivers/media/platform/ti/davinci/dm644x_ccdc.c similarity index 100% rename from drivers/media/platform/davinci/dm644x_ccdc.c rename to drivers/media/platform/ti/davinci/dm644x_ccdc.c diff --git a/drivers/media/platform/davinci/dm644x_ccdc_regs.h b/drivers/media/platform/ti/davinci/dm644x_ccdc_regs.h similarity index 100% rename from drivers/media/platform/davinci/dm644x_ccdc_regs.h rename to drivers/media/platform/ti/davinci/dm644x_ccdc_regs.h diff --git a/drivers/media/platform/davinci/isif.c b/drivers/media/platform/ti/davinci/isif.c similarity index 100% rename from drivers/media/platform/davinci/isif.c rename to drivers/media/platform/ti/davinci/isif.c diff --git a/drivers/media/platform/davinci/isif_regs.h b/drivers/media/platform/ti/davinci/isif_regs.h similarity index 100% rename from drivers/media/platform/davinci/isif_regs.h rename to drivers/media/platform/ti/davinci/isif_regs.h diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/ti/davinci/vpbe.c similarity index 100% rename from drivers/media/platform/davinci/vpbe.c rename to drivers/media/platform/ti/davinci/vpbe.c diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/ti/davinci/vpbe_display.c similarity index 100% rename from drivers/media/platform/davinci/vpbe_display.c rename to drivers/media/platform/ti/davinci/vpbe_display.c diff --git a/drivers/media/platform/davinci/vpbe_osd.c b/drivers/media/platform/ti/davinci/vpbe_osd.c similarity index 100% rename from drivers/media/platform/davinci/vpbe_osd.c rename to drivers/media/platform/ti/davinci/vpbe_osd.c diff --git a/drivers/media/platform/davinci/vpbe_osd_regs.h b/drivers/media/platform/ti/davinci/vpbe_osd_regs.h similarity index 100% rename from drivers/media/platform/davinci/vpbe_osd_regs.h rename to drivers/media/platform/ti/davinci/vpbe_osd_regs.h diff --git a/drivers/media/platform/davinci/vpbe_venc.c b/drivers/media/platform/ti/davinci/vpbe_venc.c similarity index 100% rename from drivers/media/platform/davinci/vpbe_venc.c rename to drivers/media/platform/ti/davinci/vpbe_venc.c diff --git a/drivers/media/platform/davinci/vpbe_venc_regs.h b/drivers/media/platform/ti/davinci/vpbe_venc_regs.h similarity index 100% rename from drivers/media/platform/davinci/vpbe_venc_regs.h rename to drivers/media/platform/ti/davinci/vpbe_venc_regs.h diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/ti/davinci/vpfe_capture.c similarity index 100% rename from drivers/media/platform/davinci/vpfe_capture.c rename to drivers/media/platform/ti/davinci/vpfe_capture.c diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/ti/davinci/vpif.c similarity index 100% rename from drivers/media/platform/davinci/vpif.c rename to drivers/media/platform/ti/davinci/vpif.c diff --git a/drivers/media/platform/davinci/vpif.h b/drivers/media/platform/ti/davinci/vpif.h similarity index 100% rename from drivers/media/platform/davinci/vpif.h rename to drivers/media/platform/ti/davinci/vpif.h diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/ti/davinci/vpif_capture.c similarity index 100% rename from drivers/media/platform/davinci/vpif_capture.c rename to drivers/media/platform/ti/davinci/vpif_capture.c diff --git a/drivers/media/platform/davinci/vpif_capture.h b/drivers/media/platform/ti/davinci/vpif_capture.h similarity index 100% rename from drivers/media/platform/davinci/vpif_capture.h rename to drivers/media/platform/ti/davinci/vpif_capture.h diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/ti/davinci/vpif_display.c similarity index 100% rename from drivers/media/platform/davinci/vpif_display.c rename to drivers/media/platform/ti/davinci/vpif_display.c diff --git a/drivers/media/platform/davinci/vpif_display.h b/drivers/media/platform/ti/davinci/vpif_display.h similarity index 100% rename from drivers/media/platform/davinci/vpif_display.h rename to drivers/media/platform/ti/davinci/vpif_display.h diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/ti/davinci/vpss.c similarity index 100% rename from drivers/media/platform/davinci/vpss.c rename to drivers/media/platform/ti/davinci/vpss.c From patchwork Sun Mar 13 10:52:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779146 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A792C433FE for ; Sun, 13 Mar 2022 10:53:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234351AbiCMKyu (ORCPT ); Sun, 13 Mar 2022 06:54:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234418AbiCMKy2 (ORCPT ); Sun, 13 Mar 2022 06:54:28 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D964423BCB; Sun, 13 Mar 2022 03:53:03 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 66B4D61037; Sun, 13 Mar 2022 10:52:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2041C34115; Sun, 13 Mar 2022 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168730; bh=xAtCxypNEmLvPO79tMDAEnMLEOhUNBww/nRs40l10rc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X4DAwjNp/irxZnXQA3xSRVgB5ShsYFm8iCejZnUY+WkquTNx4soBFYWRFLGZAdXpM gzYO+ZHv8XXGu24YZ6Zrj+j8RLbQcrrV4sGy1gSx0KaARycf1MeGbzpajZIjT7jBy6 XUdSFp6LuEPftv5N/95Hf9WifPr/5fvSTQQqse7r54V43jC1KMBEGOfYKN4Yoohjks NhKnIZYLQEI55fhiYQYcLjnj5qJ1RH7boMmluXVhF898lUFXCLNnOw4H7DOLaet9l1 BFXswf7cD+iyvmgS/oxIjSZ8nhwTL+bmtFKlT22d9yMXtvHDZb9sJHIztT1flqF5EE kyim/zq+dV6PQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I2W-My; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , "Gustavo A. R. Silva" , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Kees Cook , Laurent Pinchart , Ming Qian , Sakari Ailus , Tomi Valkeinen , Wei Yongjun , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 20/24] media: platform: rename omap3isp/ to ti/omap3isp/ Date: Sun, 13 Mar 2022 11:52:01 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename omap3isp/ to ti/omap3isp/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ Documentation/admin-guide/media/omap3isp.rst | 2 +- Documentation/admin-guide/media/omap4_camera.rst | 2 +- Documentation/driver-api/media/v4l2-event.rst | 2 +- MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => ti}/omap3isp/Kconfig | 0 drivers/media/platform/{ => ti}/omap3isp/Makefile | 0 drivers/media/platform/{ => ti}/omap3isp/cfa_coef_table.h | 0 drivers/media/platform/{ => ti}/omap3isp/gamma_table.h | 0 drivers/media/platform/{ => ti}/omap3isp/isp.c | 0 drivers/media/platform/{ => ti}/omap3isp/isp.h | 0 drivers/media/platform/{ => ti}/omap3isp/ispccdc.c | 0 drivers/media/platform/{ => ti}/omap3isp/ispccdc.h | 0 drivers/media/platform/{ => ti}/omap3isp/ispccp2.c | 0 drivers/media/platform/{ => ti}/omap3isp/ispccp2.h | 0 drivers/media/platform/{ => ti}/omap3isp/ispcsi2.c | 0 drivers/media/platform/{ => ti}/omap3isp/ispcsi2.h | 0 drivers/media/platform/{ => ti}/omap3isp/ispcsiphy.c | 0 drivers/media/platform/{ => ti}/omap3isp/ispcsiphy.h | 0 drivers/media/platform/{ => ti}/omap3isp/isph3a.h | 0 drivers/media/platform/{ => ti}/omap3isp/isph3a_aewb.c | 0 drivers/media/platform/{ => ti}/omap3isp/isph3a_af.c | 0 drivers/media/platform/{ => ti}/omap3isp/isphist.c | 0 drivers/media/platform/{ => ti}/omap3isp/isphist.h | 0 drivers/media/platform/{ => ti}/omap3isp/isppreview.c | 0 drivers/media/platform/{ => ti}/omap3isp/isppreview.h | 0 drivers/media/platform/{ => ti}/omap3isp/ispreg.h | 0 drivers/media/platform/{ => ti}/omap3isp/ispresizer.c | 0 drivers/media/platform/{ => ti}/omap3isp/ispresizer.h | 0 drivers/media/platform/{ => ti}/omap3isp/ispstat.c | 0 drivers/media/platform/{ => ti}/omap3isp/ispstat.h | 0 drivers/media/platform/{ => ti}/omap3isp/ispvideo.c | 0 drivers/media/platform/{ => ti}/omap3isp/ispvideo.h | 0 drivers/media/platform/{ => ti}/omap3isp/luma_enhance_table.h | 0 drivers/media/platform/{ => ti}/omap3isp/noise_filter_table.h | 0 drivers/media/platform/{ => ti}/omap3isp/omap3isp.h | 0 37 files changed, 6 insertions(+), 6 deletions(-) rename drivers/media/platform/{ => ti}/omap3isp/Kconfig (100%) rename drivers/media/platform/{ => ti}/omap3isp/Makefile (100%) rename drivers/media/platform/{ => ti}/omap3isp/cfa_coef_table.h (100%) rename drivers/media/platform/{ => ti}/omap3isp/gamma_table.h (100%) rename drivers/media/platform/{ => ti}/omap3isp/isp.c (100%) rename drivers/media/platform/{ => ti}/omap3isp/isp.h (100%) rename drivers/media/platform/{ => ti}/omap3isp/ispccdc.c (100%) rename drivers/media/platform/{ => ti}/omap3isp/ispccdc.h (100%) rename drivers/media/platform/{ => ti}/omap3isp/ispccp2.c (100%) rename drivers/media/platform/{ => ti}/omap3isp/ispccp2.h (100%) rename drivers/media/platform/{ => ti}/omap3isp/ispcsi2.c (100%) rename drivers/media/platform/{ => ti}/omap3isp/ispcsi2.h (100%) rename drivers/media/platform/{ => ti}/omap3isp/ispcsiphy.c (100%) rename drivers/media/platform/{ => ti}/omap3isp/ispcsiphy.h (100%) rename drivers/media/platform/{ => ti}/omap3isp/isph3a.h (100%) rename drivers/media/platform/{ => ti}/omap3isp/isph3a_aewb.c (100%) rename drivers/media/platform/{ => ti}/omap3isp/isph3a_af.c (100%) rename drivers/media/platform/{ => ti}/omap3isp/isphist.c (100%) rename drivers/media/platform/{ => ti}/omap3isp/isphist.h (100%) rename drivers/media/platform/{ => ti}/omap3isp/isppreview.c (100%) rename drivers/media/platform/{ => ti}/omap3isp/isppreview.h (100%) rename drivers/media/platform/{ => ti}/omap3isp/ispreg.h (100%) rename drivers/media/platform/{ => ti}/omap3isp/ispresizer.c (100%) rename drivers/media/platform/{ => ti}/omap3isp/ispresizer.h (100%) rename drivers/media/platform/{ => ti}/omap3isp/ispstat.c (100%) rename drivers/media/platform/{ => ti}/omap3isp/ispstat.h (100%) rename drivers/media/platform/{ => ti}/omap3isp/ispvideo.c (100%) rename drivers/media/platform/{ => ti}/omap3isp/ispvideo.h (100%) rename drivers/media/platform/{ => ti}/omap3isp/luma_enhance_table.h (100%) rename drivers/media/platform/{ => ti}/omap3isp/noise_filter_table.h (100%) rename drivers/media/platform/{ => ti}/omap3isp/omap3isp.h (100%) diff --git a/Documentation/admin-guide/media/omap3isp.rst b/Documentation/admin-guide/media/omap3isp.rst index bc447bbec7ce..f32e7375a1a2 100644 --- a/Documentation/admin-guide/media/omap3isp.rst +++ b/Documentation/admin-guide/media/omap3isp.rst @@ -17,7 +17,7 @@ Introduction ------------ This file documents the Texas Instruments OMAP 3 Image Signal Processor (ISP) -driver located under drivers/media/platform/omap3isp. The original driver was +driver located under drivers/media/platform/ti/omap3isp. The original driver was written by Texas Instruments but since that it has been rewritten (twice) at Nokia. diff --git a/Documentation/admin-guide/media/omap4_camera.rst b/Documentation/admin-guide/media/omap4_camera.rst index 24db4222d36d..2ada9b1e6897 100644 --- a/Documentation/admin-guide/media/omap4_camera.rst +++ b/Documentation/admin-guide/media/omap4_camera.rst @@ -25,7 +25,7 @@ As of Revision AB, the ISS is described in detail in section 8. This driver is supporting **only** the CSI2-A/B interfaces for now. It makes use of the Media Controller framework [#f2]_, and inherited most of the -code from OMAP3 ISP driver (found under drivers/media/platform/omap3isp/\*), +code from OMAP3 ISP driver (found under drivers/media/platform/ti/omap3isp/\*), except that it doesn't need an IOMMU now for ISS buffers memory mapping. Supports usage of MMAP buffers only (for now). diff --git a/Documentation/driver-api/media/v4l2-event.rst b/Documentation/driver-api/media/v4l2-event.rst index 5b8254eba7da..52d4fbc5d819 100644 --- a/Documentation/driver-api/media/v4l2-event.rst +++ b/Documentation/driver-api/media/v4l2-event.rst @@ -167,7 +167,7 @@ The first event type in the class is reserved for future use, so the first available event type is 'class base + 1'. An example on how the V4L2 events may be used can be found in the OMAP -3 ISP driver (``drivers/media/platform/omap3isp``). +3 ISP driver (``drivers/media/platform/ti/omap3isp``). A subdev can directly send an event to the :c:type:`v4l2_device` notify function with ``V4L2_DEVICE_NOTIFY_EVENT``. This allows the bridge to map diff --git a/MAINTAINERS b/MAINTAINERS index 801391246c87..2a85c98a77e4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14094,7 +14094,7 @@ M: Laurent Pinchart L: linux-media@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/media/ti,omap3isp.txt -F: drivers/media/platform/omap3isp/ +F: drivers/media/platform/ti/omap3isp/ F: drivers/staging/media/omap4iss/ OMAP MMC SUPPORT diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 4d4d8e120731..7763bd455f21 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -82,7 +82,6 @@ source "drivers/media/platform/nvidia/tegra-vde/Kconfig" source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/nxp/amphion/Kconfig" source "drivers/media/platform/omap/Kconfig" -source "drivers/media/platform/omap3isp/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/Kconfig" @@ -97,6 +96,7 @@ source "drivers/media/platform/sti/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/ti/am437x/Kconfig" source "drivers/media/platform/ti/davinci/Kconfig" +source "drivers/media/platform/ti/omap3isp/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 4e063935f061..ef6c00b2ed64 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -22,7 +22,6 @@ obj-y += nvidia/tegra-vde/ obj-y += nxp/ obj-y += nxp/amphion/ obj-y += omap/ -obj-y += omap3isp/ obj-y += qcom/camss/ obj-y += qcom/venus/ obj-y += renesas/ @@ -42,6 +41,7 @@ obj-y += sti/stm32/ obj-y += ti-vpe/ obj-y += ti/am437x/ obj-y += ti/davinci/ +obj-y += ti/omap3isp/ obj-y += via/ obj-y += xilinx/ diff --git a/drivers/media/platform/omap3isp/Kconfig b/drivers/media/platform/ti/omap3isp/Kconfig similarity index 100% rename from drivers/media/platform/omap3isp/Kconfig rename to drivers/media/platform/ti/omap3isp/Kconfig diff --git a/drivers/media/platform/omap3isp/Makefile b/drivers/media/platform/ti/omap3isp/Makefile similarity index 100% rename from drivers/media/platform/omap3isp/Makefile rename to drivers/media/platform/ti/omap3isp/Makefile diff --git a/drivers/media/platform/omap3isp/cfa_coef_table.h b/drivers/media/platform/ti/omap3isp/cfa_coef_table.h similarity index 100% rename from drivers/media/platform/omap3isp/cfa_coef_table.h rename to drivers/media/platform/ti/omap3isp/cfa_coef_table.h diff --git a/drivers/media/platform/omap3isp/gamma_table.h b/drivers/media/platform/ti/omap3isp/gamma_table.h similarity index 100% rename from drivers/media/platform/omap3isp/gamma_table.h rename to drivers/media/platform/ti/omap3isp/gamma_table.h diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/ti/omap3isp/isp.c similarity index 100% rename from drivers/media/platform/omap3isp/isp.c rename to drivers/media/platform/ti/omap3isp/isp.c diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform/ti/omap3isp/isp.h similarity index 100% rename from drivers/media/platform/omap3isp/isp.h rename to drivers/media/platform/ti/omap3isp/isp.h diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/ti/omap3isp/ispccdc.c similarity index 100% rename from drivers/media/platform/omap3isp/ispccdc.c rename to drivers/media/platform/ti/omap3isp/ispccdc.c diff --git a/drivers/media/platform/omap3isp/ispccdc.h b/drivers/media/platform/ti/omap3isp/ispccdc.h similarity index 100% rename from drivers/media/platform/omap3isp/ispccdc.h rename to drivers/media/platform/ti/omap3isp/ispccdc.h diff --git a/drivers/media/platform/omap3isp/ispccp2.c b/drivers/media/platform/ti/omap3isp/ispccp2.c similarity index 100% rename from drivers/media/platform/omap3isp/ispccp2.c rename to drivers/media/platform/ti/omap3isp/ispccp2.c diff --git a/drivers/media/platform/omap3isp/ispccp2.h b/drivers/media/platform/ti/omap3isp/ispccp2.h similarity index 100% rename from drivers/media/platform/omap3isp/ispccp2.h rename to drivers/media/platform/ti/omap3isp/ispccp2.h diff --git a/drivers/media/platform/omap3isp/ispcsi2.c b/drivers/media/platform/ti/omap3isp/ispcsi2.c similarity index 100% rename from drivers/media/platform/omap3isp/ispcsi2.c rename to drivers/media/platform/ti/omap3isp/ispcsi2.c diff --git a/drivers/media/platform/omap3isp/ispcsi2.h b/drivers/media/platform/ti/omap3isp/ispcsi2.h similarity index 100% rename from drivers/media/platform/omap3isp/ispcsi2.h rename to drivers/media/platform/ti/omap3isp/ispcsi2.h diff --git a/drivers/media/platform/omap3isp/ispcsiphy.c b/drivers/media/platform/ti/omap3isp/ispcsiphy.c similarity index 100% rename from drivers/media/platform/omap3isp/ispcsiphy.c rename to drivers/media/platform/ti/omap3isp/ispcsiphy.c diff --git a/drivers/media/platform/omap3isp/ispcsiphy.h b/drivers/media/platform/ti/omap3isp/ispcsiphy.h similarity index 100% rename from drivers/media/platform/omap3isp/ispcsiphy.h rename to drivers/media/platform/ti/omap3isp/ispcsiphy.h diff --git a/drivers/media/platform/omap3isp/isph3a.h b/drivers/media/platform/ti/omap3isp/isph3a.h similarity index 100% rename from drivers/media/platform/omap3isp/isph3a.h rename to drivers/media/platform/ti/omap3isp/isph3a.h diff --git a/drivers/media/platform/omap3isp/isph3a_aewb.c b/drivers/media/platform/ti/omap3isp/isph3a_aewb.c similarity index 100% rename from drivers/media/platform/omap3isp/isph3a_aewb.c rename to drivers/media/platform/ti/omap3isp/isph3a_aewb.c diff --git a/drivers/media/platform/omap3isp/isph3a_af.c b/drivers/media/platform/ti/omap3isp/isph3a_af.c similarity index 100% rename from drivers/media/platform/omap3isp/isph3a_af.c rename to drivers/media/platform/ti/omap3isp/isph3a_af.c diff --git a/drivers/media/platform/omap3isp/isphist.c b/drivers/media/platform/ti/omap3isp/isphist.c similarity index 100% rename from drivers/media/platform/omap3isp/isphist.c rename to drivers/media/platform/ti/omap3isp/isphist.c diff --git a/drivers/media/platform/omap3isp/isphist.h b/drivers/media/platform/ti/omap3isp/isphist.h similarity index 100% rename from drivers/media/platform/omap3isp/isphist.h rename to drivers/media/platform/ti/omap3isp/isphist.h diff --git a/drivers/media/platform/omap3isp/isppreview.c b/drivers/media/platform/ti/omap3isp/isppreview.c similarity index 100% rename from drivers/media/platform/omap3isp/isppreview.c rename to drivers/media/platform/ti/omap3isp/isppreview.c diff --git a/drivers/media/platform/omap3isp/isppreview.h b/drivers/media/platform/ti/omap3isp/isppreview.h similarity index 100% rename from drivers/media/platform/omap3isp/isppreview.h rename to drivers/media/platform/ti/omap3isp/isppreview.h diff --git a/drivers/media/platform/omap3isp/ispreg.h b/drivers/media/platform/ti/omap3isp/ispreg.h similarity index 100% rename from drivers/media/platform/omap3isp/ispreg.h rename to drivers/media/platform/ti/omap3isp/ispreg.h diff --git a/drivers/media/platform/omap3isp/ispresizer.c b/drivers/media/platform/ti/omap3isp/ispresizer.c similarity index 100% rename from drivers/media/platform/omap3isp/ispresizer.c rename to drivers/media/platform/ti/omap3isp/ispresizer.c diff --git a/drivers/media/platform/omap3isp/ispresizer.h b/drivers/media/platform/ti/omap3isp/ispresizer.h similarity index 100% rename from drivers/media/platform/omap3isp/ispresizer.h rename to drivers/media/platform/ti/omap3isp/ispresizer.h diff --git a/drivers/media/platform/omap3isp/ispstat.c b/drivers/media/platform/ti/omap3isp/ispstat.c similarity index 100% rename from drivers/media/platform/omap3isp/ispstat.c rename to drivers/media/platform/ti/omap3isp/ispstat.c diff --git a/drivers/media/platform/omap3isp/ispstat.h b/drivers/media/platform/ti/omap3isp/ispstat.h similarity index 100% rename from drivers/media/platform/omap3isp/ispstat.h rename to drivers/media/platform/ti/omap3isp/ispstat.h diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/ti/omap3isp/ispvideo.c similarity index 100% rename from drivers/media/platform/omap3isp/ispvideo.c rename to drivers/media/platform/ti/omap3isp/ispvideo.c diff --git a/drivers/media/platform/omap3isp/ispvideo.h b/drivers/media/platform/ti/omap3isp/ispvideo.h similarity index 100% rename from drivers/media/platform/omap3isp/ispvideo.h rename to drivers/media/platform/ti/omap3isp/ispvideo.h diff --git a/drivers/media/platform/omap3isp/luma_enhance_table.h b/drivers/media/platform/ti/omap3isp/luma_enhance_table.h similarity index 100% rename from drivers/media/platform/omap3isp/luma_enhance_table.h rename to drivers/media/platform/ti/omap3isp/luma_enhance_table.h diff --git a/drivers/media/platform/omap3isp/noise_filter_table.h b/drivers/media/platform/ti/omap3isp/noise_filter_table.h similarity index 100% rename from drivers/media/platform/omap3isp/noise_filter_table.h rename to drivers/media/platform/ti/omap3isp/noise_filter_table.h diff --git a/drivers/media/platform/omap3isp/omap3isp.h b/drivers/media/platform/ti/omap3isp/omap3isp.h similarity index 100% rename from drivers/media/platform/omap3isp/omap3isp.h rename to drivers/media/platform/ti/omap3isp/omap3isp.h From patchwork Sun Mar 13 10:52:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779140 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00FABC433EF for ; Sun, 13 Mar 2022 10:53:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234471AbiCMKyY (ORCPT ); Sun, 13 Mar 2022 06:54:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234361AbiCMKyE (ORCPT ); Sun, 13 Mar 2022 06:54:04 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47A5B403D0; Sun, 13 Mar 2022 03:52:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E1BB1B80CBB; Sun, 13 Mar 2022 10:52:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3030FC36AF6; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168730; bh=59ppTrYX1/Lk09KMioAiK55/3CSnDVJrxnkvpF4klHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wbo4f2Ikkm8asSJenlJaAZ0LYvPTa76aTylpntpTjVSl9qT2bpKUo3gwqR4NPGc0e /ulKOEQRHjdVVAIaypyiXVYZZNQiFHoGfSUjVWjlVHn6ScrwaUJcQ77udRKzVLyo8R 4POtACD1jkYK/AXiLDdQdyV8Pzac39rRU2vlToKBMCPRqhgmT3FsCquDpreXzsLJEd s1vavusIfGwdB/PYTcIlkrdtxlrgKxEnSNXSn9bx3KxyAthB3FuNBHIyryEAtYFwpu yVQkuWIj6KXYhHGfUqAGPCv4awDVTKJFqQPkHZvpxEDS2JE25AdL93zM5fYRHbMDW9 DkMVBDt6Rgs7Q== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I2a-OY; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Arnd Bergmann , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Laurent Pinchart , Ming Qian , Peter Ujfalusi , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 21/24] media: platform: rename omap/ to ti/omap/ Date: Sun, 13 Mar 2022 11:52:02 +0100 Message-Id: <0467d9b0be5a7c7267a082375fcaedcb58446e46.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename omap/ to ti/omap/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ => ti}/omap/Kconfig | 0 drivers/media/platform/{ => ti}/omap/Makefile | 0 drivers/media/platform/{ => ti}/omap/omap_vout.c | 0 drivers/media/platform/{ => ti}/omap/omap_vout_vrfb.c | 0 drivers/media/platform/{ => ti}/omap/omap_vout_vrfb.h | 0 drivers/media/platform/{ => ti}/omap/omap_voutdef.h | 0 drivers/media/platform/{ => ti}/omap/omap_voutlib.c | 0 drivers/media/platform/{ => ti}/omap/omap_voutlib.h | 0 10 files changed, 2 insertions(+), 2 deletions(-) rename drivers/media/platform/{ => ti}/omap/Kconfig (100%) rename drivers/media/platform/{ => ti}/omap/Makefile (100%) rename drivers/media/platform/{ => ti}/omap/omap_vout.c (100%) rename drivers/media/platform/{ => ti}/omap/omap_vout_vrfb.c (100%) rename drivers/media/platform/{ => ti}/omap/omap_vout_vrfb.h (100%) rename drivers/media/platform/{ => ti}/omap/omap_voutdef.h (100%) rename drivers/media/platform/{ => ti}/omap/omap_voutlib.c (100%) rename drivers/media/platform/{ => ti}/omap/omap_voutlib.h (100%) diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 7763bd455f21..366a0fa5e519 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -81,7 +81,6 @@ source "drivers/media/platform/mediatek/mtk-vpu/Kconfig" source "drivers/media/platform/nvidia/tegra-vde/Kconfig" source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/nxp/amphion/Kconfig" -source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/Kconfig" @@ -96,6 +95,7 @@ source "drivers/media/platform/sti/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/ti/am437x/Kconfig" source "drivers/media/platform/ti/davinci/Kconfig" +source "drivers/media/platform/ti/omap/Kconfig" source "drivers/media/platform/ti/omap3isp/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index ef6c00b2ed64..a9740f6021d2 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -21,7 +21,6 @@ obj-y += mediatek/mtk-vpu/ obj-y += nvidia/tegra-vde/ obj-y += nxp/ obj-y += nxp/amphion/ -obj-y += omap/ obj-y += qcom/camss/ obj-y += qcom/venus/ obj-y += renesas/ @@ -41,6 +40,7 @@ obj-y += sti/stm32/ obj-y += ti-vpe/ obj-y += ti/am437x/ obj-y += ti/davinci/ +obj-y += ti/omap/ obj-y += ti/omap3isp/ obj-y += via/ obj-y += xilinx/ diff --git a/drivers/media/platform/omap/Kconfig b/drivers/media/platform/ti/omap/Kconfig similarity index 100% rename from drivers/media/platform/omap/Kconfig rename to drivers/media/platform/ti/omap/Kconfig diff --git a/drivers/media/platform/omap/Makefile b/drivers/media/platform/ti/omap/Makefile similarity index 100% rename from drivers/media/platform/omap/Makefile rename to drivers/media/platform/ti/omap/Makefile diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/ti/omap/omap_vout.c similarity index 100% rename from drivers/media/platform/omap/omap_vout.c rename to drivers/media/platform/ti/omap/omap_vout.c diff --git a/drivers/media/platform/omap/omap_vout_vrfb.c b/drivers/media/platform/ti/omap/omap_vout_vrfb.c similarity index 100% rename from drivers/media/platform/omap/omap_vout_vrfb.c rename to drivers/media/platform/ti/omap/omap_vout_vrfb.c diff --git a/drivers/media/platform/omap/omap_vout_vrfb.h b/drivers/media/platform/ti/omap/omap_vout_vrfb.h similarity index 100% rename from drivers/media/platform/omap/omap_vout_vrfb.h rename to drivers/media/platform/ti/omap/omap_vout_vrfb.h diff --git a/drivers/media/platform/omap/omap_voutdef.h b/drivers/media/platform/ti/omap/omap_voutdef.h similarity index 100% rename from drivers/media/platform/omap/omap_voutdef.h rename to drivers/media/platform/ti/omap/omap_voutdef.h diff --git a/drivers/media/platform/omap/omap_voutlib.c b/drivers/media/platform/ti/omap/omap_voutlib.c similarity index 100% rename from drivers/media/platform/omap/omap_voutlib.c rename to drivers/media/platform/ti/omap/omap_voutlib.c diff --git a/drivers/media/platform/omap/omap_voutlib.h b/drivers/media/platform/ti/omap/omap_voutlib.h similarity index 100% rename from drivers/media/platform/omap/omap_voutlib.h rename to drivers/media/platform/ti/omap/omap_voutlib.h From patchwork Sun Mar 13 10:52:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779190 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2BC3C433F5 for ; Sun, 13 Mar 2022 10:54:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234457AbiCMK4B (ORCPT ); Sun, 13 Mar 2022 06:56:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234456AbiCMKzK (ORCPT ); Sun, 13 Mar 2022 06:55:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFF605B3DF; Sun, 13 Mar 2022 03:53:32 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 175F26102A; Sun, 13 Mar 2022 10:52:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3020DC36AF4; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168730; bh=2uLL+ZtF31dbNZj181Q8sc1+wodu0nbS8F5Qtq6NRHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cpYjplnb6pm7PAmVUX3CjCq8KfddhR8lm9ZCLfLL1Bz4XWbwpw6k4hBfs3p3H+YBt NX3bFndKiR5f9E3QBbHl+KkZs26touwhF51wsxCzQI+pmX8t24CPiqfqDFEeDjP8zc fHXFIjIFCPhSHvGVttqJJsIcbGI0vsBoG+oaLly3vwR5CVEcwzixOq3hYIz6BluFb2 sNWHI/XBPFUJ8hhHMy4GrKoTx9zJ7JbwGvqi4vXx45WV/SJw8GIrF9JoNTRkHhEDSx VkF5gr+5WvK3pQqA+CX1Owv/S0/aIyAdhPmolESUNc1+Fo6J9KQXNkPcjTdhmXhs+C Z9BBAKEJRAymA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I2e-Q0; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Benoit Parrot , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Jacopo Mondi , Jernej Skrabec , Laurent Pinchart , Ming Qian , Sakari Ailus , Tomi Valkeinen , Yang Yingliang , Zhou Qingyang , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 22/24] media: platform: rename ti-vpe/ to ti/vpe/ Date: Sun, 13 Mar 2022 11:52:03 +0100 Message-Id: <0ab499d911085179ee54d06c4b326cb8b313d005.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename ti-vpe/ to ti/vpe/. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/{ti-vpe => ti/vpe}/Kconfig | 0 drivers/media/platform/{ti-vpe => ti/vpe}/Makefile | 0 drivers/media/platform/{ti-vpe => ti/vpe}/cal-camerarx.c | 0 drivers/media/platform/{ti-vpe => ti/vpe}/cal-video.c | 0 drivers/media/platform/{ti-vpe => ti/vpe}/cal.c | 0 drivers/media/platform/{ti-vpe => ti/vpe}/cal.h | 0 drivers/media/platform/{ti-vpe => ti/vpe}/cal_regs.h | 0 drivers/media/platform/{ti-vpe => ti/vpe}/csc.c | 0 drivers/media/platform/{ti-vpe => ti/vpe}/csc.h | 0 drivers/media/platform/{ti-vpe => ti/vpe}/sc.c | 0 drivers/media/platform/{ti-vpe => ti/vpe}/sc.h | 0 drivers/media/platform/{ti-vpe => ti/vpe}/sc_coeff.h | 0 drivers/media/platform/{ti-vpe => ti/vpe}/vpdma.c | 0 drivers/media/platform/{ti-vpe => ti/vpe}/vpdma.h | 0 drivers/media/platform/{ti-vpe => ti/vpe}/vpdma_priv.h | 0 drivers/media/platform/{ti-vpe => ti/vpe}/vpe.c | 0 drivers/media/platform/{ti-vpe => ti/vpe}/vpe_regs.h | 0 20 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{ti-vpe => ti/vpe}/Kconfig (100%) rename drivers/media/platform/{ti-vpe => ti/vpe}/Makefile (100%) rename drivers/media/platform/{ti-vpe => ti/vpe}/cal-camerarx.c (100%) rename drivers/media/platform/{ti-vpe => ti/vpe}/cal-video.c (100%) rename drivers/media/platform/{ti-vpe => ti/vpe}/cal.c (100%) rename drivers/media/platform/{ti-vpe => ti/vpe}/cal.h (100%) rename drivers/media/platform/{ti-vpe => ti/vpe}/cal_regs.h (100%) rename drivers/media/platform/{ti-vpe => ti/vpe}/csc.c (100%) rename drivers/media/platform/{ti-vpe => ti/vpe}/csc.h (100%) rename drivers/media/platform/{ti-vpe => ti/vpe}/sc.c (100%) rename drivers/media/platform/{ti-vpe => ti/vpe}/sc.h (100%) rename drivers/media/platform/{ti-vpe => ti/vpe}/sc_coeff.h (100%) rename drivers/media/platform/{ti-vpe => ti/vpe}/vpdma.c (100%) rename drivers/media/platform/{ti-vpe => ti/vpe}/vpdma.h (100%) rename drivers/media/platform/{ti-vpe => ti/vpe}/vpdma_priv.h (100%) rename drivers/media/platform/{ti-vpe => ti/vpe}/vpe.c (100%) rename drivers/media/platform/{ti-vpe => ti/vpe}/vpe_regs.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 2a85c98a77e4..031cb2cbecba 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19407,7 +19407,7 @@ W: http://linuxtv.org/ Q: http://patchwork.linuxtv.org/project/linux-media/list/ F: Documentation/devicetree/bindings/media/ti,cal.yaml F: Documentation/devicetree/bindings/media/ti,vpe.yaml -F: drivers/media/platform/ti-vpe/ +F: drivers/media/platform/ti/vpe/ TI WILINK WIRELESS DRIVERS L: linux-wireless@vger.kernel.org diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 366a0fa5e519..d9bd7a675c22 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -92,11 +92,11 @@ source "drivers/media/platform/samsung/s5p-jpeg/Kconfig" source "drivers/media/platform/samsung/s5p-mfc/Kconfig" source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/sti/stm32/Kconfig" -source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/ti/am437x/Kconfig" source "drivers/media/platform/ti/davinci/Kconfig" source "drivers/media/platform/ti/omap/Kconfig" source "drivers/media/platform/ti/omap3isp/Kconfig" +source "drivers/media/platform/ti/vpe/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index a9740f6021d2..1e62a4009b6c 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -37,11 +37,11 @@ obj-y += sti/c8sectpfe/ obj-y += sti/delta/ obj-y += sti/hva/ obj-y += sti/stm32/ -obj-y += ti-vpe/ obj-y += ti/am437x/ obj-y += ti/davinci/ obj-y += ti/omap/ obj-y += ti/omap3isp/ +obj-y += ti/vpe/ obj-y += via/ obj-y += xilinx/ diff --git a/drivers/media/platform/ti-vpe/Kconfig b/drivers/media/platform/ti/vpe/Kconfig similarity index 100% rename from drivers/media/platform/ti-vpe/Kconfig rename to drivers/media/platform/ti/vpe/Kconfig diff --git a/drivers/media/platform/ti-vpe/Makefile b/drivers/media/platform/ti/vpe/Makefile similarity index 100% rename from drivers/media/platform/ti-vpe/Makefile rename to drivers/media/platform/ti/vpe/Makefile diff --git a/drivers/media/platform/ti-vpe/cal-camerarx.c b/drivers/media/platform/ti/vpe/cal-camerarx.c similarity index 100% rename from drivers/media/platform/ti-vpe/cal-camerarx.c rename to drivers/media/platform/ti/vpe/cal-camerarx.c diff --git a/drivers/media/platform/ti-vpe/cal-video.c b/drivers/media/platform/ti/vpe/cal-video.c similarity index 100% rename from drivers/media/platform/ti-vpe/cal-video.c rename to drivers/media/platform/ti/vpe/cal-video.c diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti/vpe/cal.c similarity index 100% rename from drivers/media/platform/ti-vpe/cal.c rename to drivers/media/platform/ti/vpe/cal.c diff --git a/drivers/media/platform/ti-vpe/cal.h b/drivers/media/platform/ti/vpe/cal.h similarity index 100% rename from drivers/media/platform/ti-vpe/cal.h rename to drivers/media/platform/ti/vpe/cal.h diff --git a/drivers/media/platform/ti-vpe/cal_regs.h b/drivers/media/platform/ti/vpe/cal_regs.h similarity index 100% rename from drivers/media/platform/ti-vpe/cal_regs.h rename to drivers/media/platform/ti/vpe/cal_regs.h diff --git a/drivers/media/platform/ti-vpe/csc.c b/drivers/media/platform/ti/vpe/csc.c similarity index 100% rename from drivers/media/platform/ti-vpe/csc.c rename to drivers/media/platform/ti/vpe/csc.c diff --git a/drivers/media/platform/ti-vpe/csc.h b/drivers/media/platform/ti/vpe/csc.h similarity index 100% rename from drivers/media/platform/ti-vpe/csc.h rename to drivers/media/platform/ti/vpe/csc.h diff --git a/drivers/media/platform/ti-vpe/sc.c b/drivers/media/platform/ti/vpe/sc.c similarity index 100% rename from drivers/media/platform/ti-vpe/sc.c rename to drivers/media/platform/ti/vpe/sc.c diff --git a/drivers/media/platform/ti-vpe/sc.h b/drivers/media/platform/ti/vpe/sc.h similarity index 100% rename from drivers/media/platform/ti-vpe/sc.h rename to drivers/media/platform/ti/vpe/sc.h diff --git a/drivers/media/platform/ti-vpe/sc_coeff.h b/drivers/media/platform/ti/vpe/sc_coeff.h similarity index 100% rename from drivers/media/platform/ti-vpe/sc_coeff.h rename to drivers/media/platform/ti/vpe/sc_coeff.h diff --git a/drivers/media/platform/ti-vpe/vpdma.c b/drivers/media/platform/ti/vpe/vpdma.c similarity index 100% rename from drivers/media/platform/ti-vpe/vpdma.c rename to drivers/media/platform/ti/vpe/vpdma.c diff --git a/drivers/media/platform/ti-vpe/vpdma.h b/drivers/media/platform/ti/vpe/vpdma.h similarity index 100% rename from drivers/media/platform/ti-vpe/vpdma.h rename to drivers/media/platform/ti/vpe/vpdma.h diff --git a/drivers/media/platform/ti-vpe/vpdma_priv.h b/drivers/media/platform/ti/vpe/vpdma_priv.h similarity index 100% rename from drivers/media/platform/ti-vpe/vpdma_priv.h rename to drivers/media/platform/ti/vpe/vpdma_priv.h diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/ti/vpe/vpe.c similarity index 100% rename from drivers/media/platform/ti-vpe/vpe.c rename to drivers/media/platform/ti/vpe/vpe.c diff --git a/drivers/media/platform/ti-vpe/vpe_regs.h b/drivers/media/platform/ti/vpe/vpe_regs.h similarity index 100% rename from drivers/media/platform/ti-vpe/vpe_regs.h rename to drivers/media/platform/ti/vpe/vpe_regs.h From patchwork Sun Mar 13 10:52:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779141 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C88C9C433F5 for ; Sun, 13 Mar 2022 10:53:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234340AbiCMKy1 (ORCPT ); Sun, 13 Mar 2022 06:54:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234355AbiCMKyE (ORCPT ); Sun, 13 Mar 2022 06:54:04 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D4CC4B1D3; Sun, 13 Mar 2022 03:52:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 46500B80CC2; Sun, 13 Mar 2022 10:52:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 302A9C36AF5; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168730; bh=ZJpDoFp5EVeECmac6pdqahL0F4Nn1kZOAzMvBSNwEMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D+PzrITrS1Cxj7gsEoQHQXrY3T4geigSw9fPsVMF04tWihbcZAbf+YwdnIKnm+G5f PYQsl9qLUKw/XNrChWPYn6T19xD8DqxIkjxbm7PsbGI4ia1HX88NWI3bhT6lubpng7 momyLMqBuEnr0N2IxynFEiUhBvOlnh3kRWiL8E0Sugq9bGlWpYGfkhkdFeyFBMLqrM YNv8TsPU9eLiwKHmmrytxq//3PF04qLoZ8JfNyg39qZ+yFS9tSQQhayumWud/o3PqY thN7+BJQBS4Hhh5qF9QbEDs3OCy1g34XkkNExXrFS1CHVJWksIZUGJtwqDp1+mph6C 5FBAssrz8/YLQ== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I2i-Rl; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?utf-8?q?Niklas_S=C3=B6derl?= =?utf-8?q?und?= , Andy Gross , Bjorn Andersson , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Heiko Stuebner , Jacopo Mondi , Jernej Skrabec , Laurent Pinchart , Matthias Brugger , Ming Qian , Robert Foss , Sakari Ailus , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH 23/24] media: platform: Create vendor/{Makefile,Kconfig} files Date: Sun, 13 Mar 2022 11:52:04 +0100 Message-Id: <96ba1497fde1226a3ccc3efe7b39c67f4a6f2aa3.1647167750.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Instead of placing multiple per-vendor entries at the platform/{Makefile,Kconfig}, create them at the per-vendor directories. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 24 ++++------------ drivers/media/platform/Makefile | 35 ++++++------------------ drivers/media/platform/amlogic/Kconfig | 2 ++ drivers/media/platform/amlogic/Makefile | 2 ++ drivers/media/platform/mediatek/Kconfig | 5 ++++ drivers/media/platform/mediatek/Makefile | 5 ++++ drivers/media/platform/nvidia/Kconfig | 2 ++ drivers/media/platform/nxp/Kconfig | 1 + drivers/media/platform/nxp/Makefile | 1 + drivers/media/platform/qcom/Makefile | 3 ++ drivers/media/platform/rockchip/Makefile | 3 ++ drivers/media/platform/samsung/Kconfig | 7 +++++ drivers/media/platform/samsung/Makefile | 7 +++++ drivers/media/platform/sti/Kconfig | 1 + drivers/media/platform/sti/Makefile | 6 ++++ drivers/media/platform/ti/Kconfig | 6 ++++ drivers/media/platform/ti/Makefile | 6 ++++ 17 files changed, 70 insertions(+), 46 deletions(-) create mode 100644 drivers/media/platform/amlogic/Kconfig create mode 100644 drivers/media/platform/amlogic/Makefile create mode 100644 drivers/media/platform/mediatek/Kconfig create mode 100644 drivers/media/platform/mediatek/Makefile create mode 100644 drivers/media/platform/nvidia/Kconfig create mode 100644 drivers/media/platform/qcom/Makefile create mode 100644 drivers/media/platform/rockchip/Makefile create mode 100644 drivers/media/platform/samsung/Kconfig create mode 100644 drivers/media/platform/samsung/Makefile create mode 100644 drivers/media/platform/sti/Makefile create mode 100644 drivers/media/platform/ti/Kconfig create mode 100644 drivers/media/platform/ti/Makefile diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index d9bd7a675c22..4e7b2973fbc1 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -67,36 +67,22 @@ config VIDEO_MUX source "drivers/media/platform/allegro-dvt/Kconfig" source "drivers/media/platform/allwinner/Kconfig" -source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" +source "drivers/media/platform/amlogic/Kconfig" source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/chips-media/Kconfig" source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" -source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" -source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" -source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" -source "drivers/media/platform/mediatek/mtk-vpu/Kconfig" -source "drivers/media/platform/nvidia/tegra-vde/Kconfig" +source "drivers/media/platform/mediatek/Kconfig" +source "drivers/media/platform/nvidia/Kconfig" source "drivers/media/platform/nxp/Kconfig" -source "drivers/media/platform/nxp/amphion/Kconfig" source "drivers/media/platform/qcom/Kconfig" source "drivers/media/platform/renesas/Kconfig" source "drivers/media/platform/rockchip/Kconfig" -source "drivers/media/platform/samsung/exynos-gsc/Kconfig" -source "drivers/media/platform/samsung/exynos4-is/Kconfig" -source "drivers/media/platform/samsung/s3c-camif/Kconfig" -source "drivers/media/platform/samsung/s5p-g2d/Kconfig" -source "drivers/media/platform/samsung/s5p-jpeg/Kconfig" -source "drivers/media/platform/samsung/s5p-mfc/Kconfig" +source "drivers/media/platform/samsung/Kconfig" source "drivers/media/platform/sti/Kconfig" -source "drivers/media/platform/sti/stm32/Kconfig" -source "drivers/media/platform/ti/am437x/Kconfig" -source "drivers/media/platform/ti/davinci/Kconfig" -source "drivers/media/platform/ti/omap/Kconfig" -source "drivers/media/platform/ti/omap3isp/Kconfig" -source "drivers/media/platform/ti/vpe/Kconfig" +source "drivers/media/platform/ti/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 1e62a4009b6c..5b14b231140b 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -7,41 +7,22 @@ # (e. g. LC_ALL=C sort Makefile) obj-y += allegro-dvt/ obj-y += allwinner/ -obj-y += amlogic/meson-ge2d/ +obj-y += amlogic/ obj-y += aspeed/ obj-y += atmel/ obj-y += cadence/ obj-y += chips-media/ obj-y += intel/ obj-y += marvell/ -obj-y += mediatek/mtk-jpeg/ -obj-y += mediatek/mtk-mdp/ -obj-y += mediatek/mtk-vcodec/ -obj-y += mediatek/mtk-vpu/ -obj-y += nvidia/tegra-vde/ +obj-y += mediatek/ +obj-y += nvidia/ obj-y += nxp/ -obj-y += nxp/amphion/ -obj-y += qcom/camss/ -obj-y += qcom/venus/ +obj-y += qcom/ obj-y += renesas/ -obj-y += rockchip/rga/ -obj-y += rockchip/rkisp1/ -obj-y += samsung/exynos-gsc/ -obj-y += samsung/exynos4-is/ -obj-y += samsung/s3c-camif/ -obj-y += samsung/s5p-g2d/ -obj-y += samsung/s5p-jpeg/ -obj-y += samsung/s5p-mfc/ -obj-y += sti/bdisp/ -obj-y += sti/c8sectpfe/ -obj-y += sti/delta/ -obj-y += sti/hva/ -obj-y += sti/stm32/ -obj-y += ti/am437x/ -obj-y += ti/davinci/ -obj-y += ti/omap/ -obj-y += ti/omap3isp/ -obj-y += ti/vpe/ +obj-y += rockchip/ +obj-y += samsung/ +obj-y += sti/ +obj-y += ti/ obj-y += via/ obj-y += xilinx/ diff --git a/drivers/media/platform/amlogic/Kconfig b/drivers/media/platform/amlogic/Kconfig new file mode 100644 index 000000000000..09fb145a0b30 --- /dev/null +++ b/drivers/media/platform/amlogic/Kconfig @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" diff --git a/drivers/media/platform/amlogic/Makefile b/drivers/media/platform/amlogic/Makefile new file mode 100644 index 000000000000..ec387adbacdd --- /dev/null +++ b/drivers/media/platform/amlogic/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += meson-ge2d/ diff --git a/drivers/media/platform/mediatek/Kconfig b/drivers/media/platform/mediatek/Kconfig new file mode 100644 index 000000000000..549abf1df7d9 --- /dev/null +++ b/drivers/media/platform/mediatek/Kconfig @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 +source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" +source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" +source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" +source "drivers/media/platform/mediatek/mtk-vpu/Kconfig" diff --git a/drivers/media/platform/mediatek/Makefile b/drivers/media/platform/mediatek/Makefile new file mode 100644 index 000000000000..ec7f58943576 --- /dev/null +++ b/drivers/media/platform/mediatek/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += mtk-jpeg/ +obj-y += mtk-mdp/ +obj-y += mtk-vcodec/ +obj-y += mtk-vpu/ diff --git a/drivers/media/platform/nvidia/Kconfig b/drivers/media/platform/nvidia/Kconfig new file mode 100644 index 000000000000..413005d8cd66 --- /dev/null +++ b/drivers/media/platform/nvidia/Kconfig @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +source "drivers/media/platform/nvidia/tegra-vde/Kconfig" diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nxp/Kconfig index af5cd4eb6bf3..e8c9d33cd3b7 100644 --- a/drivers/media/platform/nxp/Kconfig +++ b/drivers/media/platform/nxp/Kconfig @@ -64,3 +64,4 @@ config VIDEO_MX2_EMMAPRP conversion. source "drivers/media/platform/nxp/imx-jpeg/Kconfig" +source "drivers/media/platform/nxp/amphion/Kconfig" diff --git a/drivers/media/platform/nxp/Makefile b/drivers/media/platform/nxp/Makefile index a217cf7f109d..9ff13ce1391d 100644 --- a/drivers/media/platform/nxp/Makefile +++ b/drivers/media/platform/nxp/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 +obj-y += amphion/ obj-y += imx-jpeg/ obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx-mipi-csis.o diff --git a/drivers/media/platform/qcom/Makefile b/drivers/media/platform/qcom/Makefile new file mode 100644 index 000000000000..98628912bc05 --- /dev/null +++ b/drivers/media/platform/qcom/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += camss/ +obj-y += venus/ diff --git a/drivers/media/platform/rockchip/Makefile b/drivers/media/platform/rockchip/Makefile new file mode 100644 index 000000000000..ef58d1a82fc6 --- /dev/null +++ b/drivers/media/platform/rockchip/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += rga/ +obj-y += rkisp1/ diff --git a/drivers/media/platform/samsung/Kconfig b/drivers/media/platform/samsung/Kconfig new file mode 100644 index 000000000000..9e9e8acdccd3 --- /dev/null +++ b/drivers/media/platform/samsung/Kconfig @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +source "drivers/media/platform/samsung/exynos-gsc/Kconfig" +source "drivers/media/platform/samsung/exynos4-is/Kconfig" +source "drivers/media/platform/samsung/s3c-camif/Kconfig" +source "drivers/media/platform/samsung/s5p-g2d/Kconfig" +source "drivers/media/platform/samsung/s5p-jpeg/Kconfig" +source "drivers/media/platform/samsung/s5p-mfc/Kconfig" diff --git a/drivers/media/platform/samsung/Makefile b/drivers/media/platform/samsung/Makefile new file mode 100644 index 000000000000..00a2d7e4daab --- /dev/null +++ b/drivers/media/platform/samsung/Makefile @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += exynos-gsc/ +obj-y += exynos4-is/ +obj-y += s3c-camif/ +obj-y += s5p-g2d/ +obj-y += s5p-jpeg/ +obj-y += s5p-mfc/ diff --git a/drivers/media/platform/sti/Kconfig b/drivers/media/platform/sti/Kconfig index 9fb5e78a92cf..d5423743d905 100644 --- a/drivers/media/platform/sti/Kconfig +++ b/drivers/media/platform/sti/Kconfig @@ -3,3 +3,4 @@ source "drivers/media/platform/sti/bdisp/Kconfig" source "drivers/media/platform/sti/c8sectpfe/Kconfig" source "drivers/media/platform/sti/delta/Kconfig" source "drivers/media/platform/sti/hva/Kconfig" +source "drivers/media/platform/sti/stm32/Kconfig" diff --git a/drivers/media/platform/sti/Makefile b/drivers/media/platform/sti/Makefile new file mode 100644 index 000000000000..a26dc89de577 --- /dev/null +++ b/drivers/media/platform/sti/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += bdisp/ +obj-y += c8sectpfe/ +obj-y += delta/ +obj-y += hva/ +obj-y += stm32/ diff --git a/drivers/media/platform/ti/Kconfig b/drivers/media/platform/ti/Kconfig new file mode 100644 index 000000000000..796acd229987 --- /dev/null +++ b/drivers/media/platform/ti/Kconfig @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +source "drivers/media/platform/ti/am437x/Kconfig" +source "drivers/media/platform/ti/davinci/Kconfig" +source "drivers/media/platform/ti/omap/Kconfig" +source "drivers/media/platform/ti/omap3isp/Kconfig" +source "drivers/media/platform/ti/vpe/Kconfig" diff --git a/drivers/media/platform/ti/Makefile b/drivers/media/platform/ti/Makefile new file mode 100644 index 000000000000..2e0f43ed2e25 --- /dev/null +++ b/drivers/media/platform/ti/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += am437x/ +obj-y += davinci/ +obj-y += omap/ +obj-y += omap3isp/ +obj-y += vpe/ From patchwork Sun Mar 13 10:52:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12779150 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF3F4C433F5 for ; Sun, 13 Mar 2022 10:53:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234357AbiCMKzD (ORCPT ); Sun, 13 Mar 2022 06:55:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234424AbiCMKyR (ORCPT ); Sun, 13 Mar 2022 06:54:17 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFD5A54F9E; Sun, 13 Mar 2022 03:52:49 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0236E61025; Sun, 13 Mar 2022 10:52:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C0AAC36AF2; Sun, 13 Mar 2022 10:52:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647168730; bh=FFtBVxCNU0lgtf6MUAIWU8V5I44U7IcShp/XmPLquDk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AKD41VptMrEe+KcRJCNw7xHaeEIs5iGnrBPLPFycB4lXByUCL/38lXjxxbEmSSn47 3BSq/Rc+w/EJVuOfdM9XgDd9Twsi8hFDqYAbqgymBRpwUv/lWbQGKQY7XAjMIjhr4W vYU4duYCyeEQp+v64p4dqK+k+i0OoW95Xb11gyz4c3xQ6fH43PmU82cXh9aVWjbVct NnVbVQOom1sfAaei9jha7r8BksuK5GXt3RK8KONxCnw09MplpEiqkzaLwlS4MrWd2o /EoVe7FqoC4hwo07D05FDxS3dVwV3KxCtJ0sJnwOk+bS/NymyVkbYx//QAomVz3I9c ym7VCuHLA8YRw== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTLpX-001I2m-Ts; Sun, 13 Mar 2022 11:52:07 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Alexandre Belloni , Andrew Jeffery , Andy Gross , Bjorn Andersson , Eddie James , Eugen Hristev , Hans Verkuil , Heiko Stuebner , Hyun Kwon , Jacopo Mondi , Jernej Skrabec , Joel Stanley , Laurent Pinchart , Ludovic Desroches , Matthias Brugger , Michael Tretter , Michal Simek , Nicolas Ferre , Pengutronix Kernel Team , Philipp Zabel , Robert Foss , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org, openbmc@lists.ozlabs.org Subject: [PATCH 24/24] media: platform/*/Kconfig: make menus more uniform Date: Sun, 13 Mar 2022 11:52:05 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Do some adjustments at the per-vendor Kconfig, adding a comment at the beginning in order to identify the manufacturer, and adjust a few entries to make them look more uniform. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/ drivers/media/platform/allegro-dvt/Kconfig | 3 +++ drivers/media/platform/amlogic/Kconfig | 3 +++ drivers/media/platform/aspeed/Kconfig | 3 +++ drivers/media/platform/atmel/Kconfig | 3 +++ drivers/media/platform/cadence/Kconfig | 13 +----------- drivers/media/platform/chips-media/Kconfig | 3 +++ drivers/media/platform/intel/Kconfig | 3 +++ drivers/media/platform/marvell/Kconfig | 3 +++ drivers/media/platform/mediatek/Kconfig | 3 +++ drivers/media/platform/nvidia/Kconfig | 3 +++ drivers/media/platform/nxp/Kconfig | 24 ++++++---------------- drivers/media/platform/qcom/Kconfig | 3 +++ drivers/media/platform/renesas/Kconfig | 2 ++ drivers/media/platform/rockchip/Kconfig | 3 +++ drivers/media/platform/samsung/Kconfig | 3 +++ drivers/media/platform/sti/Kconfig | 3 +++ drivers/media/platform/ti/Kconfig | 3 +++ drivers/media/platform/via/Kconfig | 3 +++ drivers/media/platform/xilinx/Kconfig | 7 +++---- 19 files changed, 57 insertions(+), 34 deletions(-) diff --git a/drivers/media/platform/allegro-dvt/Kconfig b/drivers/media/platform/allegro-dvt/Kconfig index c3f76a6fb6f8..735440369c5c 100644 --- a/drivers/media/platform/allegro-dvt/Kconfig +++ b/drivers/media/platform/allegro-dvt/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Allegro DVT drivers" + config VIDEO_ALLEGRO_DVT tristate "Allegro DVT Video IP Core" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/amlogic/Kconfig b/drivers/media/platform/amlogic/Kconfig index 09fb145a0b30..bc8d99e12f96 100644 --- a/drivers/media/platform/amlogic/Kconfig +++ b/drivers/media/platform/amlogic/Kconfig @@ -1,2 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 + +comment "Amlogic drivers" + source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" diff --git a/drivers/media/platform/aspeed/Kconfig b/drivers/media/platform/aspeed/Kconfig index 810902c8a85a..af95b08adf46 100644 --- a/drivers/media/platform/aspeed/Kconfig +++ b/drivers/media/platform/aspeed/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Aspeed drivers" + config VIDEO_ASPEED tristate "Aspeed AST2400 and AST2500 Video Engine driver" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/atmel/Kconfig b/drivers/media/platform/atmel/Kconfig index abeb0ac595b3..ae0fa7f96f66 100644 --- a/drivers/media/platform/atmel/Kconfig +++ b/drivers/media/platform/atmel/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Atmel drivers" + config VIDEO_ATMEL_ISC tristate "ATMEL Image Sensor Controller (ISC) support" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/cadence/Kconfig b/drivers/media/platform/cadence/Kconfig index acfa0ef6247e..1a0f2d9a6a28 100644 --- a/drivers/media/platform/cadence/Kconfig +++ b/drivers/media/platform/cadence/Kconfig @@ -1,15 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only -config VIDEO_CADENCE - bool "Cadence Video Devices" - depends on V4L_PLATFORM_DRIVERS - help - If you have a media device designed by Cadence, say Y. - Note that this option doesn't include new drivers in the kernel: - saying N will just cause Kconfig to skip all the questions about - Cadence media devices. - -if VIDEO_CADENCE +comment "Cadence drivers" config VIDEO_CADENCE_CSI2RX tristate "Cadence MIPI-CSI2 RX Controller" @@ -34,5 +25,3 @@ config VIDEO_CADENCE_CSI2TX To compile this driver as a module, choose M here: the module will be called cdns-csi2tx. - -endif diff --git a/drivers/media/platform/chips-media/Kconfig b/drivers/media/platform/chips-media/Kconfig index 22b654018f3c..ea49b3563320 100644 --- a/drivers/media/platform/chips-media/Kconfig +++ b/drivers/media/platform/chips-media/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Chips&Media drivers" + config VIDEO_CODA tristate "Chips&Media Coda multi-standard codec IP" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/intel/Kconfig b/drivers/media/platform/intel/Kconfig index d47a2cf6f334..091e15f00ef5 100644 --- a/drivers/media/platform/intel/Kconfig +++ b/drivers/media/platform/intel/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Intel drivers" + config VIDEO_PXA27x tristate "PXA27x Quick Capture Interface driver" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/marvell/Kconfig b/drivers/media/platform/marvell/Kconfig index 474795668930..d7275322fd92 100644 --- a/drivers/media/platform/marvell/Kconfig +++ b/drivers/media/platform/marvell/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "Marvell drivers" + config VIDEO_CAFE_CCIC tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/mediatek/Kconfig b/drivers/media/platform/mediatek/Kconfig index 549abf1df7d9..8e0770fb2dd3 100644 --- a/drivers/media/platform/mediatek/Kconfig +++ b/drivers/media/platform/mediatek/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 + +comment "Mediatek drivers" + source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" diff --git a/drivers/media/platform/nvidia/Kconfig b/drivers/media/platform/nvidia/Kconfig index 413005d8cd66..8fdb41e64308 100644 --- a/drivers/media/platform/nvidia/Kconfig +++ b/drivers/media/platform/nvidia/Kconfig @@ -1,2 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 + +comment "NVidia drivers" + source "drivers/media/platform/nvidia/tegra-vde/Kconfig" diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nxp/Kconfig index e8c9d33cd3b7..65357344d5e5 100644 --- a/drivers/media/platform/nxp/Kconfig +++ b/drivers/media/platform/nxp/Kconfig @@ -2,20 +2,10 @@ # V4L drivers -menuconfig VIDEO_IMX - bool "V4L2 capture drivers for NXP i.MX devices" - depends on V4L_PLATFORM_DRIVERS - depends on ARCH_MXC || COMPILE_TEST - depends on VIDEO_DEV - help - Say yes here to enable support for capture drivers on i.MX SoCs. - Support for the single SoC features are selectable in the sub-menu - options. - -if VIDEO_IMX +comment "NXP drivers" config VIDEO_IMX_MIPI_CSIS - tristate "MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models" + tristate "NXP MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models" select MEDIA_CONTROLLER select V4L2_FWNODE select VIDEO_V4L2_SUBDEV_API @@ -24,10 +14,8 @@ config VIDEO_IMX_MIPI_CSIS Video4Linux2 sub-device driver for the MIPI CSI-2 CSIS receiver v3.3/v3.6.3 found on some i.MX7 and i.MX8 SoCs. -endif # VIDEO_IMX - config VIDEO_VIU - tristate "Freescale/NXP VIU Video Driver" + tristate "NXP VIU Video Driver" depends on V4L_PLATFORM_DRIVERS depends on VIDEO_DEV && (PPC_MPC512x || COMPILE_TEST) && I2C select VIDEOBUF_DMA_CONTIG @@ -42,7 +30,7 @@ config VIDEO_VIU # mem2mem drivers config VIDEO_IMX_PXP - tristate "i.MX Pixel Pipeline (PXP)" + tristate "NXP i.MX Pixel Pipeline (PXP)" depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV && (ARCH_MXC || COMPILE_TEST) select VIDEOBUF2_DMA_CONTIG @@ -52,7 +40,7 @@ config VIDEO_IMX_PXP color space conversion, and rotation. config VIDEO_MX2_EMMAPRP - tristate "Freescale/NXP MX2 eMMa-PrP support" + tristate "NXP MX2 eMMa-PrP support" depends on V4L_MEM2MEM_DRIVERS depends on VIDEO_DEV depends on SOC_IMX27 || COMPILE_TEST @@ -63,5 +51,5 @@ config VIDEO_MX2_EMMAPRP memory to memory. Operations include resizing and format conversion. -source "drivers/media/platform/nxp/imx-jpeg/Kconfig" source "drivers/media/platform/nxp/amphion/Kconfig" +source "drivers/media/platform/nxp/imx-jpeg/Kconfig" diff --git a/drivers/media/platform/qcom/Kconfig b/drivers/media/platform/qcom/Kconfig index aa2428f641d3..b19b4f319f6b 100644 --- a/drivers/media/platform/qcom/Kconfig +++ b/drivers/media/platform/qcom/Kconfig @@ -1,3 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 + +comment "Qualcomm drivers" + source "drivers/media/platform/qcom/camss/Kconfig" source "drivers/media/platform/qcom/venus/Kconfig" diff --git a/drivers/media/platform/renesas/Kconfig b/drivers/media/platform/renesas/Kconfig index 0c0de21584ba..8c707ab38d0a 100644 --- a/drivers/media/platform/renesas/Kconfig +++ b/drivers/media/platform/renesas/Kconfig @@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only +comment "Renesas drivers" + # V4L drivers config VIDEO_RENESAS_CEU diff --git a/drivers/media/platform/rockchip/Kconfig b/drivers/media/platform/rockchip/Kconfig index c7ba06388780..558e3e4b5aa4 100644 --- a/drivers/media/platform/rockchip/Kconfig +++ b/drivers/media/platform/rockchip/Kconfig @@ -1,3 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 + +comment "Rockchip drivers" + source "drivers/media/platform/rockchip/rga/Kconfig" source "drivers/media/platform/rockchip/rkisp1/Kconfig" diff --git a/drivers/media/platform/samsung/Kconfig b/drivers/media/platform/samsung/Kconfig index 9e9e8acdccd3..8813b61b06f4 100644 --- a/drivers/media/platform/samsung/Kconfig +++ b/drivers/media/platform/samsung/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 + +comment "Samsung drivers" + source "drivers/media/platform/samsung/exynos-gsc/Kconfig" source "drivers/media/platform/samsung/exynos4-is/Kconfig" source "drivers/media/platform/samsung/s3c-camif/Kconfig" diff --git a/drivers/media/platform/sti/Kconfig b/drivers/media/platform/sti/Kconfig index d5423743d905..a352087dba27 100644 --- a/drivers/media/platform/sti/Kconfig +++ b/drivers/media/platform/sti/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "STMicroelectronics drivers" + source "drivers/media/platform/sti/bdisp/Kconfig" source "drivers/media/platform/sti/c8sectpfe/Kconfig" source "drivers/media/platform/sti/delta/Kconfig" diff --git a/drivers/media/platform/ti/Kconfig b/drivers/media/platform/ti/Kconfig index 796acd229987..9e63ea70b48f 100644 --- a/drivers/media/platform/ti/Kconfig +++ b/drivers/media/platform/ti/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 + +comment "Texas Instruments drivers" + source "drivers/media/platform/ti/am437x/Kconfig" source "drivers/media/platform/ti/davinci/Kconfig" source "drivers/media/platform/ti/omap/Kconfig" diff --git a/drivers/media/platform/via/Kconfig b/drivers/media/platform/via/Kconfig index a289f5c81b7c..6077222eb274 100644 --- a/drivers/media/platform/via/Kconfig +++ b/drivers/media/platform/via/Kconfig @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only + +comment "VIA drivers" + config VIDEO_VIA_CAMERA tristate "VIAFB camera controller support" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/xilinx/Kconfig b/drivers/media/platform/xilinx/Kconfig index 439120c45eb1..0c772d070eb6 100644 --- a/drivers/media/platform/xilinx/Kconfig +++ b/drivers/media/platform/xilinx/Kconfig @@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 +comment "Xilinx drivers" + config VIDEO_XILINX tristate "Xilinx Video IP (EXPERIMENTAL)" depends on V4L_PLATFORM_DRIVERS @@ -11,9 +13,8 @@ config VIDEO_XILINX help Driver for Xilinx Video IP Pipelines -if VIDEO_XILINX - config VIDEO_XILINX_CSI2RXSS + depends on VIDEO_XILINX tristate "Xilinx CSI-2 Rx Subsystem" help Driver for Xilinx MIPI CSI-2 Rx Subsystem. This is a V4L sub-device @@ -32,5 +33,3 @@ config VIDEO_XILINX_VTC depends on VIDEO_XILINX help Driver for the Xilinx Video Timing Controller - -endif #VIDEO_XILINX