mediatek: update patches
[openwrt/staging/chunkeey.git] / target / linux / mediatek / patches-4.4 / 0026-scpsys-various-fixes.patch
1 From e56caadcf189eafcd2c7a9e22f22c0b67e89df75 Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Sun, 21 Feb 2016 13:52:12 +0100
4 Subject: [PATCH 26/91] scpsys: various fixes
5
6 ---
7 drivers/clk/mediatek/clk-mt2701.c | 2 ++
8 drivers/soc/mediatek/mtk-scpsys-mt2701.c | 8 --------
9 include/dt-bindings/power/mt2701-power.h | 4 ++--
10 3 files changed, 4 insertions(+), 10 deletions(-)
11
12 diff --git a/drivers/clk/mediatek/clk-mt2701.c b/drivers/clk/mediatek/clk-mt2701.c
13 index 0e40bb8..812b347 100644
14 --- a/drivers/clk/mediatek/clk-mt2701.c
15 +++ b/drivers/clk/mediatek/clk-mt2701.c
16 @@ -1043,6 +1043,8 @@ static void __init mtk_ethsys_init(struct device_node *node)
17 if (r)
18 pr_err("%s(): could not register clock provider: %d\n",
19 __func__, r);
20 +
21 + mtk_register_reset_controller(node, 1, 0x34);
22 }
23 CLK_OF_DECLARE(mtk_ethsys, "mediatek,mt2701-ethsys", mtk_ethsys_init);
24
25 diff --git a/drivers/soc/mediatek/mtk-scpsys-mt2701.c b/drivers/soc/mediatek/mtk-scpsys-mt2701.c
26 index 3a31946..19489bc 100644
27 --- a/drivers/soc/mediatek/mtk-scpsys-mt2701.c
28 +++ b/drivers/soc/mediatek/mtk-scpsys-mt2701.c
29 @@ -61,14 +61,6 @@ static const struct scp_domain_data scp_domain_data[] = {
30 .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_DISP,
31 .active_wakeup = true,
32 },
33 - [MT2701_POWER_DOMAIN_MFG] = {
34 - .name = "mfg",
35 - .sta_mask = MFG_PWR_STA_MASK,
36 - .ctl_offs = SPM_MFG_PWR_CON,
37 - .sram_pdn_bits = GENMASK(11, 8),
38 - .sram_pdn_ack_bits = GENMASK(12, 12),
39 - .active_wakeup = true,
40 - },
41 [MT2701_POWER_DOMAIN_VDEC] = {
42 .name = "vdec",
43 .sta_mask = VDE_PWR_STA_MASK,
44 diff --git a/include/dt-bindings/power/mt2701-power.h b/include/dt-bindings/power/mt2701-power.h
45 index 64cc826..c168597 100644
46 --- a/include/dt-bindings/power/mt2701-power.h
47 +++ b/include/dt-bindings/power/mt2701-power.h
48 @@ -16,12 +16,12 @@
49
50 #define MT2701_POWER_DOMAIN_CONN 0
51 #define MT2701_POWER_DOMAIN_DISP 1
52 -#define MT2701_POWER_DOMAIN_MFG 2
53 +//#define MT2701_POWER_DOMAIN_MFG 2
54 #define MT2701_POWER_DOMAIN_VDEC 3
55 #define MT2701_POWER_DOMAIN_ISP 4
56 #define MT2701_POWER_DOMAIN_BDP 5
57 #define MT2701_POWER_DOMAIN_ETH 6
58 #define MT2701_POWER_DOMAIN_HIF 7
59 -#define MT2701_POWER_DOMAIN_IFR_MSC 8
60 +#define MT2701_POWER_DOMAIN_IFR_MSC 2
61
62 #endif /* _DT_BINDINGS_POWER_MT2701_POWER_H */
63 --
64 1.7.10.4
65