Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp9110397pxu; Mon, 28 Dec 2020 06:55:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJzuMJW7WZdf5oe1dHlIavdS0D+1jT24GyaAxoxh/+42PQQkwv+lMHMNlJrqhzh6ZvLMZB9q X-Received: by 2002:a17:906:e250:: with SMTP id gq16mr40635599ejb.382.1609167305054; Mon, 28 Dec 2020 06:55:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609167305; cv=none; d=google.com; s=arc-20160816; b=rE/adjwUF22ZQVAxiNckCkzqSMYNOwd5dA2/JJCAmpCcAA4hMvADRDVsKRz1DjlfEf lmnEKKJCo27PjH2Ntv2BQaGTGAiXbQQ+fnUx/m7xi4aXZUZ4tZ5R0Qhr3DM6oBrA2za8 PusTW3ghhDNMoehpEJpdH4m/4pe600XDAnIXu1Fr1ZJN3LthqNc6L6wZYw/vXpgFFsQ8 3RSosyq5MgUMys8BeTSlVL1qCn0xTKz3Zjz7F431OrX+zpgIq7Jw+z+7MdcAvTv6dnfm dHAsoOha678oSpAvB4/pE1hRplhBdmkGa6TXduHOifuEZYcc7hUq/gBVWxqJhZGt1ciI 0nPQ== 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=h9hJiU6wBZ9TvjC82NKvu+UyPjEcwnnFVNCM+VkmIQ0=; b=dbM2TYzbyU2KZp+PElsQWx1V5gfG3sr813d3JzLnxn7dtPM4DO++cruOpZqfY+wvJb /AAy4Nz+r54bAT5ZYmA2DVxAwT8o7KA7gp4WNeupyLq8wh/YDC5gEHbHx8v8WvpGw9dV klz5ldDnUYZHtJu2ZRib9ShUfo4Fc9D1TJCg/vdUMTtTwkW5lSlz1V0+6Z2eYJLfHCp/ ZyABVFiBhoE7Wd4fNCx9zll6HYpNTE9irzunw8rZKQpyC64udZbG3Toln/JkanJVcFzW qwhF2W3B+jXZcGiwsNSv0Qudc7slX9m/I1Fq4QOvEaslEtLFHySZQ1rm0MmHDLmfa6+j BgPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=s8+pJOHk; 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 g10si17965593ejf.344.2020.12.28.06.54.42; Mon, 28 Dec 2020 06:55:05 -0800 (PST) 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=s8+pJOHk; 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 S2436558AbgL1OSg (ORCPT + 99 others); Mon, 28 Dec 2020 09:18:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:53562 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2501960AbgL1OS1 (ORCPT ); Mon, 28 Dec 2020 09:18:27 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id CDE0321D94; Mon, 28 Dec 2020 14:17:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609165067; bh=aKx1Z4Hdhd3pDjbh2VxLNFIu8djoWJafUHFWAisL7ZE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s8+pJOHkbJseufkThbHOyxWgmPCs/ZZXwIVWbnPEOJ9TXzl/pJIpLPIxBlKk2Sci5 vFXXG2fg49WpCl0ETpBm9oGOrKzTwmjsfXt5d/h/0EFxZ+e+xsTchgo9Ks5ArtAFMs EerRToFNfZYy57IQSn1cL1O4LuABJz+ZEJfwsuJs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tzung-Bi Shih , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.10 398/717] remoteproc/mediatek: change MT8192 CFG register base Date: Mon, 28 Dec 2020 13:46:36 +0100 Message-Id: <20201228125040.068695495@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228125020.963311703@linuxfoundation.org> References: <20201228125020.963311703@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: Tzung-Bi Shih [ Upstream commit 0a441514bc2b8a48ebe23c2dcb9feee6351d45b6 ] The correct MT8192 CFG register base is 0x20000 off. Changes the registers accordingly. Fixes: fd0b6c1ff85a ("remoteproc/mediatek: Add support for mt8192 SCP") Signed-off-by: Tzung-Bi Shih Link: https://lore.kernel.org/r/20201210054109.587795-1-tzungbi@google.com Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/remoteproc/mtk_common.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h index 47b4561443a94..f2bcc9d9fda65 100644 --- a/drivers/remoteproc/mtk_common.h +++ b/drivers/remoteproc/mtk_common.h @@ -32,22 +32,22 @@ #define MT8183_SCP_CACHESIZE_8KB BIT(8) #define MT8183_SCP_CACHE_CON_WAYEN BIT(10) -#define MT8192_L2TCM_SRAM_PD_0 0x210C0 -#define MT8192_L2TCM_SRAM_PD_1 0x210C4 -#define MT8192_L2TCM_SRAM_PD_2 0x210C8 -#define MT8192_L1TCM_SRAM_PDN 0x2102C -#define MT8192_CPU0_SRAM_PD 0x21080 - -#define MT8192_SCP2APMCU_IPC_SET 0x24080 -#define MT8192_SCP2APMCU_IPC_CLR 0x24084 +#define MT8192_L2TCM_SRAM_PD_0 0x10C0 +#define MT8192_L2TCM_SRAM_PD_1 0x10C4 +#define MT8192_L2TCM_SRAM_PD_2 0x10C8 +#define MT8192_L1TCM_SRAM_PDN 0x102C +#define MT8192_CPU0_SRAM_PD 0x1080 + +#define MT8192_SCP2APMCU_IPC_SET 0x4080 +#define MT8192_SCP2APMCU_IPC_CLR 0x4084 #define MT8192_SCP_IPC_INT_BIT BIT(0) -#define MT8192_SCP2SPM_IPC_CLR 0x24094 -#define MT8192_GIPC_IN_SET 0x24098 +#define MT8192_SCP2SPM_IPC_CLR 0x4094 +#define MT8192_GIPC_IN_SET 0x4098 #define MT8192_HOST_IPC_INT_BIT BIT(0) -#define MT8192_CORE0_SW_RSTN_CLR 0x30000 -#define MT8192_CORE0_SW_RSTN_SET 0x30004 -#define MT8192_CORE0_WDT_CFG 0x30034 +#define MT8192_CORE0_SW_RSTN_CLR 0x10000 +#define MT8192_CORE0_SW_RSTN_SET 0x10004 +#define MT8192_CORE0_WDT_CFG 0x10034 #define SCP_FW_VER_LEN 32 #define SCP_SHARE_BUFFER_SIZE 288 -- 2.27.0