From nobody Fri Oct 17 10:32:18 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4D2FC433FE for ; Wed, 19 Oct 2022 12:20:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232888AbiJSMUS (ORCPT ); Wed, 19 Oct 2022 08:20:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233176AbiJSMTI (ORCPT ); Wed, 19 Oct 2022 08:19:08 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B631E1DF20; Wed, 19 Oct 2022 04:54:28 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1F5BF6186B; Wed, 19 Oct 2022 09:06:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31CCCC433B5; Wed, 19 Oct 2022 09:06:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170390; bh=YV9SNubNHp2LHE3ZQBiNdjtXaux/DEG9x6Hhp3wRTGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VXYO5drseuSGA3JIYxg6CoTOP0etYhzsfOBBiChh32t97Isg0ph0aj/0bXsrY7NMW xEhv4JwMUWs/AK8WlD9td6NL04YWQ+gbjbLoo01QCa78xGzgd2oQ50/bvkSIWRvrL7 fvPxRQlC1/FyIYzIg1b7if7P8sM6VnEptZGgRJCU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liu Ying , Peng Fan , Jassi Brar , Sasha Levin Subject: [PATCH 6.0 602/862] mailbox: imx: fix RST channel support Date: Wed, 19 Oct 2022 10:31:29 +0200 Message-Id: <20221019083316.545213987@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Peng Fan [ Upstream commit 7e5cd064f73ccecd2ac1aadca078394bd25ea3ce ] Because IMX_MU_xCR_MAX was increased to 5, some mu cfgs were not updated to include the CR register. Add the missed CR register to xcr array. Fixes: 82ab513baed5 ("mailbox: imx: support RST channel") Reported-by: Liu Ying Signed-off-by: Peng Fan Tested-by: Liu Ying # i.MX8qm/qxp MEK boards boot Signed-off-by: Jassi Brar Signed-off-by: Sasha Levin --- drivers/mailbox/imx-mailbox.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c index 02922073c9ef..20f2ec880ad6 100644 --- a/drivers/mailbox/imx-mailbox.c +++ b/drivers/mailbox/imx-mailbox.c @@ -904,7 +904,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx7ulp =3D { .xTR =3D 0x20, .xRR =3D 0x40, .xSR =3D {0x60, 0x60, 0x60, 0x60}, - .xCR =3D {0x64, 0x64, 0x64, 0x64}, + .xCR =3D {0x64, 0x64, 0x64, 0x64, 0x64}, }; =20 static const struct imx_mu_dcfg imx_mu_cfg_imx8ulp =3D { @@ -927,7 +927,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx8ulp_s4 = =3D { .xTR =3D 0x200, .xRR =3D 0x280, .xSR =3D {0xC, 0x118, 0x124, 0x12C}, - .xCR =3D {0x110, 0x114, 0x120, 0x128}, + .xCR =3D {0x8, 0x110, 0x114, 0x120, 0x128}, }; =20 static const struct imx_mu_dcfg imx_mu_cfg_imx93_s4 =3D { @@ -938,7 +938,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx93_s4 =3D= { .xTR =3D 0x200, .xRR =3D 0x280, .xSR =3D {0xC, 0x118, 0x124, 0x12C}, - .xCR =3D {0x110, 0x114, 0x120, 0x128}, + .xCR =3D {0x8, 0x110, 0x114, 0x120, 0x128}, }; =20 static const struct imx_mu_dcfg imx_mu_cfg_imx8_scu =3D { @@ -949,7 +949,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx8_scu =3D= { .xTR =3D 0x0, .xRR =3D 0x10, .xSR =3D {0x20, 0x20, 0x20, 0x20}, - .xCR =3D {0x24, 0x24, 0x24, 0x24}, + .xCR =3D {0x24, 0x24, 0x24, 0x24, 0x24}, }; =20 static const struct imx_mu_dcfg imx_mu_cfg_imx8_seco =3D { @@ -960,7 +960,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx8_seco = =3D { .xTR =3D 0x0, .xRR =3D 0x10, .xSR =3D {0x20, 0x20, 0x20, 0x20}, - .xCR =3D {0x24, 0x24, 0x24, 0x24}, + .xCR =3D {0x24, 0x24, 0x24, 0x24, 0x24}, }; =20 static const struct of_device_id imx_mu_dt_ids[] =3D { --=20 2.35.1