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;
From:   "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
To:     ohad@wizery.com, bjorn.andersson@linaro.org,
        mathieu.poirier@linaro.org, o.rempel@pengutronix.de
Cc:     shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de,
        festevam@gmail.com, linux-imx@nxp.com,
        linux-remoteproc@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        Peng Fan <peng.fan@nxp.com>, Richard Zhu <hongxing.zhu@nxp.com>
Subject: [PATCH V3 6/7] remoteproc: imx_rproc: support i.MX8MQ/M
Date:   Fri,  4 Dec 2020 15:40:35 +0800
Message-Id: <20201204074036.23870-7-peng.fan@oss.nxp.com>
In-Reply-To: <20201204074036.23870-1-peng.fan@oss.nxp.com>
References: <20201204074036.23870-1-peng.fan@oss.nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from linux-1xn6.ap.freescale.net (119.31.174.71) by MAXPR0101CA0069.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:e::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.17 via Frontend Transport; Fri, 4 Dec 2020 07:13:11 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 08044133-b020-4351-7978-08d8982411e9
X-MS-TrafficTypeDiagnostic: DB7PR04MB4633:
X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <DB7PR04MB46336FFDB740387E46427BBCC9F10@DB7PR04MB4633.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:61;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: JL+xuYOSATXVJvoiGK5AZ94k9tumyBlF4yqk8Hw1sq+xMO8/DjibCI73m6COwzKpjgNHqC7bF3LdWtv59VU37QfpHyThVtrmqSWoa7gE2tiItMSbKCKvdag7+NLkHrnQ45h2x+WhPfldXMlHZuHG8N8p/DKWLx0NKVcKOvBWtn8SmBs9fsjZUNpI/e8MzIA2IPuUgNdkVKb5E+urYTV2aEDGyjExzaGWvrYXD7CLEo0+EqjT9WZS/GhdjGmPyQe0Tj1iVZlN65KkNRSObMIqlvU5sa1LgypxunjGRNYJ1W9TQZim+0bGMM89nmQXBGYOZvUQv54A71VhyKbATYbqDw==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB6PR0402MB2760.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(376002)(366004)(396003)(346002)(136003)(2616005)(86362001)(52116002)(6512007)(7416002)(1076003)(66946007)(66556008)(66476007)(478600001)(316002)(186003)(16526019)(8676002)(956004)(54906003)(6666004)(6506007)(2906002)(26005)(6486002)(8936002)(4326008)(5660300002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?Jp89GTwPTZPt1y28N9xdBfoFFsIfWxwI46kM40MLIcCqRXK+KAQLAyBgP5do?=
 =?us-ascii?Q?SbAhby5jthHeP7G9uuULmis9NTkwxaKHxJG9acozoTgwZNeTygVsTp4XPagW?=
 =?us-ascii?Q?x+EzEnIIaLz0nN9zIIbPPe2+AbUbFjo4xPuN7dMuY1RXPBpJxY1iClTfoi0Y?=
 =?us-ascii?Q?e5l8E9VDIRPRfCPpl3ftSkt+hdNq5ZaB+4ge0LAJr7sylaAUqxBZP3hUK3lj?=
 =?us-ascii?Q?6jFpLCW7gUs2L/gMs6p61ILpQtttQqdH/YglVNHIUH/0jn0xQfHjNCkfX2MS?=
 =?us-ascii?Q?9LS5jGvmnYYYDnK+GNPhl+lGcpP1s9fRTFDrvRRF39ehRwnX6QCgRz7wrlx4?=
 =?us-ascii?Q?s7hvYc1TFmN4Vb9bNu/yTzrhrHCK/8YM+jR8ipBeSmpsfRIOskgpdi3/5UtO?=
 =?us-ascii?Q?BwWsFJCMtiqyuki+OJw2tC4b0iuOQ33NqXE5zCd2Ag1bq8IAoOFZ5fINBn5l?=
 =?us-ascii?Q?rseAheo7YN9+yCpRDEJpm9XleR755p6G7D04qUWqS6WvMFRtasAxAke8eke8?=
 =?us-ascii?Q?QAzlB6iJdY42yv1RzlvXrE2EtYp9/mTd6Ex/s1ohTXwlr19VxEF6FUOIl1vE?=
 =?us-ascii?Q?OICGwGv7txpeAysHj1GGbYkxDS4Du+3DNCjImAlxd7vYr7WKJiBT31ojgrYz?=
 =?us-ascii?Q?3BQH+96AwCtITePH9uWg9U+++x/qOayvlMeyFMpZugOSw2nYw4GlCoyuPvLL?=
 =?us-ascii?Q?vl9QtnyQu1b4KJWzS1n1ItmmcFIms3Nw7RfvFa+6cOXpDOuGp33DHFp26eKj?=
 =?us-ascii?Q?LhFX9epN3YV0z2hqSASc5yaOrw6/fWCeIg5+qCYztL/xItO+M4f4RRhNYGQt?=
 =?us-ascii?Q?YnYWzfEHONW1xj1ygkWY/XqaGsJrl1CAUTOt3PaqsSkQkTNb7onwFv/E47Du?=
 =?us-ascii?Q?WuO9NjYYNWaXJIkojk1JXgtvRf7sa8JrJReXf2+7sdYdOrdgJ2genlIMB1jC?=
 =?us-ascii?Q?it4AXi8PtYitPcw5TEA0q3SgJA6XuXazbpTcNbClzs0BuDtG+iKrSTLWU3+t?=
 =?us-ascii?Q?FbH4?=
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 08044133-b020-4351-7978-08d8982411e9
X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2020 07:13:16.3221
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 5DlWuoxVZy011VyYO8alrPltd7/2PvYS2SzqtRl8MYspP2sAG2jKtdaggEdy/q98yXNL7kX/4tOicnDoUko9iw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4633
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Peng Fan <peng.fan@nxp.com>

Add i.MX8MQ dev/sys addr map and configuration data structure
i.MX8MM share i.MX8MQ settings.

Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
 drivers/remoteproc/imx_rproc.c | 40 ++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index de44b7d6ae63..afa650610996 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -90,6 +90,34 @@ struct imx_rproc {
 	struct clk			*clk;
 };
 
+static const struct imx_rproc_att imx_rproc_att_imx8mq[] = {
+	/* dev addr , sys addr  , size	    , flags */
+	/* TCML - alias */
+	{ 0x00000000, 0x007e0000, 0x00020000, 0 },
+	/* OCRAM_S */
+	{ 0x00180000, 0x00180000, 0x00008000, 0 },
+	/* OCRAM */
+	{ 0x00900000, 0x00900000, 0x00020000, 0 },
+	/* OCRAM */
+	{ 0x00920000, 0x00920000, 0x00020000, 0 },
+	/* QSPI Code - alias */
+	{ 0x08000000, 0x08000000, 0x08000000, 0 },
+	/* DDR (Code) - alias */
+	{ 0x10000000, 0x80000000, 0x0FFE0000, 0 },
+	/* TCML */
+	{ 0x1FFE0000, 0x007E0000, 0x00020000, ATT_OWN },
+	/* TCMU */
+	{ 0x20000000, 0x00800000, 0x00020000, ATT_OWN },
+	/* OCRAM_S */
+	{ 0x20180000, 0x00180000, 0x00008000, ATT_OWN },
+	/* OCRAM */
+	{ 0x20200000, 0x00900000, 0x00020000, ATT_OWN },
+	/* OCRAM */
+	{ 0x20220000, 0x00920000, 0x00020000, ATT_OWN },
+	/* DDR (Data) */
+	{ 0x40000000, 0x40000000, 0x80000000, 0 },
+};
+
 static const struct imx_rproc_att imx_rproc_att_imx7d[] = {
 	/* dev addr , sys addr  , size	    , flags */
 	/* OCRAM_S (M4 Boot code) - alias */
@@ -140,6 +168,16 @@ static const struct imx_rproc_att imx_rproc_att_imx6sx[] = {
 	{ 0x80000000, 0x80000000, 0x60000000, 0 },
 };
 
+static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = {
+	.src_reg	= IMX7D_SRC_SCR,
+	.src_mask	= IMX7D_M4_RST_MASK,
+	.src_start	= IMX7D_M4_START,
+	.src_stop	= IMX7D_M4_STOP,
+	.att		= imx_rproc_att_imx8mq,
+	.att_size	= ARRAY_SIZE(imx_rproc_att_imx8mq),
+	.elf_mem_hook	= true,
+};
+
 static const struct imx_rproc_dcfg imx_rproc_cfg_imx7d = {
 	.src_reg	= IMX7D_SRC_SCR,
 	.src_mask	= IMX7D_M4_RST_MASK,
@@ -513,6 +551,8 @@ static int imx_rproc_remove(struct platform_device *pdev)
 static const struct of_device_id imx_rproc_of_match[] = {
 	{ .compatible = "fsl,imx7d-cm4", .data = &imx_rproc_cfg_imx7d },
 	{ .compatible = "fsl,imx6sx-cm4", .data = &imx_rproc_cfg_imx6sx },
+	{ .compatible = "fsl,imx8mq-cm4", .data = &imx_rproc_cfg_imx8mq },
+	{ .compatible = "fsl,imx8mm-cm4", .data = &imx_rproc_cfg_imx8mq },
 	{},
 };
 MODULE_DEVICE_TABLE(of, imx_rproc_of_match);
-- 
2.28.0