[openwrt/openwrt] arm-trusted-firmware-mediatek: update to sources of 2022-08-31

[LEDE Commits]

dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/11a6021866a4e5c688dde0d1ea5841f10fc739be

commit 11a6021866a4e5c688dde0d1ea5841f10fc739be
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Wed Aug 31 21:10:39 2022 +0100

    arm-trusted-firmware-mediatek: update to sources of 2022-08-31
    
    Drop downstream patches which have been replaced with equivalent
    upstream changes.
    
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 .../boot/arm-trusted-firmware-mediatek/Makefile    |  6 ++--
 .../0001-spi-nor-add-more-Winbond-device-IDs.patch | 32 -----------------
 ...mt7622-initialize-watchdog-after-DDR-init.patch | 40 ----------------------
 3 files changed, 3 insertions(+), 75 deletions(-)

diff --git a/package/boot/arm-trusted-firmware-mediatek/Makefile b/package/boot/arm-trusted-firmware-mediatek/Makefile
index 583517b866..c54373f6bd 100644
--- a/package/boot/arm-trusted-firmware-mediatek/Makefile
+++ b/package/boot/arm-trusted-firmware-mediatek/Makefile
@@ -13,9 +13,9 @@ PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/mtk-openwrt/arm-trusted-firmware.git
-PKG_SOURCE_DATE:=2022-08-18
-PKG_SOURCE_VERSION:=9c9c49945c24634e4ae6cd924dbb88cf85c7926d
-PKG_MIRROR_HASH:=26b474f40c02da12b7bed56597aeef209757ad1b40a4f0a652794954018b2198
+PKG_SOURCE_DATE:=2022-08-31
+PKG_SOURCE_VERSION:=7539348480af57c6d0db95aba6381f3ee7483779
+PKG_MIRROR_HASH:=125090124d77753acc379b3b124100978c1ecb3da37c4983ba9644b433b7eb08
 
 PKG_MAINTAINER:=Daniel Golle <daniel at makrotopia.org>
 
diff --git a/package/boot/arm-trusted-firmware-mediatek/patches/0001-spi-nor-add-more-Winbond-device-IDs.patch b/package/boot/arm-trusted-firmware-mediatek/patches/0001-spi-nor-add-more-Winbond-device-IDs.patch
deleted file mode 100644
index d0e2f8a2c3..0000000000
--- a/package/boot/arm-trusted-firmware-mediatek/patches/0001-spi-nor-add-more-Winbond-device-IDs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From daaac60b504e6d5e77156ad0dc3dceca8b786e2d Mon Sep 17 00:00:00 2001
-From: Daniel Golle <daniel at makrotopia.org>
-Date: Sat, 27 Aug 2022 03:41:57 +0100
-Subject: [PATCH] spi-nor: add more Winbond device IDs
-
-Add device IDs for Winbond W25Q256 and W25Q512 variants.
-
-Signed-off-by: Daniel Golle <daniel at makrotopia.org>
----
- drivers/mtd/nor/spi_nor.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
---- a/drivers/mtd/nor/spi_nor.c
-+++ b/drivers/mtd/nor/spi_nor.c
-@@ -327,8 +327,15 @@ int spi_nor_read(unsigned int offset, ui
- 
- struct nor_device_info nor_flash_info_table[] = {
- 	{"MX25L51245G", {0xC2, 0x20, 0x1A}, 0x4000000, 0},
--	{"W25Q256JW",{0xEF,0x80, 0x19}, 0x2000000, 0},
--	{"MX25U25635",{0xC2, 0x25, 0x39}, 0x2000000, 0}
-+	{"W25Q256JV-IM", {0xEF, 0x70, 0x19}, 0x2000000, 0},
-+	{"W25Q256JV-IQ", {0xEF, 0x40, 0x19}, 0x2000000, 0},
-+	{"W25Q256JW", {0xEF, 0x60, 0x19}, 0x2000000, 0},
-+	{"W25Q256JW-IM", {0xEF, 0x80, 0x19}, 0x2000000, 0},
-+	{"W25Q512JV-IM", {0xEF, 0x70, 0x20}, 0x4000000, 0},
-+	{"W25Q512JV-IQ", {0xEF, 0x40, 0x20}, 0x4000000, 0},
-+	{"W25Q512NW-IM", {0xEF, 0x80, 0x20}, 0x4000000, 0},
-+	{"W25Q512NW-IQ/IN", {0xEF, 0x60, 0x20}, 0x4000000, 0},
-+	{"MX25U25635", {0xC2, 0x25, 0x39}, 0x2000000, 0}
- };
- 
- 
diff --git a/package/boot/arm-trusted-firmware-mediatek/patches/0002-mediatek-mt7622-initialize-watchdog-after-DDR-init.patch b/package/boot/arm-trusted-firmware-mediatek/patches/0002-mediatek-mt7622-initialize-watchdog-after-DDR-init.patch
deleted file mode 100644
index d8905986e2..0000000000
--- a/package/boot/arm-trusted-firmware-mediatek/patches/0002-mediatek-mt7622-initialize-watchdog-after-DDR-init.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2a012775b3ab6e72091c8be1c2d4bf5972407eb5 Mon Sep 17 00:00:00 2001
-From: Daniel Golle <daniel at makrotopia.org>
-Date: Sat, 27 Aug 2022 21:38:33 +0100
-Subject: [PATCH] mediatek: mt7622: initialize watchdog after DDR init
-
-Initializing the WDT before memory calibration breaks reboot at least
-on some MT7622 boards like the Bananapi BPi-R64:
-NOTICE:  BL2: v2.7(release):OpenWrt v2022-08-18-9c9c4994-2 (mt7622-emmc-2ddr)
-NOTICE:  BL2: Built : 04:00:25, Aug 27 2022
-ERROR:   Cannot find any pass-window
-ERROR:   no DATLAT taps pass, DATLAT calibration fail!
-ERROR:   DATLAT calibration fail, write back to  20!
-ERROR:   EMI: complex R/W mem test failed: -2
-
-Move watchdog initialization to happen only after memory initialization
-has completed to avoid the problem.
-
-Signed-off-by: Daniel Golle <daniel at makrotopia.org>
----
- plat/mediatek/mt7622/bl2_plat_setup.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/plat/mediatek/mt7622/bl2_plat_setup.c
-+++ b/plat/mediatek/mt7622/bl2_plat_setup.c
-@@ -277,7 +277,6 @@ void bl2_platform_setup(void)
- 	plat_mt_cpuxgpt_init();
- 	generic_delay_timer_init();
- 
--	mtk_wdt_init();
- 	mtk_pin_init();
- #ifndef USING_BL2PL
- 	mtk_pll_init();
-@@ -285,6 +284,7 @@ void bl2_platform_setup(void)
- 	mtk_pwrap_init();
- 	mtk_pmic_init();
- 	mtk_mem_init();
-+	mtk_wdt_init();
- 
- 	mtk_io_setup();
- }