mediatek: bump to v4.9

[openwrt/staging/yousong.git] / target / linux / mediatek / patches-4.4 / 0040-soc-mediatek-PMIC-wrap-add-mt6323-slave-support.patch

diff --git a/target/linux/mediatek/patches-4.4/0040-soc-mediatek-PMIC-wrap-add-mt6323-slave-support.patch b/target/linux/mediatek/patches-4.4/0040-soc-mediatek-PMIC-wrap-add-mt6323-slave-support.patch
deleted file mode 100644 (file)
index 51f0628..0000000
--- a/target/linux/mediatek/patches-4.4/0040-soc-mediatek-PMIC-wrap-add-mt6323-slave-support.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 4418ba9a0bb105f00259d10ceb16f9e27199e9b0 Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Wed, 20 Jan 2016 11:40:43 +0100
-Subject: [PATCH 040/102] soc: mediatek: PMIC wrap: add mt6323 slave support
-
-Add support for MT6323 slaves. This PMIC can be found on MT2701 and MT7623
-EVB. The only function that we need to touch is pwrap_init_cipher().
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
----
- drivers/soc/mediatek/mtk-pmic-wrap.c |   43 ++++++++++++++++++++++++++++++++++
- 1 file changed, 43 insertions(+)
-
---- a/drivers/soc/mediatek/mtk-pmic-wrap.c
-+++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
-@@ -93,6 +93,27 @@ enum dew_regs {
-       PWRAP_DEW_EVENT_TEST,
-       PWRAP_DEW_CIPHER_LOAD,
-       PWRAP_DEW_CIPHER_START,
-+
-+      /* MT6323 only regs */
-+      PWRAP_DEW_CIPHER_EN,
-+      PWRAP_DEW_RDDMY_NO,
-+};
-+
-+static const u32 mt6323_regs[] = {
-+      [PWRAP_DEW_BASE] =              0x0000,
-+      [PWRAP_DEW_DIO_EN] =            0x018a,
-+      [PWRAP_DEW_READ_TEST] =         0x018c,
-+      [PWRAP_DEW_WRITE_TEST] =        0x018e,
-+      [PWRAP_DEW_CRC_EN] =            0x0192,
-+      [PWRAP_DEW_CRC_VAL] =           0x0194,
-+      [PWRAP_DEW_MON_GRP_SEL] =       0x0196,
-+      [PWRAP_DEW_CIPHER_KEY_SEL] =    0x0198,
-+      [PWRAP_DEW_CIPHER_IV_SEL] =     0x019a,
-+      [PWRAP_DEW_CIPHER_EN] =         0x019c,
-+      [PWRAP_DEW_CIPHER_RDY] =        0x019e,
-+      [PWRAP_DEW_CIPHER_MODE] =       0x01a0,
-+      [PWRAP_DEW_CIPHER_SWRST] =      0x01a2,
-+      [PWRAP_DEW_RDDMY_NO] =          0x01a4,
- };
- 
- static const u32 mt6397_regs[] = {
-@@ -371,6 +392,7 @@ static int mt8135_regs[] = {
- };
- 
- enum pmic_type {
-+      PMIC_MT6323,
-       PMIC_MT6397,
- };
- 
-@@ -661,6 +683,19 @@ static int pwrap_init_cipher(struct pmic
-       pwrap_write(wrp, wrp->slave->dew_regs[PWRAP_DEW_CIPHER_LOAD], 0x1);
-       pwrap_write(wrp, wrp->slave->dew_regs[PWRAP_DEW_CIPHER_START], 0x1);
- 
-+      switch (wrp->slave->type) {
-+      case PMIC_MT6397:
-+              pwrap_write(wrp, wrp->slave->dew_regs[PWRAP_DEW_CIPHER_LOAD],
-+                          0x1);
-+              pwrap_write(wrp, wrp->slave->dew_regs[PWRAP_DEW_CIPHER_START],
-+                          0x1);
-+              break;
-+      case PMIC_MT6323:
-+              pwrap_write(wrp, wrp->slave->dew_regs[PWRAP_DEW_CIPHER_EN],
-+                          0x1);
-+              break;
-+      }
-+
-       /* wait for cipher data ready@AP */
-       ret = pwrap_wait_for_state(wrp, pwrap_is_cipher_ready);
-       if (ret) {
-@@ -858,6 +893,11 @@ static const struct regmap_config pwrap_
-       .max_register = 0xffff,
- };
- 
-+static const struct pwrap_slv_type pmic_mt6323 = {
-+      .dew_regs = mt6323_regs,
-+      .type = PMIC_MT6323,
-+};
-+
- static const struct pwrap_slv_type pmic_mt6397 = {
-       .dew_regs = mt6397_regs,
-       .type = PMIC_MT6397,
-@@ -865,6 +905,9 @@ static const struct pwrap_slv_type pmic_
- 
- static const struct of_device_id of_slave_match_tbl[] = {
-       {
-+              .compatible = "mediatek,mt6323",
-+              .data = &pmic_mt6323,
-+      }, {
-               .compatible = "mediatek,mt6397",
-               .data = &pmic_mt6397,
-       }, {