Skip to content

Commit 7e5cd06

Browse files
MrVanJassiBrar
authored andcommitted
mailbox: imx: fix RST channel support
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: 82ab513 ("mailbox: imx: support RST channel") Reported-by: Liu Ying <victor.liu@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> Tested-by: Liu Ying <victor.liu@nxp.com> # i.MX8qm/qxp MEK boards boot Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
1 parent 68584e3 commit 7e5cd06

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

drivers/mailbox/imx-mailbox.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx7ulp = {
904904
.xTR = 0x20,
905905
.xRR = 0x40,
906906
.xSR = {0x60, 0x60, 0x60, 0x60},
907-
.xCR = {0x64, 0x64, 0x64, 0x64},
907+
.xCR = {0x64, 0x64, 0x64, 0x64, 0x64},
908908
};
909909

910910
static const struct imx_mu_dcfg imx_mu_cfg_imx8ulp = {
@@ -927,7 +927,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx8ulp_s4 = {
927927
.xTR = 0x200,
928928
.xRR = 0x280,
929929
.xSR = {0xC, 0x118, 0x124, 0x12C},
930-
.xCR = {0x110, 0x114, 0x120, 0x128},
930+
.xCR = {0x8, 0x110, 0x114, 0x120, 0x128},
931931
};
932932

933933
static const struct imx_mu_dcfg imx_mu_cfg_imx93_s4 = {
@@ -938,7 +938,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx93_s4 = {
938938
.xTR = 0x200,
939939
.xRR = 0x280,
940940
.xSR = {0xC, 0x118, 0x124, 0x12C},
941-
.xCR = {0x110, 0x114, 0x120, 0x128},
941+
.xCR = {0x8, 0x110, 0x114, 0x120, 0x128},
942942
};
943943

944944
static const struct imx_mu_dcfg imx_mu_cfg_imx8_scu = {
@@ -949,7 +949,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx8_scu = {
949949
.xTR = 0x0,
950950
.xRR = 0x10,
951951
.xSR = {0x20, 0x20, 0x20, 0x20},
952-
.xCR = {0x24, 0x24, 0x24, 0x24},
952+
.xCR = {0x24, 0x24, 0x24, 0x24, 0x24},
953953
};
954954

955955
static const struct imx_mu_dcfg imx_mu_cfg_imx8_seco = {
@@ -960,7 +960,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx8_seco = {
960960
.xTR = 0x0,
961961
.xRR = 0x10,
962962
.xSR = {0x20, 0x20, 0x20, 0x20},
963-
.xCR = {0x24, 0x24, 0x24, 0x24},
963+
.xCR = {0x24, 0x24, 0x24, 0x24, 0x24},
964964
};
965965

966966
static const struct of_device_id imx_mu_dt_ids[] = {

0 commit comments

Comments
 (0)