diff --git a/packages/tools/atf/package.mk b/packages/tools/atf/package.mk
index 740c6f9021..3bfa30cd5b 100644
--- a/packages/tools/atf/package.mk
+++ b/packages/tools/atf/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC
 
 PKG_NAME="atf"
-PKG_VERSION="v2.1"
-PKG_SHA256="7c4c00a4f28d3cfbb235fd1a1fb28c4d2fc1d657c9301686e7d8824ef575d059"
+PKG_VERSION="v2.2"
+PKG_SHA256="07e3c058ae2d95c7d516a46fc93565b797e912c3271ddbf29df523b1ab1ee911"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="BSD-3c"
 PKG_SITE="https://github.com/ARM-software/arm-trusted-firmware"
diff --git a/packages/tools/atf/patches/01-plat-allwinner-h6-add-wdt_quirk-to-use-r_wdt-instead.patch b/packages/tools/atf/patches/01-plat-allwinner-h6-add-wdt_quirk-to-use-r_wdt-instead.patch
deleted file mode 100644
index 51dbfc9610..0000000000
--- a/packages/tools/atf/patches/01-plat-allwinner-h6-add-wdt_quirk-to-use-r_wdt-instead.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 523ab5be1a84e9aa15fb62c3a15a6338b01d3961 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <peron.clem@gmail.com>
-Date: Tue, 9 Apr 2019 00:15:06 +0200
-Subject: [PATCH] plat: allwinner: common: use r_wdog instead of wdog
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some Allwinner H6 has a broken watchdog that doesn't
-make the soc reboot.
-
-Use the R_WATCHDOG instead.
-
-Signed-off-by: Clément Péron <peron.clem@gmail.com>
-Change-Id: Ie95cc30a80ed517b60b30d6bc2e655a1b53f18ba
----
- plat/allwinner/common/sunxi_pm.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plat/allwinner/common/sunxi_pm.c b/plat/allwinner/common/sunxi_pm.c
-index 1d2dc93852..13e1353258 100644
---- a/plat/allwinner/common/sunxi_pm.c
-+++ b/plat/allwinner/common/sunxi_pm.c
-@@ -20,9 +20,9 @@
- #include <sunxi_mmap.h>
- #include <sunxi_private.h>
- 
--#define SUNXI_WDOG0_CTRL_REG		(SUNXI_WDOG_BASE + 0x0010)
--#define SUNXI_WDOG0_CFG_REG		(SUNXI_WDOG_BASE + 0x0014)
--#define SUNXI_WDOG0_MODE_REG		(SUNXI_WDOG_BASE + 0x0018)
-+#define SUNXI_WDOG0_CTRL_REG		(SUNXI_R_WDOG_BASE + 0x0010)
-+#define SUNXI_WDOG0_CFG_REG		(SUNXI_R_WDOG_BASE + 0x0014)
-+#define SUNXI_WDOG0_MODE_REG		(SUNXI_R_WDOG_BASE + 0x0018)
- 
- #define mpidr_is_valid(mpidr) ( \
- 	MPIDR_AFFLVL3_VAL(mpidr) == 0 && \