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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 8697BC43381 for ; Fri, 22 Mar 2019 11:35:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 508AB2183E for ; Fri, 22 Mar 2019 11:35:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553254555; bh=s1+Sszes50hXP6bmGkrGs/toPseNDmxoOe2ECAvHGdA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DpRSB1qCywGmX0l4MIZlRUB7q3lEmeYEetnm+fw4X5y0e6n4CeUWRuwHywtHWHVMn lCzgazTLyaJE+Ndz2NwQho9TqLZ9kuzoRAUY2xXGtE1Q9Urc9mBeb+Y05kz3rx5w90 7GAI/kjjK3CvqKP1ZSiFOrNECNCAg2ercHMKQew4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730621AbfCVLfy (ORCPT ); Fri, 22 Mar 2019 07:35:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:36952 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729668AbfCVLfv (ORCPT ); Fri, 22 Mar 2019 07:35:51 -0400 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 F0362218B0; Fri, 22 Mar 2019 11:35:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553254551; bh=s1+Sszes50hXP6bmGkrGs/toPseNDmxoOe2ECAvHGdA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mh4hpC2Tx3WW+Yef6xXgXsM7DSsZVPeYpsEfhYruE7GCose0+tCTx4ony/X8Qi65z HH/uD2RgkftkU9FYQq9JhWZLVwHVeCfwsThhE1WmZrpmN6e8BDF0rPw0fmySkc1v8M 7J1gLsIav9rrKS7RUH20vwPgwvii7XvPlOqxvp2k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexander Shiyan , Philipp Zabel , Sasha Levin Subject: [PATCH 4.4 156/230] gpu: ipu-v3: Fix i.MX51 CSI control registers offset Date: Fri, 22 Mar 2019 12:14:54 +0100 Message-Id: <20190322111247.645823158@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111236.796964179@linuxfoundation.org> References: <20190322111236.796964179@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 2c0408dd0d8906b26fe8023889af7adf5e68b2c2 ] The CSI0/CSI1 registers offset is at +0xe030000/+0xe038000 relative to the control module registers on IPUv3EX. This patch fixes wrong values for i.MX51 CSI0/CSI1. Fixes: 2ffd48f2e7 ("gpu: ipu-v3: Add Camera Sensor Interface unit") Signed-off-by: Alexander Shiyan Signed-off-by: Philipp Zabel Signed-off-by: Sasha Levin --- drivers/gpu/ipu-v3/ipu-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c index 5030cba4a581..0c51b1dde494 100644 --- a/drivers/gpu/ipu-v3/ipu-common.c +++ b/drivers/gpu/ipu-v3/ipu-common.c @@ -746,8 +746,8 @@ static struct ipu_devtype ipu_type_imx51 = { .cpmem_ofs = 0x1f000000, .srm_ofs = 0x1f040000, .tpm_ofs = 0x1f060000, - .csi0_ofs = 0x1f030000, - .csi1_ofs = 0x1f038000, + .csi0_ofs = 0x1e030000, + .csi1_ofs = 0x1e038000, .ic_ofs = 0x1e020000, .disp0_ofs = 0x1e040000, .disp1_ofs = 0x1e048000, -- 2.19.1