* [PATCH 0/2] Add support for bcm2711 in vchiq_arm
@ 2022-03-15 20:09 Adrien Thierry
2022-03-15 20:09 ` [PATCH 1/2] dt-bindings: soc: bcm: bcm2835-vchiq: Add support for bcm2711 Adrien Thierry
2022-03-15 20:09 ` [PATCH 2/2] staging: vchiq_arm: Use bcm2711 compatible string for bcm2711-based RPi Adrien Thierry
0 siblings, 2 replies; 5+ messages in thread
From: Adrien Thierry @ 2022-03-15 20:09 UTC (permalink / raw)
To: linux-kernel
Cc: Adrien Thierry, Rob Herring, Nicolas Saenz Julienne,
Florian Fainelli, Ray Jui, Scott Branden,
bcm-kernel-feedback-list, Stefan Wahren, devicetree,
linux-rpi-kernel, linux-arm-kernel, Greg Kroah-Hartman,
Gaston Gonzalez, Ojaswin Mujoo, linux-staging
The goal of this patch series is to use the bcm2711 compatible string in
vchiq_arm for the Raspberry Pi 4. This allows using the downstream device
tree with the upstream kernel.
Adrien Thierry (2):
dt-bindings: soc: bcm: bcm2835-vchiq: Add support for bcm2711
staging: vchiq_arm: Use bcm2711 compatible string for bcm2711-based
RPi
.../devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml | 6 ++++++
arch/arm/boot/dts/bcm2711-rpi.dtsi | 1 +
.../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 5 +++++
3 files changed, 12 insertions(+)
base-commit: 09688c0166e76ce2fb85e86b9d99be8b0084cdf9
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/2] dt-bindings: soc: bcm: bcm2835-vchiq: Add support for bcm2711 2022-03-15 20:09 [PATCH 0/2] Add support for bcm2711 in vchiq_arm Adrien Thierry @ 2022-03-15 20:09 ` Adrien Thierry 2022-03-23 18:44 ` Rob Herring 2022-03-15 20:09 ` [PATCH 2/2] staging: vchiq_arm: Use bcm2711 compatible string for bcm2711-based RPi Adrien Thierry 1 sibling, 1 reply; 5+ messages in thread From: Adrien Thierry @ 2022-03-15 20:09 UTC (permalink / raw) To: linux-kernel Cc: Adrien Thierry, Rob Herring, Nicolas Saenz Julienne, Florian Fainelli, Ray Jui, Scott Branden, bcm-kernel-feedback-list, Stefan Wahren, devicetree, linux-rpi-kernel, linux-arm-kernel, Greg Kroah-Hartman, Gaston Gonzalez, Ojaswin Mujoo, linux-staging Add a new compatible string for BCM2711. This is the chip used on the Raspberry Pi 4. Signed-off-by: Adrien Thierry <athierry@redhat.com> --- .../devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml index e04439b3355b..599bd283df1b 100644 --- a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml +++ b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml @@ -27,6 +27,12 @@ properties: - brcm,bcm2836-vchiq - const: brcm,bcm2835-vchiq + - description: BCM2711 based boards + items: + - enum: + - brcm,bcm2711-vchiq + - const: brcm,bcm2711-vchiq + reg: description: Physical base address and length of the doorbell register pair minItems: 1 -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] dt-bindings: soc: bcm: bcm2835-vchiq: Add support for bcm2711 2022-03-15 20:09 ` [PATCH 1/2] dt-bindings: soc: bcm: bcm2835-vchiq: Add support for bcm2711 Adrien Thierry @ 2022-03-23 18:44 ` Rob Herring 2022-03-24 17:34 ` Adrien Thierry 0 siblings, 1 reply; 5+ messages in thread From: Rob Herring @ 2022-03-23 18:44 UTC (permalink / raw) To: Adrien Thierry Cc: linux-kernel, Nicolas Saenz Julienne, Florian Fainelli, Ray Jui, Scott Branden, bcm-kernel-feedback-list, Stefan Wahren, devicetree, linux-rpi-kernel, linux-arm-kernel, Greg Kroah-Hartman, Gaston Gonzalez, Ojaswin Mujoo, linux-staging On Tue, Mar 15, 2022 at 04:09:28PM -0400, Adrien Thierry wrote: > Add a new compatible string for BCM2711. This is the chip used on the > Raspberry Pi 4. > > Signed-off-by: Adrien Thierry <athierry@redhat.com> > --- > .../devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml > index e04439b3355b..599bd283df1b 100644 > --- a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml > +++ b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml > @@ -27,6 +27,12 @@ properties: > - brcm,bcm2836-vchiq > - const: brcm,bcm2835-vchiq > > + - description: BCM2711 based boards > + items: > + - enum: > + - brcm,bcm2711-vchiq > + - const: brcm,bcm2711-vchiq Why do you have the same compatible twice? > + > reg: > description: Physical base address and length of the doorbell register pair > minItems: 1 > -- > 2.35.1 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] dt-bindings: soc: bcm: bcm2835-vchiq: Add support for bcm2711 2022-03-23 18:44 ` Rob Herring @ 2022-03-24 17:34 ` Adrien Thierry 0 siblings, 0 replies; 5+ messages in thread From: Adrien Thierry @ 2022-03-24 17:34 UTC (permalink / raw) To: Rob Herring Cc: linux-kernel, Nicolas Saenz Julienne, Florian Fainelli, Ray Jui, Scott Branden, bcm-kernel-feedback-list, Stefan Wahren, devicetree, linux-rpi-kernel, linux-arm-kernel, Greg Kroah-Hartman, Gaston Gonzalez, Ojaswin Mujoo, linux-staging Hi, > Why do you have the same compatible twice? Sorry, I misunderstood the yaml doc fields. I submitted a v2 that fixes this. Thanks, Adrien _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] staging: vchiq_arm: Use bcm2711 compatible string for bcm2711-based RPi 2022-03-15 20:09 [PATCH 0/2] Add support for bcm2711 in vchiq_arm Adrien Thierry 2022-03-15 20:09 ` [PATCH 1/2] dt-bindings: soc: bcm: bcm2835-vchiq: Add support for bcm2711 Adrien Thierry @ 2022-03-15 20:09 ` Adrien Thierry 1 sibling, 0 replies; 5+ messages in thread From: Adrien Thierry @ 2022-03-15 20:09 UTC (permalink / raw) To: linux-kernel Cc: Adrien Thierry, Rob Herring, Nicolas Saenz Julienne, Florian Fainelli, Ray Jui, Scott Branden, bcm-kernel-feedback-list, Stefan Wahren, devicetree, linux-rpi-kernel, linux-arm-kernel, Greg Kroah-Hartman, Gaston Gonzalez, Ojaswin Mujoo, linux-staging Use bcm2711 compatible string in vchiq driver and device tree for bcm2711-based Raspberry Pi (Raspberry Pi 4). This is consistent with what the downstream device tree uses, and allows running the vchiq driver on the upstream kernel with the downstream device tree. Signed-off-by: Adrien Thierry <athierry@redhat.com> --- arch/arm/boot/dts/bcm2711-rpi.dtsi | 1 + .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi index ca266c5d9f9b..c868d1dcaba7 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -70,5 +70,6 @@ blconfig: nvram@0 { }; &vchiq { + compatible = "brcm,bcm2711-vchiq"; interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; }; diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index 3a2e4582db8e..136c664132f4 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -81,6 +81,10 @@ static struct vchiq_drvdata bcm2836_drvdata = { .cache_line_size = 64, }; +static struct vchiq_drvdata bcm2711_drvdata = { + .cache_line_size = 64, +}; + struct vchiq_arm_state { /* Keepalive-related data */ struct task_struct *ka_thread; @@ -1748,6 +1752,7 @@ void vchiq_platform_conn_state_changed(struct vchiq_state *state, static const struct of_device_id vchiq_of_match[] = { { .compatible = "brcm,bcm2835-vchiq", .data = &bcm2835_drvdata }, { .compatible = "brcm,bcm2836-vchiq", .data = &bcm2836_drvdata }, + { .compatible = "brcm,bcm2711-vchiq", .data = &bcm2711_drvdata }, {}, }; MODULE_DEVICE_TABLE(of, vchiq_of_match); -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-03-24 17:35 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-03-15 20:09 [PATCH 0/2] Add support for bcm2711 in vchiq_arm Adrien Thierry 2022-03-15 20:09 ` [PATCH 1/2] dt-bindings: soc: bcm: bcm2835-vchiq: Add support for bcm2711 Adrien Thierry 2022-03-23 18:44 ` Rob Herring 2022-03-24 17:34 ` Adrien Thierry 2022-03-15 20:09 ` [PATCH 2/2] staging: vchiq_arm: Use bcm2711 compatible string for bcm2711-based RPi Adrien Thierry
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).