Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp663698pxv; Thu, 15 Jul 2021 12:51:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwny+mcizUCwrdosZpbkd8zloa3eWodqUYsdD2BjBvk6x7rZdusYv4JNUqB/hD7y2dFdmQZ X-Received: by 2002:aa7:cc87:: with SMTP id p7mr9163903edt.82.1626378664796; Thu, 15 Jul 2021 12:51:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626378664; cv=none; d=google.com; s=arc-20160816; b=wH8WmEQTIFJvPWx8OQ15pTbMN3fgVRhvXXXFb5LBBvSQcCbo+1eouJ9a8KTXoExrlp veyO9xV0TS+A1RoXV7F/pVfxpEfxvcG4L8/vSNxcHhKZ68pNO47VcNSNmhfb8/iAReEP MM7nsxkoXqpUQHmEM2z6/4oI/ykLkZDlDcdxd07wrJ1PN+5y+H/seEbPUPxxh82fLEag HVP2mgeX3Hlzh2NXMcEB1DSBATH6Ma8KWaGxY2+9ths9NLH8ebQ8oFGv/tjD7Re1gxrZ kT0e94Zgc1z2Lpr0eahryaWp74t1Ie6wbidL5SUGu/CZ/MJWZA4oeqCevJm+kfhjkWw4 0Ryg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nGgeClVi2NMnQuavgQh92V38Au+nb+q4DSS3naEniEw=; b=vHbB565CfweJjk48JQ3fjmK0VUojaVlbw3xhoeAYYSfQ8aAoXAJSt/vpLi2Ecs9vl6 klhYFgDnvkDcGW+zgzGFAoJQAGUVvj81FlYeuUeEPxpPrj2SwZk1od7RxaTQn2sZ+YC7 cu9HfNrWb44l2QAao+jsacRsxqiY4YLev5RGMpgrzvWuWGXVQc/DFsDEeKxdTTWTjfNv 5NTuG4mxaHWjTKRx13RPiOGKDPdQydHCfJIH5hdKoWSjbdq84uLTAsMKsIdHPQsyEsao f9j/4Py2wNpfHxjT+nZWlMUMHMKfgVLbPqk0BYomOGxb0j0F9sCmNtq+2Qp97oyady33 mqew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jgKggMAD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p26si8147747ejf.481.2021.07.15.12.50.40; Thu, 15 Jul 2021 12:51:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jgKggMAD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345474AbhGOTuX (ORCPT + 99 others); Thu, 15 Jul 2021 15:50:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:58960 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245051AbhGOTTO (ORCPT ); Thu, 15 Jul 2021 15:19:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9CC84613E5; Thu, 15 Jul 2021 19:14:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626376445; bh=kZo4fde+p3X2ftfMdEtwKCs+3ogPBCg1LLGIL/Cr07Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jgKggMADMskmk4ENIKjzMZDCz14HDqa1bhq6sm2/Smp+ZJrMGqQTRuPv6h04octwW bAK3wzG2JVMQZVbMWb2hRMLvXlyHR+yuM7b6mnsjqopGJyzIF7AMOg3iqTyqOUe4w9 3UWw+YrUlQfSDWTaCunycy3V7efNOBY8KAyPoQ+A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bernhard Wimmer , Sakari Ailus , Mauro Carvalho Chehab Subject: [PATCH 5.13 249/266] media: ccs: Fix the op_pll_multiplier address Date: Thu, 15 Jul 2021 20:40:04 +0200 Message-Id: <20210715182651.958503171@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210715182613.933608881@linuxfoundation.org> References: <20210715182613.933608881@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bernhard Wimmer commit 0e3e0c9369c822b7f1dd11504eeb98cfd4aabf24 upstream. According to the CCS spec the op_pll_multiplier address is 0x030e, not 0x031e. Signed-off-by: Bernhard Wimmer Signed-off-by: Sakari Ailus Cc: stable@vger.kernel.org Fixes: 6493c4b777c2 ("media: smiapp: Import CCS definitions") Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/i2c/ccs/ccs-limits.c | 4 ++++ drivers/media/i2c/ccs/ccs-limits.h | 4 ++++ drivers/media/i2c/ccs/ccs-regs.h | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) --- a/drivers/media/i2c/ccs/ccs-limits.c +++ b/drivers/media/i2c/ccs/ccs-limits.c @@ -1,5 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause /* Copyright (C) 2019--2020 Intel Corporation */ +/* + * Generated by Documentation/driver-api/media/drivers/ccs/mk-ccs-regs; + * do not modify. + */ #include "ccs-limits.h" #include "ccs-regs.h" --- a/drivers/media/i2c/ccs/ccs-limits.h +++ b/drivers/media/i2c/ccs/ccs-limits.h @@ -1,5 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause */ /* Copyright (C) 2019--2020 Intel Corporation */ +/* + * Generated by Documentation/driver-api/media/drivers/ccs/mk-ccs-regs; + * do not modify. + */ #ifndef __CCS_LIMITS_H__ #define __CCS_LIMITS_H__ --- a/drivers/media/i2c/ccs/ccs-regs.h +++ b/drivers/media/i2c/ccs/ccs-regs.h @@ -1,5 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause */ /* Copyright (C) 2019--2020 Intel Corporation */ +/* + * Generated by Documentation/driver-api/media/drivers/ccs/mk-ccs-regs; + * do not modify. + */ #ifndef __CCS_REGS_H__ #define __CCS_REGS_H__ @@ -202,7 +206,7 @@ #define CCS_R_OP_PIX_CLK_DIV (0x0308 | CCS_FL_16BIT) #define CCS_R_OP_SYS_CLK_DIV (0x030a | CCS_FL_16BIT) #define CCS_R_OP_PRE_PLL_CLK_DIV (0x030c | CCS_FL_16BIT) -#define CCS_R_OP_PLL_MULTIPLIER (0x031e | CCS_FL_16BIT) +#define CCS_R_OP_PLL_MULTIPLIER (0x030e | CCS_FL_16BIT) #define CCS_R_PLL_MODE 0x0310 #define CCS_PLL_MODE_SHIFT 0U #define CCS_PLL_MODE_MASK 0x1