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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 A7B3CC2D0CE for ; Sun, 29 Dec 2019 17:48:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F4FD21744 for ; Sun, 29 Dec 2019 17:48:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641721; bh=NPabPQxlAlRgLta9Wp5g+qVUkDV7fJuVhnyOopc1cYA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=R/KsseroCzOpevW2Q+Cyewq9Dt1Qzfi1rYK/qSML62P7bHP/xh4Oh6b9RcXLPtyXi XTpyIQGOO5gARQTsqsiQvm2sZ4ohseuaFgs6okR5FAwMcxOUgnmTE5htadzw3fXxW7 TSgzbhnVb3azZiVWFqu7atbERrfH0M7vwcAuFFts= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731476AbfL2Rsc (ORCPT ); Sun, 29 Dec 2019 12:48:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:59872 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731474AbfL2Rsb (ORCPT ); Sun, 29 Dec 2019 12:48:31 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 903A221744; Sun, 29 Dec 2019 17:48:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641711; bh=NPabPQxlAlRgLta9Wp5g+qVUkDV7fJuVhnyOopc1cYA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pCJduSrFwOT4PNcq3+cRUvB3l0ttSJqR6eXU16DVlUAvCU+ALmu9v9GHk6/H2dwR5 5Qz23YqCg8oQ3BRr+95eAgldm2gLuZ7sycHu4xsaZUa0IVHu7f46Ky97ZIhg2cf+0S qqxWwYpBaJLZOpgc0V8KWh3vXS83iXkBXGubws2Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Benoit Parrot , Jacopo Mondi , Sakari Ailus , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.4 178/434] media: ov5640: Make 2592x1944 mode only available at 15 fps Date: Sun, 29 Dec 2019 18:23:51 +0100 Message-Id: <20191229172713.635485703@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 500d9bbff10b..18dd2d717088 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