Skip to content

Commit bd830d2

Browse files
LaurentiuM1234edoardocanepa
authored andcommitted
reset: imx8mp-audiomix: Fix bad mask values
BugLink: https://bugs.launchpad.net/bugs/2137723 commit 997c06330fd5c2e220b692f2a358986c6c8fd5a2 upstream. As per the i.MX8MP TRM, section 14.2 "AUDIO_BLK_CTRL", table 14.2.3.1.1 "memory map", the definition of the EARC control register shows that the EARC controller software reset is controlled via bit 0, while the EARC PHY software reset is controlled via bit 1. This means that the current definitions of IMX8MP_AUDIOMIX_EARC_RESET_MASK and IMX8MP_AUDIOMIX_EARC_PHY_RESET_MASK are wrong since their values would imply that the EARC controller software reset is controlled via bit 1 and the EARC PHY software reset is controlled via bit 2. Fix them. Fixes: a83bc87 ("reset: imx8mp-audiomix: Prepare the code for more reset bits") Cc: stable@vger.kernel.org Reviewed-by: Shengjiu Wang <shengjiu.wang@gmail.com> Reviewed-by: Frank Li <Frank.Li@nxp.com> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com> Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Bethany <bethany.jamison@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Edoardo Canepa <edoardo.canepa@canonical.com>
1 parent 9b24d0c commit bd830d2

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/reset/reset-imx8mp-audiomix.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include <linux/reset-controller.h>
1515

1616
#define IMX8MP_AUDIOMIX_EARC_RESET_OFFSET 0x200
17-
#define IMX8MP_AUDIOMIX_EARC_RESET_MASK BIT(1)
18-
#define IMX8MP_AUDIOMIX_EARC_PHY_RESET_MASK BIT(2)
17+
#define IMX8MP_AUDIOMIX_EARC_RESET_MASK BIT(0)
18+
#define IMX8MP_AUDIOMIX_EARC_PHY_RESET_MASK BIT(1)
1919

2020
#define IMX8MP_AUDIOMIX_DSP_RUNSTALL_OFFSET 0x108
2121
#define IMX8MP_AUDIOMIX_DSP_RUNSTALL_MASK BIT(5)

0 commit comments

Comments
 (0)