From patchwork Mon Feb 8 08:56:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 12074465 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=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, 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 A1D16C433DB for ; Mon, 8 Feb 2021 09:10:13 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1F6CA64E3F for ; Mon, 8 Feb 2021 09:10:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1F6CA64E3F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=9zv8lQX00Va4KnU7TAFM8NKcm1F1PcOoOt01/oU72Zc=; b=TnOYrkC+aaOD7V9juKhCgB7wf E41nqOnUFtD6VZP4EAiC+aNQKVluX1JwHr/7/4j7tOaw9uG4Qun/FAmHB3GB1ZcjcNFeId0qztkTy VCHlJGF542B2pfwooEhGJxekEVOAcazVKlO9CF2H8D9hIUcYFDloYOF3vUPGnWimXsMrRZ/doS7cZ Zze3d8JaFWmltNQotKJQx0Co7EqXRMFAdrE9bDX98U8UChG2gNm5+aFnafzG/JgmpdvyxAlhQ3+ku 7bh9B2nOtuiDwMsuqONN8A3jriQMpEYOHpl5rC1nt43mTrq25TRPRkga/qm0zK94yfTMPpXSVgqFi ttznB5UvA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l92XF-0001X7-3Y; Mon, 08 Feb 2021 09:08:45 +0000 Received: from mail-am6eur05on2059.outbound.protection.outlook.com ([40.107.22.59] helo=EUR05-AM6-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l92Wz-0001R5-Cx for linux-arm-kernel@lists.infradead.org; Mon, 08 Feb 2021 09:08:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kk8wvSjpqXr7kLO7sBCjZYmPaH05Tc6q1YgwJjGhM2dl4GsRj3DtW1H8dwIcCMT28vlsQQRuv5oheeRHvNdYk3ijcpRe8QepmOluSkMkH6erIbJQYidFqCxW/keN7jz+1zStyYjWunKueZcAW2ZDruTHscRKSHSl4Go8Cur9JjaL3dIpDiVINOIggR6HXRVvh8BkfFWG/J7EtrBEMaAi8nhLkYJMw+K6SIvucXVbM9FNr88lrSbuKj6SoXXEyI6V9oALwExAj2lCdgigEkoAHlOE/ieTQkY0eKBBAW58AIin/Rahn6YIXAy0+aKNyULITo55XoKcZsTRdYBO17Y0yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kNgl0WbKTtb9jSYiW4oo06gJ+GsOdnAhRPfrRn4DFqI=; b=ap8ZLpfAUXJJZEPdyysxgL31IANlDP8TcCIDlMRa3BmI1wFtLxKRScfBWnIiTYEcB5o9CsVDfukhVKLGwewA8JFT3fKO9VwcZkZLIQo0/d5n8kIwX9XhL/pZaKW2hdlI6lj/+KfuO9LQZ7klFlrOKhwq796o/TOFHB3NjQcE3BpPhAWh6RF5GWFqw0jjp4cBXl0rzS/Rz88WMtwU+KnRG+95Q2DenHunH4yOieD1rOBekRMVk80i5iasWCmBqtKfj/QrVwIWDfaMsRJYevR6z5I0uh1m3rV5SVK3tMFkZNB/7uOaFordbfz3YpNFBKN9w5HCi3gJw0tSFAXy10Fw5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kNgl0WbKTtb9jSYiW4oo06gJ+GsOdnAhRPfrRn4DFqI=; b=iYdZcWRecW2600JdzRifhXdX3pE6eJRTyoXoBVZGS9vArvwk4BKlh6+qYyLkcwqugXo/KVtzwU/SwY+KbnZ6x5o4vLaljT7HOsm4iA7chQNY2+W8/Uce5Zv0U2QB3n7Tn4/IBx8rEex7ve1VSzvViE/2g2IBtOoyX34K1iJAnAM= Authentication-Results: wizery.com; dkim=none (message not signed) header.d=none;wizery.com; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB6PR0402MB2933.eurprd04.prod.outlook.com (2603:10a6:4:9c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.20; Mon, 8 Feb 2021 09:08:24 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d58c:d479:d094:43d0]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d58c:d479:d094:43d0%9]) with mapi id 15.20.3825.030; Mon, 8 Feb 2021 09:08:24 +0000 From: peng.fan@oss.nxp.com To: ohad@wizery.com, bjorn.andersson@linaro.org, mathieu.poirier@linaro.org, o.rempel@pengutronix.de, robh+dt@kernel.org, devicetree@vger.kernel.org Subject: [PATCH V10 08/10] remoteproc: imx_rproc: support i.MX8MQ/M Date: Mon, 8 Feb 2021 16:56:09 +0800 Message-Id: <1612774571-6134-9-git-send-email-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1612774571-6134-1-git-send-email-peng.fan@oss.nxp.com> References: <1612774571-6134-1-git-send-email-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: SG2PR01CA0102.apcprd01.prod.exchangelabs.com (2603:1096:3:15::28) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by SG2PR01CA0102.apcprd01.prod.exchangelabs.com (2603:1096:3:15::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3825.19 via Frontend Transport; Mon, 8 Feb 2021 09:08:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 2a883948-944b-483c-301b-08d8cc1116ac X-MS-TrafficTypeDiagnostic: DB6PR0402MB2933: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:158; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RbEyhnH0evCVFUE6IaCoMn+7EKKUDvrVKDmkeqN754c8fubNBqpikLdPl1vLCENMGrHlYvr95F7S27ErImg3mk+SszDPov0TLWqLbqSiZSGVKTz12rKW6RTVpzMJnDigLKFIQPM8vgrVMx2KBWcEGXneyaDbbopBD6dSQvTvqqU4PKSHQrZOg7Pmmawi83JCmdmEPGzN5SvHOz5ypztFuEriT70BqJnp9pDUzslkV0a51wmUfAwPpO5dlzgB0oyoqoJL0TRuFx3Iy/B0qhY8lfEJKKJ70IW8Z11vZr7xlXXb92PBw8kvDJeqdf/xXnlimophLd+x6ZqFqz0/u+Cj2NOddK1hoRV+tHs/QCDHsQGkKif06NM8tfwhTQx7ufTinXoLH1O+I2gwkUxPFbMEwKNFKgf/epLXUn6WLTGlvJ96mhXc4pe/E6Lq188jiNoPWfQp+exRisz3w3RMSpQIsEOZ/uEM+hQA0pYLPveEEdf7o/C0NPePxNbVJZYR1z1qh5mih1VkcHwpZ/4P9pYqH+lbrzCLbseS3lfER9D5DyvY48jIYM0KUn4EwSlgG53AvV6+ZNBnTbnj1ofmHIDCcA== 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)(396003)(366004)(376002)(346002)(39860400002)(136003)(7416002)(52116002)(6666004)(316002)(83380400001)(4326008)(8936002)(186003)(69590400011)(86362001)(66946007)(6486002)(8676002)(6512007)(478600001)(6506007)(26005)(956004)(2616005)(5660300002)(16526019)(66476007)(66556008)(2906002)(9686003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: cBJJ+V7QjOFPIp9CJcHc/7Ytp/i79UIzi+vZtfhdkF0OI3kMjCUsIIbI458kqJ8lxKbHBEX6Wc5SILnOcUB8gt5bJ1cavl98m7GxKllx8BsDod6ulz+iLBw6KogqyBTXsia7n+n6RATbz5OkZK11aPWhatxGpBdigZBA6x6LmeOH12fGXFLVDwDq2jOAcsupQtBmJ3GuPuVR9gTcaDR96p1p+YsRFH9hEHnn04sR/XsWCFkYXZhXFHVCB3OzEmscWuwXcvO/16OuiPx+Ag+d62t6NG6mnzCrwKrJheUpq8kcvDHUr+7GEapxmqY/yt6ofcWhKtWfg5/dTEvQ/hI3swdPUbCEvuJjh7EJNP2ObZOrOPfltaYF4OnwiPkbl260xBL3y3uBEdq3Ue14t1JIQMPqSvAL69EicZDt3w10iFzo59vwSQNpSHSJS0rZnq2ssT7iYAeHxe2bJJ11czuyIfpCCD7htLcMcR/JVMn2fSyFm8wDxnt38K3TpnpnSMZDQo36dBA8TOj01Ay52/YQF7OdOidpGJIUtQK6TSv1aRszHH/oWNx8DJatPeNfOmqcLDNp2gjgvIcO4FeWBrDGghEfjL3wGv2CCtnRI71PDCcBilIxBrRrjsSblayjbY7eANcFbVdWGbBT5sTp45TodZyxTkq2c4Nlz5t3JrCJzLdyHR4XKixZtZ5LB87iBo8rMjSSPb44uIwfvQSQPsgE//JH4E7mhwDUdIG61XyBEHk1TzumoYar+gyn3/POmXxLzsFXjf4feS47XzyQxN4Vhws4qEUBW2HqGHaL11YlIF/IIqRL28aL+BRTns5iespJ8RJD4WwDPd3xkPd1CwYCIFBb+oMQGKw2mjeEu06utLuizv1Lx6zkoe7ehyJOFHwCChLDkNpN/0MMljBaYUrlOnGJ3AJqyxn8rdwVSLVRSn1JFoDDlzFKIg5pVxx98kB7Ygc9YaHAUW5zepSFZkp4CTo1ixtaYqmrfvydRzK/pWKBlR3vzvJ+zKxF1ga0ch9SXZHR30hbqlOTdJmCdyDJYBkkbPx4XOh6KjBIxz52w/nNAgKxUbXIg1dWOKC1FVRFeaXq6FRbPzh/t8fHAeMj01sL7WyqSiv8f5pZzdNH0a+B4jamZX0LCYv4RWnRGFkvoPRq2PV8LCiVPqb3468KO5pGJbiQ2lGKV2BbPP3MzBV3R1y5yLIKIWh5hqYYR/Z+ymNbIbdhqyyfA5Vl51yjlQbxnThuIOXG3h/eB0FN+Ooi6JyXvFkvPnuBsmFLqIQuxPV5MHIMGe90h7xjEx0Hw2Rp+XL2KsPx5t/HX7abBt6+yhKui/7E3k/gj4HmNUf/ X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a883948-944b-483c-301b-08d8cc1116ac X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2021 09:08:24.2897 (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: AmvCwFFenPjYSt6KcqHhnzYeRK48OBG/0aze/JF2rxyp5EAAadUtAwYviyyIawGvZ22KIdmizp1FYFjbpT4TIQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2933 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210208_040829_513424_29F03FDB X-CRM114-Status: GOOD ( 14.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peng Fan , shawnguo@kernel.org, s.hauer@pengutronix.de, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, patrice.chotard@st.com, paul@crapouillou.net, agross@kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, matthias.bgg@gmail.com, festevam@gmail.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Peng Fan Add i.MX8MQ dev/sys addr map and configuration data structure i.MX8MM share i.MX8MQ settings. Reviewed-by: Richard Zhu Reviewed-by: Mathieu Poirier Signed-off-by: Peng Fan --- drivers/remoteproc/Kconfig | 6 ++--- drivers/remoteproc/imx_rproc.c | 41 +++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig index 9e7efe542f69..86d99229e8ab 100644 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@ -24,11 +24,11 @@ config REMOTEPROC_CDEV It's safe to say N if you don't want to use this interface. config IMX_REMOTEPROC - tristate "IMX6/7 remoteproc support" + tristate "i.MX remoteproc support" depends on ARCH_MXC help - Say y here to support iMX's remote processors (Cortex M4 - on iMX7D) via the remote processor framework. + Say y here to support iMX's remote processors via the remote + processor framework. It's safe to say N here. diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 5ae1f5209548..0124ebf69838 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -88,6 +88,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 */ @@ -138,6 +166,15 @@ 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), +}; + static const struct imx_rproc_dcfg imx_rproc_cfg_imx7d = { .src_reg = IMX7D_SRC_SCR, .src_mask = IMX7D_M4_RST_MASK, @@ -496,6 +533,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); @@ -512,5 +551,5 @@ static struct platform_driver imx_rproc_driver = { module_platform_driver(imx_rproc_driver); MODULE_LICENSE("GPL v2"); -MODULE_DESCRIPTION("IMX6SX/7D remote processor control driver"); +MODULE_DESCRIPTION("i.MX remote processor control driver"); MODULE_AUTHOR("Oleksij Rempel ");