uboot-mediatek: update to 2021.10

[openwrt/staging/hauke.git] / package / boot / uboot-mediatek / patches / 000-mtk-01-Revert-clk-Add-debugging-for-return-values.patch

diff --git a/package/boot/uboot-mediatek/patches/000-mtk-01-Revert-clk-Add-debugging-for-return-values.patch b/package/boot/uboot-mediatek/patches/000-mtk-01-Revert-clk-Add-debugging-for-return-values.patch
index c398ae4ab7cd668aee791a117d53f0d7cdaa9965..30558611c8991367e2a6c088972c325023d65979 100644 (file)
--- a/package/boot/uboot-mediatek/patches/000-mtk-01-Revert-clk-Add-debugging-for-return-values.patch
+++ b/package/boot/uboot-mediatek/patches/000-mtk-01-Revert-clk-Add-debugging-for-return-values.patch
@@ -1,7 +1,7 @@
-From 5efb7855a9d33ac897d6e2a7117e4e3d35d433a5 Mon Sep 17 00:00:00 2001
+From 34ed9f6d3018d32c7c015e57c9985d3c4c07b706 Mon Sep 17 00:00:00 2001
 From: Daniel Golle <daniel@makrotopia.org>
 Date: Thu, 11 Mar 2021 10:28:53 +0000
-Subject: [PATCH 01/21] Revert "clk: Add debugging for return values"
+Subject: [PATCH 01/12] Revert "clk: Add debugging for return values"
 
 This reverts commit 5c5992cb90cf9ca4d51e38d9a95a13c293904df5.
 ---
@@ -10,7 +10,7 @@ This reverts commit 5c5992cb90cf9ca4d51e38d9a95a13c293904df5.
 
 --- a/drivers/clk/clk-uclass.c
 +++ b/drivers/clk/clk-uclass.c
-@@ -84,7 +84,7 @@ static int clk_get_by_index_tail(int ret
+@@ -87,7 +87,7 @@ static int clk_get_by_index_tail(int ret
        if (ret) {
                debug("%s: uclass_get_device_by_of_offset failed: err=%d\n",
                      __func__, ret);
@@ -19,7 +19,7 @@ This reverts commit 5c5992cb90cf9ca4d51e38d9a95a13c293904df5.
        }
  
        clk->dev = dev_clk;
-@@ -97,15 +97,14 @@ static int clk_get_by_index_tail(int ret
+@@ -100,15 +100,14 @@ static int clk_get_by_index_tail(int ret
                ret = clk_of_xlate_default(clk, args);
        if (ret) {
                debug("of_xlate() failed: %d\n", ret);
@@ -37,7 +37,7 @@ This reverts commit 5c5992cb90cf9ca4d51e38d9a95a13c293904df5.
  }
  
  static int clk_get_by_indexed_prop(struct udevice *dev, const char *prop_name,
-@@ -124,7 +123,7 @@ static int clk_get_by_indexed_prop(struc
+@@ -127,7 +126,7 @@ static int clk_get_by_indexed_prop(struc
        if (ret) {
                debug("%s: fdtdec_parse_phandle_with_args failed: err=%d\n",
                      __func__, ret);
@@ -46,7 +46,7 @@ This reverts commit 5c5992cb90cf9ca4d51e38d9a95a13c293904df5.
        }
  
  
-@@ -472,7 +471,6 @@ int clk_free(struct clk *clk)
+@@ -502,7 +501,6 @@ int clk_free(struct clk *clk)
  ulong clk_get_rate(struct clk *clk)
  {
        const struct clk_ops *ops;
@@ -54,7 +54,7 @@ This reverts commit 5c5992cb90cf9ca4d51e38d9a95a13c293904df5.
  
        debug("%s(clk=%p)\n", __func__, clk);
        if (!clk_valid(clk))
-@@ -482,11 +480,7 @@ ulong clk_get_rate(struct clk *clk)
+@@ -512,11 +510,7 @@ ulong clk_get_rate(struct clk *clk)
        if (!ops->get_rate)
                return -ENOSYS;