mediatek: bump to v4.4

[openwrt.git] / target / linux / mediatek / patches-4.4 / 0026-scpsys-various-fixes.patch

diff --git a/target/linux/mediatek/patches-4.4/0026-scpsys-various-fixes.patch b/target/linux/mediatek/patches-4.4/0026-scpsys-various-fixes.patch
new file mode 100644 (file)
index 0000000..1ff2515
--- /dev/null
+++ b/target/linux/mediatek/patches-4.4/0026-scpsys-various-fixes.patch
@@ -0,0 +1,65 @@
+From f027ce51ff728a22428fb0b7107edf9e1bd61712 Mon Sep 17 00:00:00 2001
+From: John Crispin <blogic@openwrt.org>
+Date: Sun, 21 Feb 2016 13:52:12 +0100
+Subject: [PATCH 26/53] scpsys: various fixes
+
+---
+ drivers/clk/mediatek/clk-mt2701.c        |    2 ++
+ drivers/soc/mediatek/mtk-scpsys-mt2701.c |    8 --------
+ include/dt-bindings/power/mt2701-power.h |    4 ++--
+ 3 files changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/clk/mediatek/clk-mt2701.c b/drivers/clk/mediatek/clk-mt2701.c
+index 0e40bb8..812b347 100644
+--- a/drivers/clk/mediatek/clk-mt2701.c
++++ b/drivers/clk/mediatek/clk-mt2701.c
+@@ -1043,6 +1043,8 @@ static void __init mtk_ethsys_init(struct device_node *node)
+       if (r)
+               pr_err("%s(): could not register clock provider: %d\n",
+                       __func__, r);
++
++      mtk_register_reset_controller(node, 1, 0x34);
+ }
+ CLK_OF_DECLARE(mtk_ethsys, "mediatek,mt2701-ethsys", mtk_ethsys_init);
+ 
+diff --git a/drivers/soc/mediatek/mtk-scpsys-mt2701.c b/drivers/soc/mediatek/mtk-scpsys-mt2701.c
+index 3a31946..19489bc 100644
+--- a/drivers/soc/mediatek/mtk-scpsys-mt2701.c
++++ b/drivers/soc/mediatek/mtk-scpsys-mt2701.c
+@@ -61,14 +61,6 @@ static const struct scp_domain_data scp_domain_data[] = {
+               .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_DISP,
+               .active_wakeup = true,
+       },
+-      [MT2701_POWER_DOMAIN_MFG] = {
+-              .name = "mfg",
+-              .sta_mask = MFG_PWR_STA_MASK,
+-              .ctl_offs = SPM_MFG_PWR_CON,
+-              .sram_pdn_bits = GENMASK(11, 8),
+-              .sram_pdn_ack_bits = GENMASK(12, 12),
+-              .active_wakeup = true,
+-      },
+       [MT2701_POWER_DOMAIN_VDEC] = {
+               .name = "vdec",
+               .sta_mask = VDE_PWR_STA_MASK,
+diff --git a/include/dt-bindings/power/mt2701-power.h b/include/dt-bindings/power/mt2701-power.h
+index 64cc826..c168597 100644
+--- a/include/dt-bindings/power/mt2701-power.h
++++ b/include/dt-bindings/power/mt2701-power.h
+@@ -16,12 +16,12 @@
+ 
+ #define MT2701_POWER_DOMAIN_CONN      0
+ #define MT2701_POWER_DOMAIN_DISP      1
+-#define MT2701_POWER_DOMAIN_MFG               2
++//#define MT2701_POWER_DOMAIN_MFG             2
+ #define MT2701_POWER_DOMAIN_VDEC      3
+ #define MT2701_POWER_DOMAIN_ISP               4
+ #define MT2701_POWER_DOMAIN_BDP               5
+ #define MT2701_POWER_DOMAIN_ETH               6
+ #define MT2701_POWER_DOMAIN_HIF               7
+-#define MT2701_POWER_DOMAIN_IFR_MSC   8
++#define MT2701_POWER_DOMAIN_IFR_MSC   2
+ 
+ #endif /* _DT_BINDINGS_POWER_MT2701_POWER_H */
+-- 
+1.7.10.4
+