Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp3089953pxp; Mon, 14 Mar 2022 10:35:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVvCDxHZta9DC52rjExtX8ix5CqzXWhoGGnTyVN/PeJyxyrV/WaHWnBBlrSM6L9y5mbI+d X-Received: by 2002:a17:902:d4d2:b0:152:fd44:5004 with SMTP id o18-20020a170902d4d200b00152fd445004mr23925744plg.99.1647279341587; Mon, 14 Mar 2022 10:35:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647279341; cv=none; d=google.com; s=arc-20160816; b=ehH5KJoMT/pyA0sIN9pxXHUCoCwk8mZ513oprQhkRbliAq3hxADBI1BHIfl20m8xhF GV+XGKdiIcfFFKNw9J5ccI3S3GYzV4F/LQu+kNYW5Ov2wWzj/laRWbTPpxpgfpVezaLN 6irdIzdUF5qYaAc0eh6dCK2esnaEs521s05KbtYbYSgYiBhV1Zte0flay67VHBlBfAO6 ENNTTAz/bpkoIYmoe+FZB668DY+/ppW6eGrlaRjA6t1G5pNpFz97WdsWKACamrSGLMPk /KjaQRkLrZW7S7ERGfSv6ahpl1OXsZzEXJRSoC8BrTp4qOPitjz9eF7WvSrKMD2lstTT u/OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=3jsIzaGyDdKOhnRaaLUDMbuAiUkTDNqip3dIwyyJrkk=; b=0MHu6FVCxYZci0oV1O0oh62nfU/JJ2ZBcf03tUToZv1euuPNmelRlRM1UmUMWziT4P 2XRIwBzKcfbgM2hbrS8Dw2ayFWYsPtk7GQ64diuvkMXjrAGNouskMYjYwI9aNbEVY+qz m+FV40G6c0RN5YhNo726D09kCppfa0ACjzY5orRDh7ItR5/9e/k7zKuaexEGa9ITH3bC J+r8PQpf9/TvogZtxj7TTIFUwX0PF//cROrbI+L0m5SBjTBwEsX/qIV8SQMIkfGFJxkg 6JfFCg80xc4bdjeJUB7AqVfZm+6aPbPc19TD3toKiB8VL8xviGv/7VOMvSPnW9rykpb7 sgvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=EfZqZFl4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s6-20020a17090a440600b001bd14e03080si13792223pjg.88.2022.03.14.10.35.27; Mon, 14 Mar 2022 10:35:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=EfZqZFl4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233884AbiCNIBL (ORCPT + 99 others); Mon, 14 Mar 2022 04:01:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236837AbiCNH5u (ORCPT ); Mon, 14 Mar 2022 03:57:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C3FE4163B; Mon, 14 Mar 2022 00:56:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CA38B611DD; Mon, 14 Mar 2022 07:56:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2FE2C36B1B; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244563; bh=swRxq5gsw5Yf8Epflxt4EJGeebzMkO7Mkk9AcDrNib0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EfZqZFl4+tQFY0SXQnHCWVQFhFq5b+s7TP2+zg/YJXd1fx927aIUP3KWCqe5LuBuT p8uJJhoN+xgXDMLAHLSXyP1QiniKO9o1I46watanyDZ9jjeqF6N7j1TU3cFsFIYUxF szRZQBByb61NvMR/lmQoOXoUJikD1WJZsmqSxAXAFCOeUaaU948szVyy3OLIb8Ar6s bUgeWk1ujrEmNJ5+oZYb6bqB9bGCKzrl2WHilSk8Oj/XqKIrJ2zYcQoiZJqkX4QUyu UQxYbJZvuff2yB+BXH/DYsKOK+7KorEMPgdqj8LBhUF8mxyugXPkGZP+gvdUCqQG9F KMUW16ohtaB4A== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYe-001kXv-Pf; Mon, 14 Mar 2022 08:56:00 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , "Lad, Prabhakar" , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Arnd Bergmann , Cai Huoqing , Colin Ian King , Dmitry Osipenko , Eugen Hristev , Hans Verkuil , Herman , Jacopo Mondi , Jernej Skrabec , Johan Hovold , Lad Prabhakar , Laurent Pinchart , Ming Qian , Rui Miguel Silva , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 58/64] media: platform: rename davinci/ to ti/davinci/ Date: Mon, 14 Mar 2022 08:55:50 +0100 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As the end goal is to have platform drivers split by vendor, rename davinci/ to ti/davinci/. Reviewed-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/64] at: https://lore.kernel.org/all/cover.1647242578.git.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 9456144cd347..bedc8f2522e2 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -72,7 +72,6 @@ source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/atmel/Kconfig" source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/chips-media/Kconfig" -source "drivers/media/platform/davinci/Kconfig" source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" @@ -97,6 +96,7 @@ source "drivers/media/platform/sti/Kconfig" source "drivers/media/platform/sti/stm32/Kconfig" source "drivers/media/platform/ti-vpe/Kconfig" source "drivers/media/platform/ti/am437x/Kconfig" +source "drivers/media/platform/ti/davinci/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" 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 -- 2.35.1