From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DADFC43603 for ; Tue, 10 Dec 2019 21:09:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 39B29246A2 for ; Tue, 10 Dec 2019 21:09:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576012199; bh=Xs9azZUSBFSp7gdmcJkMreRRH1oyq6EQNLWJYKL6CiU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MltlYbInoaFmSKrm0OkbUbT5LnoST44SVbgY/yL1bAp1M4ZZzyw7VjXexRMHx4QZF 4P8zLDhKNlmvPHWW3t3srJwg3M0Gu7fxD5UYw74qpQS1H4Rnz8gNAMTrjkZBKIJkEu +KQzmD8XGDrk8G/P2RQdM3E453qi+v4q4Tw3vx/E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728328AbfLJVJ5 (ORCPT ); Tue, 10 Dec 2019 16:09:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:59100 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727482AbfLJVJz (ORCPT ); Tue, 10 Dec 2019 16:09:55 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3C4EB246AC; Tue, 10 Dec 2019 21:09:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576012195; bh=Xs9azZUSBFSp7gdmcJkMreRRH1oyq6EQNLWJYKL6CiU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rD3lv8oVwNzV1+EAAbOpkjgbV1gq2N+z8bPWYM+lMkMxEqU4ipcitR14ZZaAL7cuL JethQisTTEdaKzI9ycpNhDTywDeP1UoeUUaJ8ZoFmfxZ3HUrvMC2vlLPbwNOTeTEt7 PUj0flppHVIKD990v0rqyU9Vd5bci5Y+gDgoU9hA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Benoit Parrot , Jacopo Mondi , Sakari Ailus , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 149/350] media: ov5640: Make 2592x1944 mode only available at 15 fps Date: Tue, 10 Dec 2019 16:04:14 -0500 Message-Id: <20191210210735.9077-110-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210210735.9077-1-sashal@kernel.org> References: <20191210210735.9077-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Benoit Parrot [ Upstream commit 981e445454531c9d5ac5d3fa8c0f1bd55262d001 ] The sensor data sheet clearly state that 2592x1944 only works at 15 fps make sure we don't try to miss configure the pll out of acceptable range. Signed-off-by: Benoit Parrot Reviewed-by: Jacopo Mondi Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/i2c/ov5640.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c index 500d9bbff10b5..18dd2d717088b 100644 --- a/drivers/media/i2c/ov5640.c +++ b/drivers/media/i2c/ov5640.c @@ -1611,6 +1611,11 @@ ov5640_find_mode(struct ov5640_dev *sensor, enum ov5640_frame_rate fr, !(mode->hact == 640 && mode->vact == 480)) return NULL; + /* 2592x1944 only works at 15fps max */ + if ((mode->hact == 2592 && mode->vact == 1944) && + fr > OV5640_15_FPS) + return NULL; + return mode; } -- 2.20.1