mfd: intel_soc_pmic_crc: Merge Intel PMIC core to crc
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 1 Aug 2022 11:42:03 +0000 (14:42 +0300)
committerLee Jones <lee@kernel.org>
Wed, 28 Sep 2022 15:09:48 +0000 (16:09 +0100)
The core part is misleading since its only purpose to serve Crystal Cove PMIC,
although for couple of different platforms. Merge core part into crc one.

Advantages among others are:
- speed up a compilation and build
- decreasing the code base
- reducing noise in the namespace by making some data static and const

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20220801114211.36267-2-andriy.shevchenko@linux.intel.com
drivers/mfd/Makefile
drivers/mfd/intel_soc_pmic_core.c [deleted file]
drivers/mfd/intel_soc_pmic_core.h [deleted file]
drivers/mfd/intel_soc_pmic_crc.c

index 0004b7e86220272a2ec6e4dcee7361a8259fb891..e02abec188585f4dbc99dcc832acdc78dfedf4b4 100644 (file)
@@ -239,8 +239,7 @@ obj-$(CONFIG_MFD_RT4831)    += rt4831.o
 obj-$(CONFIG_MFD_RT5033)       += rt5033.o
 obj-$(CONFIG_MFD_SKY81452)     += sky81452.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_INTEL_SOC_PMIC)           += intel_soc_pmic_crc.o
 obj-$(CONFIG_INTEL_SOC_PMIC_BXTWC)     += intel_soc_pmic_bxtwc.o
 obj-$(CONFIG_INTEL_SOC_PMIC_CHTWC)     += intel_soc_pmic_chtwc.o
 obj-$(CONFIG_INTEL_SOC_PMIC_CHTDC_TI)  += intel_soc_pmic_chtdc_ti.o
diff --git a/drivers/mfd/intel_soc_pmic_core.c b/drivers/mfd/intel_soc_pmic_core.c
deleted file mode 100644 (file)
index 85d070b..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Intel SoC PMIC MFD Driver
- *
- * Copyright (C) 2013, 2014 Intel Corporation. All rights reserved.
- *
- * Author: Yang, Bin <bin.yang@intel.com>
- * Author: Zhu, Lejun <lejun.zhu@linux.intel.com>
- */
-
-#include <linux/acpi.h>
-#include <linux/i2c.h>
-#include <linux/interrupt.h>
-#include <linux/module.h>
-#include <linux/mfd/core.h>
-#include <linux/mfd/intel_soc_pmic.h>
-#include <linux/platform_data/x86/soc.h>
-#include <linux/pwm.h>
-#include <linux/regmap.h>
-
-#include "intel_soc_pmic_core.h"
-
-/* PWM consumed by the Intel GFX */
-static struct pwm_lookup crc_pwm_lookup[] = {
-       PWM_LOOKUP("crystal_cove_pwm", 0, "0000:00:02.0", "pwm_pmic_backlight", 0, PWM_POLARITY_NORMAL),
-};
-
-static int intel_soc_pmic_i2c_probe(struct i2c_client *i2c,
-                                   const struct i2c_device_id *i2c_id)
-{
-       struct device *dev = &i2c->dev;
-       struct intel_soc_pmic_config *config;
-       struct intel_soc_pmic *pmic;
-       int ret;
-
-       if (soc_intel_is_byt())
-               config = &intel_soc_pmic_config_byt_crc;
-       else
-               config = &intel_soc_pmic_config_cht_crc;
-
-       pmic = devm_kzalloc(dev, sizeof(*pmic), GFP_KERNEL);
-       if (!pmic)
-               return -ENOMEM;
-
-       dev_set_drvdata(dev, pmic);
-
-       pmic->regmap = devm_regmap_init_i2c(i2c, config->regmap_config);
-       if (IS_ERR(pmic->regmap))
-               return PTR_ERR(pmic->regmap);
-
-       pmic->irq = i2c->irq;
-
-       ret = regmap_add_irq_chip(pmic->regmap, pmic->irq,
-                                 config->irq_flags | IRQF_ONESHOT,
-                                 0, config->irq_chip,
-                                 &pmic->irq_chip_data);
-       if (ret)
-               return ret;
-
-       ret = enable_irq_wake(pmic->irq);
-       if (ret)
-               dev_warn(dev, "Can't enable IRQ as wake source: %d\n", ret);
-
-       /* Add lookup table for crc-pwm */
-       pwm_add_table(crc_pwm_lookup, ARRAY_SIZE(crc_pwm_lookup));
-
-       /* To distuingish this domain from the GPIO/charger's irqchip domains */
-       irq_domain_update_bus_token(regmap_irq_get_domain(pmic->irq_chip_data),
-                                   DOMAIN_BUS_NEXUS);
-
-       ret = mfd_add_devices(dev, -1, config->cell_dev,
-                             config->n_cell_devs, NULL, 0,
-                             regmap_irq_get_domain(pmic->irq_chip_data));
-       if (ret)
-               goto err_del_irq_chip;
-
-       return 0;
-
-err_del_irq_chip:
-       pwm_remove_table(crc_pwm_lookup, ARRAY_SIZE(crc_pwm_lookup));
-       regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data);
-       return ret;
-}
-
-static int intel_soc_pmic_i2c_remove(struct i2c_client *i2c)
-{
-       struct intel_soc_pmic *pmic = dev_get_drvdata(&i2c->dev);
-
-       regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data);
-
-       /* remove crc-pwm lookup table */
-       pwm_remove_table(crc_pwm_lookup, ARRAY_SIZE(crc_pwm_lookup));
-
-       mfd_remove_devices(&i2c->dev);
-
-       return 0;
-}
-
-static void intel_soc_pmic_shutdown(struct i2c_client *i2c)
-{
-       struct intel_soc_pmic *pmic = dev_get_drvdata(&i2c->dev);
-
-       disable_irq(pmic->irq);
-
-       return;
-}
-
-#if defined(CONFIG_PM_SLEEP)
-static int intel_soc_pmic_suspend(struct device *dev)
-{
-       struct intel_soc_pmic *pmic = dev_get_drvdata(dev);
-
-       disable_irq(pmic->irq);
-
-       return 0;
-}
-
-static int intel_soc_pmic_resume(struct device *dev)
-{
-       struct intel_soc_pmic *pmic = dev_get_drvdata(dev);
-
-       enable_irq(pmic->irq);
-
-       return 0;
-}
-#endif
-
-static SIMPLE_DEV_PM_OPS(intel_soc_pmic_pm_ops, intel_soc_pmic_suspend,
-                        intel_soc_pmic_resume);
-
-static const struct i2c_device_id intel_soc_pmic_i2c_id[] = {
-       { }
-};
-MODULE_DEVICE_TABLE(i2c, intel_soc_pmic_i2c_id);
-
-#if defined(CONFIG_ACPI)
-static const struct acpi_device_id intel_soc_pmic_acpi_match[] = {
-       { "INT33FD" },
-       { },
-};
-MODULE_DEVICE_TABLE(acpi, intel_soc_pmic_acpi_match);
-#endif
-
-static struct i2c_driver intel_soc_pmic_i2c_driver = {
-       .driver = {
-               .name = "intel_soc_pmic_i2c",
-               .pm = &intel_soc_pmic_pm_ops,
-               .acpi_match_table = ACPI_PTR(intel_soc_pmic_acpi_match),
-       },
-       .probe = intel_soc_pmic_i2c_probe,
-       .remove = intel_soc_pmic_i2c_remove,
-       .id_table = intel_soc_pmic_i2c_id,
-       .shutdown = intel_soc_pmic_shutdown,
-};
-
-module_i2c_driver(intel_soc_pmic_i2c_driver);
-
-MODULE_DESCRIPTION("I2C driver for Intel SoC PMIC");
-MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Yang, Bin <bin.yang@intel.com>");
-MODULE_AUTHOR("Zhu, Lejun <lejun.zhu@linux.intel.com>");
diff --git a/drivers/mfd/intel_soc_pmic_core.h b/drivers/mfd/intel_soc_pmic_core.h
deleted file mode 100644 (file)
index d490685..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Intel SoC PMIC MFD Driver
- *
- * Copyright (C) 2012-2014 Intel Corporation. All rights reserved.
- *
- * Author: Yang, Bin <bin.yang@intel.com>
- * Author: Zhu, Lejun <lejun.zhu@linux.intel.com>
- */
-
-#ifndef __INTEL_SOC_PMIC_CORE_H__
-#define __INTEL_SOC_PMIC_CORE_H__
-
-struct intel_soc_pmic_config {
-       unsigned long irq_flags;
-       struct mfd_cell *cell_dev;
-       int n_cell_devs;
-       const struct regmap_config *regmap_config;
-       const struct regmap_irq_chip *irq_chip;
-};
-
-extern struct intel_soc_pmic_config intel_soc_pmic_config_byt_crc;
-extern struct intel_soc_pmic_config intel_soc_pmic_config_cht_crc;
-
-#endif /* __INTEL_SOC_PMIC_CORE_H__ */
index 5bb0367bd974f1a70cc0e51ee8dde95f683bbc86..c4e6456976f54c34b980f6a8e4dcf61ea6d7cfa0 100644 (file)
@@ -2,18 +2,21 @@
 /*
  * Device access for Crystal Cove PMIC
  *
- * Copyright (C) 2013, 2014 Intel Corporation. All rights reserved.
+ * Copyright (C) 2012-2014 Intel Corporation. All rights reserved.
  *
  * Author: Yang, Bin <bin.yang@intel.com>
  * Author: Zhu, Lejun <lejun.zhu@linux.intel.com>
  */
 
+#include <linux/acpi.h>
+#include <linux/i2c.h>
 #include <linux/interrupt.h>
-#include <linux/regmap.h>
+#include <linux/module.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/intel_soc_pmic.h>
-
-#include "intel_soc_pmic_core.h"
+#include <linux/platform_data/x86/soc.h>
+#include <linux/pwm.h>
+#include <linux/regmap.h>
 
 #define CRYSTAL_COVE_MAX_REGISTER      0xC6
 
@@ -132,7 +135,20 @@ static const struct regmap_irq_chip crystal_cove_irq_chip = {
        .mask_base = CRYSTAL_COVE_REG_MIRQLVL1,
 };
 
-struct intel_soc_pmic_config intel_soc_pmic_config_byt_crc = {
+/* PWM consumed by the Intel GFX */
+static struct pwm_lookup crc_pwm_lookup[] = {
+       PWM_LOOKUP("crystal_cove_pwm", 0, "0000:00:02.0", "pwm_pmic_backlight", 0, PWM_POLARITY_NORMAL),
+};
+
+struct intel_soc_pmic_config {
+       unsigned long irq_flags;
+       struct mfd_cell *cell_dev;
+       int n_cell_devs;
+       const struct regmap_config *regmap_config;
+       const struct regmap_irq_chip *irq_chip;
+};
+
+static const struct intel_soc_pmic_config intel_soc_pmic_config_byt_crc = {
        .irq_flags = IRQF_TRIGGER_RISING,
        .cell_dev = crystal_cove_byt_dev,
        .n_cell_devs = ARRAY_SIZE(crystal_cove_byt_dev),
@@ -140,10 +156,145 @@ struct intel_soc_pmic_config intel_soc_pmic_config_byt_crc = {
        .irq_chip = &crystal_cove_irq_chip,
 };
 
-struct intel_soc_pmic_config intel_soc_pmic_config_cht_crc = {
+static const struct intel_soc_pmic_config intel_soc_pmic_config_cht_crc = {
        .irq_flags = IRQF_TRIGGER_RISING,
        .cell_dev = crystal_cove_cht_dev,
        .n_cell_devs = ARRAY_SIZE(crystal_cove_cht_dev),
        .regmap_config = &crystal_cove_regmap_config,
        .irq_chip = &crystal_cove_irq_chip,
 };
+
+static int intel_soc_pmic_i2c_probe(struct i2c_client *i2c,
+                                   const struct i2c_device_id *i2c_id)
+{
+       const struct intel_soc_pmic_config *config;
+       struct device *dev = &i2c->dev;
+       struct intel_soc_pmic *pmic;
+       int ret;
+
+       if (soc_intel_is_byt())
+               config = &intel_soc_pmic_config_byt_crc;
+       else
+               config = &intel_soc_pmic_config_cht_crc;
+
+       pmic = devm_kzalloc(dev, sizeof(*pmic), GFP_KERNEL);
+       if (!pmic)
+               return -ENOMEM;
+
+       dev_set_drvdata(dev, pmic);
+
+       pmic->regmap = devm_regmap_init_i2c(i2c, config->regmap_config);
+       if (IS_ERR(pmic->regmap))
+               return PTR_ERR(pmic->regmap);
+
+       pmic->irq = i2c->irq;
+
+       ret = regmap_add_irq_chip(pmic->regmap, pmic->irq,
+                                 config->irq_flags | IRQF_ONESHOT,
+                                 0, config->irq_chip,
+                                 &pmic->irq_chip_data);
+       if (ret)
+               return ret;
+
+       ret = enable_irq_wake(pmic->irq);
+       if (ret)
+               dev_warn(dev, "Can't enable IRQ as wake source: %d\n", ret);
+
+       /* Add lookup table for crc-pwm */
+       pwm_add_table(crc_pwm_lookup, ARRAY_SIZE(crc_pwm_lookup));
+
+       /* To distuingish this domain from the GPIO/charger's irqchip domains */
+       irq_domain_update_bus_token(regmap_irq_get_domain(pmic->irq_chip_data),
+                                   DOMAIN_BUS_NEXUS);
+
+       ret = mfd_add_devices(dev, -1, config->cell_dev,
+                             config->n_cell_devs, NULL, 0,
+                             regmap_irq_get_domain(pmic->irq_chip_data));
+       if (ret)
+               goto err_del_irq_chip;
+
+       return 0;
+
+err_del_irq_chip:
+       pwm_remove_table(crc_pwm_lookup, ARRAY_SIZE(crc_pwm_lookup));
+       regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data);
+       return ret;
+}
+
+static int intel_soc_pmic_i2c_remove(struct i2c_client *i2c)
+{
+       struct intel_soc_pmic *pmic = dev_get_drvdata(&i2c->dev);
+
+       regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data);
+
+       /* remove crc-pwm lookup table */
+       pwm_remove_table(crc_pwm_lookup, ARRAY_SIZE(crc_pwm_lookup));
+
+       mfd_remove_devices(&i2c->dev);
+
+       return 0;
+}
+
+static void intel_soc_pmic_shutdown(struct i2c_client *i2c)
+{
+       struct intel_soc_pmic *pmic = dev_get_drvdata(&i2c->dev);
+
+       disable_irq(pmic->irq);
+
+       return;
+}
+
+#if defined(CONFIG_PM_SLEEP)
+static int intel_soc_pmic_suspend(struct device *dev)
+{
+       struct intel_soc_pmic *pmic = dev_get_drvdata(dev);
+
+       disable_irq(pmic->irq);
+
+       return 0;
+}
+
+static int intel_soc_pmic_resume(struct device *dev)
+{
+       struct intel_soc_pmic *pmic = dev_get_drvdata(dev);
+
+       enable_irq(pmic->irq);
+
+       return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(intel_soc_pmic_pm_ops, intel_soc_pmic_suspend,
+                        intel_soc_pmic_resume);
+
+static const struct i2c_device_id intel_soc_pmic_i2c_id[] = {
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, intel_soc_pmic_i2c_id);
+
+#if defined(CONFIG_ACPI)
+static const struct acpi_device_id intel_soc_pmic_acpi_match[] = {
+       { "INT33FD" },
+       { },
+};
+MODULE_DEVICE_TABLE(acpi, intel_soc_pmic_acpi_match);
+#endif
+
+static struct i2c_driver intel_soc_pmic_i2c_driver = {
+       .driver = {
+               .name = "intel_soc_pmic_i2c",
+               .pm = &intel_soc_pmic_pm_ops,
+               .acpi_match_table = ACPI_PTR(intel_soc_pmic_acpi_match),
+       },
+       .probe = intel_soc_pmic_i2c_probe,
+       .remove = intel_soc_pmic_i2c_remove,
+       .id_table = intel_soc_pmic_i2c_id,
+       .shutdown = intel_soc_pmic_shutdown,
+};
+
+module_i2c_driver(intel_soc_pmic_i2c_driver);
+
+MODULE_DESCRIPTION("I2C driver for Intel SoC PMIC");
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Yang, Bin <bin.yang@intel.com>");
+MODULE_AUTHOR("Zhu, Lejun <lejun.zhu@linux.intel.com>");