[PATCH 4/6] platform/apple: Add new Apple Mac SMC driver

[Russell King (Oracle)]

On Mon, Sep 12, 2022 at 11:55:14AM +0100, Lee Jones wrote:
> > I'm guessing this series is now dead, and Hector needs to re-spin the
> > patch set according to your views. I'm guessing this is going to take
> > a major re-work of the patch series.
> > 
> > I suspect my attempt and trying to get this upstream has made things
> > more complicated, because I doubt Hector has updated his patch set
> > with the review comments that have been made so far... so this is
> > now quite a mess. I think, once this is sorted, the entire series
> > will need to be re-reviewed entirely afresh.
> 
> I have no insight into what Hector is doing, or plans to do.

It seems there's no plans by Hector to address this, so it comes down
to me.

So, guessing what you're after, would something like the following
work for you? I don't see *any* point in creating more yet more
platform devices unless we're on a mission to maximise wasted memory
resources (which this split will already be doing by creating two
small modules instead of one.)

Obviously, this is not an official patch yet, it's just to find out
what code structure you are looking for.

diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 78c6d9d99c3f..8d4c0508a2c8 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -18,6 +18,8 @@ obj-$(CONFIG_MFD_ENE_KB3930)	+= ene-kb3930.o
 obj-$(CONFIG_MFD_EXYNOS_LPASS)	+= exynos-lpass.o
 obj-$(CONFIG_MFD_GATEWORKS_GSC)	+= gateworks-gsc.o
 
+obj-$(CONFIG_APPLE_SMC)		+= apple-smc.o
+
 obj-$(CONFIG_HTC_PASIC3)	+= htc-pasic3.o
 obj-$(CONFIG_HTC_I2CPLD)	+= htc-i2cpld.o
 
diff --git a/drivers/mfd/apple-smc.c b/drivers/mfd/apple-smc.c
new file mode 100644
index 000000000000..bc59d1c5e13d
--- /dev/null
+++ b/drivers/mfd/apple-smc.c
@@ -0,0 +1,38 @@
+#include <linux/mfd/core.h>
+#include <linux/mfd/apple-smc.h>
+
+static const struct mfd_cell apple_smc_devs[] = {
+	{
+		.name = "macsmc-gpio",
+		.of_compatible = "apple,smc-gpio",
+	},
+	{
+		.name = "macsmc-hid",
+	},
+	{
+		.name = "macsmc-power",
+	},
+	{
+		.name = "macsmc-reboot",
+	},
+	{
+		.name = "macsmc-rtc",
+	},
+};
+
+int apple_smc_mfd_probe(struct device *dev)
+{
+	return mfd_add_devices(dev, -1, apple_smc_devs,
+			       ARRAY_SIZE(apple_smc_devs), NULL, 0, NULL);
+}
+EXPORT_SYMBOL(apple_smc_mfd_probe);
+
+void apple_smc_mfd_remove(struct device *dev)
+{
+	mfd_remove_devices(dev);
+}
+EXPORT_SYMBOL(apple_smc_mfd_remove);
+
+MODULE_AUTHOR("Hector Martin <marcan at marcan.st>");
+MODULE_LICENSE("Dual MIT/GPL");
+MODULE_DESCRIPTION("Apple SMC MFD core");
diff --git a/drivers/platform/apple/smc_core.c b/drivers/platform/apple/smc_core.c
index 148a3f8173d3..d4a502835b27 100644
--- a/drivers/platform/apple/smc_core.c
+++ b/drivers/platform/apple/smc_core.c
@@ -5,7 +5,7 @@
  */
 
 #include <linux/device.h>
-#include <linux/mfd/core.h>
+#include <linux/mfd/apple-smc.h>
 #include <linux/mutex.h>
 #include <linux/notifier.h>
 #include "smc.h"
@@ -25,25 +25,6 @@ struct apple_smc {
 	struct blocking_notifier_head event_handlers;
 };
 
-static const struct mfd_cell apple_smc_devs[] = {
-	{
-		.name = "macsmc-gpio",
-		.of_compatible = "apple,smc-gpio",
-	},
-	{
-		.name = "macsmc-hid",
-	},
-	{
-		.name = "macsmc-power",
-	},
-	{
-		.name = "macsmc-reboot",
-	},
-	{
-		.name = "macsmc-rtc",
-	},
-};
-
 int apple_smc_read(struct apple_smc *smc, smc_key key, void *buf, size_t size)
 {
 	int ret;
@@ -226,7 +207,7 @@ struct apple_smc *apple_smc_probe(struct device *dev, const struct apple_smc_bac
 
 	dev_set_drvdata(dev, smc);
 
-	ret = mfd_add_devices(dev, -1, apple_smc_devs, ARRAY_SIZE(apple_smc_devs), NULL, 0, NULL);
+	ret = apple_smc_mfd_probe(dev);
 	if (ret)
 		return ERR_PTR(dev_err_probe(dev, ret, "Subdevice initialization failed"));
 
@@ -236,7 +217,7 @@ EXPORT_SYMBOL(apple_smc_probe);
 
 int apple_smc_remove(struct apple_smc *smc)
 {
-	mfd_remove_devices(smc->dev);
+	apple_smc_mfd_remove(smc->dev);
 
 	/* Disable notifications */
 	apple_smc_write_flag(smc, SMC_KEY(NTAP), 1);
diff --git a/include/linux/mfd/apple-smc.h b/include/linux/mfd/apple-smc.h
new file mode 100644
index 000000000000..2f34ca0f07f3
--- /dev/null
+++ b/include/linux/mfd/apple-smc.h
@@ -0,0 +1,9 @@
+#ifndef LINUX_MFD_APPLE_SMC_H
+#define LINUX_MFD_APPLE_SMC_H
+
+struct device;
+
+int apple_smc_mfd_probe(struct device *dev);
+void apple_smc_mfd_remove(struct device *dev);
+
+#endif

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!