From: Stefan Wahren <stefan.wahren@i2se.com> To: Florian Fainelli <f.fainelli@gmail.com>, Ray Jui <rjui@broadcom.com>, Scott Branden <sbranden@broadcom.com>, Lee Jones <lee.jones@linaro.org> Cc: Peter Robinson <pbrobinson@gmail.com>, Melissa Wen <melissa.srw@gmail.com>, Phil Elwell <phil@raspberrypi.com>, bcm-kernel-feedback-list@broadcom.com, Maxime Ripard <maxime@cerno.tech>, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren <stefan.wahren@i2se.com> Subject: [PATCH V4 07/11] mfd: bcm2835-pm: Add support for BCM2711 Date: Sat, 25 Jun 2022 13:36:15 +0200 [thread overview] Message-ID: <20220625113619.15944-8-stefan.wahren@i2se.com> (raw) In-Reply-To: <20220625113619.15944-1-stefan.wahren@i2se.com> In BCM2711 the new RPiVid ASB took over V3D. The old ASB is still present with the ISP and H264 bits, and V3D is in the same place in the new ASB as the old one. As per the devicetree bindings, BCM2711 will provide both the old and new ASB resources, so get both of them and pass them into 'bcm2835-power,' which will take care of selecting which one to use accordingly. Since the RPiVid ASB's resources were being provided prior to formalizing the bindings[1], also support the old DT files that didn't use 'reg-names.' Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Reviewed-by: Peter Robinson <pbrobinson@gmail.com> [1] See: 7dbe8c62ceeb ("ARM: dts: Add minimal Raspberry Pi 4 support") --- drivers/mfd/bcm2835-pm.c | 13 +++++++++++++ include/linux/mfd/bcm2835-pm.h | 1 + 2 files changed, 14 insertions(+) diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c index 418c8a16427d..49cd1f03884a 100644 --- a/drivers/mfd/bcm2835-pm.c +++ b/drivers/mfd/bcm2835-pm.c @@ -42,6 +42,14 @@ static int bcm2835_pm_get_pdata(struct platform_device *pdev, pm->asb = NULL; } + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, + "rpivid_asb"); + if (res) { + pm->rpivid_asb = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(pm->rpivid_asb)) + pm->rpivid_asb = NULL; + } + return 0; } @@ -54,6 +62,10 @@ static int bcm2835_pm_get_pdata(struct platform_device *pdev, if (IS_ERR(pm->asb)) pm->asb = NULL; + pm->rpivid_asb = devm_platform_ioremap_resource(pdev, 2); + if (IS_ERR(pm->rpivid_asb)) + pm->rpivid_asb = NULL; + return 0; } @@ -95,6 +107,7 @@ 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", }, {}, }; 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 ed37dc40e82a..f70a810c55f7 100644 --- a/include/linux/mfd/bcm2835-pm.h +++ b/include/linux/mfd/bcm2835-pm.h @@ -9,6 +9,7 @@ struct bcm2835_pm { struct device *dev; void __iomem *base; void __iomem *asb; + void __iomem *rpivid_asb; }; #endif /* BCM2835_MFD_PM_H */ -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Stefan Wahren <stefan.wahren@i2se.com> To: Florian Fainelli <f.fainelli@gmail.com>, Ray Jui <rjui@broadcom.com>, Scott Branden <sbranden@broadcom.com>, Lee Jones <lee.jones@linaro.org> Cc: Peter Robinson <pbrobinson@gmail.com>, Melissa Wen <melissa.srw@gmail.com>, Phil Elwell <phil@raspberrypi.com>, bcm-kernel-feedback-list@broadcom.com, Maxime Ripard <maxime@cerno.tech>, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren <stefan.wahren@i2se.com> Subject: [PATCH V4 07/11] mfd: bcm2835-pm: Add support for BCM2711 Date: Sat, 25 Jun 2022 13:36:15 +0200 [thread overview] Message-ID: <20220625113619.15944-8-stefan.wahren@i2se.com> (raw) In-Reply-To: <20220625113619.15944-1-stefan.wahren@i2se.com> In BCM2711 the new RPiVid ASB took over V3D. The old ASB is still present with the ISP and H264 bits, and V3D is in the same place in the new ASB as the old one. As per the devicetree bindings, BCM2711 will provide both the old and new ASB resources, so get both of them and pass them into 'bcm2835-power,' which will take care of selecting which one to use accordingly. Since the RPiVid ASB's resources were being provided prior to formalizing the bindings[1], also support the old DT files that didn't use 'reg-names.' Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Reviewed-by: Peter Robinson <pbrobinson@gmail.com> [1] See: 7dbe8c62ceeb ("ARM: dts: Add minimal Raspberry Pi 4 support") --- drivers/mfd/bcm2835-pm.c | 13 +++++++++++++ include/linux/mfd/bcm2835-pm.h | 1 + 2 files changed, 14 insertions(+) diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c index 418c8a16427d..49cd1f03884a 100644 --- a/drivers/mfd/bcm2835-pm.c +++ b/drivers/mfd/bcm2835-pm.c @@ -42,6 +42,14 @@ static int bcm2835_pm_get_pdata(struct platform_device *pdev, pm->asb = NULL; } + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, + "rpivid_asb"); + if (res) { + pm->rpivid_asb = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(pm->rpivid_asb)) + pm->rpivid_asb = NULL; + } + return 0; } @@ -54,6 +62,10 @@ static int bcm2835_pm_get_pdata(struct platform_device *pdev, if (IS_ERR(pm->asb)) pm->asb = NULL; + pm->rpivid_asb = devm_platform_ioremap_resource(pdev, 2); + if (IS_ERR(pm->rpivid_asb)) + pm->rpivid_asb = NULL; + return 0; } @@ -95,6 +107,7 @@ 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", }, {}, }; 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 ed37dc40e82a..f70a810c55f7 100644 --- a/include/linux/mfd/bcm2835-pm.h +++ b/include/linux/mfd/bcm2835-pm.h @@ -9,6 +9,7 @@ struct bcm2835_pm { struct device *dev; void __iomem *base; void __iomem *asb; + void __iomem *rpivid_asb; }; #endif /* BCM2835_MFD_PM_H */ -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-06-25 11:37 UTC|newest] Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-25 11:36 [PATCH V4 00/11] soc: bcm2835-power: Prepare BCM2711 V3D support Stefan Wahren 2022-06-25 11:36 ` Stefan Wahren 2022-06-25 11:36 ` [PATCH V4 01/11] dt-bindings: soc: bcm: bcm2835-pm: Convert bindings to DT schema Stefan Wahren 2022-06-25 11:36 ` Stefan Wahren 2022-06-27 17:27 ` Florian Fainelli 2022-06-27 17:27 ` Florian Fainelli 2022-06-25 11:36 ` [PATCH V4 02/11] dt-bindings: soc: bcm: bcm2835-pm: Introduce reg-names Stefan Wahren 2022-06-25 11:36 ` Stefan Wahren 2022-06-27 17:27 ` Florian Fainelli 2022-06-27 17:27 ` Florian Fainelli 2022-06-25 11:36 ` [PATCH V4 03/11] dt-bindings: soc: bcm: bcm2835-pm: Add support for bcm2711 Stefan Wahren 2022-06-25 11:36 ` Stefan Wahren 2022-06-27 17:27 ` Florian Fainelli 2022-06-27 17:27 ` Florian Fainelli 2022-06-25 11:36 ` [PATCH V4 04/11] ARM: dts: bcm2835/bcm2711: Introduce reg-names in watchdog node Stefan Wahren 2022-06-25 11:36 ` Stefan Wahren 2022-06-27 17:27 ` Florian Fainelli 2022-06-27 17:27 ` Florian Fainelli 2022-06-25 11:36 ` [PATCH V4 05/11] ARM: dts: bcm2711: Use proper compatible in PM/Watchdog node Stefan Wahren 2022-06-25 11:36 ` Stefan Wahren 2022-06-27 17:27 ` Florian Fainelli 2022-06-27 17:27 ` Florian Fainelli 2022-06-25 11:36 ` [PATCH V4 06/11] mfd: bcm2835-pm: Use 'reg-names' to get resources Stefan Wahren 2022-06-25 11:36 ` Stefan Wahren 2022-06-27 16:22 ` Lee Jones 2022-06-27 16:22 ` Lee Jones 2022-06-27 16:28 ` Florian Fainelli 2022-06-27 16:28 ` Florian Fainelli 2022-06-28 2:07 ` Florian Fainelli 2022-06-28 2:07 ` Florian Fainelli 2022-06-28 7:44 ` Lee Jones 2022-06-28 7:44 ` Lee Jones 2022-07-05 20:51 ` Florian Fainelli 2022-07-05 20:51 ` Florian Fainelli 2022-07-06 10:20 ` Lee Jones 2022-07-06 10:20 ` Lee Jones 2022-06-28 16:24 ` Florian Fainelli 2022-06-28 16:24 ` Florian Fainelli 2022-06-25 11:36 ` Stefan Wahren [this message] 2022-06-25 11:36 ` [PATCH V4 07/11] mfd: bcm2835-pm: Add support for BCM2711 Stefan Wahren 2022-06-28 16:24 ` Florian Fainelli 2022-06-28 16:24 ` Florian Fainelli 2022-06-25 11:36 ` [PATCH V4 08/11] soc: bcm: bcm2835-power: Refactor ASB control Stefan Wahren 2022-06-25 11:36 ` Stefan Wahren 2022-06-27 17:27 ` Florian Fainelli 2022-06-27 17:27 ` Florian Fainelli 2022-06-28 16:24 ` Florian Fainelli 2022-06-28 16:24 ` Florian Fainelli 2022-06-25 11:36 ` [PATCH V4 09/11] soc: bcm: bcm2835-power: Resolve ASB register macros Stefan Wahren 2022-06-25 11:36 ` Stefan Wahren 2022-06-27 17:27 ` Florian Fainelli 2022-06-27 17:27 ` Florian Fainelli 2022-06-28 16:24 ` Florian Fainelli 2022-06-28 16:24 ` Florian Fainelli 2022-06-25 11:36 ` [PATCH V4 10/11] soc: bcm: bcm2835-power: Add support for BCM2711's RPiVid ASB Stefan Wahren 2022-06-25 11:36 ` Stefan Wahren 2022-06-27 17:28 ` Florian Fainelli 2022-06-27 17:28 ` Florian Fainelli 2022-06-28 16:25 ` Florian Fainelli 2022-06-28 16:25 ` Florian Fainelli 2022-06-25 11:36 ` [PATCH V4 11/11] soc: bcm: bcm2835-power: Bypass power_on/off() calls Stefan Wahren 2022-06-25 11:36 ` Stefan Wahren 2022-06-27 17:28 ` Florian Fainelli 2022-06-27 17:28 ` Florian Fainelli 2022-06-28 16:26 ` Florian Fainelli 2022-06-28 16:26 ` Florian Fainelli 2022-07-06 11:58 ` [GIT PULL] Immutable branch between MFD and SoC due for the v5.20 merge window Lee Jones 2022-07-06 11:58 ` Lee Jones 2022-07-06 16:18 ` Florian Fainelli 2022-07-06 16:18 ` Florian Fainelli
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220625113619.15944-8-stefan.wahren@i2se.com \ --to=stefan.wahren@i2se.com \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=devicetree@vger.kernel.org \ --cc=f.fainelli@gmail.com \ --cc=lee.jones@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=maxime@cerno.tech \ --cc=melissa.srw@gmail.com \ --cc=pbrobinson@gmail.com \ --cc=phil@raspberrypi.com \ --cc=rjui@broadcom.com \ --cc=sbranden@broadcom.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.