kernel: bump 4.14 to 4.14.44

[openwrt/staging/dedeckeh.git] / target / linux / mediatek / patches-4.14 / 0193-clk-mediatek-adjust-dependency-of-reset.c-to-avoid-u.patch

diff --git a/target/linux/mediatek/patches-4.14/0193-clk-mediatek-adjust-dependency-of-reset.c-to-avoid-u.patch b/target/linux/mediatek/patches-4.14/0193-clk-mediatek-adjust-dependency-of-reset.c-to-avoid-u.patch
index 19527f1a065a67d3458fbe32300237efce7ce9de..ee7d035fd825e9dbc51e43f8710057c3c10280f8 100644 (file)
--- a/target/linux/mediatek/patches-4.14/0193-clk-mediatek-adjust-dependency-of-reset.c-to-avoid-u.patch
+++ b/target/linux/mediatek/patches-4.14/0193-clk-mediatek-adjust-dependency-of-reset.c-to-avoid-u.patch
@@ -32,10 +32,8 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  drivers/clk/mediatek/clk-mtk.h | 7 -------
  3 files changed, 3 insertions(+), 9 deletions(-)
 
-Index: linux-4.14.25/drivers/clk/mediatek/Kconfig
-===================================================================
---- linux-4.14.25.orig/drivers/clk/mediatek/Kconfig
-+++ linux-4.14.25/drivers/clk/mediatek/Kconfig
+--- a/drivers/clk/mediatek/Kconfig
++++ b/drivers/clk/mediatek/Kconfig
 @@ -6,6 +6,7 @@ menu "Clock driver for MediaTek SoC"
  
  config COMMON_CLK_MEDIATEK
@@ -44,10 +42,8 @@ Index: linux-4.14.25/drivers/clk/mediatek/Kconfig
        ---help---
          MediaTek SoCs' clock support.
  
-Index: linux-4.14.25/drivers/clk/mediatek/Makefile
-===================================================================
---- linux-4.14.25.orig/drivers/clk/mediatek/Makefile
-+++ linux-4.14.25/drivers/clk/mediatek/Makefile
+--- a/drivers/clk/mediatek/Makefile
++++ b/drivers/clk/mediatek/Makefile
 @@ -1,6 +1,5 @@
  # SPDX-License-Identifier: GPL-2.0
 -obj-$(CONFIG_COMMON_CLK_MEDIATEK) += clk-mtk.o clk-pll.o clk-gate.o clk-apmixed.o clk-cpumux.o
@@ -56,10 +52,8 @@ Index: linux-4.14.25/drivers/clk/mediatek/Makefile
  obj-$(CONFIG_COMMON_CLK_MT6797) += clk-mt6797.o
  obj-$(CONFIG_COMMON_CLK_MT6797_IMGSYS) += clk-mt6797-img.o
  obj-$(CONFIG_COMMON_CLK_MT6797_MMSYS) += clk-mt6797-mm.o
-Index: linux-4.14.25/drivers/clk/mediatek/clk-mtk.h
-===================================================================
---- linux-4.14.25.orig/drivers/clk/mediatek/clk-mtk.h
-+++ linux-4.14.25/drivers/clk/mediatek/clk-mtk.h
+--- a/drivers/clk/mediatek/clk-mtk.h
++++ b/drivers/clk/mediatek/clk-mtk.h
 @@ -229,14 +229,7 @@ void mtk_clk_register_plls(struct device
  struct clk *mtk_clk_register_ref2usb_tx(const char *name,
                        const char *parent_name, void __iomem *reg);