mfd: hi6421-spmi-pmic: move driver from staging
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Fri, 23 Jul 2021 07:40:06 +0000 (09:40 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 Jul 2021 08:13:27 +0000 (10:13 +0200)
This driver is ready for mainstream. So, move it out of staging.

Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/dd150f3ffa19c2dda0171f7dbe1dd63cce2a7af5.1627025657.git.mchehab+huawei@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 files changed:
Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml [new file with mode: 0644]
MAINTAINERS
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/mfd/hi6421-spmi-pmic.c [new file with mode: 0644]
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/hikey9xx/Kconfig [deleted file]
drivers/staging/hikey9xx/Makefile [deleted file]
drivers/staging/hikey9xx/TODO [deleted file]
drivers/staging/hikey9xx/hi6421-spmi-pmic.c [deleted file]
drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml [deleted file]

diff --git a/Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml
new file mode 100644 (file)
index 0000000..cedf9d9
--- /dev/null
@@ -0,0 +1,136 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/mfd/hisilicon,hi6421-spmi-pmic.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: HiSilicon 6421v600 SPMI PMIC
+
+maintainers:
+  - Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+
+description: |
+  HiSilicon 6421v600 should be connected inside a MIPI System Power Management
+  (SPMI) bus. It provides interrupts and power supply.
+
+  The GPIO and interrupt settings are represented as part of the top-level PMIC
+  node.
+
+  The SPMI controller part is provided by
+  Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml
+
+properties:
+  $nodename:
+    pattern: "pmic@[0-9a-f]"
+
+  compatible:
+    const: hisilicon,hi6421v600-spmi
+
+  reg:
+    maxItems: 1
+
+  '#interrupt-cells':
+    const: 2
+
+  interrupt-controller: true
+
+  interrupts: true
+
+  regulators:
+    type: object
+
+    additionalProperties: false
+
+    properties:
+      '#address-cells':
+        const: 1
+
+      '#size-cells':
+        const: 0
+
+    patternProperties:
+      '^(ldo|LDO)[0-9]+$':
+        type: object
+
+        $ref: "/schemas/regulator/regulator.yaml#"
+
+        unevaluatedProperties: false
+
+required:
+  - compatible
+  - reg
+  - regulators
+
+additionalProperties: false
+
+examples:
+  - |
+
+    pmic: pmic@0 {
+      compatible = "hisilicon,hi6421v600-spmi";
+      reg = <0 0>;
+
+      #interrupt-cells = <2>;
+      interrupt-controller;
+      interrupt-parent = <&gpio28>;
+      interrupts = <0 0>;
+
+      regulators {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        ldo3: LDO3 {
+          regulator-name = "ldo3";
+          regulator-min-microvolt = <1500000>;
+          regulator-max-microvolt = <2000000>;
+          regulator-boot-on;
+        };
+
+        ldo4: LDO4 {
+          regulator-name = "ldo4";
+          regulator-min-microvolt = <1725000>;
+          regulator-max-microvolt = <1900000>;
+          regulator-boot-on;
+        };
+
+        ldo9: LDO9 {
+          regulator-name = "ldo9";
+          regulator-min-microvolt = <1750000>;
+          regulator-max-microvolt = <3300000>;
+          regulator-boot-on;
+        };
+
+        ldo15: LDO15 {
+          regulator-name = "ldo15";
+          regulator-min-microvolt = <1800000>;
+          regulator-max-microvolt = <3000000>;
+          regulator-always-on;
+        };
+
+        ldo16: LDO16 {
+          regulator-name = "ldo16";
+          regulator-min-microvolt = <1800000>;
+          regulator-max-microvolt = <3000000>;
+          regulator-boot-on;
+        };
+
+        ldo17: LDO17 {
+          regulator-name = "ldo17";
+          regulator-min-microvolt = <2500000>;
+          regulator-max-microvolt = <3300000>;
+        };
+
+        ldo33: LDO33 {
+          regulator-name = "ldo33";
+          regulator-min-microvolt = <2500000>;
+          regulator-max-microvolt = <3300000>;
+          regulator-boot-on;
+        };
+
+        ldo34: LDO34 {
+          regulator-name = "ldo34";
+          regulator-min-microvolt = <2600000>;
+          regulator-max-microvolt = <3300000>;
+        };
+      };
+    };
index 6c8be735cc91059e77aa0c5f79fc67fdcc70a7f1..09e0dfed01a976d2befb77406579fe629e72a0f3 100644 (file)
@@ -8433,6 +8433,13 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml
 F:     drivers/spmi/hisi-spmi-controller.c
 
+HISILICON SPMI PMIC DRIVER FOR HIKEY 6421v600
+M:     Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml
+F:     drivers/mfd/hi6421-spmi-pmic.c
+
 HISILICON STAGING DRIVERS FOR HIKEY 960/970
 M:     Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
 S:     Maintained
index 6a3fd2d75f964a8f55ec40eb9afea55862a29c72..01bb42f0ca0b5a2baabac58ee99a616e60e52f74 100644 (file)
@@ -510,6 +510,22 @@ config MFD_HI6421_PMIC
          menus in order to enable them.
          We communicate with the Hi6421 via memory-mapped I/O.
 
+config MFD_HI6421_SPMI
+       tristate "HiSilicon Hi6421v600 SPMI PMU/Codec IC"
+       depends on OF
+       depends on SPMI
+       select MFD_CORE
+       select REGMAP_SPMI
+       help
+         Add support for HiSilicon Hi6421v600 SPMI PMIC. Hi6421 includes
+         multi-functions, such as regulators, RTC, codec, Coulomb counter,
+         etc.
+
+         This driver includes core APIs _only_. You have to select
+         individual components like voltage regulators under corresponding
+         menus in order to enable them.
+         We communicate with the Hi6421v600 via a SPMI bus.
+
 config MFD_HI655X_PMIC
        tristate "HiSilicon Hi655X series PMU/Codec IC"
        depends on ARCH_HISI || COMPILE_TEST
index 8116c19d5fd4daa0a03ab693d2fa04938b5dbab5..570b9ffb34d0f6603ae81cd2575b05b277e39e5c 100644 (file)
@@ -231,6 +231,7 @@ obj-$(CONFIG_MFD_IPAQ_MICRO)        += ipaq-micro.o
 obj-$(CONFIG_MFD_IQS62X)       += iqs62x.o
 obj-$(CONFIG_MFD_MENF21BMC)    += menf21bmc.o
 obj-$(CONFIG_MFD_HI6421_PMIC)  += hi6421-pmic-core.o
+obj-$(CONFIG_MFD_HI6421_SPMI)  += hi6421-spmi-pmic.o
 obj-$(CONFIG_MFD_HI655X_PMIC)   += hi655x-pmic.o
 obj-$(CONFIG_MFD_DLN2)         += dln2.o
 obj-$(CONFIG_MFD_RT4831)       += rt4831.o
diff --git a/drivers/mfd/hi6421-spmi-pmic.c b/drivers/mfd/hi6421-spmi-pmic.c
new file mode 100644 (file)
index 0000000..4f13682
--- /dev/null
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device driver for regulators in HISI PMIC IC
+ *
+ * Copyright (c) 2013 Linaro Ltd.
+ * Copyright (c) 2011 Hisilicon.
+ * Copyright (c) 2020-2021 Huawei Technologies Co., Ltd.
+ */
+
+#include <linux/mfd/core.h>
+#include <linux/mfd/hi6421-spmi-pmic.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+#include <linux/spmi.h>
+
+static const struct mfd_cell hi6421v600_devs[] = {
+       { .name = "hi6421v600-irq", },
+       { .name = "hi6421v600-regulator", },
+};
+
+static const struct regmap_config regmap_config = {
+       .reg_bits       = 16,
+       .val_bits       = BITS_PER_BYTE,
+       .max_register   = 0xffff,
+       .fast_io        = true
+};
+
+static int hi6421_spmi_pmic_probe(struct spmi_device *sdev)
+{
+       struct device *dev = &sdev->dev;
+       int ret;
+       struct hi6421_spmi_pmic *ddata;
+       ddata = devm_kzalloc(dev, sizeof(*ddata), GFP_KERNEL);
+       if (!ddata)
+               return -ENOMEM;
+
+       ddata->regmap = devm_regmap_init_spmi_ext(sdev, &regmap_config);
+       if (IS_ERR(ddata->regmap))
+               return PTR_ERR(ddata->regmap);
+
+       ddata->dev = dev;
+
+       dev_set_drvdata(&sdev->dev, ddata);
+
+       ret = devm_mfd_add_devices(&sdev->dev, PLATFORM_DEVID_NONE,
+                                  hi6421v600_devs, ARRAY_SIZE(hi6421v600_devs),
+                                  NULL, 0, NULL);
+       if (ret < 0)
+               dev_err(dev, "Failed to add child devices: %d\n", ret);
+
+       return ret;
+}
+
+static const struct of_device_id pmic_spmi_id_table[] = {
+       { .compatible = "hisilicon,hi6421-spmi" },
+       { }
+};
+MODULE_DEVICE_TABLE(of, pmic_spmi_id_table);
+
+static struct spmi_driver hi6421_spmi_pmic_driver = {
+       .driver = {
+               .name   = "hi6421-spmi-pmic",
+               .of_match_table = pmic_spmi_id_table,
+       },
+       .probe  = hi6421_spmi_pmic_probe,
+};
+module_spmi_driver(hi6421_spmi_pmic_driver);
+
+MODULE_DESCRIPTION("HiSilicon Hi6421v600 SPMI PMIC driver");
+MODULE_LICENSE("GPL v2");
index c8eaae6412bbec0255433e83c218e6d3640b10d0..03ee99d98945fc4d01956305dc29f48020921d12 100644 (file)
@@ -102,6 +102,4 @@ source "drivers/staging/qlge/Kconfig"
 
 source "drivers/staging/wfx/Kconfig"
 
-source "drivers/staging/hikey9xx/Kconfig"
-
 endif # STAGING
index 818b6f96436962e34f88dd1ed5991969912941f3..9a4c0e6f34d55d8755206e1a3ddc66ae66214d1a 100644 (file)
@@ -41,4 +41,3 @@ obj-$(CONFIG_XIL_AXIS_FIFO)   += axis-fifo/
 obj-$(CONFIG_FIELDBUS_DEV)     += fieldbus/
 obj-$(CONFIG_QLGE)             += qlge/
 obj-$(CONFIG_WFX)              += wfx/
-obj-y                          += hikey9xx/
diff --git a/drivers/staging/hikey9xx/Kconfig b/drivers/staging/hikey9xx/Kconfig
deleted file mode 100644 (file)
index 9f53df9..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-
-# to be placed at drivers/mfd
-config MFD_HI6421_SPMI
-       tristate "HiSilicon Hi6421v600 SPMI PMU/Codec IC"
-       depends on HAS_IOMEM
-       depends on OF
-       depends on SPMI
-       select MFD_CORE
-       select REGMAP_SPMI
-       help
-         Add support for HiSilicon Hi6421v600 SPMI PMIC. Hi6421 includes
-         multi-functions, such as regulators, RTC, codec, Coulomb counter,
-         etc.
-
-         This driver includes core APIs _only_. You have to select
-         individual components like voltage regulators under corresponding
-         menus in order to enable them.
-         We communicate with the Hi6421v600 via a SPMI bus.
diff --git a/drivers/staging/hikey9xx/Makefile b/drivers/staging/hikey9xx/Makefile
deleted file mode 100644 (file)
index e3108d7..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-
-obj-$(CONFIG_MFD_HI6421_SPMI)          += hi6421-spmi-pmic.o
diff --git a/drivers/staging/hikey9xx/TODO b/drivers/staging/hikey9xx/TODO
deleted file mode 100644 (file)
index 65e7996..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-ToDo list:
-
-- Port other drivers needed by Hikey 960/970;
-- Test drivers on Hikey 960;
-- Validate device tree bindings.
diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c
deleted file mode 100644 (file)
index 4f13682..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device driver for regulators in HISI PMIC IC
- *
- * Copyright (c) 2013 Linaro Ltd.
- * Copyright (c) 2011 Hisilicon.
- * Copyright (c) 2020-2021 Huawei Technologies Co., Ltd.
- */
-
-#include <linux/mfd/core.h>
-#include <linux/mfd/hi6421-spmi-pmic.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/regmap.h>
-#include <linux/slab.h>
-#include <linux/spmi.h>
-
-static const struct mfd_cell hi6421v600_devs[] = {
-       { .name = "hi6421v600-irq", },
-       { .name = "hi6421v600-regulator", },
-};
-
-static const struct regmap_config regmap_config = {
-       .reg_bits       = 16,
-       .val_bits       = BITS_PER_BYTE,
-       .max_register   = 0xffff,
-       .fast_io        = true
-};
-
-static int hi6421_spmi_pmic_probe(struct spmi_device *sdev)
-{
-       struct device *dev = &sdev->dev;
-       int ret;
-       struct hi6421_spmi_pmic *ddata;
-       ddata = devm_kzalloc(dev, sizeof(*ddata), GFP_KERNEL);
-       if (!ddata)
-               return -ENOMEM;
-
-       ddata->regmap = devm_regmap_init_spmi_ext(sdev, &regmap_config);
-       if (IS_ERR(ddata->regmap))
-               return PTR_ERR(ddata->regmap);
-
-       ddata->dev = dev;
-
-       dev_set_drvdata(&sdev->dev, ddata);
-
-       ret = devm_mfd_add_devices(&sdev->dev, PLATFORM_DEVID_NONE,
-                                  hi6421v600_devs, ARRAY_SIZE(hi6421v600_devs),
-                                  NULL, 0, NULL);
-       if (ret < 0)
-               dev_err(dev, "Failed to add child devices: %d\n", ret);
-
-       return ret;
-}
-
-static const struct of_device_id pmic_spmi_id_table[] = {
-       { .compatible = "hisilicon,hi6421-spmi" },
-       { }
-};
-MODULE_DEVICE_TABLE(of, pmic_spmi_id_table);
-
-static struct spmi_driver hi6421_spmi_pmic_driver = {
-       .driver = {
-               .name   = "hi6421-spmi-pmic",
-               .of_match_table = pmic_spmi_id_table,
-       },
-       .probe  = hi6421_spmi_pmic_probe,
-};
-module_spmi_driver(hi6421_spmi_pmic_driver);
-
-MODULE_DESCRIPTION("HiSilicon Hi6421v600 SPMI PMIC driver");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml b/drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml
deleted file mode 100644 (file)
index cedf9d9..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-%YAML 1.2
----
-$id: http://devicetree.org/schemas/mfd/hisilicon,hi6421-spmi-pmic.yaml#
-$schema: http://devicetree.org/meta-schemas/core.yaml#
-
-title: HiSilicon 6421v600 SPMI PMIC
-
-maintainers:
-  - Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
-
-description: |
-  HiSilicon 6421v600 should be connected inside a MIPI System Power Management
-  (SPMI) bus. It provides interrupts and power supply.
-
-  The GPIO and interrupt settings are represented as part of the top-level PMIC
-  node.
-
-  The SPMI controller part is provided by
-  Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml
-
-properties:
-  $nodename:
-    pattern: "pmic@[0-9a-f]"
-
-  compatible:
-    const: hisilicon,hi6421v600-spmi
-
-  reg:
-    maxItems: 1
-
-  '#interrupt-cells':
-    const: 2
-
-  interrupt-controller: true
-
-  interrupts: true
-
-  regulators:
-    type: object
-
-    additionalProperties: false
-
-    properties:
-      '#address-cells':
-        const: 1
-
-      '#size-cells':
-        const: 0
-
-    patternProperties:
-      '^(ldo|LDO)[0-9]+$':
-        type: object
-
-        $ref: "/schemas/regulator/regulator.yaml#"
-
-        unevaluatedProperties: false
-
-required:
-  - compatible
-  - reg
-  - regulators
-
-additionalProperties: false
-
-examples:
-  - |
-
-    pmic: pmic@0 {
-      compatible = "hisilicon,hi6421v600-spmi";
-      reg = <0 0>;
-
-      #interrupt-cells = <2>;
-      interrupt-controller;
-      interrupt-parent = <&gpio28>;
-      interrupts = <0 0>;
-
-      regulators {
-        #address-cells = <1>;
-        #size-cells = <0>;
-
-        ldo3: LDO3 {
-          regulator-name = "ldo3";
-          regulator-min-microvolt = <1500000>;
-          regulator-max-microvolt = <2000000>;
-          regulator-boot-on;
-        };
-
-        ldo4: LDO4 {
-          regulator-name = "ldo4";
-          regulator-min-microvolt = <1725000>;
-          regulator-max-microvolt = <1900000>;
-          regulator-boot-on;
-        };
-
-        ldo9: LDO9 {
-          regulator-name = "ldo9";
-          regulator-min-microvolt = <1750000>;
-          regulator-max-microvolt = <3300000>;
-          regulator-boot-on;
-        };
-
-        ldo15: LDO15 {
-          regulator-name = "ldo15";
-          regulator-min-microvolt = <1800000>;
-          regulator-max-microvolt = <3000000>;
-          regulator-always-on;
-        };
-
-        ldo16: LDO16 {
-          regulator-name = "ldo16";
-          regulator-min-microvolt = <1800000>;
-          regulator-max-microvolt = <3000000>;
-          regulator-boot-on;
-        };
-
-        ldo17: LDO17 {
-          regulator-name = "ldo17";
-          regulator-min-microvolt = <2500000>;
-          regulator-max-microvolt = <3300000>;
-        };
-
-        ldo33: LDO33 {
-          regulator-name = "ldo33";
-          regulator-min-microvolt = <2500000>;
-          regulator-max-microvolt = <3300000>;
-          regulator-boot-on;
-        };
-
-        ldo34: LDO34 {
-          regulator-name = "ldo34";
-          regulator-min-microvolt = <2600000>;
-          regulator-max-microvolt = <3300000>;
-        };
-      };
-    };