mediatek: bump to v4.14
[openwrt/openwrt.git] / target / linux / mediatek / patches-4.9 / 0009-soc-mediatek-Add-MT2701-scpsys-driver.patch
diff --git a/target/linux/mediatek/patches-4.9/0009-soc-mediatek-Add-MT2701-scpsys-driver.patch b/target/linux/mediatek/patches-4.9/0009-soc-mediatek-Add-MT2701-scpsys-driver.patch
deleted file mode 100644 (file)
index 0b47635..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-From fb9f97e047f5a831a54cd61529b8cfdc4d413bb6 Mon Sep 17 00:00:00 2001
-From: Shunli Wang <shunli.wang@mediatek.com>
-Date: Thu, 20 Oct 2016 16:56:38 +0800
-Subject: [PATCH 09/57] soc: mediatek: Add MT2701 scpsys driver
-
-Add scpsys driver for MT2701.
-
-mtk-scpsys now supports MT8173 (arm64) and MT2701 (arm). So it should
-be enabled on both arm64 and arm platforms.
-
-Signed-off-by: Shunli Wang <shunli.wang@mediatek.com>
-Signed-off-by: James Liao <jamesjj.liao@mediatek.com>
-Reviewed-by: Kevin Hilman <khilman@baylibre.com>
-Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
----
- drivers/soc/mediatek/Kconfig      |   2 +-
- drivers/soc/mediatek/mtk-scpsys.c | 108 +++++++++++++++++++++++++++++++++++++-
- 2 files changed, 108 insertions(+), 2 deletions(-)
-
---- a/drivers/soc/mediatek/Kconfig
-+++ b/drivers/soc/mediatek/Kconfig
-@@ -23,7 +23,7 @@ config MTK_PMIC_WRAP
- config MTK_SCPSYS
-       bool "MediaTek SCPSYS Support"
-       depends on ARCH_MEDIATEK || COMPILE_TEST
--      default ARM64 && ARCH_MEDIATEK
-+      default ARCH_MEDIATEK
-       select REGMAP
-       select MTK_INFRACFG
-       select PM_GENERIC_DOMAINS if PM
---- a/drivers/soc/mediatek/mtk-scpsys.c
-+++ b/drivers/soc/mediatek/mtk-scpsys.c
-@@ -20,6 +20,7 @@
- #include <linux/regulator/consumer.h>
- #include <linux/soc/mediatek/infracfg.h>
-+#include <dt-bindings/power/mt2701-power.h>
- #include <dt-bindings/power/mt8173-power.h>
- #define SPM_VDE_PWR_CON                       0x0210
-@@ -27,8 +28,13 @@
- #define SPM_VEN_PWR_CON                       0x0230
- #define SPM_ISP_PWR_CON                       0x0238
- #define SPM_DIS_PWR_CON                       0x023c
-+#define SPM_CONN_PWR_CON              0x0280
- #define SPM_VEN2_PWR_CON              0x0298
--#define SPM_AUDIO_PWR_CON             0x029c
-+#define SPM_AUDIO_PWR_CON             0x029c  /* MT8173 */
-+#define SPM_BDP_PWR_CON                       0x029c  /* MT2701 */
-+#define SPM_ETH_PWR_CON                       0x02a0
-+#define SPM_HIF_PWR_CON                       0x02a4
-+#define SPM_IFR_MSC_PWR_CON           0x02a8
- #define SPM_MFG_2D_PWR_CON            0x02c0
- #define SPM_MFG_ASYNC_PWR_CON         0x02c4
- #define SPM_USB_PWR_CON                       0x02cc
-@@ -42,10 +48,15 @@
- #define PWR_ON_2ND_BIT                        BIT(3)
- #define PWR_CLK_DIS_BIT                       BIT(4)
-+#define PWR_STATUS_CONN                       BIT(1)
- #define PWR_STATUS_DISP                       BIT(3)
- #define PWR_STATUS_MFG                        BIT(4)
- #define PWR_STATUS_ISP                        BIT(5)
- #define PWR_STATUS_VDEC                       BIT(7)
-+#define PWR_STATUS_BDP                        BIT(14)
-+#define PWR_STATUS_ETH                        BIT(15)
-+#define PWR_STATUS_HIF                        BIT(16)
-+#define PWR_STATUS_IFR_MSC            BIT(17)
- #define PWR_STATUS_VENC_LT            BIT(20)
- #define PWR_STATUS_VENC                       BIT(21)
- #define PWR_STATUS_MFG_2D             BIT(22)
-@@ -59,6 +70,7 @@ enum clk_id {
-       CLK_MFG,
-       CLK_VENC,
-       CLK_VENC_LT,
-+      CLK_ETHIF,
-       CLK_MAX,
- };
-@@ -68,6 +80,7 @@ static const char * const clk_names[] =
-       "mfg",
-       "venc",
-       "venc_lt",
-+      "ethif",
-       NULL,
- };
-@@ -455,6 +468,96 @@ static void mtk_register_power_domains(s
- }
- /*
-+ * MT2701 power domain support
-+ */
-+
-+static const struct scp_domain_data scp_domain_data_mt2701[] = {
-+      [MT2701_POWER_DOMAIN_CONN] = {
-+              .name = "conn",
-+              .sta_mask = PWR_STATUS_CONN,
-+              .ctl_offs = SPM_CONN_PWR_CON,
-+              .bus_prot_mask = 0x0104,
-+              .clk_id = {CLK_NONE},
-+              .active_wakeup = true,
-+      },
-+      [MT2701_POWER_DOMAIN_DISP] = {
-+              .name = "disp",
-+              .sta_mask = PWR_STATUS_DISP,
-+              .ctl_offs = SPM_DIS_PWR_CON,
-+              .sram_pdn_bits = GENMASK(11, 8),
-+              .clk_id = {CLK_MM},
-+              .bus_prot_mask = 0x0002,
-+              .active_wakeup = true,
-+      },
-+      [MT2701_POWER_DOMAIN_VDEC] = {
-+              .name = "vdec",
-+              .sta_mask = PWR_STATUS_VDEC,
-+              .ctl_offs = SPM_VDE_PWR_CON,
-+              .sram_pdn_bits = GENMASK(11, 8),
-+              .sram_pdn_ack_bits = GENMASK(12, 12),
-+              .clk_id = {CLK_MM},
-+              .active_wakeup = true,
-+      },
-+      [MT2701_POWER_DOMAIN_ISP] = {
-+              .name = "isp",
-+              .sta_mask = PWR_STATUS_ISP,
-+              .ctl_offs = SPM_ISP_PWR_CON,
-+              .sram_pdn_bits = GENMASK(11, 8),
-+              .sram_pdn_ack_bits = GENMASK(13, 12),
-+              .clk_id = {CLK_MM},
-+              .active_wakeup = true,
-+      },
-+      [MT2701_POWER_DOMAIN_BDP] = {
-+              .name = "bdp",
-+              .sta_mask = PWR_STATUS_BDP,
-+              .ctl_offs = SPM_BDP_PWR_CON,
-+              .sram_pdn_bits = GENMASK(11, 8),
-+              .clk_id = {CLK_NONE},
-+              .active_wakeup = true,
-+      },
-+      [MT2701_POWER_DOMAIN_ETH] = {
-+              .name = "eth",
-+              .sta_mask = PWR_STATUS_ETH,
-+              .ctl_offs = SPM_ETH_PWR_CON,
-+              .sram_pdn_bits = GENMASK(11, 8),
-+              .sram_pdn_ack_bits = GENMASK(15, 12),
-+              .clk_id = {CLK_ETHIF},
-+              .active_wakeup = true,
-+      },
-+      [MT2701_POWER_DOMAIN_HIF] = {
-+              .name = "hif",
-+              .sta_mask = PWR_STATUS_HIF,
-+              .ctl_offs = SPM_HIF_PWR_CON,
-+              .sram_pdn_bits = GENMASK(11, 8),
-+              .sram_pdn_ack_bits = GENMASK(15, 12),
-+              .clk_id = {CLK_ETHIF},
-+              .active_wakeup = true,
-+      },
-+      [MT2701_POWER_DOMAIN_IFR_MSC] = {
-+              .name = "ifr_msc",
-+              .sta_mask = PWR_STATUS_IFR_MSC,
-+              .ctl_offs = SPM_IFR_MSC_PWR_CON,
-+              .clk_id = {CLK_NONE},
-+              .active_wakeup = true,
-+      },
-+};
-+
-+#define NUM_DOMAINS_MT2701    ARRAY_SIZE(scp_domain_data_mt2701)
-+
-+static int __init scpsys_probe_mt2701(struct platform_device *pdev)
-+{
-+      struct scp *scp;
-+
-+      scp = init_scp(pdev, scp_domain_data_mt2701, NUM_DOMAINS_MT2701);
-+      if (IS_ERR(scp))
-+              return PTR_ERR(scp);
-+
-+      mtk_register_power_domains(pdev, scp, NUM_DOMAINS_MT2701);
-+
-+      return 0;
-+}
-+
-+/*
-  * MT8173 power domain support
-  */
-@@ -583,6 +686,9 @@ static int __init scpsys_probe_mt8173(st
- static const struct of_device_id of_scpsys_match_tbl[] = {
-       {
-+              .compatible = "mediatek,mt2701-scpsys",
-+              .data = scpsys_probe_mt2701,
-+      }, {
-               .compatible = "mediatek,mt8173-scpsys",
-               .data = scpsys_probe_mt8173,
-       }, {