From patchwork Fri Nov 25 09:28:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 25889 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3880003wrr; Fri, 25 Nov 2022 01:29:15 -0800 (PST) X-Google-Smtp-Source: AA0mqf6oDzXTjIy5F7XKIlLT24z4Ld9cRyTScV7nmVUp3HA8Jlv9rbWXmS7c4BGOd6rl8VwqRQVk X-Received: by 2002:a65:6d10:0:b0:476:fdde:e539 with SMTP id bf16-20020a656d10000000b00476fddee539mr18151360pgb.216.1669368554843; Fri, 25 Nov 2022 01:29:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669368554; cv=none; d=google.com; s=arc-20160816; b=Fe41GHGbTNdC6PVoT4YsaqVn1a/oNpehfOpPrgUAczxOnA1QTjeRbqGyMeGPeMjg0Z QEhVbXAmZfyFztdMpeEDW4rlMw473RYG1fqvGWHdsB3cudM+P+6faF4GDjwHCa1E9hkK Q7k2jPpIAcMl8zwoZmHbRZuGaWeWQGlKwYG5/fLnE+rBkLKMOxi9WXVTJtNI9XbM9h6E xjrWd16w4Q8ELAli5n2Xi7NkQYOiJVHEOOAS7yHMdq4jhM6Af1cNunG9QtJ3LsTs4IgH U31u/3bTMURUD/UnIXjovaJCsqnlHPVtIBalYGyid2hQJUYHK7NYp6dL4Wbm/pVmZonr 3c9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=mzZBGRlRc6yY+0jQaVBnk/lKdEqeDc8koXBMv8SN02I=; b=lrDp/WO5NJs+ANiK5C7Pm1N3Mk/0Zu7PNHDwuY5EEy5yi7xA988mrDdqBnhCSwTyaD SkV+EiJt+Bk6wigT5nS1w3LSL8C7IWw1fwn+D6GPxdoBPXW6i5YVQurlneCOlG5GGdCb khJoBiCaD1BVpPTEkEL4C7Y57GlIBNChbFKU97n5KdMjh3G2LtIRYj4GWU9k5hpA3DE1 R8AY0higxRnGKoC+Y080jyGGkHVTmn22AZQUOvJrqsnubCbAqHM4V/3mZO9AxSljY6iW HS4DjhL9NmMJO3G+KDkobn9W72geHkXnNR7MagWE48JwS+4++aVT8HoLweS9WSA8bawJ P+/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=dcMxsgzS; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g33-20020a631121000000b004774f2a6adcsi3103345pgl.540.2022.11.25.01.29.02; Fri, 25 Nov 2022 01:29:14 -0800 (PST) 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=pass header.i=@microchip.com header.s=mchp header.b=dcMxsgzS; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229915AbiKYJ2s (ORCPT + 99 others); Fri, 25 Nov 2022 04:28:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229871AbiKYJ22 (ORCPT ); Fri, 25 Nov 2022 04:28:28 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB53A222BB; Fri, 25 Nov 2022 01:28:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1669368504; x=1700904504; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Wzwmhe1tAJXVDVxgspmjOf4RzyKkfCj4R+nMlHGJos8=; b=dcMxsgzS+J1wjQfB1wt4NC632r/WZPuOF4+DsiVMZIms1Mnz5hVezLuf SgJUS96g0oWxgD9wUvutFR+jaoPo08g+lQ/+uqvpe93odydm23blLZ8Fq ucHGe8xpH7HfLv1q0b027OrP2FByQQFYLg98fNK6Qurkawum3Yo9W1ls6 1+HMwi2qDr4P77aTAbaEJmlTjtbCQj/dGg0/obQJmAZah/ZDOH4VDnhQu amuIRD74kzpCj0MX9rD6vtTpaupDq/GXol8ojBdJD3FQio3YUShYGI1md 9PsRwUHTIWAWjbrZfC3Q/9K3l8MXqXm87JKiLgVcAvVkefyJRTGx0O69B A==; X-IronPort-AV: E=Sophos;i="5.96,193,1665471600"; d="scan'208";a="190492699" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 25 Nov 2022 02:28:23 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Fri, 25 Nov 2022 02:28:22 -0700 Received: from ROB-ULT-M18282.microchip.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Fri, 25 Nov 2022 02:28:21 -0700 From: Eugen Hristev To: CC: , , , Eugen Hristev Subject: [PATCH] ARM: configs: switch to new MICROCHIP_ISC driver Date: Fri, 25 Nov 2022 11:28:12 +0200 Message-ID: <20221125092812.446379-1-eugen.hristev@microchip.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750459801476843205?= X-GMAIL-MSGID: =?utf-8?q?1750459801476843205?= The ATMEL_ISC and ATMEL_XISC have been deprecated and moved to staging. Use the new MICROCHIP_ISC/MICROCHIP_XISC symbols which are the replacement drivers. Signed-off-by: Eugen Hristev --- Hi, This should go in 6.2, after the media subsystem new features will be merged. The tree here : https://git.linuxtv.org/media_stage.git/ ... contains the patches that are destined for 6.2 and perform the move of the ISC drivers to staging: https://git.linuxtv.org/media_stage.git/commit/?id=55927c98a2c88019e23353a87f44032107ca2854 Hence this patch has to go in the same kernel version to allow the current defconfigs that use the ISC to switch to the new driver. (The old driver won't be selected anymore since it depends on MEDIA_DEPRECATED , so that symbol has to be selected first to select the old driver which is now in staging ) Thanks arch/arm/configs/multi_v7_defconfig | 6 +++--- arch/arm/configs/sama5_defconfig | 2 +- arch/arm/configs/sama7_defconfig | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index b61b2e3d116b..d1686bc40e5d 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -663,11 +663,11 @@ CONFIG_USB_VIDEO_CLASS=m CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_ASPEED=m -CONFIG_VIDEO_ATMEL_ISC=m -CONFIG_VIDEO_ATMEL_XISC=m CONFIG_VIDEO_ATMEL_ISI=m -CONFIG_VIDEO_MICROCHIP_CSI2DC=m CONFIG_VIDEO_MMP_CAMERA=m +CONFIG_VIDEO_MICROCHIP_ISC=m +CONFIG_VIDEO_MICROCHIP_XISC=m +CONFIG_VIDEO_MICROCHIP_CSI2DC=m CONFIG_VIDEO_TEGRA_VDE=m CONFIG_VIDEO_RENESAS_CEU=m CONFIG_VIDEO_RCAR_VIN=m diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index 877bbe7b777e..f89fd4e0d10a 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig @@ -150,8 +150,8 @@ CONFIG_MEDIA_PLATFORM_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y CONFIG_USB_VIDEO_CLASS=m CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VIDEO_ATMEL_ISC=y CONFIG_VIDEO_ATMEL_ISI=y +CONFIG_VIDEO_MICROCHIP_ISC=y CONFIG_VIDEO_MT9V032=m CONFIG_VIDEO_OV2640=m CONFIG_VIDEO_OV5640=m diff --git a/arch/arm/configs/sama7_defconfig b/arch/arm/configs/sama7_defconfig index 8f28c9d443f0..cc42cea77f38 100644 --- a/arch/arm/configs/sama7_defconfig +++ b/arch/arm/configs/sama7_defconfig @@ -140,7 +140,7 @@ CONFIG_MEDIA_SUPPORT_FILTER=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_PLATFORM_SUPPORT=y CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VIDEO_ATMEL_XISC=y +CONFIG_VIDEO_MICROCHIP_XISC=y CONFIG_VIDEO_MICROCHIP_CSI2DC=y CONFIG_VIDEO_IMX219=m CONFIG_VIDEO_IMX274=m