mfd: bcm2835-pm: Introduce SoC-specific type identifier

Power management blocks across the BCM2835 family share a common
base but require variant-specific handling. For instance, the
BCM2712 lacks ASB register space, yet it manages the power domain
for the V3D graphics block.

Add a hardware type identifier to the driver's private data. This
allows the driver to distinguish between SoC models and implement
custom quirks or features as needed.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Co-developed-by: Stanimir Varbanov <svarbanov@suse.de>
Signed-off-by: Stanimir Varbanov <svarbanov@suse.de>
Signed-off-by: Andrea della Porta <andrea.porta@suse.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://patch.msgid.link/c4bb218654e91f312a01b419d3d408e5131f7673.1772839224.git.andrea.porta@suse.com
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c
index 8bed59816e82eeff7b6920d9937b97c7cf1e836a..2d5dc521b623d1b8362089cfac0521888ce575c8 100644 (file)
--- a/drivers/mfd/bcm2835-pm.c
+++ b/drivers/mfd/bcm2835-pm.c
@@ -81,6 +81,7 @@ static int bcm2835_pm_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, pm);
 
        pm->dev = dev;
+       pm->soc = (uintptr_t)device_get_match_data(dev);
 
        ret = bcm2835_pm_get_pdata(pdev, pm);
        if (ret)
@@ -106,9 +107,9 @@ static int bcm2835_pm_probe(struct platform_device *pdev)
 
 static const struct of_device_id bcm2835_pm_of_match[] = {
        { .compatible = "brcm,bcm2835-pm-wdt", },
-       { .compatible = "brcm,bcm2835-pm", },
-       { .compatible = "brcm,bcm2711-pm", },
-       { .compatible = "brcm,bcm2712-pm", },
+       { .compatible = "brcm,bcm2835-pm", .data = (void *)BCM2835_PM_SOC_BCM2835 },
+       { .compatible = "brcm,bcm2711-pm", .data = (void *)BCM2835_PM_SOC_BCM2711 },
+       { .compatible = "brcm,bcm2712-pm", .data = (void *)BCM2835_PM_SOC_BCM2712 },
        {},
 };
 MODULE_DEVICE_TABLE(of, bcm2835_pm_of_match);

diff --git a/include/linux/mfd/bcm2835-pm.h b/include/linux/mfd/bcm2835-pm.h
index f70a810c55f7d5e886df22cd027c48c50fdf7a16..d2e17ab1dbfc5ebdf54c052762573b47756ed7df 100644 (file)
--- a/include/linux/mfd/bcm2835-pm.h
+++ b/include/linux/mfd/bcm2835-pm.h
@@ -5,11 +5,18 @@
 
 #include <linux/regmap.h>
 
+enum bcm2835_soc {
+       BCM2835_PM_SOC_BCM2835,
+       BCM2835_PM_SOC_BCM2711,
+       BCM2835_PM_SOC_BCM2712,
+};
+
 struct bcm2835_pm {
        struct device *dev;
        void __iomem *base;
        void __iomem *asb;
        void __iomem *rpivid_asb;
+       enum bcm2835_soc soc;
 };
 
 #endif /* BCM2835_MFD_PM_H */