Merge tag 'u-boot-atmel-fixes-2021.01-b' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / drivers / reset / stm32-reset.c

diff --git a/drivers/reset/stm32-reset.c b/drivers/reset/stm32-reset.c
index 64a11cf..d8902e9 100644 (file)
--- a/drivers/reset/stm32-reset.c
+++ b/drivers/reset/stm32-reset.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
- * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics.
+ * Author(s): Patrice Chotard, <patrice.chotard@foss.st.com> for STMicroelectronics.
  */
 
 #include <common.h>
@@ -14,6 +14,9 @@
 #include <asm/io.h>
 #include <linux/bitops.h>
 
+/* offset of register without set/clear management */
+#define RCC_MP_GCR_OFFSET 0x10C
+
 /* reset clear offset for STM32MP RCC */
 #define RCC_CL 0x4
 
@@ -40,8 +43,11 @@ static int stm32_reset_assert(struct reset_ctl *reset_ctl)
              reset_ctl->id, bank, offset);
 
        if (dev_get_driver_data(reset_ctl->dev) == STM32MP1)
-               /* reset assert is done in rcc set register */
-               writel(BIT(offset), priv->base + bank);
+               if (bank != RCC_MP_GCR_OFFSET)
+                       /* reset assert is done in rcc set register */
+                       writel(BIT(offset), priv->base + bank);
+               else
+                       clrbits_le32(priv->base + bank, BIT(offset));
        else
                setbits_le32(priv->base + bank, BIT(offset));
 
@@ -57,8 +63,11 @@ static int stm32_reset_deassert(struct reset_ctl *reset_ctl)
              reset_ctl->id, bank, offset);
 
        if (dev_get_driver_data(reset_ctl->dev) == STM32MP1)
-               /* reset deassert is done in rcc clr register */
-               writel(BIT(offset), priv->base + bank + RCC_CL);
+               if (bank != RCC_MP_GCR_OFFSET)
+                       /* reset deassert is done in rcc clr register */
+                       writel(BIT(offset), priv->base + bank + RCC_CL);
+               else
+                       setbits_le32(priv->base + bank, BIT(offset));
        else
                clrbits_le32(priv->base + bank, BIT(offset));