| Message ID | 20220429115325.20038-1-pali@kernel.org |
|---|---|
| State | Accepted |
| Commit | 363d9f2c2f1e8f1ea2db7ccb3336385eb60b2b54 |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | arm: mvebu: turris_omnia: Fix SYS_RSTOUT_* macro names | expand |
On 29.04.22 13:53, Pali Rohár wrote: > This is A385 register. > > Signed-off-by: Pali Rohár <pali@kernel.org> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > board/CZ.NIC/turris_omnia/turris_omnia.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c > index 97292456f148..6132c8f94369 100644 > --- a/board/CZ.NIC/turris_omnia/turris_omnia.c > +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c > @@ -43,8 +43,8 @@ DECLARE_GLOBAL_DATA_PTR; > #define OMNIA_I2C_EEPROM_CHIP_LEN 2 > #define OMNIA_I2C_EEPROM_MAGIC 0x0341a034 > > -#define SYS_RSTOUT_MASK MVEBU_REGISTER(0x18260) > -#define SYS_RSTOUT_MASK_WD BIT(10) > +#define A385_SYS_RSTOUT_MASK MVEBU_REGISTER(0x18260) > +#define A385_SYS_RSTOUT_MASK_WD BIT(10) > > #define A385_WDT_GLOBAL_CTRL MVEBU_REGISTER(0x20300) > #define A385_WDT_GLOBAL_RATIO_MASK GENMASK(18, 16) > @@ -187,7 +187,7 @@ static void enable_a385_watchdog(unsigned int timeout_minutes) > setbits_32(A385_WD_RSTOUT_UNMASK, A385_WD_RSTOUT_UNMASK_GLOBAL); > > /* Unmask reset for watchdog */ > - clrbits_32(SYS_RSTOUT_MASK, SYS_RSTOUT_MASK_WD); > + clrbits_32(A385_SYS_RSTOUT_MASK, A385_SYS_RSTOUT_MASK_WD); > } > > static bool disable_mcu_watchdog(void) Viele Grüße, Stefan Roese
On 29.04.22 13:53, Pali Rohár wrote: > This is A385 register. > > Signed-off-by: Pali Rohár <pali@kernel.org> Applied to u-boot-marvell/master Thanks, Stefan > --- > board/CZ.NIC/turris_omnia/turris_omnia.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c > index 97292456f148..6132c8f94369 100644 > --- a/board/CZ.NIC/turris_omnia/turris_omnia.c > +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c > @@ -43,8 +43,8 @@ DECLARE_GLOBAL_DATA_PTR; > #define OMNIA_I2C_EEPROM_CHIP_LEN 2 > #define OMNIA_I2C_EEPROM_MAGIC 0x0341a034 > > -#define SYS_RSTOUT_MASK MVEBU_REGISTER(0x18260) > -#define SYS_RSTOUT_MASK_WD BIT(10) > +#define A385_SYS_RSTOUT_MASK MVEBU_REGISTER(0x18260) > +#define A385_SYS_RSTOUT_MASK_WD BIT(10) > > #define A385_WDT_GLOBAL_CTRL MVEBU_REGISTER(0x20300) > #define A385_WDT_GLOBAL_RATIO_MASK GENMASK(18, 16) > @@ -187,7 +187,7 @@ static void enable_a385_watchdog(unsigned int timeout_minutes) > setbits_32(A385_WD_RSTOUT_UNMASK, A385_WD_RSTOUT_UNMASK_GLOBAL); > > /* Unmask reset for watchdog */ > - clrbits_32(SYS_RSTOUT_MASK, SYS_RSTOUT_MASK_WD); > + clrbits_32(A385_SYS_RSTOUT_MASK, A385_SYS_RSTOUT_MASK_WD); > } > > static bool disable_mcu_watchdog(void) Viele Grüße, Stefan Roese
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c index 97292456f148..6132c8f94369 100644 --- a/board/CZ.NIC/turris_omnia/turris_omnia.c +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c @@ -43,8 +43,8 @@ DECLARE_GLOBAL_DATA_PTR; #define OMNIA_I2C_EEPROM_CHIP_LEN 2 #define OMNIA_I2C_EEPROM_MAGIC 0x0341a034 -#define SYS_RSTOUT_MASK MVEBU_REGISTER(0x18260) -#define SYS_RSTOUT_MASK_WD BIT(10) +#define A385_SYS_RSTOUT_MASK MVEBU_REGISTER(0x18260) +#define A385_SYS_RSTOUT_MASK_WD BIT(10) #define A385_WDT_GLOBAL_CTRL MVEBU_REGISTER(0x20300) #define A385_WDT_GLOBAL_RATIO_MASK GENMASK(18, 16) @@ -187,7 +187,7 @@ static void enable_a385_watchdog(unsigned int timeout_minutes) setbits_32(A385_WD_RSTOUT_UNMASK, A385_WD_RSTOUT_UNMASK_GLOBAL); /* Unmask reset for watchdog */ - clrbits_32(SYS_RSTOUT_MASK, SYS_RSTOUT_MASK_WD); + clrbits_32(A385_SYS_RSTOUT_MASK, A385_SYS_RSTOUT_MASK_WD); } static bool disable_mcu_watchdog(void)
This is A385 register. Signed-off-by: Pali Rohár <pali@kernel.org> --- board/CZ.NIC/turris_omnia/turris_omnia.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)