diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2021-05-03 21:28:55 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2021-05-03 21:30:40 +0200 |
| commit | 835a8f67b2ca7aa3f2d05d6e6a1a51f7e1147266 (patch) | |
| tree | 229385550c80485b4f31cdad8a78eda7d5fac26e /plat/imx/imx8m/imx8m_csu.c | |
| parent | 7f1187ba31cc1624f7dadd98998e010cb229926a (diff) | |
| parent | 2a26786460edd4f0ec3111e7027c93c57fc572c1 (diff) | |
Merge remote-tracking branch 'nxp/imx_5.4.70_2.3.0' into toradex_imx_5.4.70_2.3.0
Updates to 5.4.70_2.3.2
Related-to: ELB-3957
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'plat/imx/imx8m/imx8m_csu.c')
| -rw-r--r-- | plat/imx/imx8m/imx8m_csu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plat/imx/imx8m/imx8m_csu.c b/plat/imx/imx8m/imx8m_csu.c index 3405fa59..b1f6886e 100644 --- a/plat/imx/imx8m/imx8m_csu.c +++ b/plat/imx/imx8m/imx8m_csu.c @@ -34,14 +34,14 @@ void imx_csu_init(const struct imx_csu_cfg *csu_cfg) if (val & CSU_SA_LOCK(csu->idx)) break; mmio_clrsetbits_32(CSU_SA_REG(csu->idx), CSU_SA_CFG(0x1, csu->idx), - CSU_SA_CFG(csu->hp | (csu->lock << 0x1), csu->idx)); + CSU_SA_CFG(csu->sa | (csu->lock << 0x1), csu->idx)); break; case CSU_HPCONTROL: val = mmio_read_32(CSU_HPCONTROL_REG(csu->idx)); if (val & CSU_HPCONTROL_LOCK(csu->idx)) break; mmio_clrsetbits_32(CSU_HPCONTROL_REG(csu->idx), CSU_HPCONTROL_CFG(0x1, csu->idx), - CSU_HPCONTROL_CFG(csu->hp | (csu->lock << 0x1), csu->idx)); + CSU_HPCONTROL_CFG(csu->hpctrl | (csu->lock << 0x1), csu->idx)); break; default: break; |