Skip to content

Commit 471b69a

Browse files
raajlokaAlif Zakuan Yuslaimi
authored andcommitted
Remove WATCHDOG_RESET macro and replace it with schedule()
With the v2023.01 uboot software from mainline, all the WATCHDOG_RESET macro has been removed and replaced it with schedule(). Signed-off-by: Lokanathan, Raaj <raaj.lokanathan@intel.com>
1 parent e5582ff commit 471b69a

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

drivers/ddr/altera/sdram_n5x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1394,7 +1394,7 @@ static int cal_data_ocram(phys_addr_t phy_base, u32 addr,
13941394
phybak_p++;
13951395
phybak_num--;
13961396
data++;
1397-
WATCHDOG_RESET();
1397+
schedule();
13981398
};
13991399

14001400
if (proc == STORE) {

drivers/ddr/altera/sdram_soc32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void sdram_init_ecc_bits(void)
5353
memset((void *)start_addr, 0, size_init);
5454
size -= size_init;
5555
start_addr += size_init;
56-
WATCHDOG_RESET();
56+
schedule();
5757
}
5858

5959
dcache_disable();

drivers/fpga/intel_pr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ static int intel_freeze_br_req_ack(fdt_addr_t addr, u32 req_ack)
9999
break;
100100

101101
udelay(1);
102-
WATCHDOG_RESET();
102+
schedule();
103103
}
104104

105105
return ret;

drivers/spi/cadence_qspi_apb.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ static unsigned int cadence_qspi_wait_idle(void *reg_base)
157157

158158
start = get_timer(0);
159159
for ( ; get_timer(start) < timeout ; ) {
160-
WATCHDOG_RESET();
160+
schedule();
161161
if (CQSPI_REG_IS_IDLE(reg_base))
162162
count++;
163163
else
@@ -364,7 +364,7 @@ int cadence_qspi_apb_exec_flash_cmd(void *reg_base, unsigned int reg)
364364
if ((reg & CQSPI_REG_CMDCTRL_INPROGRESS) == 0)
365365
break;
366366
udelay(1);
367-
WATCHDOG_RESET();
367+
schedule();
368368
}
369369

370370
if (!retry) {
@@ -682,7 +682,7 @@ static int cadence_qspi_wait_for_data(struct cadence_spi_priv *priv)
682682
if (reg)
683683
return reg;
684684
udelay(1);
685-
WATCHDOG_RESET();
685+
schedule();
686686
}
687687

688688
return -ETIMEDOUT;
@@ -727,7 +727,7 @@ cadence_qspi_apb_indirect_read_execute(struct cadence_spi_priv *priv,
727727
rxbuf += bytes_to_read;
728728
remaining -= bytes_to_read;
729729
bytes_to_read = cadence_qspi_get_rd_sram_level(priv);
730-
WATCHDOG_RESET();
730+
schedule();
731731
}
732732
}
733733

@@ -898,7 +898,7 @@ cadence_qspi_apb_indirect_write_execute(struct cadence_spi_priv *priv,
898898

899899
bb_txbuf += write_bytes;
900900
remaining -= write_bytes;
901-
WATCHDOG_RESET();
901+
schedule();
902902
}
903903

904904
/* Check indirect done status */

0 commit comments

Comments
 (0)