diff mbox series

[V4,06/11] mfd: bcm2835-pm: Use 'reg-names' to get resources

Message ID 20220625113619.15944-7-stefan.wahren@i2se.com (mailing list archive)
State New, archived
Headers show
Series soc: bcm2835-power: Prepare BCM2711 V3D support | expand

Commit Message

Stefan Wahren June 25, 2022, 11:36 a.m. UTC 
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>

If available in firmware, find resources by their 'reg-names' position
instead of relying on hardcoded offsets. Care is taken to support old
firmware nonetheless.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
 drivers/mfd/bcm2835-pm.c | 61 +++++++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 20 deletions(-)

Comments

Lee Jones June 27, 2022, 4:22 p.m. UTC | #1 
On Sat, 25 Jun 2022, Stefan Wahren wrote:

> From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
> 
> If available in firmware, find resources by their 'reg-names' position
> instead of relying on hardcoded offsets. Care is taken to support old
> firmware nonetheless.
> 
> Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> ---
>  drivers/mfd/bcm2835-pm.c | 61 +++++++++++++++++++++++++++-------------
>  1 file changed, 41 insertions(+), 20 deletions(-)

Anything preventing me from applying the two MFD patches?
Florian Fainelli June 27, 2022, 4:28 p.m. UTC | #2 
On 6/27/22 09:22, Lee Jones wrote:
> On Sat, 25 Jun 2022, Stefan Wahren wrote:
> 
>> From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
>>
>> If available in firmware, find resources by their 'reg-names' position
>> instead of relying on hardcoded offsets. Care is taken to support old
>> firmware nonetheless.
>>
>> Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
>> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
>> ---
>>   drivers/mfd/bcm2835-pm.c | 61 +++++++++++++++++++++++++++-------------
>>   1 file changed, 41 insertions(+), 20 deletions(-)
> 
> Anything preventing me from applying the two MFD patches?
> 

They are self contained and cater to being backward/forward compatible 
with Device Tree changes, so not really no. If that is how you want it, 
please proceed in taking the 2 MFD patches and I will apply the rest.
Florian Fainelli June 28, 2022, 2:07 a.m. UTC | #3 
On 6/27/2022 9:28 AM, Florian Fainelli wrote:
> On 6/27/22 09:22, Lee Jones wrote:
>> On Sat, 25 Jun 2022, Stefan Wahren wrote:
>>
>>> From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
>>>
>>> If available in firmware, find resources by their 'reg-names' position
>>> instead of relying on hardcoded offsets. Care is taken to support old
>>> firmware nonetheless.
>>>
>>> Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
>>> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
>>> ---
>>>   drivers/mfd/bcm2835-pm.c | 61 +++++++++++++++++++++++++++-------------
>>>   1 file changed, 41 insertions(+), 20 deletions(-)
>>
>> Anything preventing me from applying the two MFD patches?
>>
> 
> They are self contained and cater to being backward/forward compatible 
> with Device Tree changes, so not really no. If that is how you want it, 
> please proceed in taking the 2 MFD patches and I will apply the rest.

Actually there is a dependency between patch 10 which uses 
pm->rpivid_asb and patch 7 which introduces it. I can give you my 
acked-by for patches 8-11 so you can take them via the MFD tree if you 
would like.
Lee Jones June 28, 2022, 7:44 a.m. UTC | #4 
On Mon, 27 Jun 2022, Florian Fainelli wrote:

> 
> 
> On 6/27/2022 9:28 AM, Florian Fainelli wrote:
> > On 6/27/22 09:22, Lee Jones wrote:
> > > On Sat, 25 Jun 2022, Stefan Wahren wrote:
> > > 
> > > > From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
> > > > 
> > > > If available in firmware, find resources by their 'reg-names' position
> > > > instead of relying on hardcoded offsets. Care is taken to support old
> > > > firmware nonetheless.
> > > > 
> > > > Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
> > > > Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> > > > ---
> > > >   drivers/mfd/bcm2835-pm.c | 61 +++++++++++++++++++++++++++-------------
> > > >   1 file changed, 41 insertions(+), 20 deletions(-)
> > > 
> > > Anything preventing me from applying the two MFD patches?
> > > 
> > 
> > They are self contained and cater to being backward/forward compatible
> > with Device Tree changes, so not really no. If that is how you want it,
> > please proceed in taking the 2 MFD patches and I will apply the rest.
> 
> Actually there is a dependency between patch 10 which uses pm->rpivid_asb
> and patch 7 which introduces it. I can give you my acked-by for patches 8-11
> so you can take them via the MFD tree if you would like.

That works too.
Florian Fainelli June 28, 2022, 4:24 p.m. UTC | #5 
On 6/25/22 04:36, Stefan Wahren wrote:
> From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
> 
> If available in firmware, find resources by their 'reg-names' position
> instead of relying on hardcoded offsets. Care is taken to support old
> firmware nonetheless.
> 
> Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Florian Fainelli July 5, 2022, 8:51 p.m. UTC | #6 
On 6/28/22 00:44, Lee Jones wrote:
>>>> Anything preventing me from applying the two MFD patches?
>>>>
>>>
>>> They are self contained and cater to being backward/forward compatible
>>> with Device Tree changes, so not really no. If that is how you want it,
>>> please proceed in taking the 2 MFD patches and I will apply the rest.
>>
>> Actually there is a dependency between patch 10 which uses pm->rpivid_asb
>> and patch 7 which introduces it. I can give you my acked-by for patches 8-11
>> so you can take them via the MFD tree if you would like.
> 
> That works too.
> 

I took patches 1 through 5, can you apply 6 through 11? Thanks
Lee Jones July 6, 2022, 10:20 a.m. UTC | #7 
On Tue, 05 Jul 2022, Florian Fainelli wrote:

> On 6/28/22 00:44, Lee Jones wrote:
> > > > > Anything preventing me from applying the two MFD patches?
> > > > > 
> > > > 
> > > > They are self contained and cater to being backward/forward compatible
> > > > with Device Tree changes, so not really no. If that is how you want it,
> > > > please proceed in taking the 2 MFD patches and I will apply the rest.
> > > 
> > > Actually there is a dependency between patch 10 which uses pm->rpivid_asb
> > > and patch 7 which introduces it. I can give you my acked-by for patches 8-11
> > > so you can take them via the MFD tree if you would like.
> > 
> > That works too.
> > 
> 
> I took patches 1 through 5, can you apply 6 through 11? Thanks

I currently have them in soak.
diff mbox series

Patch

diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c
index 42fe67f1538e..418c8a16427d 100644
--- a/drivers/mfd/bcm2835-pm.c
+++ b/drivers/mfd/bcm2835-pm.c
@@ -25,9 +25,40 @@  static const struct mfd_cell bcm2835_power_devs[] = {
 	{ .name = "bcm2835-power" },
 };
 
+static int bcm2835_pm_get_pdata(struct platform_device *pdev,
+				struct bcm2835_pm *pm)
+{
+	if (of_find_property(pm->dev->of_node, "reg-names", NULL)) {
+		struct resource *res;
+
+		pm->base = devm_platform_ioremap_resource_byname(pdev, "pm");
+		if (IS_ERR(pm->base))
+			return PTR_ERR(pm->base);
+
+		res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "asb");
+		if (res) {
+			pm->asb = devm_ioremap_resource(&pdev->dev, res);
+			if (IS_ERR(pm->asb))
+				pm->asb = NULL;
+		}
+
+		return 0;
+	}
+
+	/* If no 'reg-names' property is found we can assume we're using old DTB. */
+	pm->base = devm_platform_ioremap_resource(pdev, 0);
+	if (IS_ERR(pm->base))
+		return PTR_ERR(pm->base);
+
+	pm->asb = devm_platform_ioremap_resource(pdev, 1);
+	if (IS_ERR(pm->asb))
+		pm->asb = NULL;
+
+	return 0;
+}
+
 static int bcm2835_pm_probe(struct platform_device *pdev)
 {
-	struct resource *res;
 	struct device *dev = &pdev->dev;
 	struct bcm2835_pm *pm;
 	int ret;
@@ -39,10 +70,9 @@  static int bcm2835_pm_probe(struct platform_device *pdev)
 
 	pm->dev = dev;
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	pm->base = devm_ioremap_resource(dev, res);
-	if (IS_ERR(pm->base))
-		return PTR_ERR(pm->base);
+	ret = bcm2835_pm_get_pdata(pdev, pm);
+	if (ret)
+		return ret;
 
 	ret = devm_mfd_add_devices(dev, -1,
 				   bcm2835_pm_devs, ARRAY_SIZE(bcm2835_pm_devs),
@@ -50,24 +80,15 @@  static int bcm2835_pm_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	/* We'll use the presence of the AXI ASB regs in the
+	/*
+	 * We'll use the presence of the AXI ASB regs in the
 	 * bcm2835-pm binding as the key for whether we can reference
 	 * the full PM register range and support power domains.
 	 */
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-	if (res) {
-		pm->asb = devm_ioremap_resource(dev, res);
-		if (IS_ERR(pm->asb))
-			return PTR_ERR(pm->asb);
-
-		ret = devm_mfd_add_devices(dev, -1,
-					   bcm2835_power_devs,
-					   ARRAY_SIZE(bcm2835_power_devs),
-					   NULL, 0, NULL);
-		if (ret)
-			return ret;
-	}
-
+	if (pm->asb)
+		return devm_mfd_add_devices(dev, -1, bcm2835_power_devs,
+					    ARRAY_SIZE(bcm2835_power_devs),
+					    NULL, 0, NULL);
 	return 0;
 }