diff options
| author | Tom Rini <trini@konsulko.com> | 2022-01-13 16:00:02 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-13 16:00:02 +0300 |
| commit | 743c562d0c5269740236864bdb0002e73ec3e614 (patch) | |
| tree | a269ce0e19e559d9a12aff62d5c20f29c60e3719 /arch | |
| parent | 43304e49fe1644c3d05009fdb7c73b3aff606857 (diff) | |
| parent | 9a8e3736da25a62449f84aef2b566e2b31ca60fd (diff) | |
| download | u-boot-743c562d0c5269740236864bdb0002e73ec3e614.tar.xz | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- Add Apple M1 watchdog timer (Mark)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/dts/t8103.dtsi | 13 | ||||
| -rw-r--r-- | arch/arm/mach-apple/board.c | 24 |
3 files changed, 11 insertions, 29 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7264d72bde..78c6b2e92d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -942,6 +942,9 @@ config ARCH_APPLE select OF_CONTROL select PINCTRL select POSITION_INDEPENDENT + select SYSRESET + select SYSRESET_WATCHDOG + select SYSRESET_WATCHDOG_AUTO select USB imply CMD_DM imply CMD_GPT diff --git a/arch/arm/dts/t8103.dtsi b/arch/arm/dts/t8103.dtsi index 7d9cb272f9..03d8436fec 100644 --- a/arch/arm/dts/t8103.dtsi +++ b/arch/arm/dts/t8103.dtsi @@ -328,6 +328,14 @@ <AIC_IRQ 336 IRQ_TYPE_LEVEL_HIGH>; }; + wdt: watchdog@23d2b0000 { + compatible = "apple,t8103-wdt", "apple,wdt"; + reg = <0x2 0x3d2b0000 0x0 0x4000>; + clocks = <&clkref>; + interrupt-parent = <&aic>; + interrupts = <AIC_IRQ 338 IRQ_TYPE_LEVEL_HIGH>; + }; + pinctrl_smc: pinctrl@23e820000 { compatible = "apple,t8103-pinctrl", "apple,pinctrl"; reg = <0x2 0x3e820000 0x0 0x4000>; @@ -529,11 +537,6 @@ status = "disabled"; }; - reboot@23d2b0000 { - compatible = "apple,reboot-v0"; - reg = <0x2 0x3d2b0000 0x0 0x4000>; - }; - spi@23510c000 { compatible = "apple,t8103-spi", "apple,spi"; reg = <0x2 0x3510c000 0x0 0x4000>; diff --git a/arch/arm/mach-apple/board.c b/arch/arm/mach-apple/board.c index 0bfbc473ec..b7e8d212f1 100644 --- a/arch/arm/mach-apple/board.c +++ b/arch/arm/mach-apple/board.c @@ -119,30 +119,6 @@ int dram_init_banksize(void) return fdtdec_setup_memory_banksize(); } -#define APPLE_WDT_BASE 0x23d2b0000ULL - -#define APPLE_WDT_SYS_CTL_ENABLE BIT(2) - -typedef struct apple_wdt { - u32 reserved0[3]; - u32 chip_ctl; - u32 sys_tmr; - u32 sys_cmp; - u32 reserved1; - u32 sys_ctl; -} apple_wdt_t; - -void reset_cpu(void) -{ - apple_wdt_t *wdt = (apple_wdt_t *)APPLE_WDT_BASE; - - writel(0, &wdt->sys_cmp); - writel(APPLE_WDT_SYS_CTL_ENABLE, &wdt->sys_ctl); - - while(1) - wfi(); -} - extern long fw_dtb_pointer; void *board_fdt_blob_setup(int *err) |