* Add Support for MediaTek PMIC MT6397 MFD Core and Regulator
@ 2014-11-17 7:40 Flora Fu
2014-11-17 7:40 ` [PATCH 1/7] mfd: MT6397: Add support for PMIC MT6397 MFD Flora Fu
` (6 more replies)
0 siblings, 7 replies; 18+ messages in thread
From: Flora Fu @ 2014-11-17 7:40 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Matthias Brugger
Cc: Ashwin Chaugule, Vladimir Murzin, Russell King, Samuel Ortiz,
Pawel Moll, Ian Campbell, Catalin Marinas, srv_heupstream,
Liam Girdwood, linux-kernel, Flora Fu, devicetree, Mark Brown,
Sascha Hauer, Kumar Gala, Grant Likely, Joe.C, Eddie Huang,
Lee Jones, linux-arm-kernel, Dongdong Cheng
Hi,
The patch sets add support for MediaTek PMIC MT6397 MFD core and its regulator driver.
This is hardware layout for access PMIC MT6397 from AP SoC MT8135.
Between PMIC MT6397 and MT8135, the physical signal channel is SPI bus.
Tere is a specific hardware called PMIC Wrapper or PWRAP to handle access protocols in both PMIC and AP side.
+-----------------+ +---------------+
| | | |
| Mediatek AP SoC | | |
| (ex. MT8135) | | MT6397 |
| | | |
| +--------+ | (SPI bus) | +--------+ |
| | | |-----------| | | |
| | PMIC | |-----------| | PMIC | |
| | Wrapper| |-----------| | Wrapper| |
| | | |-----------| | | |
| +--------+ | | +--------+ |
| | | |
+-----------------+ +---------------+
The patch set:
Patch 1/7: Add core driver files for PMIC MT6397 MFD.
Patch 2/7: Add PMIC wrapper of MT8135 to access MT6397 MFD. This is regmap of MT6397 MFD.
Patch 3/7: PMIC provides regulator functions. This patch is MT6397 regulator driver.
Patch 4/7: Add document for MT6397 MFD.
Patch 5/7: Add document for MT6397 Regulator.
Patch 6/7: Add device tree for MT6397 MFD and its regmap in mt8135.dtsi.
Patch 7/7: Add device tree for MT6397 regulators in mt8135.dtsi.
This driver is based on 3.18-rc1.
Please notice that reset controller in Patch 2/7 is based previous patch in
http://lists.infradead.org/pipermail/linux-arm-kernel/2014-November/299141.html.
Flora Fu (7):
mfd: MT6397: Add support for PMIC MT6397 MFD
mfd: MT6397: Add regmap for MT8135 and MT6397 SoC
regulator: MT6397: Add support for MT6397 regulator
dt-bindings: Add document for MT6397 MFD
dt-bindings: Add document for MT6397 regulator
ARM: dts: mt8135: Add support for PMIC MT6397 MFD
ARM: dts: mt8135: Add support for MT6397 regulator
Documentation/devicetree/bindings/mfd/mt6397.txt | 87 +++
.../bindings/regulator/mt6397-regulator.txt | 31 +
arch/arm/boot/dts/mt8135.dtsi | 211 +++++
drivers/mfd/Kconfig | 18 +
drivers/mfd/Makefile | 2 +
drivers/mfd/mt6397-core.c | 94 +++
drivers/mfd/mt8135-pmic-wrap.c | 847 +++++++++++++++++++++
drivers/mfd/mt8135-pmic-wrap.h | 138 ++++
drivers/mfd/mtk-pmic-wrap.h | 25 +
drivers/regulator/Kconfig | 6 +
drivers/regulator/Makefile | 1 +
drivers/regulator/mt6397-regulator.c | 547 +++++++++++++
include/linux/mfd/mt6397/core.h | 27 +
include/linux/mfd/mt6397/registers.h | 362 +++++++++
include/linux/regulator/mt6397-regulator.h | 50 ++
15 files changed, 2446 insertions(+)
create mode 100644 Documentation/devicetree/bindings/mfd/mt6397.txt
create mode 100644 Documentation/devicetree/bindings/regulator/mt6397-regulator.txt
create mode 100644 drivers/mfd/mt6397-core.c
create mode 100644 drivers/mfd/mt8135-pmic-wrap.c
create mode 100644 drivers/mfd/mt8135-pmic-wrap.h
create mode 100644 drivers/mfd/mtk-pmic-wrap.h
create mode 100644 drivers/regulator/mt6397-regulator.c
create mode 100644 include/linux/mfd/mt6397/core.h
create mode 100644 include/linux/mfd/mt6397/registers.h
create mode 100644 include/linux/regulator/mt6397-regulator.h
--
1.8.1.1.dirty
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 1/7] mfd: MT6397: Add support for PMIC MT6397 MFD
2014-11-17 7:40 Add Support for MediaTek PMIC MT6397 MFD Core and Regulator Flora Fu
@ 2014-11-17 7:40 ` Flora Fu
2014-11-18 11:59 ` Lee Jones
2014-11-17 7:40 ` [PATCH 2/7] mfd: MT6397: Add regmap for MT8135 and MT6397 SoC Flora Fu
` (5 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Flora Fu @ 2014-11-17 7:40 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Matthias Brugger
Cc: Ashwin Chaugule, Vladimir Murzin, Russell King, Samuel Ortiz,
Pawel Moll, Ian Campbell, Catalin Marinas, srv_heupstream,
Liam Girdwood, linux-kernel, Flora Fu, devicetree, Mark Brown,
Sascha Hauer, Kumar Gala, Grant Likely, Joe.C, Eddie Huang,
Lee Jones, linux-arm-kernel, Dongdong Cheng
Add core driver files for MT6397 MFD.
Signed-off-by: Flora Fu <flora.fu@mediatek.com>
---
drivers/mfd/Kconfig | 10 +
drivers/mfd/Makefile | 1 +
drivers/mfd/mt6397-core.c | 94 +++++++++
drivers/mfd/mtk-pmic-wrap.h | 25 +++
include/linux/mfd/mt6397/core.h | 27 +++
include/linux/mfd/mt6397/registers.h | 362 +++++++++++++++++++++++++++++++++++
6 files changed, 519 insertions(+)
create mode 100644 drivers/mfd/mt6397-core.c
create mode 100644 drivers/mfd/mtk-pmic-wrap.h
create mode 100644 include/linux/mfd/mt6397/core.h
create mode 100644 include/linux/mfd/mt6397/registers.h
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 1456ea7..f0b3efc 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1318,6 +1318,16 @@ config MFD_STW481X
in various ST Microelectronics and ST-Ericsson embedded
Nomadik series.
+config MFD_MT6397
+ tristate "MediaTek MT6397 PMIC Support"
+ select MFD_CORE
+ select IRQ_DOMAIN
+ help
+ Say yes here to add support for MediaTek MT6397 PMIC. This is
+ a Power Management IC. This driver provides common support for
+ accessing the device; additional drivers must be enabled in order
+ to use the functionality of the device.
+
menu "Multimedia Capabilities Port drivers"
depends on ARCH_SA1100
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 8bd54b1..7168193 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -177,3 +177,4 @@ obj-$(CONFIG_MFD_HI6421_PMIC) += hi6421-pmic-core.o
intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o
obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o
+obj-$(CONFIG_MFD_MT6397) += mt6397-core.o
diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
new file mode 100644
index 0000000..69cacdc
--- /dev/null
+++ b/drivers/mfd/mt6397-core.c
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2014 MediaTek Inc.
+ * Author: Flora.Fu <flora.fu@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/mfd/core.h>
+#include <linux/mfd/mt6397/core.h>
+#include <linux/of_device.h>
+#include "mtk-pmic-wrap.h"
+
+static struct mfd_cell mt6397_devs[] = {
+ {
+ .name = "mt6397-clk",
+ .id = -1,
+ },
+ {
+ .name = "mt6397-rtc",
+ .id = -1,
+ },
+ {
+ .name = "mt6397-regulator",
+ .id = -1,
+ },
+ {
+ .name = "mt6397-codec",
+ .id = -1,
+ .of_compatible = "mediatek,mt6397-codec"
+ },
+};
+
+static int mt6397_probe(struct platform_device *pdev)
+{
+ u32 ret;
+ struct mt6397_chip *mt6397;
+
+ struct pmic_wrapper *wrp = dev_get_drvdata(pdev->dev.parent);
+
+ mt6397 = devm_kzalloc(&pdev->dev,
+ sizeof(struct mt6397_chip), GFP_KERNEL);
+ if (!mt6397)
+ return -ENOMEM;
+
+ mt6397->dev = &pdev->dev;
+ mt6397->regmap = wrp->regmap;
+ platform_set_drvdata(pdev, mt6397);
+
+ ret = mfd_add_devices(mt6397->dev, -1, &mt6397_devs[0],
+ ARRAY_SIZE(mt6397_devs), NULL, 0, NULL);
+ if (ret < 0)
+ dev_err(mt6397->dev, "Failed to mfd_add_devices: %d\n", ret);
+
+ return ret;
+}
+
+static int mt6397_remove(struct platform_device *pdev)
+{
+ struct mt6397_chip *mt6397 = platform_get_drvdata(pdev);
+
+ mfd_remove_devices(mt6397->dev);
+ return 0;
+}
+
+static const struct of_device_id mt6397_of_match[] = {
+ { .compatible = "mediatek,mt6397" },
+ { }
+};
+MODULE_DEVICE_TABLE(of, mt6397_of_match);
+
+static struct platform_driver mt6397_driver = {
+ .probe = mt6397_probe,
+ .remove = mt6397_remove,
+ .driver = {
+ .name = "mt6397",
+ .owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(mt6397_of_match),
+ },
+};
+
+module_platform_driver(mt6397_driver);
+
+MODULE_AUTHOR("Flora Fu <flora.fu@mediatek.com>");
+MODULE_DESCRIPTION("Driver for MediaTek MT6397 PMIC");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mt6397");
diff --git a/drivers/mfd/mtk-pmic-wrap.h b/drivers/mfd/mtk-pmic-wrap.h
new file mode 100644
index 0000000..1557a9d
--- /dev/null
+++ b/drivers/mfd/mtk-pmic-wrap.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2014 MediaTek Inc.
+ * Author: Flora.Fu <flora.fu@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __MTK_PMIC_WRAP_H__
+#define __MTK_PMIC_WRAP_H__
+
+struct pmic_wrapper {
+ struct platform_device *pdev;
+ void __iomem *pwrap_base;
+ void __iomem *pwrap_bridge_base;
+ struct regmap *regmap;
+};
+
+#endif /* __MTK_PMIC_WRAP_H__ */
diff --git a/include/linux/mfd/mt6397/core.h b/include/linux/mfd/mt6397/core.h
new file mode 100644
index 0000000..edf38c4
--- /dev/null
+++ b/include/linux/mfd/mt6397/core.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2014 MediaTek Inc.
+ * Author: Flora.Fu <flora.fu@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __MFD_MT6397_CORE_H__
+#define __MFD_MT6397_CORE_H__
+
+struct mt6397_chip {
+ /* Device */
+ struct device *dev;
+
+ /* Control interface */
+ struct regmap *regmap;
+};
+
+#endif /* __MFD_MT6397_CORE_H__ */
+
diff --git a/include/linux/mfd/mt6397/registers.h b/include/linux/mfd/mt6397/registers.h
new file mode 100644
index 0000000..d1c4067
--- /dev/null
+++ b/include/linux/mfd/mt6397/registers.h
@@ -0,0 +1,362 @@
+/*
+* Copyright (c) 2014 MediaTek Inc.
+* Author: Flora.Fu <flora.fu@mediatek.com>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*/
+
+#ifndef __MFD_MT6397_REGISTERS_H__
+#define __MFD_MT6397_REGISTERS_H__
+
+/* PMIC Rgisters */
+#define MT6397_CID 0x0100
+#define MT6397_TOP_CKPDN 0x0102
+#define MT6397_TOP_CKPDN_SET 0x0104
+#define MT6397_TOP_CKPDN_CLR 0x0106
+#define MT6397_TOP_CKPDN2 0x0108
+#define MT6397_TOP_CKPDN2_SET 0x010A
+#define MT6397_TOP_CKPDN2_CLR 0x010C
+#define MT6397_TOP_GPIO_CKPDN 0x010E
+#define MT6397_TOP_RST_CON 0x0114
+#define MT6397_WRP_CKPDN 0x011A
+#define MT6397_WRP_RST_CON 0x0120
+#define MT6397_TOP_RST_MISC 0x0126
+#define MT6397_TOP_CKCON1 0x0128
+#define MT6397_TOP_CKCON2 0x012A
+#define MT6397_TOP_CKTST1 0x012C
+#define MT6397_TOP_CKTST2 0x012E
+#define MT6397_OC_DEG_EN 0x0130
+#define MT6397_OC_CTL0 0x0132
+#define MT6397_OC_CTL1 0x0134
+#define MT6397_OC_CTL2 0x0136
+#define MT6397_INT_RSV 0x0138
+#define MT6397_TEST_CON0 0x013A
+#define MT6397_TEST_CON1 0x013C
+#define MT6397_STATUS0 0x013E
+#define MT6397_STATUS1 0x0140
+#define MT6397_PGSTATUS 0x0142
+#define MT6397_CHRSTATUS 0x0144
+#define MT6397_OCSTATUS0 0x0146
+#define MT6397_OCSTATUS1 0x0148
+#define MT6397_OCSTATUS2 0x014A
+#define MT6397_HDMI_PAD_IE 0x014C
+#define MT6397_TEST_OUT_L 0x014E
+#define MT6397_TEST_OUT_H 0x0150
+#define MT6397_TDSEL_CON 0x0152
+#define MT6397_RDSEL_CON 0x0154
+#define MT6397_GPIO_SMT_CON0 0x0156
+#define MT6397_GPIO_SMT_CON1 0x0158
+#define MT6397_GPIO_SMT_CON2 0x015A
+#define MT6397_GPIO_SMT_CON3 0x015C
+#define MT6397_DRV_CON0 0x015E
+#define MT6397_DRV_CON1 0x0160
+#define MT6397_DRV_CON2 0x0162
+#define MT6397_DRV_CON3 0x0164
+#define MT6397_DRV_CON4 0x0166
+#define MT6397_DRV_CON5 0x0168
+#define MT6397_DRV_CON6 0x016A
+#define MT6397_DRV_CON7 0x016C
+#define MT6397_DRV_CON8 0x016E
+#define MT6397_DRV_CON9 0x0170
+#define MT6397_DRV_CON10 0x0172
+#define MT6397_DRV_CON11 0x0174
+#define MT6397_DRV_CON12 0x0176
+#define MT6397_INT_CON0 0x0178
+#define MT6397_INT_CON1 0x017E
+#define MT6397_INT_STATUS0 0x0184
+#define MT6397_INT_STATUS1 0x0186
+#define MT6397_FQMTR_CON0 0x0188
+#define MT6397_FQMTR_CON1 0x018A
+#define MT6397_FQMTR_CON2 0x018C
+#define MT6397_EFUSE_DOUT_0_15 0x01C4
+#define MT6397_EFUSE_DOUT_16_31 0x01C6
+#define MT6397_EFUSE_DOUT_32_47 0x01C8
+#define MT6397_EFUSE_DOUT_48_63 0x01CA
+#define MT6397_SPI_CON 0x01CC
+#define MT6397_TOP_CKPDN3 0x01CE
+#define MT6397_TOP_CKCON3 0x01D4
+#define MT6397_EFUSE_DOUT_64_79 0x01D6
+#define MT6397_EFUSE_DOUT_80_95 0x01D8
+#define MT6397_EFUSE_DOUT_96_111 0x01DA
+#define MT6397_EFUSE_DOUT_112_127 0x01DC
+#define MT6397_EFUSE_DOUT_128_143 0x01DE
+#define MT6397_EFUSE_DOUT_144_159 0x01E0
+#define MT6397_EFUSE_DOUT_160_175 0x01E2
+#define MT6397_EFUSE_DOUT_176_191 0x01E4
+#define MT6397_EFUSE_DOUT_192_207 0x01E6
+#define MT6397_EFUSE_DOUT_208_223 0x01E8
+#define MT6397_EFUSE_DOUT_224_239 0x01EA
+#define MT6397_EFUSE_DOUT_240_255 0x01EC
+#define MT6397_EFUSE_DOUT_256_271 0x01EE
+#define MT6397_EFUSE_DOUT_272_287 0x01F0
+#define MT6397_EFUSE_DOUT_288_303 0x01F2
+#define MT6397_EFUSE_DOUT_304_319 0x01F4
+#define MT6397_BUCK_CON0 0x0200
+#define MT6397_BUCK_CON1 0x0202
+#define MT6397_BUCK_CON2 0x0204
+#define MT6397_BUCK_CON3 0x0206
+#define MT6397_BUCK_CON4 0x0208
+#define MT6397_BUCK_CON5 0x020A
+#define MT6397_BUCK_CON6 0x020C
+#define MT6397_BUCK_CON7 0x020E
+#define MT6397_BUCK_CON8 0x0210
+#define MT6397_BUCK_CON9 0x0212
+#define MT6397_VCA15_CON0 0x0214
+#define MT6397_VCA15_CON1 0x0216
+#define MT6397_VCA15_CON2 0x0218
+#define MT6397_VCA15_CON3 0x021A
+#define MT6397_VCA15_CON4 0x021C
+#define MT6397_VCA15_CON5 0x021E
+#define MT6397_VCA15_CON6 0x0220
+#define MT6397_VCA15_CON7 0x0222
+#define MT6397_VCA15_CON8 0x0224
+#define MT6397_VCA15_CON9 0x0226
+#define MT6397_VCA15_CON10 0x0228
+#define MT6397_VCA15_CON11 0x022A
+#define MT6397_VCA15_CON12 0x022C
+#define MT6397_VCA15_CON13 0x022E
+#define MT6397_VCA15_CON14 0x0230
+#define MT6397_VCA15_CON15 0x0232
+#define MT6397_VCA15_CON16 0x0234
+#define MT6397_VCA15_CON17 0x0236
+#define MT6397_VCA15_CON18 0x0238
+#define MT6397_VSRMCA15_CON0 0x023A
+#define MT6397_VSRMCA15_CON1 0x023C
+#define MT6397_VSRMCA15_CON2 0x023E
+#define MT6397_VSRMCA15_CON3 0x0240
+#define MT6397_VSRMCA15_CON4 0x0242
+#define MT6397_VSRMCA15_CON5 0x0244
+#define MT6397_VSRMCA15_CON6 0x0246
+#define MT6397_VSRMCA15_CON7 0x0248
+#define MT6397_VSRMCA15_CON8 0x024A
+#define MT6397_VSRMCA15_CON9 0x024C
+#define MT6397_VSRMCA15_CON10 0x024E
+#define MT6397_VSRMCA15_CON11 0x0250
+#define MT6397_VSRMCA15_CON12 0x0252
+#define MT6397_VSRMCA15_CON13 0x0254
+#define MT6397_VSRMCA15_CON14 0x0256
+#define MT6397_VSRMCA15_CON15 0x0258
+#define MT6397_VSRMCA15_CON16 0x025A
+#define MT6397_VSRMCA15_CON17 0x025C
+#define MT6397_VSRMCA15_CON18 0x025E
+#define MT6397_VSRMCA15_CON19 0x0260
+#define MT6397_VSRMCA15_CON20 0x0262
+#define MT6397_VSRMCA15_CON21 0x0264
+#define MT6397_VCORE_CON0 0x0266
+#define MT6397_VCORE_CON1 0x0268
+#define MT6397_VCORE_CON2 0x026A
+#define MT6397_VCORE_CON3 0x026C
+#define MT6397_VCORE_CON4 0x026E
+#define MT6397_VCORE_CON5 0x0270
+#define MT6397_VCORE_CON6 0x0272
+#define MT6397_VCORE_CON7 0x0274
+#define MT6397_VCORE_CON8 0x0276
+#define MT6397_VCORE_CON9 0x0278
+#define MT6397_VCORE_CON10 0x027A
+#define MT6397_VCORE_CON11 0x027C
+#define MT6397_VCORE_CON12 0x027E
+#define MT6397_VCORE_CON13 0x0280
+#define MT6397_VCORE_CON14 0x0282
+#define MT6397_VCORE_CON15 0x0284
+#define MT6397_VCORE_CON16 0x0286
+#define MT6397_VCORE_CON17 0x0288
+#define MT6397_VCORE_CON18 0x028A
+#define MT6397_VGPU_CON0 0x028C
+#define MT6397_VGPU_CON1 0x028E
+#define MT6397_VGPU_CON2 0x0290
+#define MT6397_VGPU_CON3 0x0292
+#define MT6397_VGPU_CON4 0x0294
+#define MT6397_VGPU_CON5 0x0296
+#define MT6397_VGPU_CON6 0x0298
+#define MT6397_VGPU_CON7 0x029A
+#define MT6397_VGPU_CON8 0x029C
+#define MT6397_VGPU_CON9 0x029E
+#define MT6397_VGPU_CON10 0x02A0
+#define MT6397_VGPU_CON11 0x02A2
+#define MT6397_VGPU_CON12 0x02A4
+#define MT6397_VGPU_CON13 0x02A6
+#define MT6397_VGPU_CON14 0x02A8
+#define MT6397_VGPU_CON15 0x02AA
+#define MT6397_VGPU_CON16 0x02AC
+#define MT6397_VGPU_CON17 0x02AE
+#define MT6397_VGPU_CON18 0x02B0
+#define MT6397_VIO18_CON0 0x0300
+#define MT6397_VIO18_CON1 0x0302
+#define MT6397_VIO18_CON2 0x0304
+#define MT6397_VIO18_CON3 0x0306
+#define MT6397_VIO18_CON4 0x0308
+#define MT6397_VIO18_CON5 0x030A
+#define MT6397_VIO18_CON6 0x030C
+#define MT6397_VIO18_CON7 0x030E
+#define MT6397_VIO18_CON8 0x0310
+#define MT6397_VIO18_CON9 0x0312
+#define MT6397_VIO18_CON10 0x0314
+#define MT6397_VIO18_CON11 0x0316
+#define MT6397_VIO18_CON12 0x0318
+#define MT6397_VIO18_CON13 0x031A
+#define MT6397_VIO18_CON14 0x031C
+#define MT6397_VIO18_CON15 0x031E
+#define MT6397_VIO18_CON16 0x0320
+#define MT6397_VIO18_CON17 0x0322
+#define MT6397_VIO18_CON18 0x0324
+#define MT6397_VPCA7_CON0 0x0326
+#define MT6397_VPCA7_CON1 0x0328
+#define MT6397_VPCA7_CON2 0x032A
+#define MT6397_VPCA7_CON3 0x032C
+#define MT6397_VPCA7_CON4 0x032E
+#define MT6397_VPCA7_CON5 0x0330
+#define MT6397_VPCA7_CON6 0x0332
+#define MT6397_VPCA7_CON7 0x0334
+#define MT6397_VPCA7_CON8 0x0336
+#define MT6397_VPCA7_CON9 0x0338
+#define MT6397_VPCA7_CON10 0x033A
+#define MT6397_VPCA7_CON11 0x033C
+#define MT6397_VPCA7_CON12 0x033E
+#define MT6397_VPCA7_CON13 0x0340
+#define MT6397_VPCA7_CON14 0x0342
+#define MT6397_VPCA7_CON15 0x0344
+#define MT6397_VPCA7_CON16 0x0346
+#define MT6397_VPCA7_CON17 0x0348
+#define MT6397_VPCA7_CON18 0x034A
+#define MT6397_VSRMCA7_CON0 0x034C
+#define MT6397_VSRMCA7_CON1 0x034E
+#define MT6397_VSRMCA7_CON2 0x0350
+#define MT6397_VSRMCA7_CON3 0x0352
+#define MT6397_VSRMCA7_CON4 0x0354
+#define MT6397_VSRMCA7_CON5 0x0356
+#define MT6397_VSRMCA7_CON6 0x0358
+#define MT6397_VSRMCA7_CON7 0x035A
+#define MT6397_VSRMCA7_CON8 0x035C
+#define MT6397_VSRMCA7_CON9 0x035E
+#define MT6397_VSRMCA7_CON10 0x0360
+#define MT6397_VSRMCA7_CON11 0x0362
+#define MT6397_VSRMCA7_CON12 0x0364
+#define MT6397_VSRMCA7_CON13 0x0366
+#define MT6397_VSRMCA7_CON14 0x0368
+#define MT6397_VSRMCA7_CON15 0x036A
+#define MT6397_VSRMCA7_CON16 0x036C
+#define MT6397_VSRMCA7_CON17 0x036E
+#define MT6397_VSRMCA7_CON18 0x0370
+#define MT6397_VSRMCA7_CON19 0x0372
+#define MT6397_VSRMCA7_CON20 0x0374
+#define MT6397_VSRMCA7_CON21 0x0376
+#define MT6397_VDRM_CON0 0x0378
+#define MT6397_VDRM_CON1 0x037A
+#define MT6397_VDRM_CON2 0x037C
+#define MT6397_VDRM_CON3 0x037E
+#define MT6397_VDRM_CON4 0x0380
+#define MT6397_VDRM_CON5 0x0382
+#define MT6397_VDRM_CON6 0x0384
+#define MT6397_VDRM_CON7 0x0386
+#define MT6397_VDRM_CON8 0x0388
+#define MT6397_VDRM_CON9 0x038A
+#define MT6397_VDRM_CON10 0x038C
+#define MT6397_VDRM_CON11 0x038E
+#define MT6397_VDRM_CON12 0x0390
+#define MT6397_VDRM_CON13 0x0392
+#define MT6397_VDRM_CON14 0x0394
+#define MT6397_VDRM_CON15 0x0396
+#define MT6397_VDRM_CON16 0x0398
+#define MT6397_VDRM_CON17 0x039A
+#define MT6397_VDRM_CON18 0x039C
+#define MT6397_BUCK_K_CON0 0x039E
+#define MT6397_BUCK_K_CON1 0x03A0
+#define MT6397_ANALDO_CON0 0x0400
+#define MT6397_ANALDO_CON1 0x0402
+#define MT6397_ANALDO_CON2 0x0404
+#define MT6397_ANALDO_CON3 0x0406
+#define MT6397_ANALDO_CON4 0x0408
+#define MT6397_ANALDO_CON5 0x040A
+#define MT6397_ANALDO_CON6 0x040C
+#define MT6397_ANALDO_CON7 0x040E
+#define MT6397_DIGLDO_CON0 0x0410
+#define MT6397_DIGLDO_CON1 0x0412
+#define MT6397_DIGLDO_CON2 0x0414
+#define MT6397_DIGLDO_CON3 0x0416
+#define MT6397_DIGLDO_CON4 0x0418
+#define MT6397_DIGLDO_CON5 0x041A
+#define MT6397_DIGLDO_CON6 0x041C
+#define MT6397_DIGLDO_CON7 0x041E
+#define MT6397_DIGLDO_CON8 0x0420
+#define MT6397_DIGLDO_CON9 0x0422
+#define MT6397_DIGLDO_CON10 0x0424
+#define MT6397_DIGLDO_CON11 0x0426
+#define MT6397_DIGLDO_CON12 0x0428
+#define MT6397_DIGLDO_CON13 0x042A
+#define MT6397_DIGLDO_CON14 0x042C
+#define MT6397_DIGLDO_CON15 0x042E
+#define MT6397_DIGLDO_CON16 0x0430
+#define MT6397_DIGLDO_CON17 0x0432
+#define MT6397_DIGLDO_CON18 0x0434
+#define MT6397_DIGLDO_CON19 0x0436
+#define MT6397_DIGLDO_CON20 0x0438
+#define MT6397_DIGLDO_CON21 0x043A
+#define MT6397_DIGLDO_CON22 0x043C
+#define MT6397_DIGLDO_CON23 0x043E
+#define MT6397_DIGLDO_CON24 0x0440
+#define MT6397_DIGLDO_CON25 0x0442
+#define MT6397_DIGLDO_CON26 0x0444
+#define MT6397_DIGLDO_CON27 0x0446
+#define MT6397_DIGLDO_CON28 0x0448
+#define MT6397_DIGLDO_CON29 0x044A
+#define MT6397_DIGLDO_CON30 0x044C
+#define MT6397_DIGLDO_CON31 0x044E
+#define MT6397_DIGLDO_CON32 0x0450
+#define MT6397_DIGLDO_CON33 0x045A
+#define MT6397_SPK_CON0 0x0600
+#define MT6397_SPK_CON1 0x0602
+#define MT6397_SPK_CON2 0x0604
+#define MT6397_SPK_CON3 0x0606
+#define MT6397_SPK_CON4 0x0608
+#define MT6397_SPK_CON5 0x060A
+#define MT6397_SPK_CON6 0x060C
+#define MT6397_SPK_CON7 0x060E
+#define MT6397_SPK_CON8 0x0610
+#define MT6397_SPK_CON9 0x0612
+#define MT6397_SPK_CON10 0x0614
+#define MT6397_SPK_CON11 0x0616
+#define MT6397_AUDDAC_CON0 0x0700
+#define MT6397_AUDBUF_CFG0 0x0702
+#define MT6397_AUDBUF_CFG1 0x0704
+#define MT6397_AUDBUF_CFG2 0x0706
+#define MT6397_AUDBUF_CFG3 0x0708
+#define MT6397_AUDBUF_CFG4 0x070A
+#define MT6397_IBIASDIST_CFG0 0x070C
+#define MT6397_AUDACCDEPOP_CFG0 0x070E
+#define MT6397_AUD_IV_CFG0 0x0710
+#define MT6397_AUDCLKGEN_CFG0 0x0712
+#define MT6397_AUDLDO_CFG0 0x0714
+#define MT6397_AUDLDO_CFG1 0x0716
+#define MT6397_AUDNVREGGLB_CFG0 0x0718
+#define MT6397_AUD_NCP0 0x071A
+#define MT6397_AUDPREAMP_CON0 0x071C
+#define MT6397_AUDADC_CON0 0x071E
+#define MT6397_AUDADC_CON1 0x0720
+#define MT6397_AUDADC_CON2 0x0722
+#define MT6397_AUDADC_CON3 0x0724
+#define MT6397_AUDADC_CON4 0x0726
+#define MT6397_AUDADC_CON5 0x0728
+#define MT6397_AUDADC_CON6 0x072A
+#define MT6397_AUDDIGMI_CON0 0x072C
+#define MT6397_AUDLSBUF_CON0 0x072E
+#define MT6397_AUDLSBUF_CON1 0x0730
+#define MT6397_AUDENCSPARE_CON0 0x0732
+#define MT6397_AUDENCCLKSQ_CON0 0x0734
+#define MT6397_AUDPREAMPGAIN_CON0 0x0736
+#define MT6397_ZCD_CON0 0x0738
+#define MT6397_ZCD_CON1 0x073A
+#define MT6397_ZCD_CON2 0x073C
+#define MT6397_ZCD_CON3 0x073E
+#define MT6397_ZCD_CON4 0x0740
+#define MT6397_ZCD_CON5 0x0742
+#define MT6397_NCP_CLKDIV_CON0 0x0744
+#define MT6397_NCP_CLKDIV_CON1 0x0746
+
+#endif /* __MFD_MT6397_REGISTERS_H__ */
--
1.8.1.1.dirty
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 2/7] mfd: MT6397: Add regmap for MT8135 and MT6397 SoC
2014-11-17 7:40 Add Support for MediaTek PMIC MT6397 MFD Core and Regulator Flora Fu
2014-11-17 7:40 ` [PATCH 1/7] mfd: MT6397: Add support for PMIC MT6397 MFD Flora Fu
@ 2014-11-17 7:40 ` Flora Fu
2014-11-18 11:46 ` Lee Jones
2014-11-17 7:40 ` [PATCH 3/7] regulator: MT6397: Add support for MT6397 regulator Flora Fu
` (4 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Flora Fu @ 2014-11-17 7:40 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Matthias Brugger
Cc: Ashwin Chaugule, Vladimir Murzin, Russell King, Samuel Ortiz,
Pawel Moll, Ian Campbell, Catalin Marinas, srv_heupstream,
Liam Girdwood, linux-kernel, Flora Fu, devicetree, Mark Brown,
Sascha Hauer, Kumar Gala, Grant Likely, Joe.C, Eddie Huang,
Lee Jones, linux-arm-kernel, Dongdong Cheng
Add PMIC wrapper of MT8135 to access MFD MT6397.
This is regmap of MT6397 MFD.
Signed-off-by: Flora Fu <flora.fu@mediatek.com>
---
drivers/mfd/Kconfig | 8 +
drivers/mfd/Makefile | 1 +
drivers/mfd/mt8135-pmic-wrap.c | 847 +++++++++++++++++++++++++++++++++++++++++
drivers/mfd/mt8135-pmic-wrap.h | 138 +++++++
4 files changed, 994 insertions(+)
create mode 100644 drivers/mfd/mt8135-pmic-wrap.c
create mode 100644 drivers/mfd/mt8135-pmic-wrap.h
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index f0b3efc..6559cf3 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1328,6 +1328,14 @@ config MFD_MT6397
accessing the device; additional drivers must be enabled in order
to use the functionality of the device.
+config MT8135_PMIC_WRAP
+ tristate "MediaTek MT8135 PMIC Wrapper Support"
+ help
+ Say yes here to add support for MediaTek MT8135 PMIC Wrapper. This is
+ for PMIC connect. This driver provides common support for
+ accessing the pmic; additional drivers must be enabled in order
+ to use the functionality of the device.
+
menu "Multimedia Capabilities Port drivers"
depends on ARCH_SA1100
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 7168193..4b802ba 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -178,3 +178,4 @@ obj-$(CONFIG_MFD_HI6421_PMIC) += hi6421-pmic-core.o
intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o
obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o
obj-$(CONFIG_MFD_MT6397) += mt6397-core.o
+obj-$(CONFIG_MT8135_PMIC_WRAP) += mt8135-pmic-wrap.o
diff --git a/drivers/mfd/mt8135-pmic-wrap.c b/drivers/mfd/mt8135-pmic-wrap.c
new file mode 100644
index 0000000..42c3262
--- /dev/null
+++ b/drivers/mfd/mt8135-pmic-wrap.c
@@ -0,0 +1,847 @@
+/*
+ * Copyright (c) 2014 MediaTek Inc.
+ * Author: Flora.Fu <flora.fu@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/clk.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/module.h>
+#include <linux/mfd/mt6397/registers.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+#include "mt8135-pmic-wrap.h"
+#include "mtk-pmic-wrap.h"
+
+/* macro for wrapper status */
+#define PWRAP_GET_WACS0_WDATA(x) (((x) >> 0) & 0x0000ffff)
+#define PWRAP_GET_WACS0_ADR(x) (((x) >> 16) & 0x00007fff)
+#define PWRAP_GET_WACS0_WRITE(x) (((x) >> 31) & 0x00000001)
+#define PWRAP_GET_WACS0_RDATA(x) (((x) >> 0) & 0x0000ffff)
+#define PWRAP_GET_WACS0_FSM(x) (((x) >> 16) & 0x00000007)
+#define PWRAP_STATE_SYNC_IDLE0 (1 << 20)
+#define PWRAP_STATE_INIT_DONE0 (1 << 21)
+
+/* macro for WACS FSM */
+#define PWRAP_WACS_FSM_IDLE 0x00
+#define PWRAP_WACS_FSM_REQ 0x02
+#define PWRAP_WACS_FSM_WFDLE 0x04
+#define PWRAP_WACS_FSM_WFVLDCLR 0x06
+#define PWRAP_WACS_INIT_DONE 0x01
+#define PWRAP_WACS_WACS_SYNC_IDLE 0x01
+
+/* macro for device wrapper default value */
+#define PWRAP_DEW_READ_TEST_VAL 0x5aa5
+#define PWRAP_DEW_WRITE_TEST_VAL 0xa55a
+
+/* macro for manual command */
+#define PWRAP_OP_WR 0x1
+#define PWRAP_OP_RD 0x0
+#define PWRAP_OP_CSH 0x0
+#define PWRAP_OP_CSL 0x1
+#define PWRAP_OP_OUTS 0x8
+#define PWRAP_OP_OUTD 0x9
+#define PWRAP_OP_OUTQ 0xA
+
+static bool is_fsm_idle(u32 x)
+{
+ return PWRAP_GET_WACS0_FSM(x) == PWRAP_WACS_FSM_IDLE;
+}
+
+static bool is_fsm_vldclr(u32 x)
+{
+ return PWRAP_GET_WACS0_FSM(x) == PWRAP_WACS_FSM_WFVLDCLR;
+}
+
+static bool is_sync_idle(u32 x)
+{
+ return x & PWRAP_STATE_SYNC_IDLE0;
+}
+
+static bool is_fsm_idle_and_sync_idle(u32 x)
+{
+ return (PWRAP_GET_WACS0_FSM(x) == PWRAP_WACS_FSM_IDLE) &&
+ (x & PWRAP_STATE_SYNC_IDLE0);
+}
+
+static bool is_cipher_ready(u32 x)
+{
+ return x == 1;
+}
+
+static int wait_for_state_ready(
+ struct pmic_wrapper *wrp, bool (*fp)(u32),
+ void *wacs_register, void *wacs_vldclr_register, u32 *read_reg)
+{
+ u32 reg_rdata;
+ unsigned long timeout;
+ int timeout_retry = 0;
+ struct device *dev = &wrp->pdev->dev;
+
+ timeout = jiffies + usecs_to_jiffies(255);
+ do {
+ reg_rdata = readl(wacs_register);
+ if (time_after(jiffies, timeout)) {
+ if (timeout_retry) {
+ dev_err(dev, "timeout when waiting for idle\n");
+ return -ETIMEDOUT;
+ }
+ timeout_retry = 1;
+ }
+ } while (!fp(reg_rdata));
+
+ if (read_reg)
+ *read_reg = reg_rdata;
+
+ return 0;
+}
+
+static int pwrap_write(struct pmic_wrapper *wrp, u32 adr, u32 wdata)
+{
+ u32 wacs_cmd;
+ int ret;
+ void __iomem *pwrap_base = wrp->pwrap_base;
+ struct device *dev = &wrp->pdev->dev;
+
+ ret = wait_for_state_ready(wrp, is_fsm_idle,
+ pwrap_base + PWRAP_WACS2_RDATA,
+ pwrap_base + PWRAP_WACS2_VLDCLR, 0);
+ if (ret) {
+ dev_err(dev, "%s command fail, ret=%d\n", __func__, ret);
+ return ret;
+ }
+
+ wacs_cmd = (1 << 31) | ((adr >> 1) << 16) | wdata;
+ writel(wacs_cmd, pwrap_base + PWRAP_WACS2_CMD);
+
+ return 0;
+}
+
+static int pwrap_read(struct pmic_wrapper *wrp, u32 adr, u32 *rdata)
+{
+ u32 reg_rdata;
+ u32 wacs_cmd;
+ int ret;
+ u32 rval;
+ void __iomem *pwrap_base = wrp->pwrap_base;
+ struct device *dev = &wrp->pdev->dev;
+
+ if (!rdata)
+ return -EINVAL;
+
+ ret = wait_for_state_ready(wrp, is_fsm_idle,
+ pwrap_base + PWRAP_WACS2_RDATA,
+ pwrap_base + PWRAP_WACS2_VLDCLR, 0);
+ if (ret) {
+ dev_err(dev, "%s command fail, ret=%d\n", __func__, ret);
+ return ret;
+ }
+
+ wacs_cmd = (adr >> 1) << 16;
+ writel(wacs_cmd, pwrap_base + PWRAP_WACS2_CMD);
+
+ ret = wait_for_state_ready(wrp, is_fsm_vldclr,
+ pwrap_base + PWRAP_WACS2_RDATA, NULL, ®_rdata);
+ if (ret) {
+ dev_err(dev, "%s read fail, ret=%d\n", __func__, ret);
+ return ret;
+ }
+ rval = PWRAP_GET_WACS0_RDATA(reg_rdata);
+ writel(1, pwrap_base + PWRAP_WACS2_VLDCLR);
+ *rdata = rval;
+
+ return 0;
+}
+
+static int pwrap_regmap_read(void *context, u32 adr, u32 *rdata)
+{
+ u32 reg_rdata;
+
+ struct pmic_wrapper *wrp = context;
+ void __iomem *pwrap_base = wrp->pwrap_base;
+
+ reg_rdata = readl(pwrap_base + PWRAP_WACS2_RDATA);
+ if (PWRAP_GET_WACS0_FSM(reg_rdata) == PWRAP_WACS_FSM_WFVLDCLR)
+ writel(1, pwrap_base + PWRAP_WACS2_VLDCLR);
+
+ return pwrap_read(wrp, adr, rdata);
+}
+
+static int pwrap_regmap_write(void *context, u32 adr, u32 wdata)
+{
+ u32 reg_rdata;
+
+ struct pmic_wrapper *wrp = context;
+ void __iomem *pwrap_base = wrp->pwrap_base;
+
+ reg_rdata = readl(pwrap_base + PWRAP_WACS2_RDATA);
+ if (PWRAP_GET_WACS0_FSM(reg_rdata) == PWRAP_WACS_FSM_WFVLDCLR)
+ writel(1, pwrap_base + PWRAP_WACS2_VLDCLR);
+
+ return pwrap_write(wrp, adr, wdata);
+}
+
+static int pwrap_reset(struct pmic_wrapper *wrp)
+{
+ int ret;
+ struct reset_control *rstc_infracfg, *rstc_pericfg;
+ struct device *dev = &wrp->pdev->dev;
+
+ rstc_infracfg = devm_reset_control_get(dev, "infra-pwrap-rst");
+ if (IS_ERR(rstc_infracfg)) {
+ ret = PTR_ERR(rstc_infracfg);
+ dev_err(dev, "get pwrap-rst failed=%d\n", ret);
+ return ret;
+ }
+ rstc_pericfg = devm_reset_control_get(dev, "peri-pwrap-bridge-rst");
+ if (IS_ERR(rstc_pericfg)) {
+ ret = PTR_ERR(rstc_pericfg);
+ dev_err(dev, "get peri-pwrap-bridge-rst failed=%d\n", ret);
+ return ret;
+ }
+
+ reset_control_assert(rstc_infracfg);
+ reset_control_assert(rstc_pericfg);
+ reset_control_deassert(rstc_infracfg);
+ reset_control_deassert(rstc_pericfg);
+
+ return 0;
+}
+
+static int pwrap_set_clock(struct pmic_wrapper *wrp)
+{
+ int ret;
+ void __iomem *pwrap_base = wrp->pwrap_base;
+ struct device *dev = &wrp->pdev->dev;
+ struct clk *pmicspi;
+ struct clk *pmicspi_parent;
+
+ pmicspi = devm_clk_get(dev, "pmicspi-sel");
+ if (IS_ERR(pmicspi)) {
+ ret = PTR_ERR(pmicspi);
+ dev_err(dev, "pmicspi-sel fail ret=%d\n", ret);
+ return ret;
+ }
+ pmicspi_parent = devm_clk_get(dev, "pmicspi-parent");
+ if (IS_ERR(pmicspi_parent)) {
+ ret = PTR_ERR(pmicspi_parent);
+ dev_err(dev, "pmicspi-parent fail ret=%d\n", ret);
+ return ret;
+ }
+
+ /* Note: HW design, enable clock mux and then switch to new source. */
+ ret = clk_set_parent(pmicspi, pmicspi_parent);
+ if (ret) {
+ dev_err(dev, "prepare pmicspi clock fail, ret=%d\n", ret);
+ return ret;
+ }
+
+ ret = clk_prepare_enable(pmicspi);
+ if (ret) {
+ dev_err(dev, "prepare pmicspi clock fail, ret=%d\n", ret);
+ return ret;
+ }
+
+ /* Enable internal dynamic clock */
+ writel(1, pwrap_base + PWRAP_DCM_EN);
+ writel(0, pwrap_base + PWRAP_DCM_DBC_PRD);
+
+ return 0;
+}
+
+static int pwrap_reset_spislv(struct pmic_wrapper *wrp)
+{
+ int ret, i;
+ u32 cmd;
+ void __iomem *pwrap_base = wrp->pwrap_base;
+ struct device *dev = &wrp->pdev->dev;
+
+ writel(0, pwrap_base + PWRAP_HIPRIO_ARB_EN);
+ writel(0, pwrap_base + PWRAP_WRAP_EN);
+ writel(1, pwrap_base + PWRAP_MUX_SEL);
+ writel(1, pwrap_base + PWRAP_MAN_EN);
+ writel(0, pwrap_base + PWRAP_DIO_EN);
+
+ cmd = (PWRAP_OP_WR << 13) | (PWRAP_OP_CSL << 8);
+ writel(cmd, pwrap_base + PWRAP_MAN_CMD);
+
+ cmd = (PWRAP_OP_WR << 13) | (PWRAP_OP_OUTS << 8);
+ writel(cmd, pwrap_base + PWRAP_MAN_CMD);
+
+ cmd = (PWRAP_OP_WR << 13) | (PWRAP_OP_CSH << 8);
+ writel(cmd, pwrap_base + PWRAP_MAN_CMD);
+
+ for (i = 0; i < 4; i++) {
+ cmd = (PWRAP_OP_WR << 13) | (PWRAP_OP_OUTS << 8);
+ writel(cmd, pwrap_base + PWRAP_MAN_CMD);
+ }
+ ret = wait_for_state_ready(wrp, is_sync_idle,
+ pwrap_base + PWRAP_WACS2_RDATA, NULL, 0);
+ if (ret)
+ dev_err(dev, "%s fail, ret=%d\n", __func__, ret);
+
+ writel(0, pwrap_base + PWRAP_MAN_EN);
+ writel(0, pwrap_base + PWRAP_MUX_SEL);
+
+ return 0;
+}
+
+static int pwrap_init_sidly(struct pmic_wrapper *wrp)
+{
+ u32 arb_en_backup;
+ u32 rdata;
+ u32 ind;
+ u32 result;
+ u32 sidly;
+ bool failed = false;
+ void __iomem *pwrap_base = wrp->pwrap_base;
+ struct device *dev = &wrp->pdev->dev;
+
+ /* Enable WACS2 to do read test on bus */
+ writel(1, pwrap_base + PWRAP_WRAP_EN);
+ writel(0x8, pwrap_base + PWRAP_HIPRIO_ARB_EN);
+ writel(1, pwrap_base + PWRAP_WACS2_EN);
+ arb_en_backup = readl(pwrap_base + PWRAP_HIPRIO_ARB_EN);
+
+ /* Scan all SIDLY by Read Test */
+ result = 0;
+ for (ind = 0; ind < 4; ind++) {
+ writel(ind, wrp->pwrap_base + PWRAP_SIDLY);
+ pwrap_read(wrp, PWRAP_DEW_READ_TEST, &rdata);
+ if (rdata == PWRAP_DEW_READ_TEST_VAL) {
+ dev_info(dev, "[Read Test] pass, SIDLY=%x\n", ind);
+ result |= (0x1 << ind);
+ }
+ }
+
+ /* Config SIDLY according to results */
+ switch (result) {
+ /* only 1 pass, choose it */
+ case 0x1:
+ sidly = 0;
+ break;
+ case 0x2:
+ sidly = 1;
+ break;
+ case 0x4:
+ sidly = 2;
+ break;
+ case 0x8:
+ sidly = 3;
+ break;
+ /* two pass, choose the one on SIDLY boundary */
+ case 0x3:
+ sidly = 0;
+ break;
+ case 0x6: /* no boundary, choose smaller one */
+ sidly = 1;
+ break;
+ case 0xc:
+ sidly = 3;
+ break;
+ /* three pass, choose the middle one */
+ case 0x7:
+ sidly = 1;
+ break;
+ case 0xe:
+ sidly = 2;
+ break;
+ /* four pass, choose the smaller middle one */
+ case 0xf:
+ sidly = 1;
+ break;
+ /* pass range not continuous, should not happen */
+ default:
+ sidly = 0;
+ failed = true;
+ break;
+ }
+ writel(sidly, pwrap_base + PWRAP_SIDLY);
+ writel(arb_en_backup, pwrap_base + PWRAP_HIPRIO_ARB_EN);
+ if (!failed)
+ return 0;
+
+ dev_err(dev, "%s fail, result=%x\n", __func__, result);
+
+ return -EIO;
+}
+
+static int pwrap_init_reg_clock(struct pmic_wrapper *wrp, u32 regck_sel)
+{
+ u32 wdata;
+ u32 rdata;
+ void __iomem *pwrap_base = wrp->pwrap_base;
+ struct device *dev = &wrp->pdev->dev;
+
+ pwrap_read(wrp, MT6397_TOP_CKCON2, &rdata);
+ wdata = rdata & (~(0x3 << 10));
+ if (regck_sel == 1)
+ wdata |= (0x1 << 10);
+
+ if (pwrap_write(wrp, MT6397_TOP_CKCON2, wdata)) {
+ dev_err(dev, "Enable PMIC TOP_CKCON2 fail\n");
+ return -EFAULT;
+ }
+ switch (regck_sel) {
+ case 1:
+ writel(0xc, pwrap_base + PWRAP_CSHEXT);
+ writel(0x4, pwrap_base + PWRAP_CSHEXT_WRITE);
+ writel(0xc, pwrap_base + PWRAP_CSHEXT_READ);
+ writel(0x0, pwrap_base + PWRAP_CSLEXT_START);
+ writel(0x0, pwrap_base + PWRAP_CSLEXT_END);
+ break;
+ case 2:
+ writel(0x4, pwrap_base + PWRAP_CSHEXT);
+ writel(0x0, pwrap_base + PWRAP_CSHEXT_WRITE);
+ writel(0x4, pwrap_base + PWRAP_CSHEXT_READ);
+ writel(0x0, pwrap_base + PWRAP_CSLEXT_START);
+ writel(0x0, pwrap_base + PWRAP_CSLEXT_END);
+ break;
+ default:
+ writel(0xf, pwrap_base + PWRAP_CSHEXT);
+ writel(0xf, pwrap_base + PWRAP_CSHEXT_WRITE);
+ writel(0xf, pwrap_base + PWRAP_CSHEXT_READ);
+ writel(0xf, pwrap_base + PWRAP_CSLEXT_START);
+ writel(0xf, pwrap_base + PWRAP_CSLEXT_END);
+ break;
+ }
+
+ /* Enable PMIC side reg clock */
+ if (pwrap_write(wrp, MT6397_WRP_CKPDN, 0) ||
+ pwrap_write(wrp, MT6397_WRP_RST_CON, 0)) {
+ dev_err(dev, "Enable PMIC fail\n");
+ return -EFAULT;
+ }
+
+ return 0;
+}
+
+static int pwrap_init_dio(struct pmic_wrapper *wrp, u32 dio_en)
+{
+ u32 arb_en_backup;
+ u32 rdata;
+ int ret;
+ void __iomem *pwrap_base = wrp->pwrap_base;
+ struct device *dev = &wrp->pdev->dev;
+
+ arb_en_backup = readl(pwrap_base + PWRAP_HIPRIO_ARB_EN);
+ writel(0x8, pwrap_base + PWRAP_HIPRIO_ARB_EN);
+ pwrap_write(wrp, PWRAP_DEW_DIO_EN, dio_en);
+
+ /* Check IDLE & INIT_DONE in advance */
+ ret = wait_for_state_ready(wrp, is_fsm_idle_and_sync_idle,
+ pwrap_base + PWRAP_WACS2_RDATA, NULL, 0);
+ if (ret) {
+ dev_err(dev, "%s fail, ret=%d\n", __func__, ret);
+ return ret;
+ }
+ writel(dio_en, pwrap_base + PWRAP_DIO_EN);
+
+ /* Read Test */
+ pwrap_read(wrp, PWRAP_DEW_READ_TEST, &rdata);
+ if (rdata != PWRAP_DEW_READ_TEST_VAL) {
+ dev_err(dev, "DIO Test Fail en=%x, rdata=%x\n", dio_en, rdata);
+ return -EFAULT;
+ }
+
+ writel(arb_en_backup, pwrap_base + PWRAP_HIPRIO_ARB_EN);
+ return 0;
+}
+
+static int pwrap_init_cipher(struct pmic_wrapper *wrp)
+{
+ int ret;
+ u32 arb_en_backup;
+ u32 rdata;
+ unsigned long timeout;
+ int timeout_retry = 0;
+ void __iomem *pwrap_base = wrp->pwrap_base;
+ struct device *dev = &wrp->pdev->dev;
+
+ arb_en_backup = readl(pwrap_base + PWRAP_HIPRIO_ARB_EN);
+
+ writel(0x8, pwrap_base + PWRAP_HIPRIO_ARB_EN);
+ writel(1, pwrap_base + PWRAP_CIPHER_SWRST);
+ writel(0, pwrap_base + PWRAP_CIPHER_SWRST);
+ writel(1, pwrap_base + PWRAP_CIPHER_KEY_SEL);
+ writel(2, pwrap_base + PWRAP_CIPHER_IV_SEL);
+ writel(1, pwrap_base + PWRAP_CIPHER_LOAD);
+ writel(1, pwrap_base + PWRAP_CIPHER_START);
+
+ /* Config cipher mode @PMIC */
+ pwrap_write(wrp, PWRAP_DEW_CIPHER_SWRST, 0x1);
+ pwrap_write(wrp, PWRAP_DEW_CIPHER_SWRST, 0x0);
+ pwrap_write(wrp, PWRAP_DEW_CIPHER_KEY_SEL, 0x1);
+ pwrap_write(wrp, PWRAP_DEW_CIPHER_IV_SEL, 0x2);
+ pwrap_write(wrp, PWRAP_DEW_CIPHER_LOAD, 0x1);
+ pwrap_write(wrp, PWRAP_DEW_CIPHER_START, 0x1);
+
+ /* wait for cipher data ready@AP */
+ ret = wait_for_state_ready(wrp, is_cipher_ready,
+ pwrap_base + PWRAP_CIPHER_RDY, NULL, 0);
+ if (ret) {
+ dev_err(dev, "cipher data ready@AP fail, ret=%d\n", ret);
+ return ret;
+ }
+
+ /* wait for cipher data ready@PMIC */
+ timeout = jiffies + usecs_to_jiffies(255);
+ do {
+ pwrap_read(wrp, PWRAP_DEW_CIPHER_RDY, &rdata);
+ if (time_after(jiffies, timeout)) {
+ if (timeout_retry) {
+ dev_err(dev, "timeout when waiting for idle\n");
+ return -ETIMEDOUT;
+ }
+ timeout_retry = 1;
+ }
+ } while (rdata != 0x1);
+
+ /* wait for cipher mode idle */
+ pwrap_write(wrp, PWRAP_DEW_CIPHER_MODE, 0x1);
+ ret = wait_for_state_ready(wrp, is_fsm_idle_and_sync_idle,
+ pwrap_base + PWRAP_WACS2_RDATA, NULL, 0);
+ if (ret) {
+ dev_err(dev, "cipher mode idle fail, ret=%d\n", ret);
+ return ret;
+ }
+
+ writel(1, pwrap_base + PWRAP_CIPHER_MODE);
+ writel(arb_en_backup, pwrap_base + PWRAP_HIPRIO_ARB_EN);
+ /* Write Test */
+ if (pwrap_write(wrp, PWRAP_DEW_WRITE_TEST, PWRAP_DEW_WRITE_TEST_VAL) ||
+ pwrap_read(wrp, PWRAP_DEW_WRITE_TEST, &rdata) ||
+ (rdata != PWRAP_DEW_WRITE_TEST_VAL)) {
+ dev_err(dev, "rdata=0x%04X\n", rdata);
+ return -EFAULT;
+ }
+
+ return 0;
+}
+
+static int pwrap_init_crc(struct pmic_wrapper *wrp)
+{
+ void __iomem *pwrap_base = wrp->pwrap_base;
+
+ if (pwrap_write(wrp, PWRAP_DEW_CRC_EN, 0x1))
+ return -EFAULT;
+
+ writel(0x1, pwrap_base + PWRAP_CRC_EN);
+ writel(0x0, pwrap_base + PWRAP_SIG_MODE);
+ writel(PWRAP_DEW_CRC_VAL, pwrap_base + PWRAP_SIG_ADR);
+
+ return 0;
+}
+
+static int pwrap_enable_wacs(struct pmic_wrapper *wrp)
+{
+ void __iomem *pwrap_base = wrp->pwrap_base;
+
+ writel(0x1ff, pwrap_base + PWRAP_HIPRIO_ARB_EN);
+ writel(0x7, pwrap_base + PWRAP_RRARB_EN);
+ writel(0x1, pwrap_base + PWRAP_WACS0_EN);
+ writel(0x1, pwrap_base + PWRAP_WACS1_EN);
+ writel(0x1, pwrap_base + PWRAP_WACS2_EN);
+ writel(0x5, pwrap_base + PWRAP_STAUPD_PRD);
+ writel(0xff, pwrap_base + PWRAP_STAUPD_GRPEN);
+ writel(0xf, pwrap_base + PWRAP_WDT_UNIT);
+ writel(0xffffffff, pwrap_base + PWRAP_WDT_SRC_EN);
+ writel(0x1, pwrap_base + PWRAP_TIMER_EN);
+ writel(~((1 << 31) | (1 << 1)), pwrap_base + PWRAP_INT_EN);
+
+ return 0;
+}
+
+static int pwrap_enable_event_bridge(struct pmic_wrapper *wrp)
+{
+ void __iomem *pwrap_base = wrp->pwrap_base;
+ void __iomem *pwrap_bridge_base = wrp->pwrap_bridge_base;
+ struct device *dev = &wrp->pdev->dev;
+
+ /* enable pwrap events and pwrap bridge in AP side */
+ writel(0x1, pwrap_base + PWRAP_EVENT_IN_EN);
+ writel(0xffff, pwrap_base + PWRAP_EVENT_DST_EN);
+ writel(0x7f, pwrap_bridge_base + PWRAP_BRIDGE_IORD_ARB_EN);
+ writel(0x1, pwrap_bridge_base + PWRAP_BRIDGE_WACS3_EN);
+ writel(0x1, pwrap_bridge_base + PWRAP_BRIDGE_WACS4_EN);
+ writel(0x1, pwrap_bridge_base + PWRAP_BRIDGE_WDT_UNIT);
+ writel(0xffff, pwrap_bridge_base + PWRAP_BRIDGE_WDT_SRC_EN);
+ writel(0x1, pwrap_bridge_base + PWRAP_BRIDGE_TIMER_EN);
+ writel(0x7ff, pwrap_bridge_base + PWRAP_BRIDGE_INT_EN);
+
+ /* enable PMIC event out and sources */
+ if (pwrap_write(wrp, PWRAP_DEW_EVENT_OUT_EN, 0x1) ||
+ pwrap_write(wrp, PWRAP_DEW_EVENT_SRC_EN, 0xffff)) {
+ dev_err(dev, "enable dewrap fail\n");
+ return -EFAULT;
+ }
+
+ return 0;
+}
+
+static int pwrap_switch_event_pin(struct pmic_wrapper *wrp)
+{
+ u32 rdata;
+ struct device *dev = &wrp->pdev->dev;
+
+ /* switch event pin from usbdl mode to normal mode @ MT6397 */
+ if (pwrap_read(wrp, MT6397_TOP_CKCON3, &rdata) ||
+ pwrap_write(wrp, MT6397_TOP_CKCON3, (rdata & 0x0007))) {
+ dev_err(dev, "switch event pin fail\n");
+ return -EFAULT;
+ }
+
+ return 0;
+};
+
+static int pwrap_init_done(struct pmic_wrapper *wrp)
+{
+ void __iomem *pwrap_base = wrp->pwrap_base;
+ void __iomem *pwrap_bridge_base = wrp->pwrap_bridge_base;
+
+ writel(1, pwrap_base + PWRAP_INIT_DONE2);
+ writel(1, pwrap_base + PWRAP_INIT_DONE0);
+ writel(1, pwrap_base + PWRAP_INIT_DONE1);
+ writel(1, pwrap_bridge_base + PWRAP_BRIDGE_INIT_DONE3);
+ writel(1, pwrap_bridge_base + PWRAP_BRIDGE_INIT_DONE4);
+
+ return 0;
+}
+
+static int pwrap_init(struct pmic_wrapper *wrp)
+{
+ int ret;
+
+ /* Reset pwrap and pwrap bridge in infracfg and perifcfg. */
+ ret = pwrap_reset(wrp);
+ if (ret)
+ return ret;
+
+ /* Set SPI_CK frequency = 26MHz */
+ ret = pwrap_set_clock(wrp);
+ if (ret)
+ return ret;
+
+ /* Reset SPI slave */
+ ret = pwrap_reset_spislv(wrp);
+ if (ret)
+ return ret;
+
+ /* Setup serial input delay */
+ ret = pwrap_init_sidly(wrp);
+ if (ret)
+ return ret;
+
+ /* SPI Waveform Configuration 0:safe mode, 1:18MHz, 2:26MHz */
+ ret = pwrap_init_reg_clock(wrp, 2);
+ if (ret)
+ return ret;
+
+ /* Enable dual IO mode */
+ ret = pwrap_init_dio(wrp, 1);
+ if (ret)
+ return ret;
+
+ /* Enable encryption */
+ ret = pwrap_init_cipher(wrp);
+ if (ret)
+ return ret;
+
+ /* Signature checking - using CRC */
+ ret = pwrap_init_crc(wrp);
+ if (ret)
+ return ret;
+
+ /* Enable all wrapper access */
+ ret = pwrap_enable_wacs(wrp);
+ if (ret)
+ return ret;
+
+ /* Switch event pin from usbdl mode to normal mode */
+ ret = pwrap_switch_event_pin(wrp);
+ if (ret)
+ return ret;
+
+ /* Enable evnts and pwrap bridge */
+ ret = pwrap_enable_event_bridge(wrp);
+ if (ret)
+ return ret;
+
+ /* Setup the init done registers */
+ ret = pwrap_init_done(wrp);
+ if (ret)
+ return ret;
+
+ return 0;
+
+}
+
+static int pwrap_iomap_init(struct platform_device *pdev)
+{
+ struct resource *res;
+ struct pmic_wrapper *wrp = platform_get_drvdata(pdev);
+ struct device *dev = &pdev->dev;
+
+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pwrap-base");
+ if (!res) {
+ dev_err(dev, "could not get pwrap-base resource\n");
+ return -ENODEV;
+ }
+ wrp->pwrap_base = devm_ioremap(dev, res->start, resource_size(res));
+ if (!wrp->pwrap_base) {
+ dev_err(dev, "could not get pwrap_base\n");
+ return -ENOMEM;
+ }
+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+ "pwrap-bridge-base");
+ if (!res) {
+ dev_err(dev, "could not get pwrap-bridge-base resource\n");
+ return -ENODEV;
+ }
+ wrp->pwrap_bridge_base = devm_ioremap(dev, res->start,
+ resource_size(res));
+ if (!wrp->pwrap_bridge_base) {
+ dev_err(dev, "could not get pwrap_bridge_base\n");
+ return -ENOMEM;
+ }
+
+ return 0;
+}
+
+static int pwrap_check_and_init(struct pmic_wrapper *wrp)
+{
+ int ret;
+ u32 rdata;
+ void __iomem *pwrap_base = wrp->pwrap_base;
+ struct device *dev = &wrp->pdev->dev;
+
+ rdata = readl(pwrap_base + PWRAP_INIT_DONE2);
+ if (rdata)
+ goto done;
+
+ ret = pwrap_init(wrp);
+ if (ret) {
+ dev_err(dev, "PMIC wrapper init error, ret=%d\n", ret);
+ return ret;
+ }
+
+done:
+ rdata = readl(pwrap_base + PWRAP_WACS2_RDATA);
+ if (!(rdata & PWRAP_STATE_INIT_DONE0)) {
+ dev_err(dev, "initialization isn't finished\n");
+ return -ENODEV;
+ }
+
+ return 0;
+}
+
+static irqreturn_t pwrap_interrupt(int irqno, void *dev_id)
+{
+ u32 rdata;
+ struct pmic_wrapper *wrp = dev_id;
+ void __iomem *pwrap_base = wrp->pwrap_base;
+ struct device *dev = &wrp->pdev->dev;
+
+ rdata = readl(pwrap_base + PWRAP_INT_FLG);
+ dev_err(dev, "unexpected interrupt int=0x%x\n", rdata);
+
+ writel(0x8, pwrap_base + PWRAP_HARB_HPRIO);
+ writel(0xffffffff, pwrap_base + PWRAP_INT_CLR);
+
+ return IRQ_HANDLED;
+}
+
+const struct regmap_config pwrap_regmap_config = {
+ .reg_bits = 16,
+ .val_bits = 16,
+ .reg_read = pwrap_regmap_read,
+ .reg_write = pwrap_regmap_write,
+};
+
+static int pwrap_probe(struct platform_device *pdev)
+{
+ int ret;
+ struct pmic_wrapper *wrp;
+ int irq;
+ struct device *dev = &pdev->dev;
+ struct device_node *np = pdev->dev.of_node;
+
+ wrp = devm_kzalloc(dev, sizeof(struct pmic_wrapper), GFP_KERNEL);
+ if (!wrp) {
+ dev_err(dev, "Error: No memory\n");
+ return -ENOMEM;
+ }
+ platform_set_drvdata(pdev, wrp);
+
+ ret = pwrap_iomap_init(pdev);
+ if (ret) {
+ dev_err(dev, "pwrap_iomap_init, ret=%d\n", ret);
+ return ret;
+ }
+
+ wrp->pdev = pdev;
+ ret = pwrap_check_and_init(wrp);
+ if (ret) {
+ dev_err(dev, "PMIC wrapper HW init failed=%d\n", ret);
+ return ret;
+ }
+
+ /* Register pwrap irq to catch interrupt when pwrap behaves abnormal. */
+ irq = platform_get_irq(pdev, 0);
+ ret = devm_request_threaded_irq(dev, irq,
+ pwrap_interrupt, NULL,
+ IRQF_TRIGGER_HIGH, "mt8135-pwrap", wrp);
+ if (ret) {
+ dev_err(dev, "Register IRQ failed, ret=%d\n", ret);
+ return ret;
+ }
+
+ wrp->regmap = devm_regmap_init(dev, NULL, wrp, &pwrap_regmap_config);
+ if (IS_ERR(wrp->regmap)) {
+ ret = PTR_ERR(wrp->regmap);
+ dev_err(dev, "Failed to allocate register map, ret=%d\n",
+ ret);
+ return ret;
+ }
+
+ ret = of_platform_populate(np, NULL, NULL, dev);
+ if (ret) {
+ dev_err(dev, "%s fail to create devices\n", np->full_name);
+ return ret;
+ }
+
+ return 0;
+}
+
+static struct of_device_id of_pwrap_match_tbl[] = {
+ {.compatible = "mediatek,mt8135-pwrap",},
+ {}
+};
+MODULE_DEVICE_TABLE(of, of_pwrap_match_tbl);
+
+static struct platform_driver pwrap_drv = {
+ .driver = {
+ .name = "mt8135-pwrap",
+ .owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(of_pwrap_match_tbl),
+ },
+ .probe = pwrap_probe,
+};
+
+module_platform_driver(pwrap_drv);
+
+MODULE_AUTHOR("Flora Fu <flora.fu@mediatek.com>");
+MODULE_DESCRIPTION("MediaTek MT8135 PMIC Wrapper Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mfd/mt8135-pmic-wrap.h b/drivers/mfd/mt8135-pmic-wrap.h
new file mode 100644
index 0000000..6d7f1f4
--- /dev/null
+++ b/drivers/mfd/mt8135-pmic-wrap.h
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2014 MediaTek Inc.
+ * Author: Flora.Fu <flora.fu@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __PMIC_WRAP_REGS_H__
+#define __PMIC_WRAP_REGS_H__
+
+/* macro for wrapper registers */
+#define PWRAP_MUX_SEL 0x0
+#define PWRAP_WRAP_EN 0x4
+#define PWRAP_DIO_EN 0x8
+#define PWRAP_SIDLY 0xC
+#define PWRAP_CSHEXT 0x10
+#define PWRAP_CSHEXT_WRITE 0x14
+#define PWRAP_CSHEXT_READ 0x18
+#define PWRAP_CSLEXT_START 0x1C
+#define PWRAP_CSLEXT_END 0x20
+#define PWRAP_STAUPD_PRD 0x24
+#define PWRAP_STAUPD_GRPEN 0x28
+#define PWRAP_STAUPD_MAN_TRIG 0x2C
+#define PWRAP_STAUPD_STA 0x30
+#define PWRAP_EVENT_IN_EN 0x34
+#define PWRAP_EVENT_DST_EN 0x38
+#define PWRAP_WRAP_STA 0x3C
+#define PWRAP_RRARB_INIT 0x40
+#define PWRAP_RRARB_EN 0x44
+#define PWRAP_RRARB_STA0 0x48
+#define PWRAP_RRARB_STA1 0x4C
+#define PWRAP_HARB_INIT 0x50
+#define PWRAP_HARB_HPRIO 0x54
+#define PWRAP_HIPRIO_ARB_EN 0x58
+#define PWRAP_HARB_STA0 0x5C
+#define PWRAP_HARB_STA1 0x60
+#define PWRAP_MAN_EN 0x64
+#define PWRAP_MAN_CMD 0x68
+#define PWRAP_MAN_RDATA 0x6C
+#define PWRAP_MAN_VLDCLR 0x70
+#define PWRAP_WACS0_EN 0x74
+#define PWRAP_INIT_DONE0 0x78
+#define PWRAP_WACS0_CMD 0x7C
+#define PWRAP_WACS0_RDATA 0x80
+#define PWRAP_WACS0_VLDCLR 0x84
+#define PWRAP_WACS1_EN 0x88
+#define PWRAP_INIT_DONE1 0x8C
+#define PWRAP_WACS1_CMD 0x90
+#define PWRAP_WACS1_RDATA 0x94
+#define PWRAP_WACS1_VLDCLR 0x98
+#define PWRAP_WACS2_EN 0x9C
+#define PWRAP_INIT_DONE2 0xA0
+#define PWRAP_WACS2_CMD 0xA4
+#define PWRAP_WACS2_RDATA 0xA8
+#define PWRAP_WACS2_VLDCLR 0xAC
+#define PWRAP_INT_EN 0xB0
+#define PWRAP_INT_FLG_RAW 0xB4
+#define PWRAP_INT_FLG 0xB8
+#define PWRAP_INT_CLR 0xBC
+#define PWRAP_SIG_ADR 0xC0
+#define PWRAP_SIG_MODE 0xC4
+#define PWRAP_SIG_VALUE 0xC8
+#define PWRAP_SIG_ERRVAL 0xCC
+#define PWRAP_CRC_EN 0xD0
+#define PWRAP_EVENT_STA 0xD4
+#define PWRAP_EVENT_STACLR 0xD8
+#define PWRAP_TIMER_EN 0xDC
+#define PWRAP_TIMER_STA 0xE0
+#define PWRAP_WDT_UNIT 0xE4
+#define PWRAP_WDT_SRC_EN 0xE8
+#define PWRAP_WDT_FLG 0xEC
+#define PWRAP_DEBUG_INT_SEL 0xF0
+#define PWRAP_CIPHER_KEY_SEL 0x134
+#define PWRAP_CIPHER_IV_SEL 0x138
+#define PWRAP_CIPHER_LOAD 0x13C
+#define PWRAP_CIPHER_START 0x140
+#define PWRAP_CIPHER_RDY 0x144
+#define PWRAP_CIPHER_MODE 0x148
+#define PWRAP_CIPHER_SWRST 0x14C
+#define PWRAP_DCM_EN 0x15C
+#define PWRAP_DCM_DBC_PRD 0x160
+
+/* macro for wrapper bridge registers */
+#define PWRAP_BRIDGE_IARB_INIT 0x0
+#define PWRAP_BRIDGE_IORD_ARB_EN 0x4
+#define PWRAP_BRIDGE_IARB_STA0 0x8
+#define PWRAP_BRIDGE_IARB_STA1 0xC
+#define PWRAP_BRIDGE_WACS3_EN 0x10
+#define PWRAP_BRIDGE_INIT_DONE3 0x14
+#define PWRAP_BRIDGE_WACS3_CMD 0x18
+#define PWRAP_BRIDGE_WACS3_RDATA 0x1C
+#define PWRAP_BRIDGE_WACS3_VLDCLR 0x20
+#define PWRAP_BRIDGE_WACS4_EN 0x24
+#define PWRAP_BRIDGE_INIT_DONE4 0x28
+#define PWRAP_BRIDGE_WACS4_CMD 0x2C
+#define PWRAP_BRIDGE_WACS4_RDATA 0x30
+#define PWRAP_BRIDGE_WACS4_VLDCLR 0x34
+#define PWRAP_BRIDGE_INT_EN 0x38
+#define PWRAP_BRIDGE_INT_FLG_RAW 0x3C
+#define PWRAP_BRIDGE_INT_FLG 0x40
+#define PWRAP_BRIDGE_INT_CLR 0x44
+#define PWRAP_BRIDGE_TIMER_EN 0x48
+#define PWRAP_BRIDGE_TIMER_STA 0x4C
+#define PWRAP_BRIDGE_WDT_UNIT 0x50
+#define PWRAP_BRIDGE_WDT_SRC_EN 0x54
+#define PWRAP_BRIDGE_WDT_FLG 0x58
+#define PWRAP_BRIDGE_DEBUG_INT_SE 0x5C
+
+/* macro for slave device wrapper registers */
+#define PWRAP_DEW_BASE 0xBC00
+#define PWRAP_DEW_EVENT_OUT_EN (PWRAP_DEW_BASE + 0x0)
+#define PWRAP_DEW_DIO_EN (PWRAP_DEW_BASE + 0x2)
+#define PWRAP_DEW_EVENT_SRC_EN (PWRAP_DEW_BASE + 0x4)
+#define PWRAP_DEW_EVENT_SRC (PWRAP_DEW_BASE + 0x6)
+#define PWRAP_DEW_EVENT_FLAG (PWRAP_DEW_BASE + 0x8)
+#define PWRAP_DEW_READ_TEST (PWRAP_DEW_BASE + 0xA)
+#define PWRAP_DEW_WRITE_TEST (PWRAP_DEW_BASE + 0xC)
+#define PWRAP_DEW_CRC_EN (PWRAP_DEW_BASE + 0xE)
+#define PWRAP_DEW_CRC_VAL (PWRAP_DEW_BASE + 0x10)
+#define PWRAP_DEW_MON_GRP_SEL (PWRAP_DEW_BASE + 0x12)
+#define PWRAP_DEW_MON_FLAG_SEL (PWRAP_DEW_BASE + 0x14)
+#define PWRAP_DEW_EVENT_TEST (PWRAP_DEW_BASE + 0x16)
+#define PWRAP_DEW_CIPHER_KEY_SEL (PWRAP_DEW_BASE + 0x18)
+#define PWRAP_DEW_CIPHER_IV_SEL (PWRAP_DEW_BASE + 0x1A)
+#define PWRAP_DEW_CIPHER_LOAD (PWRAP_DEW_BASE + 0x1C)
+#define PWRAP_DEW_CIPHER_START (PWRAP_DEW_BASE + 0x1E)
+#define PWRAP_DEW_CIPHER_RDY (PWRAP_DEW_BASE + 0x20)
+#define PWRAP_DEW_CIPHER_MODE (PWRAP_DEW_BASE + 0x22)
+#define PWRAP_DEW_CIPHER_SWRST (PWRAP_DEW_BASE + 0x24)
+
+#endif /* __PMIC_WRAP_REGS_H__ */
--
1.8.1.1.dirty
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 3/7] regulator: MT6397: Add support for MT6397 regulator
2014-11-17 7:40 Add Support for MediaTek PMIC MT6397 MFD Core and Regulator Flora Fu
2014-11-17 7:40 ` [PATCH 1/7] mfd: MT6397: Add support for PMIC MT6397 MFD Flora Fu
2014-11-17 7:40 ` [PATCH 2/7] mfd: MT6397: Add regmap for MT8135 and MT6397 SoC Flora Fu
@ 2014-11-17 7:40 ` Flora Fu
[not found] ` <1416210027-5562-4-git-send-email-flora.fu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2014-11-17 7:40 ` [PATCH 4/7] dt-bindings: Add document for MT6397 MFD Flora Fu
` (3 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Flora Fu @ 2014-11-17 7:40 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Matthias Brugger
Cc: Ashwin Chaugule, Vladimir Murzin, Russell King, Samuel Ortiz,
Pawel Moll, Ian Campbell, Catalin Marinas, srv_heupstream,
Liam Girdwood, linux-kernel, Flora Fu, devicetree, Mark Brown,
Sascha Hauer, Kumar Gala, Grant Likely, Joe.C, Eddie Huang,
Lee Jones, linux-arm-kernel, Dongdong Cheng
This patch is MT6397 regulator driver.
signed-off-by: Flora Fu <flora.fu@mediatek.com>
---
drivers/regulator/Kconfig | 6 +
drivers/regulator/Makefile | 1 +
drivers/regulator/mt6397-regulator.c | 547 +++++++++++++++++++++++++++++
include/linux/regulator/mt6397-regulator.h | 50 +++
4 files changed, 604 insertions(+)
create mode 100644 drivers/regulator/mt6397-regulator.c
create mode 100644 include/linux/regulator/mt6397-regulator.h
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 55d7b7b..ced47af 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -725,5 +725,11 @@ config REGULATOR_WM8994
This driver provides support for the voltage regulators on the
WM8994 CODEC.
+config REGULATOR_MT6397
+ tristate "MediaTek MT6397 PMIC"
+ depends on MFD_MT6397
+ help
+ This driver provides support for the voltage regulators on the MediaTek MT6397 PMIC.
+
endif
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 1029ed3..3622ece 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -95,6 +95,7 @@ obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o
obj-$(CONFIG_REGULATOR_WM8350) += wm8350-regulator.o
obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o
obj-$(CONFIG_REGULATOR_WM8994) += wm8994-regulator.o
+obj-$(CONFIG_REGULATOR_MT6397) += mt6397-regulator.o
ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG
diff --git a/drivers/regulator/mt6397-regulator.c b/drivers/regulator/mt6397-regulator.c
new file mode 100644
index 0000000..6ff0c22
--- /dev/null
+++ b/drivers/regulator/mt6397-regulator.c
@@ -0,0 +1,547 @@
+/*
+ * Copyright (c) 2014 MediaTek Inc.
+ * Author: Flora.Fu <flora.fu@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/regmap.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/of_regulator.h>
+#include <linux/regulator/mt6397-regulator.h>
+#include <linux/mfd/mt6397/core.h>
+#include <linux/mfd/mt6397/registers.h>
+
+struct mt6397_buck_conf {
+ unsigned int vosel_reg;
+ unsigned int voselon_reg;
+ unsigned int nivosel_reg;
+ unsigned int vosel_mask;
+};
+
+struct mt6397_ldo_conf {
+ unsigned int is_fixed;
+ unsigned int vosel_reg;
+ unsigned int vosel_mask;
+ unsigned int vosel_shift;
+};
+
+struct mt6397_regulator_info {
+ struct regulator_desc desc;
+ struct mt6397_buck_conf buck_conf;
+ struct mt6397_ldo_conf ldo_conf;
+ unsigned int qi;
+ unsigned int qi_mask;
+};
+
+struct mt6397_regulator_data {
+ int id;
+ const char *name;
+ struct regulator_init_data *initdata;
+ struct device_node *reg_node;
+};
+
+struct mt6397_regulator_priv {
+ struct mt6397_regulator_data *regulators;
+ unsigned int num_regulators;
+};
+
+#define MT6397_BUCK(vreg, min, max, step, volt_ranges, \
+ enreg, vosel, voselon, nivosel) \
+[MT6397_ID_##vreg] = { \
+ .desc = { \
+ .name = #vreg, \
+ .ops = &mt6397_volt_range_ops, \
+ .type = REGULATOR_VOLTAGE, \
+ .id = MT6397_ID_##vreg, \
+ .owner = THIS_MODULE, \
+ .n_voltages = (max - min)/step + 1, \
+ .linear_ranges = volt_ranges, \
+ .n_linear_ranges = ARRAY_SIZE(volt_ranges), \
+ .enable_reg = enreg, \
+ .enable_mask = BIT(0), \
+ }, \
+ .qi = enreg, \
+ .qi_mask = BIT(13), \
+ .buck_conf = { \
+ .vosel_reg = vosel, \
+ .voselon_reg = voselon, \
+ .nivosel_reg = nivosel, \
+ .vosel_mask = 0x7f, \
+ }, \
+}
+
+#define MT6397_BUCK_TABLE(vreg, buck_volt_table, \
+ enreg, vosel, voselon, nivosel) \
+[MT6397_ID_##vreg] = { \
+ .desc = { \
+ .name = #vreg, \
+ .ops = &mt6397_volt_table_ops, \
+ .type = REGULATOR_VOLTAGE, \
+ .id = MT6397_ID_##vreg, \
+ .owner = THIS_MODULE, \
+ .n_voltages = 1, \
+ .volt_table = buck_volt_table, \
+ .enable_reg = enreg, \
+ .enable_mask = BIT(0), \
+ }, \
+ .qi = enreg, \
+ .qi_mask = BIT(13), \
+ .buck_conf = { \
+ .vosel_reg = vosel, \
+ .voselon_reg = voselon, \
+ .nivosel_reg = nivosel, \
+ .vosel_mask = 0x1f, \
+ }, \
+}
+
+#define MT6397_LDO(vreg, ldo_volt_table, \
+ enreg, enbit, fixed, vosel, _vosel_mask, \
+ _vosel_shift) \
+[MT6397_ID_##vreg] = { \
+ .desc = { \
+ .name = #vreg, \
+ .ops = &mt6397_volt_table_ops, \
+ .type = REGULATOR_VOLTAGE, \
+ .id = MT6397_ID_##vreg, \
+ .owner = THIS_MODULE, \
+ .n_voltages = ARRAY_SIZE(ldo_volt_table), \
+ .volt_table = ldo_volt_table, \
+ .enable_reg = enreg, \
+ .enable_mask = BIT(enbit), \
+ }, \
+ .qi = enreg, \
+ .qi_mask = BIT(15), \
+ .ldo_conf = { \
+ .is_fixed = fixed, \
+ .vosel_reg = vosel, \
+ .vosel_mask = _vosel_mask, \
+ .vosel_shift = _vosel_shift, \
+ }, \
+}
+
+static const struct regulator_linear_range buck_volt_range1[] = {
+ REGULATOR_LINEAR_RANGE(700000, 0, 0x7f, 6250),
+};
+
+static const struct regulator_linear_range buck_volt_range2[] = {
+ REGULATOR_LINEAR_RANGE(800000, 0, 0x7f, 6250),
+};
+
+static const unsigned int fixed_1800000_voltage[] = {
+ 1800000,
+};
+
+static const unsigned int fixed_2800000_voltage[] = {
+ 2800000,
+};
+
+static const unsigned int fixed_3300000_voltage[] = {
+ 3300000,
+};
+
+static const unsigned int ldo_volt_table1[] = {
+ 1500000, 1800000, 2500000, 2800000,
+};
+
+static const unsigned int ldo_volt_table2[] = {
+ 1800000, 3300000,
+};
+
+static const unsigned int ldo_volt_table3[] = {
+ 3000000, 3300000,
+};
+
+static const unsigned int ldo_volt_table4[] = {
+ 1220000, 1300000, 1500000, 1800000, 2500000, 2800000, 3000000, 3300000,
+};
+
+static const unsigned int ldo_volt_table5[] = {
+ 1200000, 1300000, 1500000, 1800000, 2500000, 2800000, 3000000, 3300000,
+};
+
+static const unsigned int ldo_volt_table5_v2[] = {
+ 1200000, 1000000, 1500000, 1800000, 2500000, 2800000, 3000000, 3300000,
+};
+
+static const unsigned int ldo_volt_table6[] = {
+ 1200000, 1300000, 1500000, 1800000, 2500000, 2800000, 3000000, 2000000,
+};
+
+static const unsigned int ldo_volt_table7[] = {
+ 1300000, 1500000, 1800000, 2000000, 2500000, 2800000, 3000000, 3300000,
+};
+
+static int mt6397_buck_set_voltage_sel(struct regulator_dev *rdev, unsigned sel)
+{
+ int ret;
+ unsigned int vosel;
+ unsigned int voselon;
+ unsigned int vosel_mask;
+ struct mt6397_regulator_info *info = rdev_get_drvdata(rdev);
+
+ vosel = info->buck_conf.vosel_reg;
+ voselon = info->buck_conf.voselon_reg;
+ vosel_mask = info->buck_conf.vosel_mask;
+
+ ret = regmap_update_bits(rdev->regmap, vosel, vosel_mask, sel);
+ if (ret != 0) {
+ dev_err(&rdev->dev, "Failed to update vosel: %d\n", ret);
+ return ret;
+ }
+
+ ret = regmap_update_bits(rdev->regmap, voselon, vosel_mask, sel);
+ if (ret != 0) {
+ dev_err(&rdev->dev, "Failed to update vosel_on: %d\n", ret);
+ return ret;
+ }
+ return 0;
+}
+
+static int mt6397_buck_get_voltage_sel(struct regulator_dev *rdev)
+{
+ int ret;
+ unsigned int nivosel;
+ unsigned int vosel_mask;
+ unsigned int regval;
+ struct mt6397_regulator_info *info = rdev_get_drvdata(rdev);
+
+ nivosel = info->buck_conf.nivosel_reg;
+ vosel_mask = info->buck_conf.vosel_mask;
+
+ ret = regmap_read(rdev->regmap, nivosel, ®val);
+ if (ret != 0) {
+ dev_err(&rdev->dev, "Failed to get vosel: %d\n", ret);
+ return ret;
+ }
+
+ regval &= vosel_mask;
+ regval >>= ffs(vosel_mask) - 1;
+
+ return regval;
+}
+
+
+static int mt6397_ldo_set_voltage_sel(struct regulator_dev *rdev, unsigned sel)
+{
+ int ret;
+ unsigned int is_fixed;
+ unsigned int vosel;
+ unsigned int vosel_mask;
+ unsigned int vosel_shift;
+
+ struct mt6397_regulator_info *info = rdev_get_drvdata(rdev);
+
+ is_fixed = info->ldo_conf.is_fixed;
+ vosel = info->ldo_conf.vosel_reg;
+ vosel_mask = info->ldo_conf.vosel_mask;
+ vosel_shift = info->ldo_conf.vosel_shift;
+
+ if (is_fixed)
+ return 0;
+
+ sel <<= vosel_shift;
+ ret = regmap_update_bits(rdev->regmap, vosel, vosel_mask, sel);
+ if (ret != 0) {
+ dev_err(&rdev->dev, "Failed to update vosel: %d\n", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int mt6397_ldo_get_voltage_sel(struct regulator_dev *rdev)
+{
+ int ret;
+ unsigned int vosel;
+ unsigned int vosel_mask;
+ unsigned int regval;
+ struct mt6397_regulator_info *info = rdev_get_drvdata(rdev);
+
+ vosel = info->ldo_conf.vosel_reg;
+ vosel_mask = info->ldo_conf.vosel_mask;
+
+ ret = regmap_read(rdev->regmap, vosel, ®val);
+ if (ret != 0) {
+ dev_err(&rdev->dev, "Failed to get vosel: %d\n", ret);
+ return ret;
+ }
+
+ regval &= vosel_mask;
+ regval >>= ffs(vosel_mask) - 1;
+
+ return regval;
+}
+
+static int mt6397_regulator_is_enabled(struct regulator_dev *rdev)
+{
+ int ret;
+ unsigned int regaddr;
+ unsigned int regmask;
+ unsigned int regval;
+ struct mt6397_regulator_info *info = rdev_get_drvdata(rdev);
+
+ regaddr = info->qi;
+ regmask = info->qi_mask;
+
+ ret = regmap_read(rdev->regmap, regaddr, ®val);
+ if (ret != 0) {
+ dev_err(&rdev->dev, "Failed to get vosel: %d\n", ret);
+ return ret;
+ }
+
+ return (regval & info->qi_mask) ? 1 : 0;
+}
+
+static struct regulator_ops mt6397_volt_range_ops = {
+ .list_voltage = regulator_list_voltage_linear_range,
+ .map_voltage = regulator_map_voltage_linear_range,
+ .set_voltage_sel = mt6397_buck_set_voltage_sel,
+ .get_voltage_sel = mt6397_buck_get_voltage_sel,
+ .set_voltage_time_sel = regulator_set_voltage_time_sel,
+ .enable = regulator_enable_regmap,
+ .disable = regulator_disable_regmap,
+ .is_enabled = mt6397_regulator_is_enabled,
+};
+
+static struct regulator_ops mt6397_volt_table_ops = {
+ .list_voltage = regulator_list_voltage_table,
+ .map_voltage = regulator_map_voltage_iterate,
+ .set_voltage_sel = mt6397_ldo_set_voltage_sel,
+ .get_voltage_sel = mt6397_ldo_get_voltage_sel,
+ .set_voltage_time_sel = regulator_set_voltage_time_sel,
+ .enable = regulator_enable_regmap,
+ .disable = regulator_disable_regmap,
+ .is_enabled = mt6397_regulator_is_enabled,
+};
+
+/* The array is indexed by id(MT6397_ID_XXX) */
+static struct mt6397_regulator_info mt6397_regulators[] = {
+ MT6397_BUCK(VPCA15, 700000, 1493750, 6250, buck_volt_range1,
+ MT6397_VCA15_CON7, MT6397_VCA15_CON9,
+ MT6397_VCA15_CON10, MT6397_VCA15_CON12),
+ MT6397_BUCK(VPCA7, 700000, 1493750, 6250, buck_volt_range1,
+ MT6397_VPCA7_CON7, MT6397_VPCA7_CON9,
+ MT6397_VPCA7_CON10, MT6397_VPCA7_CON12),
+ MT6397_BUCK(VSRAMCA15, 700000, 1493750, 6250, buck_volt_range1,
+ MT6397_VSRMCA15_CON7, MT6397_VSRMCA15_CON9,
+ MT6397_VSRMCA15_CON10, MT6397_VSRMCA15_CON12),
+ MT6397_BUCK(VSRAMCA7, 700000, 1493750, 6250, buck_volt_range1,
+ MT6397_VSRMCA7_CON7, MT6397_VSRMCA7_CON9,
+ MT6397_VSRMCA7_CON10, MT6397_VSRMCA7_CON12),
+ MT6397_BUCK(VCORE, 700000, 1493750, 6250, buck_volt_range1,
+ MT6397_VCORE_CON7, MT6397_VCORE_CON9,
+ MT6397_VCORE_CON10, MT6397_VCORE_CON12),
+ MT6397_BUCK(VGPU, 700000, 1493750, 6250, buck_volt_range1,
+ MT6397_VGPU_CON7, MT6397_VGPU_CON9,
+ MT6397_VGPU_CON10, MT6397_VCORE_CON12),
+ MT6397_BUCK(VDRM, 800000, 1593750, 6250, buck_volt_range2,
+ MT6397_VDRM_CON7, MT6397_VDRM_CON9,
+ MT6397_VDRM_CON10, MT6397_VDRM_CON12),
+ MT6397_BUCK_TABLE(VIO18, fixed_1800000_voltage,
+ MT6397_VIO18_CON7, MT6397_VIO18_CON9,
+ MT6397_VIO18_CON10, MT6397_VIO18_CON12),
+ MT6397_LDO(VTCXO, fixed_2800000_voltage,
+ MT6397_ANALDO_CON0, 10, 1, 0, 0, 0),
+ MT6397_LDO(VA28, fixed_2800000_voltage,
+ MT6397_ANALDO_CON1, 14, 1, 0, 0, 0),
+ MT6397_LDO(VCAMA, ldo_volt_table1,
+ MT6397_ANALDO_CON2, 15, 0, MT6397_ANALDO_CON6, 0xC0, 6),
+ MT6397_LDO(VIO28, fixed_2800000_voltage,
+ MT6397_DIGLDO_CON0, 14, 1, 0, 0, 0),
+ MT6397_LDO(USB, fixed_3300000_voltage,
+ MT6397_DIGLDO_CON1, 14, 1, 0, 0, 0),
+ MT6397_LDO(VMC, ldo_volt_table2,
+ MT6397_DIGLDO_CON2, 12, 0, MT6397_DIGLDO_CON29, 0x10, 4),
+ MT6397_LDO(VMCH, ldo_volt_table3,
+ MT6397_DIGLDO_CON3, 14, 0, MT6397_DIGLDO_CON17, 0x80, 7),
+ MT6397_LDO(VEMC3V3, ldo_volt_table3,
+ MT6397_DIGLDO_CON4, 14, 0, MT6397_DIGLDO_CON18, 0x10, 4),
+ MT6397_LDO(VCAMD, ldo_volt_table4,
+ MT6397_DIGLDO_CON5, 15, 0, MT6397_DIGLDO_CON19, 0xE0, 5),
+ MT6397_LDO(VCAMIO, ldo_volt_table5,
+ MT6397_DIGLDO_CON6, 15, 0, MT6397_DIGLDO_CON20, 0xE0, 5),
+ MT6397_LDO(VCAMAF, ldo_volt_table5,
+ MT6397_DIGLDO_CON7, 15, 0, MT6397_DIGLDO_CON21, 0xE0, 5),
+ MT6397_LDO(VGP4, ldo_volt_table5,
+ MT6397_DIGLDO_CON8, 15, 0, MT6397_DIGLDO_CON22, 0xE0, 5),
+ MT6397_LDO(VGP5, ldo_volt_table6,
+ MT6397_DIGLDO_CON9, 15, 0, MT6397_DIGLDO_CON23, 0xE0, 5),
+ MT6397_LDO(VGP6, ldo_volt_table5,
+ MT6397_DIGLDO_CON10, 15, 0, MT6397_DIGLDO_CON33, 0xE0, 5),
+ MT6397_LDO(VIBR, ldo_volt_table7,
+ MT6397_DIGLDO_CON24, 15, 0, MT6397_DIGLDO_CON25, 0xE00, 9),
+};
+
+#define MT6397_REGULATOR_OF_MATCH(_name, _id) \
+[MT6397_ID_##_id] = { \
+ .name = #_name, \
+ .driver_data = &mt6397_regulators[MT6397_ID_##_id], \
+}
+
+static struct of_regulator_match mt6397_regulator_matches[] = {
+ MT6397_REGULATOR_OF_MATCH(buck_vpca15, VPCA15),
+ MT6397_REGULATOR_OF_MATCH(buck_vpca7, VPCA7),
+ MT6397_REGULATOR_OF_MATCH(buck_vsramca15, VSRAMCA15),
+ MT6397_REGULATOR_OF_MATCH(buck_vsramca7, VSRAMCA7),
+ MT6397_REGULATOR_OF_MATCH(buck_vcore, VCORE),
+ MT6397_REGULATOR_OF_MATCH(buck_vgpu, VGPU),
+ MT6397_REGULATOR_OF_MATCH(buck_vdrm, VDRM),
+ MT6397_REGULATOR_OF_MATCH(buck_vio18, VIO18),
+ MT6397_REGULATOR_OF_MATCH(ldo_vtcxo, VTCXO),
+ MT6397_REGULATOR_OF_MATCH(ldo_va28, VA28),
+ MT6397_REGULATOR_OF_MATCH(ldo_vcama, VCAMA),
+ MT6397_REGULATOR_OF_MATCH(ldo_vio28, VIO28),
+ MT6397_REGULATOR_OF_MATCH(ldo_usb, USB),
+ MT6397_REGULATOR_OF_MATCH(ldo_vmc, VMC),
+ MT6397_REGULATOR_OF_MATCH(ldo_vmch, VMCH),
+ MT6397_REGULATOR_OF_MATCH(ldo_vemc3v3, VEMC3V3),
+ MT6397_REGULATOR_OF_MATCH(ldo_vcamd, VCAMD),
+ MT6397_REGULATOR_OF_MATCH(ldo_vcamio, VCAMIO),
+ MT6397_REGULATOR_OF_MATCH(ldo_vcamaf, VCAMAF),
+ MT6397_REGULATOR_OF_MATCH(ldo_vgp4, VGP4),
+ MT6397_REGULATOR_OF_MATCH(ldo_vgp5, VGP5),
+ MT6397_REGULATOR_OF_MATCH(ldo_vgp6, VGP6),
+ MT6397_REGULATOR_OF_MATCH(ldo_vibr, VIBR),
+};
+
+static int mt6397_regulator_dt_init(struct platform_device *pdev,
+ struct mt6397_regulator_priv *priv)
+{
+ struct mt6397_chip *mt6397 = dev_get_drvdata(pdev->dev.parent);
+ struct device_node *np, *regulators;
+ struct mt6397_regulator_data *rdata;
+ int matched, i, j, ret;
+ unsigned int reg_value;
+
+ if (!priv) {
+ dev_err(&pdev->dev, "regulator private data missing\n");
+ return -EINVAL;
+ }
+
+ np = of_node_get(pdev->dev.parent->of_node);
+ if (!np)
+ return -EINVAL;
+
+ regulators = of_get_child_by_name(np, "regulators");
+ if (!regulators) {
+ dev_err(&pdev->dev, "regulators node not found\n");
+ ret = -EINVAL;
+ goto out;
+ }
+ of_node_put(np);
+ matched = of_regulator_match(&pdev->dev, regulators,
+ mt6397_regulator_matches,
+ ARRAY_SIZE(mt6397_regulator_matches));
+ of_node_put(regulators);
+ if (matched < 0) {
+ dev_err(&pdev->dev, "Error parsing regulator init data: %d\n",
+ matched);
+ return matched;
+ }
+
+ priv->num_regulators = matched;
+ priv->regulators = devm_kzalloc(&pdev->dev,
+ (sizeof(struct mt6397_regulator_data) *
+ ARRAY_SIZE(mt6397_regulator_matches)), GFP_KERNEL);
+ if (!priv->regulators)
+ return -ENOMEM;
+
+ /* Read PMIC chip revision to update constraints and voltage table */
+ if (regmap_read(mt6397->regmap, MT6397_CID, ®_value) < 0) {
+ dev_err(&pdev->dev, "Failed to read Chip ID\n");
+ return -EIO;
+ }
+ dev_info(&pdev->dev, "Chip ID = 0x%x\n", reg_value);
+
+ if ((reg_value & 0xFF) == MT6397_REGULATOR_ID91) {
+ j = MT6397_ID_VCAMIO;
+ mt6397_regulator_matches[j].init_data->constraints.min_uV =
+ 1000000;
+ mt6397_regulators[j].desc.volt_table = ldo_volt_table5_v2;
+ }
+
+ rdata = priv->regulators;
+ for (i = 0; i < ARRAY_SIZE(mt6397_regulator_matches); i++) {
+ rdata->id = i;
+ rdata->name = mt6397_regulator_matches[i].name;
+ rdata->initdata = mt6397_regulator_matches[i].init_data;
+ rdata->reg_node = mt6397_regulator_matches[i].of_node;
+ rdata++;
+ }
+ return 0;
+
+out:
+ of_node_put(np);
+ return ret;
+}
+
+static int mt6397_regulator_probe(struct platform_device *pdev)
+{
+ struct mt6397_chip *mt6397 = dev_get_drvdata(pdev->dev.parent);
+ int ret, i, id, size;
+ struct regulator_config config = {};
+ struct regulator_dev *rdev;
+ struct mt6397_regulator_priv *priv;
+
+ size = sizeof(struct mt6397_regulator_priv);
+ priv = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
+ if (!priv)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, priv);
+ ret = mt6397_regulator_dt_init(pdev, priv);
+ if (ret)
+ return ret;
+
+ for (i = 0; i < MT6397_ID_RG_MAX; i++) {
+ id = priv->regulators[i].id;
+ config.dev = &pdev->dev;
+ config.init_data = priv->regulators[i].initdata;
+ config.of_node = priv->regulators[i].reg_node;
+ config.driver_data = mt6397_regulator_matches[i].driver_data;
+ config.regmap = mt6397->regmap;
+
+ rdev = devm_regulator_register(&pdev->dev,
+ &mt6397_regulators[i].desc, &config);
+ if (IS_ERR(rdev)) {
+ dev_err(&pdev->dev, "failed to register %s\n",
+ mt6397_regulators[id].desc.name);
+ return PTR_ERR(rdev);
+ }
+ }
+
+ return 0;
+}
+
+static const struct platform_device_id mt6397_regulator_id[] = {
+ {"mt6397-regulator", 0},
+ { },
+};
+
+static struct platform_driver mt6397_regulator_driver = {
+ .driver = {
+ .name = "mt6397-regulator",
+ .owner = THIS_MODULE,
+ },
+ .probe = mt6397_regulator_probe,
+ .id_table = mt6397_regulator_id,
+};
+
+module_platform_driver(mt6397_regulator_driver);
+
+MODULE_AUTHOR("Flora Fu <flora.fu@mediatek.com>");
+MODULE_DESCRIPTION("Regulator Driver for MediaTek MT6397 PMIC");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mt6397-regulator");
diff --git a/include/linux/regulator/mt6397-regulator.h b/include/linux/regulator/mt6397-regulator.h
new file mode 100644
index 0000000..d03be02
--- /dev/null
+++ b/include/linux/regulator/mt6397-regulator.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2014 MediaTek Inc.
+ * Author: Flora.Fu <flora.fu@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __LINUX_REGULATOR_MT6397_H
+#define __LINUX_REGULATOR_MT6397_H
+
+enum {
+ MT6397_ID_VPCA15 = 0,
+ MT6397_ID_VPCA7,
+ MT6397_ID_VSRAMCA15,
+ MT6397_ID_VSRAMCA7,
+ MT6397_ID_VCORE,
+ MT6397_ID_VGPU,
+ MT6397_ID_VDRM,
+ MT6397_ID_VIO18 = 7,
+
+ MT6397_ID_VTCXO,
+ MT6397_ID_VA28,
+ MT6397_ID_VCAMA,
+ MT6397_ID_VIO28,
+ MT6397_ID_USB,
+ MT6397_ID_VMC,
+ MT6397_ID_VMCH,
+ MT6397_ID_VEMC3V3,
+ MT6397_ID_VCAMD,
+ MT6397_ID_VCAMIO,
+ MT6397_ID_VCAMAF,
+ MT6397_ID_VGP4,
+ MT6397_ID_VGP5,
+ MT6397_ID_VGP6,
+ MT6397_ID_VIBR,
+
+ MT6397_ID_RG_MAX,
+};
+#define MT6397_MAX_REGULATOR MT6397_ID_RG_MAX
+#define MT6397_REGULATOR_ID97 0x97
+#define MT6397_REGULATOR_ID91 0x91
+
+#endif /* __LINUX_REGULATOR_MT6397_H */
--
1.8.1.1.dirty
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 4/7] dt-bindings: Add document for MT6397 MFD
2014-11-17 7:40 Add Support for MediaTek PMIC MT6397 MFD Core and Regulator Flora Fu
` (2 preceding siblings ...)
2014-11-17 7:40 ` [PATCH 3/7] regulator: MT6397: Add support for MT6397 regulator Flora Fu
@ 2014-11-17 7:40 ` Flora Fu
[not found] ` <1416210027-5562-5-git-send-email-flora.fu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2014-11-17 7:40 ` [PATCH 5/7] dt-bindings: Add document for MT6397 regulator Flora Fu
` (2 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Flora Fu @ 2014-11-17 7:40 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Matthias Brugger
Cc: Ashwin Chaugule, Vladimir Murzin, Russell King, Samuel Ortiz,
Pawel Moll, Ian Campbell, Catalin Marinas, srv_heupstream,
Liam Girdwood, linux-kernel, Flora Fu, devicetree, Mark Brown,
Sascha Hauer, Kumar Gala, Grant Likely, Joe.C, Eddie Huang,
Lee Jones, linux-arm-kernel, Dongdong Cheng
Signed-off-by: Flora Fu <flora.fu@mediatek.com>
---
Documentation/devicetree/bindings/mfd/mt6397.txt | 87 ++++++++++++++++++++++++
1 file changed, 87 insertions(+)
create mode 100644 Documentation/devicetree/bindings/mfd/mt6397.txt
diff --git a/Documentation/devicetree/bindings/mfd/mt6397.txt b/Documentation/devicetree/bindings/mfd/mt6397.txt
new file mode 100644
index 0000000..0783368
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/mt6397.txt
@@ -0,0 +1,87 @@
+MediaTek MT6397 multifunction device
+
+MT6397 is a multifunction device with the following sub modules:
+- PMIC
+- Regulator
+- RTC
+- Audio codec
+- GPIO
+- Clock
+
+It is interfaced to host controller using SPI interface by a proprietary hardware
+called pmic wrapper or pwrap. This document describes the binding for mfd device
+and PMIC sub module.
+
+Required properties in pwrap device node.
+- compatible:"mediatek,mt8135-pwrap";
+- interrupts : This pmic wrapper device has an IRQ line connected to the main SoC.
+- reg: Specifies the address of pwrap in AP.
+- resets: reset bit for pwrap
+- clock: clock frequency selection in SPI bus.
+- pmic: Mediatek PMIC used pwrap as its communication protocol.
+
+Example:
+ pwrap: pwrap@1000f000 {
+ compatible = "mediatek,mt8135-pwrap";
+ reg = <0 0x1000f000 0 0x1000>,
+ <0 0x11017000 0 0x1000>;
+ reg-names = "pwrap-base", "pwrap-bridge-base";
+ interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>;
+ resets = <&infrarst MT8135_INFRA_PMIC_WRAP_RST>,
+ <&perirst MT8135_PERI_PWRAP_BRIDGE_SW_RST>;
+ reset-names = "infra-pwrap-rst",
+ "peri-pwrap-bridge-rst";
+ clocks = <&pmicspi_sel>, <&clk26m> ;
+ clock-names = "pmicspi-sel", "pmicspi-parent";
+
+ pmic {
+ compatible = "mediatek,mt6397";
+ }
+
+MT6397 MFD device should in pwrap device node.
+Optional properties:
+- codec: Audio Codec
+- pinctrl: GPIO in mt6397
+- rtc: RTC
+- clock: clocks in mt6397
+- regulators : The regulators of mt6397
+ regulators {
+ regulator constratints.
+ refer Documentation/devicetree/bindings/regulator/regulator.txt
+ };
+
+Example:
+ pwrap: pwrap@1000f000 {
+ [...]
+ pmic {
+ compatible = "mediatek,mt6397";
+
+ codec: mt6397codec {
+ compatible = "mediatek,mt6397-codec";
+ };
+
+ pinctrl@0x0000C000 {
+ compatible = "mediatek,mt6397-pinctrl";
+ reg = <0 0x0000C000 0 0x0108>;
+ gpio-controller;
+ };
+
+ regulators {
+ mt6397_vpca15_reg: buck_vpca15 {
+ regulator-name = "vpca15";
+ regulator-min-microvolt = < 700000>;
+ regulator-max-microvolt = <1493750>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ mt6397_vpca7_reg: buck_vpca7 {
+ regulator-name = "vpca7";
+ regulator-min-microvolt = < 700000>;
+ regulator-max-microvolt = <1493750>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+ }
+ }
+ }
\ No newline at end of file
--
1.8.1.1.dirty
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 5/7] dt-bindings: Add document for MT6397 regulator
2014-11-17 7:40 Add Support for MediaTek PMIC MT6397 MFD Core and Regulator Flora Fu
` (3 preceding siblings ...)
2014-11-17 7:40 ` [PATCH 4/7] dt-bindings: Add document for MT6397 MFD Flora Fu
@ 2014-11-17 7:40 ` Flora Fu
2014-11-17 7:40 ` [PATCH 6/7] ARM: dts: mt8135: Add support for PMIC MT6397 MFD Flora Fu
2014-11-17 7:40 ` [PATCH 7/7] ARM: dts: mt8135: Add support for MT6397 regulator Flora Fu
6 siblings, 0 replies; 18+ messages in thread
From: Flora Fu @ 2014-11-17 7:40 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Matthias Brugger
Cc: Ashwin Chaugule, Vladimir Murzin, Russell King, Samuel Ortiz,
Pawel Moll, Ian Campbell, Catalin Marinas, srv_heupstream,
Liam Girdwood, linux-kernel, Flora Fu, devicetree, Mark Brown,
Sascha Hauer, Kumar Gala, Grant Likely, Joe.C, Eddie Huang,
Lee Jones, linux-arm-kernel, Dongdong Cheng
Signed-off-by: Flora Fu <flora.fu@mediatek.com>
---
.../bindings/regulator/mt6397-regulator.txt | 31 ++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 Documentation/devicetree/bindings/regulator/mt6397-regulator.txt
diff --git a/Documentation/devicetree/bindings/regulator/mt6397-regulator.txt b/Documentation/devicetree/bindings/regulator/mt6397-regulator.txt
new file mode 100644
index 0000000..019d9bd
--- /dev/null
+++ b/Documentation/devicetree/bindings/regulator/mt6397-regulator.txt
@@ -0,0 +1,31 @@
+Mediatek mt6397 regulator
+
+Required properties:
+- compatible: "mediatek,mt6397"
+- regulators: This is the list of child nodes that specify the regulator
+ initialization data for defined regulators. The definition for each of these
+ nodes is defined using the standard binding for regulators found at
+ Documentation/devicetree/bindings/regulator/regulator.txt.
+
+Example:
+
+ pmic {
+ compatible = "mediatek,mt6397";
+
+ regulators {
+
+ mt6397_vpca15_reg: buck_vpca15 {
+ regulator-name = "vpca15";
+ regulator-min-microvolt = < 700000>;
+ regulator-max-microvolt = <1493750>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ mt6397_vgp4_reg: ldo_vgp4 {
+ regulator-name = "vgp4";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <3300000>;
+ };
+ };
+ };
--
1.8.1.1.dirty
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 6/7] ARM: dts: mt8135: Add support for PMIC MT6397 MFD
2014-11-17 7:40 Add Support for MediaTek PMIC MT6397 MFD Core and Regulator Flora Fu
` (4 preceding siblings ...)
2014-11-17 7:40 ` [PATCH 5/7] dt-bindings: Add document for MT6397 regulator Flora Fu
@ 2014-11-17 7:40 ` Flora Fu
2014-11-17 7:40 ` [PATCH 7/7] ARM: dts: mt8135: Add support for MT6397 regulator Flora Fu
6 siblings, 0 replies; 18+ messages in thread
From: Flora Fu @ 2014-11-17 7:40 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Matthias Brugger
Cc: Ashwin Chaugule, Vladimir Murzin, Russell King, Samuel Ortiz,
Pawel Moll, Ian Campbell, Catalin Marinas, srv_heupstream,
Liam Girdwood, linux-kernel, Flora Fu, devicetree, Mark Brown,
Sascha Hauer, Kumar Gala, Grant Likely, Joe.C, Eddie Huang,
Lee Jones, linux-arm-kernel, Dongdong Cheng
Add device tree for MT6397 MFD and its PMIC wrapper in mt8135.dtsi.
Signed-off-by: Flora Fu <flora.fu@mediatek.com>
---
arch/arm/boot/dts/mt8135.dtsi | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/arch/arm/boot/dts/mt8135.dtsi b/arch/arm/boot/dts/mt8135.dtsi
index 90a56ad..14a8aad 100644
--- a/arch/arm/boot/dts/mt8135.dtsi
+++ b/arch/arm/boot/dts/mt8135.dtsi
@@ -102,6 +102,25 @@
clock-names = "system-clk", "rtc-clk";
};
+
+ pwrap: pwrap@1000f000 {
+ compatible = "mediatek,mt8135-pwrap";
+ reg = <0 0x1000f000 0 0x1000>,
+ <0 0x11017000 0 0x1000>;
+ reg-names = "pwrap-base", "pwrap-bridge-base";
+ interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>;
+ resets = <&infrarst MT8135_INFRA_PMIC_WRAP_RST>,
+ <&perirst MT8135_PERI_PWRAP_BRIDGE_SW_RST>;
+ reset-names = "infra-pwrap-rst",
+ "peri-pwrap-bridge-rst";
+ clocks = <&pmicspi_sel>, <&clk26m> ;
+ clock-names = "pmicspi-sel", "pmicspi-parent";
+
+ pmic {
+ compatible = "mediatek,mt6397";
+ };
+ };
+
gic: interrupt-controller@10211000 {
compatible = "arm,cortex-a15-gic";
interrupt-controller;
--
1.8.1.1.dirty
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 7/7] ARM: dts: mt8135: Add support for MT6397 regulator
2014-11-17 7:40 Add Support for MediaTek PMIC MT6397 MFD Core and Regulator Flora Fu
` (5 preceding siblings ...)
2014-11-17 7:40 ` [PATCH 6/7] ARM: dts: mt8135: Add support for PMIC MT6397 MFD Flora Fu
@ 2014-11-17 7:40 ` Flora Fu
6 siblings, 0 replies; 18+ messages in thread
From: Flora Fu @ 2014-11-17 7:40 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Matthias Brugger
Cc: Ashwin Chaugule, Vladimir Murzin, Russell King, Samuel Ortiz,
Pawel Moll, Ian Campbell, Catalin Marinas, srv_heupstream,
Liam Girdwood, linux-kernel, Flora Fu, devicetree, Mark Brown,
Sascha Hauer, Kumar Gala, Grant Likely, Joe.C, Eddie Huang,
Lee Jones, linux-arm-kernel, Dongdong Cheng
Add device tree for MT6397 regulators in mt8135.dtsi.
Signed-off-by: Flora Fu <flora.fu@mediatek.com>
---
arch/arm/boot/dts/mt8135.dtsi | 192 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 192 insertions(+)
diff --git a/arch/arm/boot/dts/mt8135.dtsi b/arch/arm/boot/dts/mt8135.dtsi
index 14a8aad..4f78287 100644
--- a/arch/arm/boot/dts/mt8135.dtsi
+++ b/arch/arm/boot/dts/mt8135.dtsi
@@ -118,6 +118,198 @@
pmic {
compatible = "mediatek,mt6397";
+
+ regulators {
+ mt6397_vpca15_reg: buck_vpca15 {
+ regulator-name = "vpca15";
+ regulator-min-microvolt = < 700000>;
+ regulator-max-microvolt = <1493750>;
+ regulator-ramp-delay = <12500>;
+ regulator-enable-ramp-delay = <200>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ mt6397_vpca7_reg: buck_vpca7 {
+ regulator-name = "vpca7";
+ regulator-min-microvolt = < 700000>;
+ regulator-max-microvolt = <1493750>;
+ regulator-ramp-delay = <12500>;
+ regulator-enable-ramp-delay = <115>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ mt6397_vsramca15_reg: buck_vsramca15 {
+ regulator-name = "vsramca15";
+ regulator-min-microvolt = < 700000>;
+ regulator-max-microvolt = <1493750>;
+ regulator-ramp-delay = <12500>;
+ regulator-enable-ramp-delay = <115>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ mt6397_vsramca7_reg: buck_vsramca7 {
+ regulator-name = "vsramca7";
+ regulator-min-microvolt = < 700000>;
+ regulator-max-microvolt = <1493750>;
+ regulator-ramp-delay = <12500>;
+ regulator-enable-ramp-delay = <115>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ mt6397_vcore_reg: buck_vcore {
+ regulator-name = "vcore";
+ regulator-min-microvolt = < 700000>;
+ regulator-max-microvolt = <1493750>;
+ regulator-ramp-delay = <12500>;
+ regulator-enable-ramp-delay = <115>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ mt6397_vgpu_reg: buck_vgpu {
+ regulator-name = "vgpu";
+ regulator-min-microvolt = < 700000>;
+ regulator-max-microvolt = <1493750>;
+ regulator-ramp-delay = <12500>;
+ regulator-enable-ramp-delay = <115>;
+ };
+
+ mt6397_vdrm_reg: buck_vdrm {
+ regulator-name = "vdrm";
+ regulator-min-microvolt = < 800000>;
+ regulator-max-microvolt = <1593750>;
+ regulator-ramp-delay = <12500>;
+ regulator-enable-ramp-delay = <500>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ mt6397_vio18_reg: buck_vio18 {
+ regulator-name = "vio18";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-ramp-delay = <12500>;
+ regulator-enable-ramp-delay = <500>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ mt6397_vtcxo_reg: ldo_vtcxo {
+ regulator-name = "vtcxo";
+ regulator-min-microvolt = <2800000>;
+ regulator-max-microvolt = <2800000>;
+ regulator-enable-ramp-delay = <90>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ mt6397_va28_reg: ldo_va28 {
+ regulator-name = "va28";
+ regulator-min-microvolt = <2800000>;
+ regulator-max-microvolt = <2800000>;
+ regulator-enable-ramp-delay = <218>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ mt6397_vcama_reg: ldo_vcama {
+ regulator-name = "vcama";
+ regulator-min-microvolt = <1500000>;
+ regulator-max-microvolt = <2800000>;
+ regulator-enable-ramp-delay = <218>;
+ };
+
+ mt6397_vio28_reg: ldo_vio28 {
+ regulator-name = "vio28";
+ regulator-min-microvolt = <2800000>;
+ regulator-max-microvolt = <2800000>;
+ regulator-enable-ramp-delay = <240>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ mt6397_usb_reg: ldo_usb {
+ regulator-name = "usb";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-enable-ramp-delay = <218>;
+ };
+
+ mt6397_vmc_reg: ldo_vmc {
+ regulator-name = "vmc";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-enable-ramp-delay = <218>;
+ };
+
+ mt6397_vmch_reg: ldo_vmch {
+ regulator-name = "vmch";
+ regulator-min-microvolt = <3000000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-enable-ramp-delay = <218>;
+ };
+
+ mt6397_vemc_3v3_reg: ldo_vemc3v3 {
+ regulator-name = "vemc_3v3";
+ regulator-min-microvolt = <3000000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-enable-ramp-delay = <218>;
+ regulator-boot-on;
+ };
+
+ mt6397_vgp1_reg: ldo_vcamd {
+ regulator-name = "vgp1";
+ regulator-min-microvolt = <1220000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-enable-ramp-delay = <240>;
+ };
+
+ mt6397_vgp2_reg: ldo_vcamio {
+ regulator-name = "vgp2";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-enable-ramp-delay = <218>;
+ };
+
+ mt6397_vgp3_reg: ldo_vcamaf {
+ regulator-name = "vgp3";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-enable-ramp-delay = <218>;
+ };
+
+ mt6397_vgp4_reg: ldo_vgp4 {
+ regulator-name = "vgp4";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-enable-ramp-delay = <218>;
+ };
+
+ mt6397_vgp5_reg: ldo_vgp5 {
+ regulator-name = "vgp5";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <3000000>;
+ regulator-enable-ramp-delay = <218>;
+ };
+
+ mt6397_vgp6_reg: ldo_vgp6 {
+ regulator-name = "vgp6";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-enable-ramp-delay = <218>;
+ };
+
+ mt6397_vibr_reg: ldo_vibr {
+ regulator-name = "vibr";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-enable-ramp-delay = <218>;
+ };
+ };
};
};
--
1.8.1.1.dirty
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 4/7] dt-bindings: Add document for MT6397 MFD
[not found] ` <1416210027-5562-5-git-send-email-flora.fu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
@ 2014-11-17 23:31 ` Mark Brown
0 siblings, 0 replies; 18+ messages in thread
From: Mark Brown @ 2014-11-17 23:31 UTC (permalink / raw)
To: Flora Fu
Cc: Rob Herring, Mark Rutland, Matthias Brugger, Pawel Moll,
Ian Campbell, Kumar Gala, Russell King, Samuel Ortiz, Lee Jones,
Liam Girdwood, Grant Likely, Joe.C, Catalin Marinas,
Vladimir Murzin, Ashwin Chaugule,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
srv_heupstream-NuS5LvNUpcJWk0Htik3J/w, Sascha Hauer, Eddie Huang,
Dongdong Cheng
[-- Attachment #1: Type: text/plain, Size: 538 bytes --]
On Mon, Nov 17, 2014 at 03:40:24PM +0800, Flora Fu wrote:
> + pmic {
> + compatible = "mediatek,mt6397";
> + }
This looks like it's missing a closing brace and is just generally weird
(having a subnode like this).
> +- regulators : The regulators of mt6397
> + regulators {
> + regulator constratints.
> + refer Documentation/devicetree/bindings/regulator/regulator.txt
> + };
You need to define the set of valid regulator names and how that maps
onto the physical device, look at other regulator binding documents for
examples.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 3/7] regulator: MT6397: Add support for MT6397 regulator
[not found] ` <1416210027-5562-4-git-send-email-flora.fu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
@ 2014-11-17 23:40 ` Mark Brown
2014-11-21 7:09 ` Flora Fu
0 siblings, 1 reply; 18+ messages in thread
From: Mark Brown @ 2014-11-17 23:40 UTC (permalink / raw)
To: Flora Fu
Cc: Rob Herring, Mark Rutland, Matthias Brugger, Pawel Moll,
Ian Campbell, Kumar Gala, Russell King, Samuel Ortiz, Lee Jones,
Liam Girdwood, Grant Likely, Joe.C, Catalin Marinas,
Vladimir Murzin, Ashwin Chaugule,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
srv_heupstream-NuS5LvNUpcJWk0Htik3J/w, Sascha Hauer, Eddie Huang,
Dongdong Cheng
[-- Attachment #1: Type: text/plain, Size: 2765 bytes --]
On Mon, Nov 17, 2014 at 03:40:23PM +0800, Flora Fu wrote:
This looks mostly good but there are a few fairly straightfoward things:
> @@ -725,5 +725,11 @@ config REGULATOR_WM8994
> This driver provides support for the voltage regulators on the
> WM8994 CODEC.
>
> +config REGULATOR_MT6397
> + tristate "MediaTek MT6397 PMIC"
> + depends on MFD_MT6397
> + help
> + This driver provides support for the voltage regulators on the MediaTek MT6397 PMIC.
> +
> endif
Keep this and the Makefile sorted.
> +static int mt6397_buck_set_voltage_sel(struct regulator_dev *rdev, unsigned sel)
> +{
> + vosel = info->buck_conf.vosel_reg;
> + voselon = info->buck_conf.voselon_reg;
> + vosel_mask = info->buck_conf.vosel_mask;
Please use the standard way of specifying data even if you can't use the
standard function.
> +
> + ret = regmap_update_bits(rdev->regmap, vosel, vosel_mask, sel);
> + if (ret != 0) {
> + dev_err(&rdev->dev, "Failed to update vosel: %d\n", ret);
> + return ret;
> + }
> +
> + ret = regmap_update_bits(rdev->regmap, voselon, vosel_mask, sel);
> + if (ret != 0) {
> + dev_err(&rdev->dev, "Failed to update vosel_on: %d\n", ret);
> + return ret;
> + }
> + return 0;
You should add comments here explaining what's going on - it's very
strange to have to write the same value to two different registers and
the names of the registers look suspicously like this is something to do
with a suspend mode...
Missing blank line before the return too.
> +static int mt6397_buck_get_voltage_sel(struct regulator_dev *rdev)
> +{
You could use the regmap based helper for this.
> +static int mt6397_ldo_set_voltage_sel(struct regulator_dev *rdev, unsigned sel)
> +{
The LDO operations appear to be identical to the standard regmap
helpers, please use them.
> + if (is_fixed)
> + return 0;
You should use the standard fixed voltage regulator support rather than
> +static int mt6397_regulator_is_enabled(struct regulator_dev *rdev)
> +{
Again this looks like it should be using helpers.
> +#define MT6397_REGULATOR_OF_MATCH(_name, _id) \
> +[MT6397_ID_##_id] = { \
> + .name = #_name, \
> + .driver_data = &mt6397_regulators[MT6397_ID_##_id], \
> +}
Define regulators_node and of_match in the regulator desc and you can
remove both this table and all your DT matching code in the driver, the
core will handle it for you.
> + if ((reg_value & 0xFF) == MT6397_REGULATOR_ID91) {
> + j = MT6397_ID_VCAMIO;
> + mt6397_regulator_matches[j].init_data->constraints.min_uV =
> + 1000000;
> + mt6397_regulators[j].desc.volt_table = ldo_volt_table5_v2;
> + }
Use a switch statement, that way other variants can be added more
easily.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/7] mfd: MT6397: Add regmap for MT8135 and MT6397 SoC
2014-11-17 7:40 ` [PATCH 2/7] mfd: MT6397: Add regmap for MT8135 and MT6397 SoC Flora Fu
@ 2014-11-18 11:46 ` Lee Jones
2014-11-18 13:46 ` Sascha Hauer
0 siblings, 1 reply; 18+ messages in thread
From: Lee Jones @ 2014-11-18 11:46 UTC (permalink / raw)
To: Flora Fu
Cc: Rob Herring, Mark Rutland, Matthias Brugger, Pawel Moll,
Ian Campbell, Kumar Gala, Russell King, Samuel Ortiz,
Liam Girdwood, Mark Brown, Grant Likely, Joe.C, Catalin Marinas,
Vladimir Murzin, Ashwin Chaugule, devicetree, linux-kernel,
linux-arm-kernel, srv_heupstream, Sascha Hauer, Eddie Huang,
Dongdong Cheng
On Mon, 17 Nov 2014, Flora Fu wrote:
> Add PMIC wrapper of MT8135 to access MFD MT6397.
> This is regmap of MT6397 MFD.
>
> Signed-off-by: Flora Fu <flora.fu@mediatek.com>
> ---
> drivers/mfd/Kconfig | 8 +
> drivers/mfd/Makefile | 1 +
> drivers/mfd/mt8135-pmic-wrap.c | 847 +++++++++++++++++++++++++++++++++++++++++
All of the PMIC functionality needs removing from MFD and placed
somewhere else. I suggest either drivers/power or drivers/regulator.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/7] mfd: MT6397: Add support for PMIC MT6397 MFD
2014-11-17 7:40 ` [PATCH 1/7] mfd: MT6397: Add support for PMIC MT6397 MFD Flora Fu
@ 2014-11-18 11:59 ` Lee Jones
0 siblings, 0 replies; 18+ messages in thread
From: Lee Jones @ 2014-11-18 11:59 UTC (permalink / raw)
To: Flora Fu
Cc: Mark Rutland, Catalin Marinas, Rob Herring, linux-kernel,
Russell King, Samuel Ortiz, Grant Likely, Joe.C, devicetree,
Vladimir Murzin, Pawel Moll, Ian Campbell, Mark Brown,
Matthias Brugger, Eddie Huang, linux-arm-kernel, Dongdong Cheng,
srv_heupstream, Liam Girdwood, Ashwin Chaugule, Sascha Hauer,
Kumar Gala
On Mon, 17 Nov 2014, Flora Fu wrote:
> Add core driver files for MT6397 MFD.
>
> Signed-off-by: Flora Fu <flora.fu@mediatek.com>
> ---
> drivers/mfd/Kconfig | 10 +
> drivers/mfd/Makefile | 1 +
> drivers/mfd/mt6397-core.c | 94 +++++++++
> drivers/mfd/mtk-pmic-wrap.h | 25 +++
> include/linux/mfd/mt6397/core.h | 27 +++
> include/linux/mfd/mt6397/registers.h | 362 +++++++++++++++++++++++++++++++++++
> 6 files changed, 519 insertions(+)
> create mode 100644 drivers/mfd/mt6397-core.c
> create mode 100644 drivers/mfd/mtk-pmic-wrap.h
> create mode 100644 include/linux/mfd/mt6397/core.h
> create mode 100644 include/linux/mfd/mt6397/registers.h
>
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index 1456ea7..f0b3efc 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -1318,6 +1318,16 @@ config MFD_STW481X
> in various ST Microelectronics and ST-Ericsson embedded
> Nomadik series.
>
> +config MFD_MT6397
> + tristate "MediaTek MT6397 PMIC Support"
> + select MFD_CORE
> + select IRQ_DOMAIN
> + help
> + Say yes here to add support for MediaTek MT6397 PMIC. This is
> + a Power Management IC. This driver provides common support for
> + accessing the device; additional drivers must be enabled in order
> + to use the functionality of the device.
> +
> menu "Multimedia Capabilities Port drivers"
> depends on ARCH_SA1100
>
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index 8bd54b1..7168193 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -177,3 +177,4 @@ obj-$(CONFIG_MFD_HI6421_PMIC) += hi6421-pmic-core.o
>
> intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o
> obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o
> +obj-$(CONFIG_MFD_MT6397) += mt6397-core.o
> diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
> new file mode 100644
> index 0000000..69cacdc
> --- /dev/null
> +++ b/drivers/mfd/mt6397-core.c
> @@ -0,0 +1,94 @@
> +/*
> + * Copyright (c) 2014 MediaTek Inc.
> + * Author: Flora.Fu <flora.fu@mediatek.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + */
> +
> +#include <linux/module.h>
> +#include <linux/mfd/core.h>
> +#include <linux/mfd/mt6397/core.h>
> +#include <linux/of_device.h>
> +#include "mtk-pmic-wrap.h"
> +
> +static struct mfd_cell mt6397_devs[] = {
const?
> + {
> + .name = "mt6397-clk",
> + .id = -1,
> + },
> + {
> + .name = "mt6397-rtc",
> + .id = -1,
> + },
> + {
> + .name = "mt6397-regulator",
> + .id = -1,
> + },
> + {
> + .name = "mt6397-codec",
> + .id = -1,
> + .of_compatible = "mediatek,mt6397-codec"
> + },
> +};
The .ids aren't requred here. Please remove them and put all of the
.names onto a single line, like this:
{ .name = "mt6397-clk" },
> +static int mt6397_probe(struct platform_device *pdev)
> +{
> + u32 ret;
> + struct mt6397_chip *mt6397;
> +
> + struct pmic_wrapper *wrp = dev_get_drvdata(pdev->dev.parent);
Where does this come from? This should be the top level parent.
> + mt6397 = devm_kzalloc(&pdev->dev,
> + sizeof(struct mt6397_chip), GFP_KERNEL);
sizeof(*mt6397)
> + if (!mt6397)
> + return -ENOMEM;
> +
> + mt6397->dev = &pdev->dev;
> + mt6397->regmap = wrp->regmap;
> + platform_set_drvdata(pdev, mt6397);
> +
> + ret = mfd_add_devices(mt6397->dev, -1, &mt6397_devs[0],
> + ARRAY_SIZE(mt6397_devs), NULL, 0, NULL);
> + if (ret < 0)
if (ret)
> + dev_err(mt6397->dev, "Failed to mfd_add_devices: %d\n", ret);
User doesn't care about kernel functions. Swap this out for something
for user friendly, "failed to add child devices".
> +
> + return ret;
> +}
> +
> +static int mt6397_remove(struct platform_device *pdev)
> +{
> + struct mt6397_chip *mt6397 = platform_get_drvdata(pdev);
> +
> + mfd_remove_devices(mt6397->dev);
> + return 0;
> +}
> +
> +static const struct of_device_id mt6397_of_match[] = {
> + { .compatible = "mediatek,mt6397" },
> + { }
> +};
> +MODULE_DEVICE_TABLE(of, mt6397_of_match);
> +
> +static struct platform_driver mt6397_driver = {
> + .probe = mt6397_probe,
> + .remove = mt6397_remove,
> + .driver = {
> + .name = "mt6397",
> + .owner = THIS_MODULE,
Remove this, it's taken care of elsewhere.
> + .of_match_table = of_match_ptr(mt6397_of_match),
> + },
> +};
> +
> +module_platform_driver(mt6397_driver);
> +
> +MODULE_AUTHOR("Flora Fu <flora.fu@mediatek.com>");
> +MODULE_DESCRIPTION("Driver for MediaTek MT6397 PMIC");
> +MODULE_LICENSE("GPL");
> +MODULE_ALIAS("platform:mt6397");
> diff --git a/drivers/mfd/mtk-pmic-wrap.h b/drivers/mfd/mtk-pmic-wrap.h
> new file mode 100644
> index 0000000..1557a9d
> --- /dev/null
> +++ b/drivers/mfd/mtk-pmic-wrap.h
> @@ -0,0 +1,25 @@
> +/*
> + * Copyright (c) 2014 MediaTek Inc.
> + * Author: Flora.Fu <flora.fu@mediatek.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + */
> +
> +#ifndef __MTK_PMIC_WRAP_H__
> +#define __MTK_PMIC_WRAP_H__
> +
> +struct pmic_wrapper {
> + struct platform_device *pdev;
> + void __iomem *pwrap_base;
> + void __iomem *pwrap_bridge_base;
> + struct regmap *regmap;
> +};
> +
> +#endif /* __MTK_PMIC_WRAP_H__ */
> diff --git a/include/linux/mfd/mt6397/core.h b/include/linux/mfd/mt6397/core.h
> new file mode 100644
> index 0000000..edf38c4
> --- /dev/null
> +++ b/include/linux/mfd/mt6397/core.h
> @@ -0,0 +1,27 @@
> +/*
> + * Copyright (c) 2014 MediaTek Inc.
> + * Author: Flora.Fu <flora.fu@mediatek.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + */
> +
> +#ifndef __MFD_MT6397_CORE_H__
> +#define __MFD_MT6397_CORE_H__
> +
> +struct mt6397_chip {
> + /* Device */
> + struct device *dev;
> +
> + /* Control interface */
> + struct regmap *regmap;
These two comments are unnecessary.
> +};
> +
> +#endif /* __MFD_MT6397_CORE_H__ */
> +
> diff --git a/include/linux/mfd/mt6397/registers.h b/include/linux/mfd/mt6397/registers.h
> new file mode 100644
> index 0000000..d1c4067
> --- /dev/null
> +++ b/include/linux/mfd/mt6397/registers.h
> @@ -0,0 +1,362 @@
> +/*
> +* Copyright (c) 2014 MediaTek Inc.
> +* Author: Flora.Fu <flora.fu@mediatek.com>
> +*
> +* This program is free software; you can redistribute it and/or modify
> +* it under the terms of the GNU General Public License version 2 as
> +* published by the Free Software Foundation.
> +*
> +* This program is distributed in the hope that it will be useful,
> +* but WITHOUT ANY WARRANTY; without even the implied warranty of
> +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +* GNU General Public License for more details.
> +*/
> +
> +#ifndef __MFD_MT6397_REGISTERS_H__
> +#define __MFD_MT6397_REGISTERS_H__
> +
> +/* PMIC Rgisters */
> +#define MT6397_CID 0x0100
Are these spaces or tabs? They should be tabs.
> +#define MT6397_TOP_CKPDN 0x0102
> +#define MT6397_TOP_CKPDN_SET 0x0104
> +#define MT6397_TOP_CKPDN_CLR 0x0106
> +#define MT6397_TOP_CKPDN2 0x0108
> +#define MT6397_TOP_CKPDN2_SET 0x010A
> +#define MT6397_TOP_CKPDN2_CLR 0x010C
> +#define MT6397_TOP_GPIO_CKPDN 0x010E
> +#define MT6397_TOP_RST_CON 0x0114
> +#define MT6397_WRP_CKPDN 0x011A
> +#define MT6397_WRP_RST_CON 0x0120
> +#define MT6397_TOP_RST_MISC 0x0126
> +#define MT6397_TOP_CKCON1 0x0128
> +#define MT6397_TOP_CKCON2 0x012A
> +#define MT6397_TOP_CKTST1 0x012C
> +#define MT6397_TOP_CKTST2 0x012E
> +#define MT6397_OC_DEG_EN 0x0130
> +#define MT6397_OC_CTL0 0x0132
> +#define MT6397_OC_CTL1 0x0134
> +#define MT6397_OC_CTL2 0x0136
> +#define MT6397_INT_RSV 0x0138
> +#define MT6397_TEST_CON0 0x013A
> +#define MT6397_TEST_CON1 0x013C
> +#define MT6397_STATUS0 0x013E
> +#define MT6397_STATUS1 0x0140
> +#define MT6397_PGSTATUS 0x0142
> +#define MT6397_CHRSTATUS 0x0144
> +#define MT6397_OCSTATUS0 0x0146
> +#define MT6397_OCSTATUS1 0x0148
> +#define MT6397_OCSTATUS2 0x014A
> +#define MT6397_HDMI_PAD_IE 0x014C
> +#define MT6397_TEST_OUT_L 0x014E
> +#define MT6397_TEST_OUT_H 0x0150
> +#define MT6397_TDSEL_CON 0x0152
> +#define MT6397_RDSEL_CON 0x0154
> +#define MT6397_GPIO_SMT_CON0 0x0156
> +#define MT6397_GPIO_SMT_CON1 0x0158
> +#define MT6397_GPIO_SMT_CON2 0x015A
> +#define MT6397_GPIO_SMT_CON3 0x015C
> +#define MT6397_DRV_CON0 0x015E
> +#define MT6397_DRV_CON1 0x0160
> +#define MT6397_DRV_CON2 0x0162
> +#define MT6397_DRV_CON3 0x0164
> +#define MT6397_DRV_CON4 0x0166
> +#define MT6397_DRV_CON5 0x0168
> +#define MT6397_DRV_CON6 0x016A
> +#define MT6397_DRV_CON7 0x016C
> +#define MT6397_DRV_CON8 0x016E
> +#define MT6397_DRV_CON9 0x0170
> +#define MT6397_DRV_CON10 0x0172
> +#define MT6397_DRV_CON11 0x0174
> +#define MT6397_DRV_CON12 0x0176
> +#define MT6397_INT_CON0 0x0178
> +#define MT6397_INT_CON1 0x017E
> +#define MT6397_INT_STATUS0 0x0184
> +#define MT6397_INT_STATUS1 0x0186
> +#define MT6397_FQMTR_CON0 0x0188
> +#define MT6397_FQMTR_CON1 0x018A
> +#define MT6397_FQMTR_CON2 0x018C
> +#define MT6397_EFUSE_DOUT_0_15 0x01C4
> +#define MT6397_EFUSE_DOUT_16_31 0x01C6
> +#define MT6397_EFUSE_DOUT_32_47 0x01C8
> +#define MT6397_EFUSE_DOUT_48_63 0x01CA
> +#define MT6397_SPI_CON 0x01CC
> +#define MT6397_TOP_CKPDN3 0x01CE
> +#define MT6397_TOP_CKCON3 0x01D4
> +#define MT6397_EFUSE_DOUT_64_79 0x01D6
> +#define MT6397_EFUSE_DOUT_80_95 0x01D8
> +#define MT6397_EFUSE_DOUT_96_111 0x01DA
> +#define MT6397_EFUSE_DOUT_112_127 0x01DC
> +#define MT6397_EFUSE_DOUT_128_143 0x01DE
> +#define MT6397_EFUSE_DOUT_144_159 0x01E0
> +#define MT6397_EFUSE_DOUT_160_175 0x01E2
> +#define MT6397_EFUSE_DOUT_176_191 0x01E4
> +#define MT6397_EFUSE_DOUT_192_207 0x01E6
> +#define MT6397_EFUSE_DOUT_208_223 0x01E8
> +#define MT6397_EFUSE_DOUT_224_239 0x01EA
> +#define MT6397_EFUSE_DOUT_240_255 0x01EC
> +#define MT6397_EFUSE_DOUT_256_271 0x01EE
> +#define MT6397_EFUSE_DOUT_272_287 0x01F0
> +#define MT6397_EFUSE_DOUT_288_303 0x01F2
> +#define MT6397_EFUSE_DOUT_304_319 0x01F4
> +#define MT6397_BUCK_CON0 0x0200
> +#define MT6397_BUCK_CON1 0x0202
> +#define MT6397_BUCK_CON2 0x0204
> +#define MT6397_BUCK_CON3 0x0206
> +#define MT6397_BUCK_CON4 0x0208
> +#define MT6397_BUCK_CON5 0x020A
> +#define MT6397_BUCK_CON6 0x020C
> +#define MT6397_BUCK_CON7 0x020E
> +#define MT6397_BUCK_CON8 0x0210
> +#define MT6397_BUCK_CON9 0x0212
> +#define MT6397_VCA15_CON0 0x0214
> +#define MT6397_VCA15_CON1 0x0216
> +#define MT6397_VCA15_CON2 0x0218
> +#define MT6397_VCA15_CON3 0x021A
> +#define MT6397_VCA15_CON4 0x021C
> +#define MT6397_VCA15_CON5 0x021E
> +#define MT6397_VCA15_CON6 0x0220
> +#define MT6397_VCA15_CON7 0x0222
> +#define MT6397_VCA15_CON8 0x0224
> +#define MT6397_VCA15_CON9 0x0226
> +#define MT6397_VCA15_CON10 0x0228
> +#define MT6397_VCA15_CON11 0x022A
> +#define MT6397_VCA15_CON12 0x022C
> +#define MT6397_VCA15_CON13 0x022E
> +#define MT6397_VCA15_CON14 0x0230
> +#define MT6397_VCA15_CON15 0x0232
> +#define MT6397_VCA15_CON16 0x0234
> +#define MT6397_VCA15_CON17 0x0236
> +#define MT6397_VCA15_CON18 0x0238
> +#define MT6397_VSRMCA15_CON0 0x023A
> +#define MT6397_VSRMCA15_CON1 0x023C
> +#define MT6397_VSRMCA15_CON2 0x023E
> +#define MT6397_VSRMCA15_CON3 0x0240
> +#define MT6397_VSRMCA15_CON4 0x0242
> +#define MT6397_VSRMCA15_CON5 0x0244
> +#define MT6397_VSRMCA15_CON6 0x0246
> +#define MT6397_VSRMCA15_CON7 0x0248
> +#define MT6397_VSRMCA15_CON8 0x024A
> +#define MT6397_VSRMCA15_CON9 0x024C
> +#define MT6397_VSRMCA15_CON10 0x024E
> +#define MT6397_VSRMCA15_CON11 0x0250
> +#define MT6397_VSRMCA15_CON12 0x0252
> +#define MT6397_VSRMCA15_CON13 0x0254
> +#define MT6397_VSRMCA15_CON14 0x0256
> +#define MT6397_VSRMCA15_CON15 0x0258
> +#define MT6397_VSRMCA15_CON16 0x025A
> +#define MT6397_VSRMCA15_CON17 0x025C
> +#define MT6397_VSRMCA15_CON18 0x025E
> +#define MT6397_VSRMCA15_CON19 0x0260
> +#define MT6397_VSRMCA15_CON20 0x0262
> +#define MT6397_VSRMCA15_CON21 0x0264
> +#define MT6397_VCORE_CON0 0x0266
> +#define MT6397_VCORE_CON1 0x0268
> +#define MT6397_VCORE_CON2 0x026A
> +#define MT6397_VCORE_CON3 0x026C
> +#define MT6397_VCORE_CON4 0x026E
> +#define MT6397_VCORE_CON5 0x0270
> +#define MT6397_VCORE_CON6 0x0272
> +#define MT6397_VCORE_CON7 0x0274
> +#define MT6397_VCORE_CON8 0x0276
> +#define MT6397_VCORE_CON9 0x0278
> +#define MT6397_VCORE_CON10 0x027A
> +#define MT6397_VCORE_CON11 0x027C
> +#define MT6397_VCORE_CON12 0x027E
> +#define MT6397_VCORE_CON13 0x0280
> +#define MT6397_VCORE_CON14 0x0282
> +#define MT6397_VCORE_CON15 0x0284
> +#define MT6397_VCORE_CON16 0x0286
> +#define MT6397_VCORE_CON17 0x0288
> +#define MT6397_VCORE_CON18 0x028A
> +#define MT6397_VGPU_CON0 0x028C
> +#define MT6397_VGPU_CON1 0x028E
> +#define MT6397_VGPU_CON2 0x0290
> +#define MT6397_VGPU_CON3 0x0292
> +#define MT6397_VGPU_CON4 0x0294
> +#define MT6397_VGPU_CON5 0x0296
> +#define MT6397_VGPU_CON6 0x0298
> +#define MT6397_VGPU_CON7 0x029A
> +#define MT6397_VGPU_CON8 0x029C
> +#define MT6397_VGPU_CON9 0x029E
> +#define MT6397_VGPU_CON10 0x02A0
> +#define MT6397_VGPU_CON11 0x02A2
> +#define MT6397_VGPU_CON12 0x02A4
> +#define MT6397_VGPU_CON13 0x02A6
> +#define MT6397_VGPU_CON14 0x02A8
> +#define MT6397_VGPU_CON15 0x02AA
> +#define MT6397_VGPU_CON16 0x02AC
> +#define MT6397_VGPU_CON17 0x02AE
> +#define MT6397_VGPU_CON18 0x02B0
> +#define MT6397_VIO18_CON0 0x0300
> +#define MT6397_VIO18_CON1 0x0302
> +#define MT6397_VIO18_CON2 0x0304
> +#define MT6397_VIO18_CON3 0x0306
> +#define MT6397_VIO18_CON4 0x0308
> +#define MT6397_VIO18_CON5 0x030A
> +#define MT6397_VIO18_CON6 0x030C
> +#define MT6397_VIO18_CON7 0x030E
> +#define MT6397_VIO18_CON8 0x0310
> +#define MT6397_VIO18_CON9 0x0312
> +#define MT6397_VIO18_CON10 0x0314
> +#define MT6397_VIO18_CON11 0x0316
> +#define MT6397_VIO18_CON12 0x0318
> +#define MT6397_VIO18_CON13 0x031A
> +#define MT6397_VIO18_CON14 0x031C
> +#define MT6397_VIO18_CON15 0x031E
> +#define MT6397_VIO18_CON16 0x0320
> +#define MT6397_VIO18_CON17 0x0322
> +#define MT6397_VIO18_CON18 0x0324
> +#define MT6397_VPCA7_CON0 0x0326
> +#define MT6397_VPCA7_CON1 0x0328
> +#define MT6397_VPCA7_CON2 0x032A
> +#define MT6397_VPCA7_CON3 0x032C
> +#define MT6397_VPCA7_CON4 0x032E
> +#define MT6397_VPCA7_CON5 0x0330
> +#define MT6397_VPCA7_CON6 0x0332
> +#define MT6397_VPCA7_CON7 0x0334
> +#define MT6397_VPCA7_CON8 0x0336
> +#define MT6397_VPCA7_CON9 0x0338
> +#define MT6397_VPCA7_CON10 0x033A
> +#define MT6397_VPCA7_CON11 0x033C
> +#define MT6397_VPCA7_CON12 0x033E
> +#define MT6397_VPCA7_CON13 0x0340
> +#define MT6397_VPCA7_CON14 0x0342
> +#define MT6397_VPCA7_CON15 0x0344
> +#define MT6397_VPCA7_CON16 0x0346
> +#define MT6397_VPCA7_CON17 0x0348
> +#define MT6397_VPCA7_CON18 0x034A
> +#define MT6397_VSRMCA7_CON0 0x034C
> +#define MT6397_VSRMCA7_CON1 0x034E
> +#define MT6397_VSRMCA7_CON2 0x0350
> +#define MT6397_VSRMCA7_CON3 0x0352
> +#define MT6397_VSRMCA7_CON4 0x0354
> +#define MT6397_VSRMCA7_CON5 0x0356
> +#define MT6397_VSRMCA7_CON6 0x0358
> +#define MT6397_VSRMCA7_CON7 0x035A
> +#define MT6397_VSRMCA7_CON8 0x035C
> +#define MT6397_VSRMCA7_CON9 0x035E
> +#define MT6397_VSRMCA7_CON10 0x0360
> +#define MT6397_VSRMCA7_CON11 0x0362
> +#define MT6397_VSRMCA7_CON12 0x0364
> +#define MT6397_VSRMCA7_CON13 0x0366
> +#define MT6397_VSRMCA7_CON14 0x0368
> +#define MT6397_VSRMCA7_CON15 0x036A
> +#define MT6397_VSRMCA7_CON16 0x036C
> +#define MT6397_VSRMCA7_CON17 0x036E
> +#define MT6397_VSRMCA7_CON18 0x0370
> +#define MT6397_VSRMCA7_CON19 0x0372
> +#define MT6397_VSRMCA7_CON20 0x0374
> +#define MT6397_VSRMCA7_CON21 0x0376
> +#define MT6397_VDRM_CON0 0x0378
> +#define MT6397_VDRM_CON1 0x037A
> +#define MT6397_VDRM_CON2 0x037C
> +#define MT6397_VDRM_CON3 0x037E
> +#define MT6397_VDRM_CON4 0x0380
> +#define MT6397_VDRM_CON5 0x0382
> +#define MT6397_VDRM_CON6 0x0384
> +#define MT6397_VDRM_CON7 0x0386
> +#define MT6397_VDRM_CON8 0x0388
> +#define MT6397_VDRM_CON9 0x038A
> +#define MT6397_VDRM_CON10 0x038C
> +#define MT6397_VDRM_CON11 0x038E
> +#define MT6397_VDRM_CON12 0x0390
> +#define MT6397_VDRM_CON13 0x0392
> +#define MT6397_VDRM_CON14 0x0394
> +#define MT6397_VDRM_CON15 0x0396
> +#define MT6397_VDRM_CON16 0x0398
> +#define MT6397_VDRM_CON17 0x039A
> +#define MT6397_VDRM_CON18 0x039C
> +#define MT6397_BUCK_K_CON0 0x039E
> +#define MT6397_BUCK_K_CON1 0x03A0
> +#define MT6397_ANALDO_CON0 0x0400
> +#define MT6397_ANALDO_CON1 0x0402
> +#define MT6397_ANALDO_CON2 0x0404
> +#define MT6397_ANALDO_CON3 0x0406
> +#define MT6397_ANALDO_CON4 0x0408
> +#define MT6397_ANALDO_CON5 0x040A
> +#define MT6397_ANALDO_CON6 0x040C
> +#define MT6397_ANALDO_CON7 0x040E
> +#define MT6397_DIGLDO_CON0 0x0410
> +#define MT6397_DIGLDO_CON1 0x0412
> +#define MT6397_DIGLDO_CON2 0x0414
> +#define MT6397_DIGLDO_CON3 0x0416
> +#define MT6397_DIGLDO_CON4 0x0418
> +#define MT6397_DIGLDO_CON5 0x041A
> +#define MT6397_DIGLDO_CON6 0x041C
> +#define MT6397_DIGLDO_CON7 0x041E
> +#define MT6397_DIGLDO_CON8 0x0420
> +#define MT6397_DIGLDO_CON9 0x0422
> +#define MT6397_DIGLDO_CON10 0x0424
> +#define MT6397_DIGLDO_CON11 0x0426
> +#define MT6397_DIGLDO_CON12 0x0428
> +#define MT6397_DIGLDO_CON13 0x042A
> +#define MT6397_DIGLDO_CON14 0x042C
> +#define MT6397_DIGLDO_CON15 0x042E
> +#define MT6397_DIGLDO_CON16 0x0430
> +#define MT6397_DIGLDO_CON17 0x0432
> +#define MT6397_DIGLDO_CON18 0x0434
> +#define MT6397_DIGLDO_CON19 0x0436
> +#define MT6397_DIGLDO_CON20 0x0438
> +#define MT6397_DIGLDO_CON21 0x043A
> +#define MT6397_DIGLDO_CON22 0x043C
> +#define MT6397_DIGLDO_CON23 0x043E
> +#define MT6397_DIGLDO_CON24 0x0440
> +#define MT6397_DIGLDO_CON25 0x0442
> +#define MT6397_DIGLDO_CON26 0x0444
> +#define MT6397_DIGLDO_CON27 0x0446
> +#define MT6397_DIGLDO_CON28 0x0448
> +#define MT6397_DIGLDO_CON29 0x044A
> +#define MT6397_DIGLDO_CON30 0x044C
> +#define MT6397_DIGLDO_CON31 0x044E
> +#define MT6397_DIGLDO_CON32 0x0450
> +#define MT6397_DIGLDO_CON33 0x045A
> +#define MT6397_SPK_CON0 0x0600
> +#define MT6397_SPK_CON1 0x0602
> +#define MT6397_SPK_CON2 0x0604
> +#define MT6397_SPK_CON3 0x0606
> +#define MT6397_SPK_CON4 0x0608
> +#define MT6397_SPK_CON5 0x060A
> +#define MT6397_SPK_CON6 0x060C
> +#define MT6397_SPK_CON7 0x060E
> +#define MT6397_SPK_CON8 0x0610
> +#define MT6397_SPK_CON9 0x0612
> +#define MT6397_SPK_CON10 0x0614
> +#define MT6397_SPK_CON11 0x0616
> +#define MT6397_AUDDAC_CON0 0x0700
> +#define MT6397_AUDBUF_CFG0 0x0702
> +#define MT6397_AUDBUF_CFG1 0x0704
> +#define MT6397_AUDBUF_CFG2 0x0706
> +#define MT6397_AUDBUF_CFG3 0x0708
> +#define MT6397_AUDBUF_CFG4 0x070A
> +#define MT6397_IBIASDIST_CFG0 0x070C
> +#define MT6397_AUDACCDEPOP_CFG0 0x070E
> +#define MT6397_AUD_IV_CFG0 0x0710
> +#define MT6397_AUDCLKGEN_CFG0 0x0712
> +#define MT6397_AUDLDO_CFG0 0x0714
> +#define MT6397_AUDLDO_CFG1 0x0716
> +#define MT6397_AUDNVREGGLB_CFG0 0x0718
> +#define MT6397_AUD_NCP0 0x071A
> +#define MT6397_AUDPREAMP_CON0 0x071C
> +#define MT6397_AUDADC_CON0 0x071E
> +#define MT6397_AUDADC_CON1 0x0720
> +#define MT6397_AUDADC_CON2 0x0722
> +#define MT6397_AUDADC_CON3 0x0724
> +#define MT6397_AUDADC_CON4 0x0726
> +#define MT6397_AUDADC_CON5 0x0728
> +#define MT6397_AUDADC_CON6 0x072A
> +#define MT6397_AUDDIGMI_CON0 0x072C
> +#define MT6397_AUDLSBUF_CON0 0x072E
> +#define MT6397_AUDLSBUF_CON1 0x0730
> +#define MT6397_AUDENCSPARE_CON0 0x0732
> +#define MT6397_AUDENCCLKSQ_CON0 0x0734
> +#define MT6397_AUDPREAMPGAIN_CON0 0x0736
> +#define MT6397_ZCD_CON0 0x0738
> +#define MT6397_ZCD_CON1 0x073A
> +#define MT6397_ZCD_CON2 0x073C
> +#define MT6397_ZCD_CON3 0x073E
> +#define MT6397_ZCD_CON4 0x0740
> +#define MT6397_ZCD_CON5 0x0742
> +#define MT6397_NCP_CLKDIV_CON0 0x0744
> +#define MT6397_NCP_CLKDIV_CON1 0x0746
> +
> +#endif /* __MFD_MT6397_REGISTERS_H__ */
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/7] mfd: MT6397: Add regmap for MT8135 and MT6397 SoC
2014-11-18 11:46 ` Lee Jones
@ 2014-11-18 13:46 ` Sascha Hauer
[not found] ` <20141118134618.GF30369-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
0 siblings, 1 reply; 18+ messages in thread
From: Sascha Hauer @ 2014-11-18 13:46 UTC (permalink / raw)
To: Lee Jones
Cc: Flora Fu, Rob Herring, Mark Rutland, Matthias Brugger, Pawel Moll,
Ian Campbell, Kumar Gala, Russell King, Samuel Ortiz,
Liam Girdwood, Mark Brown, Grant Likely, Joe.C, Catalin Marinas,
Vladimir Murzin, Ashwin Chaugule, devicetree, linux-kernel,
linux-arm-kernel, srv_heupstream, Sascha Hauer, Eddie Huang,
Dongdong Cheng
On Tue, Nov 18, 2014 at 11:46:45AM +0000, Lee Jones wrote:
> On Mon, 17 Nov 2014, Flora Fu wrote:
>
> > Add PMIC wrapper of MT8135 to access MFD MT6397.
> > This is regmap of MT6397 MFD.
> >
> > Signed-off-by: Flora Fu <flora.fu@mediatek.com>
> > ---
> > drivers/mfd/Kconfig | 8 +
> > drivers/mfd/Makefile | 1 +
> > drivers/mfd/mt8135-pmic-wrap.c | 847 +++++++++++++++++++++++++++++++++++++++++
>
> All of the PMIC functionality needs removing from MFD and placed
> somewhere else. I suggest either drivers/power or drivers/regulator.
This is no PMIC functionality. The MT8135 has a unit which is is used to
access the PMIC (which is not only a PMIC, but also Touchscreen
interface and other stuff). This unit is called pmic-wrapper in the
docs. See the introductory mail for a nice picture.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/7] mfd: MT6397: Add regmap for MT8135 and MT6397 SoC
[not found] ` <20141118134618.GF30369-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
@ 2014-11-19 17:04 ` Lee Jones
2014-11-20 9:19 ` Sascha Hauer
0 siblings, 1 reply; 18+ messages in thread
From: Lee Jones @ 2014-11-19 17:04 UTC (permalink / raw)
To: Sascha Hauer
Cc: Flora Fu, Rob Herring, Mark Rutland, Matthias Brugger, Pawel Moll,
Ian Campbell, Kumar Gala, Russell King, Samuel Ortiz,
Liam Girdwood, Mark Brown, Grant Likely, Joe.C, Catalin Marinas,
Vladimir Murzin, Ashwin Chaugule,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
srv_heupstream-NuS5LvNUpcJWk0Htik3J/w, Sascha Hauer, Eddie Huang,
Dongdong Cheng
On Tue, 18 Nov 2014, Sascha Hauer wrote:
> On Tue, Nov 18, 2014 at 11:46:45AM +0000, Lee Jones wrote:
> > On Mon, 17 Nov 2014, Flora Fu wrote:
> >
> > > Add PMIC wrapper of MT8135 to access MFD MT6397.
> > > This is regmap of MT6397 MFD.
> > >
> > > Signed-off-by: Flora Fu <flora.fu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
> > > ---
> > > drivers/mfd/Kconfig | 8 +
> > > drivers/mfd/Makefile | 1 +
> > > drivers/mfd/mt8135-pmic-wrap.c | 847 +++++++++++++++++++++++++++++++++++++++++
> >
> > All of the PMIC functionality needs removing from MFD and placed
> > somewhere else. I suggest either drivers/power or drivers/regulator.
>
> This is no PMIC functionality. The MT8135 has a unit which is is used to
> access the PMIC (which is not only a PMIC, but also Touchscreen
> interface and other stuff). This unit is called pmic-wrapper in the
> docs. See the introductory mail for a nice picture.
I saw the picture, it's very nice. Whatever this is, it's not an
MFD. It's a device which is located on an MFD. There is far too much
functional (the operative word here) code contained in this patch.
I'm not sure where this device should live, but I'm keen for MFD not
to become a dumping ground for ill-fitting devices. Happy for you to
create resources and register it from here, but the bulk for the
functional driver needs to live somewhere else.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/7] mfd: MT6397: Add regmap for MT8135 and MT6397 SoC
2014-11-19 17:04 ` Lee Jones
@ 2014-11-20 9:19 ` Sascha Hauer
[not found] ` <20141120091943.GJ30369-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
0 siblings, 1 reply; 18+ messages in thread
From: Sascha Hauer @ 2014-11-20 9:19 UTC (permalink / raw)
To: Lee Jones
Cc: Flora Fu, Rob Herring, Mark Rutland, Matthias Brugger, Pawel Moll,
Ian Campbell, Kumar Gala, Russell King, Samuel Ortiz,
Liam Girdwood, Mark Brown, Grant Likely, Joe.C, Catalin Marinas,
Vladimir Murzin, Ashwin Chaugule,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
srv_heupstream-NuS5LvNUpcJWk0Htik3J/w, Sascha Hauer, Eddie Huang,
Dongdong Cheng
On Wed, Nov 19, 2014 at 05:04:54PM +0000, Lee Jones wrote:
> On Tue, 18 Nov 2014, Sascha Hauer wrote:
>
> > On Tue, Nov 18, 2014 at 11:46:45AM +0000, Lee Jones wrote:
> > > On Mon, 17 Nov 2014, Flora Fu wrote:
> > >
> > > > Add PMIC wrapper of MT8135 to access MFD MT6397.
> > > > This is regmap of MT6397 MFD.
> > > >
> > > > Signed-off-by: Flora Fu <flora.fu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
> > > > ---
> > > > drivers/mfd/Kconfig | 8 +
> > > > drivers/mfd/Makefile | 1 +
> > > > drivers/mfd/mt8135-pmic-wrap.c | 847 +++++++++++++++++++++++++++++++++++++++++
> > >
> > > All of the PMIC functionality needs removing from MFD and placed
> > > somewhere else. I suggest either drivers/power or drivers/regulator.
> >
> > This is no PMIC functionality. The MT8135 has a unit which is is used to
> > access the PMIC (which is not only a PMIC, but also Touchscreen
> > interface and other stuff). This unit is called pmic-wrapper in the
> > docs. See the introductory mail for a nice picture.
>
> I saw the picture, it's very nice. Whatever this is, it's not an
> MFD. It's a device which is located on an MFD. There is far too much
> functional (the operative word here) code contained in this patch.
The MT6397 is a classical MFD device. It has a PMIC, an audio amp and a
RTC. It is very tightly coupled to the SoC via SPI, but the SPI itself
is not directly visible on the SoC. It's accessible indirectly via the
PMIC-wrapper. Indeed the PMIC-wrapper is not MFD. Another dumping ground
that comes to my mind is drivers/soc/. We could move over there.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/7] mfd: MT6397: Add regmap for MT8135 and MT6397 SoC
[not found] ` <20141120091943.GJ30369-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
@ 2014-11-20 10:38 ` Lee Jones
0 siblings, 0 replies; 18+ messages in thread
From: Lee Jones @ 2014-11-20 10:38 UTC (permalink / raw)
To: Sascha Hauer
Cc: Flora Fu, Rob Herring, Mark Rutland, Matthias Brugger, Pawel Moll,
Ian Campbell, Kumar Gala, Russell King, Samuel Ortiz,
Liam Girdwood, Mark Brown, Grant Likely, Joe.C, Catalin Marinas,
Vladimir Murzin, Ashwin Chaugule,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
srv_heupstream-NuS5LvNUpcJWk0Htik3J/w, Sascha Hauer, Eddie Huang,
Dongdong Cheng
On Thu, 20 Nov 2014, Sascha Hauer wrote:
> On Wed, Nov 19, 2014 at 05:04:54PM +0000, Lee Jones wrote:
> > On Tue, 18 Nov 2014, Sascha Hauer wrote:
> >
> > > On Tue, Nov 18, 2014 at 11:46:45AM +0000, Lee Jones wrote:
> > > > On Mon, 17 Nov 2014, Flora Fu wrote:
> > > >
> > > > > Add PMIC wrapper of MT8135 to access MFD MT6397.
> > > > > This is regmap of MT6397 MFD.
> > > > >
> > > > > Signed-off-by: Flora Fu <flora.fu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
> > > > > ---
> > > > > drivers/mfd/Kconfig | 8 +
> > > > > drivers/mfd/Makefile | 1 +
> > > > > drivers/mfd/mt8135-pmic-wrap.c | 847 +++++++++++++++++++++++++++++++++++++++++
> > > >
> > > > All of the PMIC functionality needs removing from MFD and placed
> > > > somewhere else. I suggest either drivers/power or drivers/regulator.
> > >
> > > This is no PMIC functionality. The MT8135 has a unit which is is used to
> > > access the PMIC (which is not only a PMIC, but also Touchscreen
> > > interface and other stuff). This unit is called pmic-wrapper in the
> > > docs. See the introductory mail for a nice picture.
> >
> > I saw the picture, it's very nice. Whatever this is, it's not an
> > MFD. It's a device which is located on an MFD. There is far too much
> > functional (the operative word here) code contained in this patch.
>
> The MT6397 is a classical MFD device. It has a PMIC, an audio amp and a
> RTC. It is very tightly coupled to the SoC via SPI, but the SPI itself
> is not directly visible on the SoC. It's accessible indirectly via the
> PMIC-wrapper. Indeed the PMIC-wrapper is not MFD. Another dumping ground
> that comes to my mind is drivers/soc/. We could move over there.
Thanks for understanding my point-of-view. Hopefully there is a
suitable "dumping ground", or even better a proper place to move the
PMIC-wrapper to.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 3/7] regulator: MT6397: Add support for MT6397 regulator
2014-11-17 23:40 ` Mark Brown
@ 2014-11-21 7:09 ` Flora Fu
2014-11-21 10:16 ` Mark Brown
0 siblings, 1 reply; 18+ messages in thread
From: Flora Fu @ 2014-11-21 7:09 UTC (permalink / raw)
To: Mark Brown
Cc: Mark Rutland, Catalin Marinas, linux-kernel, Lee Jones,
Russell King, Samuel Ortiz, Grant Likely, Joe.C, devicetree,
Vladimir Murzin, Pawel Moll, Ian Campbell, Rob Herring,
Matthias Brugger, Eddie Huang, linux-arm-kernel, Dongdong Cheng,
srv_heupstream, Liam Girdwood, Ashwin Chaugule, Sascha Hauer,
Kumar Gala
Hi, Mark,
On Mon, 2014-11-17 at 23:40 +0000, Mark Brown wrote:
> On Mon, Nov 17, 2014 at 03:40:23PM +0800, Flora Fu wrote:
> > +static int mt6397_buck_set_voltage_sel(struct regulator_dev *rdev, unsigned sel)
> > +{
>
>
> > + vosel = info->buck_conf.vosel_reg;
> > + voselon = info->buck_conf.voselon_reg;
> > + vosel_mask = info->buck_conf.vosel_mask;
>
> Please use the standard way of specifying data even if you can't use the
> standard function.
>
Could you specify the standard way of specification data? Thanks.
> > +
> > + ret = regmap_update_bits(rdev->regmap, vosel, vosel_mask, sel);
> > + if (ret != 0) {
> > + dev_err(&rdev->dev, "Failed to update vosel: %d\n", ret);
> > + return ret;
> > + }
> > +
> > + ret = regmap_update_bits(rdev->regmap, voselon, vosel_mask, sel);
> > + if (ret != 0) {
> > + dev_err(&rdev->dev, "Failed to update vosel_on: %d\n", ret);
> > + return ret;
> > + }
> > + return 0;
>
> You should add comments here explaining what's going on - it's very
> strange to have to write the same value to two different registers and
> the names of the registers look suspiciously like this is something to do
> with a suspend mode...
>
Yes, its is for suspend mode control usage.
For registers "vosel", "voselon", they is called register mode or
hardware control mode voltage settings. Register mode is a default mode
on the buck control. For quickly normal/sleep mode switch, hardware
control can be enabled by controlling buck output by a CTRL_PIN. In the
following diagram, there is a static settings on vosel_sleep for suspend
mode output. According to CTRL_PIN's level, Vout can have different
output (voselon or vosel_sleep).
+------------------------------------------------------+
| MT6397 |
| -vosel - |
CTRL_PIN | +-----------------+ \ + nivosel-|-Vout
-----------|-----| hardware control|---+ -voselon - |
| +-----------------+ \ -vosel_sleep - |
| |
+------------------------------------------------------+
In the design, voltage change on bucks are set both on registers vosel
and voselon. I will add more comments on the function to clarify the
implementation.
Thanks,
Flora
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 3/7] regulator: MT6397: Add support for MT6397 regulator
2014-11-21 7:09 ` Flora Fu
@ 2014-11-21 10:16 ` Mark Brown
0 siblings, 0 replies; 18+ messages in thread
From: Mark Brown @ 2014-11-21 10:16 UTC (permalink / raw)
To: Flora Fu
Cc: Rob Herring, Mark Rutland, Matthias Brugger, Pawel Moll,
Ian Campbell, Kumar Gala, Russell King, Samuel Ortiz, Lee Jones,
Liam Girdwood, Grant Likely, Joe.C, Catalin Marinas,
Vladimir Murzin, Ashwin Chaugule, devicetree, linux-kernel,
linux-arm-kernel, srv_heupstream, Sascha Hauer, Eddie Huang,
Dongdong Cheng
[-- Attachment #1: Type: text/plain, Size: 1602 bytes --]
On Fri, Nov 21, 2014 at 03:09:31PM +0800, Flora Fu wrote:
> On Mon, 2014-11-17 at 23:40 +0000, Mark Brown wrote:
> > > + vosel = info->buck_conf.vosel_reg;
> > > + voselon = info->buck_conf.voselon_reg;
> > > + vosel_mask = info->buck_conf.vosel_mask;
> > Please use the standard way of specifying data even if you can't use the
> > standard function.
> Could you specify the standard way of specification data? Thanks.
Using the fields in the regulator_desc as you can see from the standard
helpers.
> > You should add comments here explaining what's going on - it's very
> > strange to have to write the same value to two different registers and
> > the names of the registers look suspiciously like this is something to do
> > with a suspend mode...
> Yes, its is for suspend mode control usage.
> For registers "vosel", "voselon", they is called register mode or
> hardware control mode voltage settings. Register mode is a default mode
> on the buck control. For quickly normal/sleep mode switch, hardware
> control can be enabled by controlling buck output by a CTRL_PIN. In the
> following diagram, there is a static settings on vosel_sleep for suspend
> mode output. According to CTRL_PIN's level, Vout can have different
> output (voselon or vosel_sleep).
You need to represent this in your driver, the sleep mode controls
should either be controlled using the suspend API or the GPIO control
needs to be visible in the driver. It's also OK to ignore the GPIO
control for now and do it later if complex work is needed to represent
it in the driver.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2014-11-21 10:16 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-17 7:40 Add Support for MediaTek PMIC MT6397 MFD Core and Regulator Flora Fu
2014-11-17 7:40 ` [PATCH 1/7] mfd: MT6397: Add support for PMIC MT6397 MFD Flora Fu
2014-11-18 11:59 ` Lee Jones
2014-11-17 7:40 ` [PATCH 2/7] mfd: MT6397: Add regmap for MT8135 and MT6397 SoC Flora Fu
2014-11-18 11:46 ` Lee Jones
2014-11-18 13:46 ` Sascha Hauer
[not found] ` <20141118134618.GF30369-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2014-11-19 17:04 ` Lee Jones
2014-11-20 9:19 ` Sascha Hauer
[not found] ` <20141120091943.GJ30369-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2014-11-20 10:38 ` Lee Jones
2014-11-17 7:40 ` [PATCH 3/7] regulator: MT6397: Add support for MT6397 regulator Flora Fu
[not found] ` <1416210027-5562-4-git-send-email-flora.fu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2014-11-17 23:40 ` Mark Brown
2014-11-21 7:09 ` Flora Fu
2014-11-21 10:16 ` Mark Brown
2014-11-17 7:40 ` [PATCH 4/7] dt-bindings: Add document for MT6397 MFD Flora Fu
[not found] ` <1416210027-5562-5-git-send-email-flora.fu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2014-11-17 23:31 ` Mark Brown
2014-11-17 7:40 ` [PATCH 5/7] dt-bindings: Add document for MT6397 regulator Flora Fu
2014-11-17 7:40 ` [PATCH 6/7] ARM: dts: mt8135: Add support for PMIC MT6397 MFD Flora Fu
2014-11-17 7:40 ` [PATCH 7/7] ARM: dts: mt8135: Add support for MT6397 regulator Flora Fu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).