From 84ab03341b1e41c02a8572ed3f1fe7be4e76c21f Mon Sep 17 00:00:00 2001 From: Marco von Rosenberg Date: Sat, 29 Jun 2024 14:33:37 +0200 Subject: [PATCH] Fix watchdog in loader --- target/linux/ath79/image/lzma-loader/src/board.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target/linux/ath79/image/lzma-loader/src/board.c b/target/linux/ath79/image/lzma-loader/src/board.c index 878c7c30e1e3dd..73e1b35ee4e2c2 100644 --- a/target/linux/ath79/image/lzma-loader/src/board.c +++ b/target/linux/ath79/image/lzma-loader/src/board.c @@ -183,20 +183,20 @@ static inline void mr18_init(void) { } #endif #if defined(CONFIG_BOARD_HUAWEI_AP5030DN) || defined(CONFIG_BOARD_HUAWEI_AP6010DN) -static inline void apX0X0dn_init(void) +static inline void huawei_apXXXXdn_init(void) { - const unsigned int apX0X0dn_watchdog_gpio = 15; + const unsigned int apXXXXdn_watchdog_gpio = 15; unsigned int gpiobase, reg; gpiobase = KSEG1ADDR(AR71XX_GPIO_BASE); - printf("Huawei APX0X0DN\n"); + printf("Huawei APXXXXDN\n"); reg = READREG(gpiobase + AR71XX_GPIO_REG_OE); WRITEREG(gpiobase + AR71XX_GPIO_REG_OE, - reg & ~(1 << apX0X0dn_watchdog_gpio)); + reg & ~(1 << apXXXXdn_watchdog_gpio)); - /* Set GPIO15 MUX to output CLK_OBS5 (= CPU_CLK/4) + /* Set GPIO15 MUX to output CLK_OBS4 (= AHB_CLK/2) * to keep the watchdog happy until wdt-gpio takes over */ reg = READREG(gpiobase + AR934X_GPIO_REG_OUT_FUNC3); @@ -209,12 +209,12 @@ static inline void apX0X0dn_init(void) #endif } #else -static inline void apX0X0dn_init(void) {} +static inline void huawei_apXXXXdn_init(void) {} #endif void board_init(void) { tlwr1043nd_init(); mr18_init(); - apX0X0dn_init(); + huawei_apXXXXdn_init(); }