From patchwork Sun Apr 16 10:16:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 83836 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1482999vqo; Sun, 16 Apr 2023 03:33:09 -0700 (PDT) X-Google-Smtp-Source: AKy350ZP59PwjnNAfeM+cX0jsC053KzJhJzBf5yOCRg76hsHDFnwskkISBe5cEBZAlnf4ux1pv9I X-Received: by 2002:a05:6a00:181f:b0:63b:7280:8a98 with SMTP id y31-20020a056a00181f00b0063b72808a98mr9796511pfa.17.1681641188915; Sun, 16 Apr 2023 03:33:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681641188; cv=none; d=google.com; s=arc-20160816; b=IM8bgkbLo1DNodf1z4/mJYdn2DZTlEZgrYY7wbXpjmXXJYyxMHzuI3FnrWWsPKeHGJ jnDM4afHX7AM7K7VjcXYhuvPI3ebJwmieJ0ihKNEYEK3bQuf1sQ5p01l6/W3zdiReLWj eFt6+OuGW14pPp3C8l7Q4+4Nl9tuAnswkepE5yZ+/fMPezqvdum+Ohobi0xBNhVvXgoj OjYhNZOBKRXQV4ZqS4aUmvoSXLZDW0R2nLNCx9ia8SX+q+nYiyD2eNjOfY6kXTwORyqx DRD1FXQ42arClQHOfxYhcG9EL5FC8sjNJrWWuALmglffPGu3Eqm0ynaiv2wFBgDOKsi6 iNQg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=MKVIgiz58zIFJgX8elDwMTDtG02bu6kIfybVoLMLnnE=; b=aydgfnnAdx+Moyb8j9S5w/ptbP2QRIE49OLXh8X2YYoks788EwIsyUFi5BosK3wAPx OV79D3d9SFvnsMmk69G6ZCABcXuda+DHzLDxEMbsWUdD4mit+VVcM0vGiVZUEgIHQgy/ k+dcyBHzoQpQjk3xeb8GA7Bucm7jyjtqzxRUV3v9Jql9GsOAq5X3+xll9TQT8ezOlXt9 qqrKh8QAvJYIb+0lyrY98t54P0ADiLwL/hRc9gQp4gy4hbf0xPqbIiFIwDNyYIYx6x1u b9Y567SUcxiddsv4cb4Mug4oTj4wTK4Mp9S8VHibyg7Gjjv6plcoICn1/UZETnYcChvk c28w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=cqXiolsx; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z28-20020aa7959c000000b0063b85b18764si2690711pfj.219.2023.04.16.03.32.53; Sun, 16 Apr 2023 03:33:08 -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=pass header.i=@gmail.com header.s=20221208 header.b=cqXiolsx; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230347AbjDPKT1 (ORCPT + 99 others); Sun, 16 Apr 2023 06:19:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229711AbjDPKS0 (ORCPT ); Sun, 16 Apr 2023 06:18:26 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96E0F2D53; Sun, 16 Apr 2023 03:18:23 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id jg21so56458777ejc.2; Sun, 16 Apr 2023 03:18:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681640302; x=1684232302; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MKVIgiz58zIFJgX8elDwMTDtG02bu6kIfybVoLMLnnE=; b=cqXiolsx0L2qOIBAA7EALCik+iaaMM62IB0P+KqocrXkk7GYA93KjBCpZoy0NZhJUd zFaSWz7Pk/WRCBJVmp76y9w8+t7VnQLSiTi0SzoZ1VSEtpmbzRMTxFrqiGFAYYFBIsGx WPYkkPYTcimur1fXWbF9clpXQOhh6c/8gItlzWD0C74yR1BtOioezl+95Jpx2Pz4K5gn /EBQZXYEXoszFUQPGeQznA9XBQtpL8d9IW4DEizt/m2fZDYEdmlYRdVBr5SbXw2B77mz yI3+V/Rn+urSLxJtYLfbjVP6d8B8WC0W4ZxKS7UmQ7rHRGzxlhBhZE3Qiv+xlVEXTHKR A14g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681640302; x=1684232302; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MKVIgiz58zIFJgX8elDwMTDtG02bu6kIfybVoLMLnnE=; b=M8xF6UP9TM29oeZAnzQ33JDtM9qI4vXRbxtUhuRqpsBAmpv7DXOfOLBPlTdJJMTV3e qTB60rWW+CxfgQW5md8OFTA19H8K14bnazmJGPAmWmd4brAQyZjm6bBJA/hxZxKkR/zL rCSLm+1zKAdg2ejpaj/UbT9A+D8eMk6n5cL2c3sJ0bo6rPBV1qChWpcTuUc71VYYzgH9 Th0may+d46W8mwefsWqQLls+JtY/VdRYMSDk6ry34epxrqWYN95e/Srx0elUKGTDZcqR HAUycSh4X/mj56LWjVHX94hPzwRaI6fnFJN3fWLfqrp3D9Fdttnm75KffK/868gaEv5W grtQ== X-Gm-Message-State: AAQBX9emOr8s/YkFjums+FzfN450ohBU0lp91bzSRqZQZKOczOb+Gq0U G6Vyx5kmmt1+LMNgYYThyJ4= X-Received: by 2002:a17:906:57d5:b0:94e:dd1c:dc78 with SMTP id u21-20020a17090657d500b0094edd1cdc78mr4487386ejr.69.1681640301702; Sun, 16 Apr 2023 03:18:21 -0700 (PDT) Received: from localhost.my.domain (83.8.121.70.ipv4.supernova.orange.pl. [83.8.121.70]) by smtp.gmail.com with ESMTPSA id r20-20020a056402019400b0050476da5160sm4427443edv.45.2023.04.16.03.18.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Apr 2023 03:18:21 -0700 (PDT) From: Artur Weber To: Krzysztof Kozlowski Cc: Alim Akhtar , Rob Herring , Sylwester Nawrocki , Tomasz Figa , Chanwoo Choi , Michael Turquette , Stephen Boyd , Arnd Bergmann , Olof Johansson , soc@kernel.org, Russell King , Daniel Lezcano , Kukjin Kim , Mauro Carvalho Chehab , Vinod Koul , Kishon Vijay Abraham I , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, linux-media@vger.kernel.org, linux-phy@lists.infradead.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber Subject: [PATCH 07/12] Revert "media: exynos4-is: Remove dependency on obsolete SoC support" Date: Sun, 16 Apr 2023 12:16:19 +0200 Message-Id: <20230416101624.15866-8-aweber.kernel@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230416101624.15866-1-aweber.kernel@gmail.com> References: <20230416101624.15866-1-aweber.kernel@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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 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?1763328591475334857?= X-GMAIL-MSGID: =?utf-8?q?1763328591475334857?= The platform was originally dropped in commit bca9085e0ae9 ("ARM: dts: exynos: remove Exynos4212 support (dead code)"), as there were no boards using it. We will be adding a device that uses it, so add it back. This reverts commit 2d41a0c9ae51ac363d107f2510022106e7234b33. Signed-off-by: Artur Weber --- drivers/media/platform/samsung/exynos4-is/Kconfig | 2 +- drivers/media/platform/samsung/exynos4-is/fimc-core.c | 2 +- drivers/media/platform/samsung/exynos4-is/fimc-lite.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/samsung/exynos4-is/Kconfig b/drivers/media/platform/samsung/exynos4-is/Kconfig index da33faa7132e..7f9ba053dd8e 100644 --- a/drivers/media/platform/samsung/exynos4-is/Kconfig +++ b/drivers/media/platform/samsung/exynos4-is/Kconfig @@ -47,7 +47,7 @@ config VIDEO_S5P_MIPI_CSIS config VIDEO_EXYNOS_FIMC_LITE tristate "EXYNOS FIMC-LITE camera interface driver" depends on I2C - depends on SOC_EXYNOS4412 || SOC_EXYNOS5250 || COMPILE_TEST + depends on SOC_EXYNOS4212 || SOC_EXYNOS4412 || SOC_EXYNOS5250 || COMPILE_TEST depends on HAS_DMA select VIDEOBUF2_DMA_CONTIG select VIDEO_EXYNOS4_IS_COMMON diff --git a/drivers/media/platform/samsung/exynos4-is/fimc-core.c b/drivers/media/platform/samsung/exynos4-is/fimc-core.c index 1791100b6935..e2f394e60dee 100644 --- a/drivers/media/platform/samsung/exynos4-is/fimc-core.c +++ b/drivers/media/platform/samsung/exynos4-is/fimc-core.c @@ -1129,7 +1129,7 @@ static const struct fimc_drvdata fimc_drvdata_exynos4210 = { .out_buf_count = 32, }; -/* EXYNOS4412 */ +/* EXYNOS4212, EXYNOS4412 */ static const struct fimc_drvdata fimc_drvdata_exynos4x12 = { .num_entities = 4, .lclk_frequency = 166000000UL, diff --git a/drivers/media/platform/samsung/exynos4-is/fimc-lite.c b/drivers/media/platform/samsung/exynos4-is/fimc-lite.c index e185a40305a8..f80047095f30 100644 --- a/drivers/media/platform/samsung/exynos4-is/fimc-lite.c +++ b/drivers/media/platform/samsung/exynos4-is/fimc-lite.c @@ -1619,7 +1619,7 @@ static const struct dev_pm_ops fimc_lite_pm_ops = { NULL) }; -/* EXYNOS4412 */ +/* EXYNOS4212, EXYNOS4412 */ static struct flite_drvdata fimc_lite_drvdata_exynos4 = { .max_width = 8192, .max_height = 8192,