ARM: dts: add Raspberry Pi Compute Module 3 and IO board
Subsystems (4)
v2 cover ARM: dts: add Raspberry Pi Compute Module 3 and IO board
This patch series add support for Rasberry Pi Compute Module 3 and Compute Module 3 Lite.
Changes in V2:
- add Reviewed-by tag from Rob
- split arm and arm64 into separate patches
Stefan Wahren (3):
dt-bindings: bcm: Add Raspberry Pi CM3 and CM3L
ARM: dts: add Raspberry Pi Compute Module 3 and IO board
arm64: dts: broadcom: Add reference to Compute Module IO Board V3
.../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 8 ++ arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 87 ++++++++++++++++++++++ arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 52 +++++++++++++ arch/arm64/boot/dts/broadcom/Makefile | 3 +- .../boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts | 2 + 6 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts create mode 100644 arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts
Signature · 1 line
2.7.4
PATCH v2 1/3 dt-bindings: bcm: Add Raspberry Pi CM3 and CM3L
This adds the root properties for Raspberry Pi Compute Module 3 and Compute Module 3 Lite.
--- Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 8 ++++++++ 1 file changed, 8 insertions(+)
Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt +8 -0
@@ -42,6 +42,14 @@ Raspberry Pi Compute Module Required root node properties: compatible = "raspberrypi,compute-module", "brcm,bcm2835"; +Raspberry Pi Compute Module 3 +Required root node properties: +compatible = "raspberrypi,3-compute-module", "brcm,bcm2837"; + +Raspberry Pi Compute Module 3 Lite +Required root node properties: +compatible = "raspberrypi,3-compute-module-lite", "brcm,bcm2837"; + Raspberry Pi Zero Required root node properties: compatible = "raspberrypi,model-zero", "brcm,bcm2835";
Signature · 1 line
2.7.4
PATCH v2 2/3 ARM: dts: add Raspberry Pi Compute Module 3 and IO board
In reply to Stefan WahrenThe Raspberry Pi Compute Module 3 (CM3) and the Raspberry Pi Compute Module 3 Lite (CM3L) are SoMs which contains a BCM2837 processor, 1 GB RAM and a GPIO expander. The CM3 has a 4 GB eMMC, but on the CM3L the eMMC is unpopulated and it's up to the user to connect their own SD/MMC device. The dtsi file is designed to work for both modules. There is also a matching carrier board which is called Compute Module IO Board V3.
--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 87 +++++++++++++++++++++++++++++++ arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 52 ++++++++++++++++++ 3 files changed, 140 insertions(+) create mode 100644 arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts create mode 100644 arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
arch/arm/boot/dts/Makefile +1 -0
@@ -81,6 +81,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ bcm2836-rpi-2-b.dtb \ bcm2837-rpi-3-b.dtb \ bcm2837-rpi-3-b-plus.dtb \ + bcm2837-rpi-cm3-io3.dtb \ bcm2835-rpi-zero.dtb \ bcm2835-rpi-zero-w.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += \
arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts new file +87 -0
87 lines not on this page · raw message
arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi new file +52 -0
52 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v2 3/3 arm64: dts: broadcom: Add reference to Compute Module IO Board V3
In reply to Stefan WahrenThis adds a reference to the dts of the Compute Module IO Board V3 in arm, so we don't need to maintain the content in arm64.
--- arch/arm64/boot/dts/broadcom/Makefile | 3 ++- arch/arm64/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts
arch/arm64/boot/dts/broadcom/Makefile +2 -1
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb \ - bcm2837-rpi-3-b-plus.dtb + bcm2837-rpi-3-b-plus.dtb \ + bcm2837-rpi-cm3-io3.dts subdir-y += northstar2 subdir-y += stingray
arch/arm64/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts new file +2 -0
@@ -0,0 +1,2 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "arm/bcm2837-rpi-cm3-io3.dts"
Signature · 1 line
2.7.4
PATCH v2 3/3 arm64: dts: broadcom: Add reference to Compute Module IO Board V3
Quoted 15 lines · Stefan Wahren
This adds a reference to the dts of the Compute Module IO Board V3 in arm, so we don't need to maintain the content in arm64.
Signed-off-by Stefan Wahren <[email protected]>--- arch/arm64/boot/dts/broadcom/Makefile | 3 ++- arch/arm64/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dtsarch/arm64/boot/dts/broadcom/Makefile +0
-0
arch/arm64/boot/dts/broadcom/Makefile line 4
Quoted 5 lines
arch/arm64/boot/dts/broadcom/Makefile +2
-1@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb \ - bcm2837-rpi-3-b-plus.dtb + bcm2837-rpi-3-b-plus.dtb \ + bcm2837-rpi-cm3-io3.dts
This should be the .dtb file, not the .dts. At compile time make is not going to complain, because it finds the file, but make dtbs_install will fail.
I'm not sure if you want a patch or if you can fix it in your public tree.
Found out while trying to install the dtbs from linux-next 20180920
Best regards,
Liviu
Quoted 19 lines
arch/arm64/boot/dts/broadcom/Makefile +0
-0subdir-y += northstar2 subdir-y += stingrayarch/arm64/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts new file +2
-0@@ -0,0 +1,2 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "arm/bcm2837-rpi-cm3-io3.dts"Signature · 7 lines
2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 3/3 arm64: dts: broadcom: Add reference to Compute Module IO Board V3
Hi Liviu,
[add Arnd and Olof]
Am 23.09.2018 um 19:39 schrieb Liviu Dudau:
Quoted 24 lines · Stefan Wahren
Quoted 15 lines
This adds a reference to the dts of the Compute Module IO Board V3 in arm, so we don't need to maintain the content in arm64.
Signed-off-by Stefan Wahren <[email protected]>--- arch/arm64/boot/dts/broadcom/Makefile | 3 ++- arch/arm64/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dtsarch/arm64/boot/dts/broadcom/Makefile +0
-0arch/arm64/boot/dts/broadcom/Makefile line 4
Quoted 5 lines
arch/arm64/boot/dts/broadcom/Makefile +2
-1@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb \ - bcm2837-rpi-3-b-plus.dtb + bcm2837-rpi-3-b-plus.dtb \ + bcm2837-rpi-cm3-io3.dtsThis should be the .dtb file, not the .dts. At compile time make is not going to complain, because it finds the file, but make
dtbs_installwill fail.
Quoted 1 line
I'm not sure if you want a patch or if you can fix it in your public tree.
oops, please send a patch (with a fixes tag and Arnd & Olof in CC) because this patch has already been pulled for 4.20.
Quoted 26 lines
Found out while trying to install the dtbs from linux-next 20180920
Best regards,
LiviuQuoted 19 lines
arch/arm64/boot/dts/broadcom/Makefile +0
-0subdir-y += northstar2 subdir-y += stingrayarch/arm64/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts new file +2
-0@@ -0,0 +1,2 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "arm/bcm2837-rpi-cm3-io3.dts"Signature · 7 lines
2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 1/1 arm64: dts: broadcom: Use the .dtb name in the rule, rather than .dts
Commit a7eb26392b893 ("arm64: dts: broadcom: Add reference to Compute Module IO Board V3") adds the bcm2837-rpi-cm3-io3.dts file as a target in the Makefile, rather than the .dtb name. This will skip the generation of the .dtb file at compile time and will fail the dtbs_install target.
Module IO Board V3")
--- arch/arm64/boot/dts/broadcom/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/broadcom/Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb \ bcm2837-rpi-3-b-plus.dtb \ - bcm2837-rpi-cm3-io3.dts + bcm2837-rpi-cm3-io3.dtb subdir-y += northstar2 subdir-y += stingray
Signature · 1 line
2.18.0
PATCH 1/1 arm64: dts: broadcom: Use the .dtb name in the rule, rather than .dts
Am 24.09.2018 um 12:22 schrieb Liviu Dudau:
Quoted 10 lines
Commit
a7eb26392b893("arm64: dts: broadcom: Add reference to Compute Module IO Board V3") adds thebcm2837-rpi-cm3-io3.dtsfile as a target in theMakefile, rather than the .dtb name. This will skip the generation of the .dtb file at compile time and will fail thedtbs_installtarget.Fixes a7eb26392b893 ("arm64: dts: broadcom: Add reference to ComputeModule IO Board V3")
Signed-off-by Liviu Dudau <[email protected]>
Thanks, i will add a dtbs_install step to my test jobs.
@Arnd @Olof Should this fix for 4.20 go via pull request or can you apply it directly to your tree?
Quoted 17 lines
--- arch/arm64/boot/dts/broadcom/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm64/boot/dts/broadcom/Makefile +1
-1@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb \ bcm2837-rpi-3-b-plus.dtb \ - bcm2837-rpi-cm3-io3.dts + bcm2837-rpi-cm3-io3.dtb subdir-y += northstar2 subdir-y += stingray
PATCH 1/1 arm64: dts: broadcom: Use the .dtb name in the rule, rather than .dts
Quoted 7 lines · Stefan Wahren
Am 24.09.2018 um 12:22 schrieb Liviu Dudau:
Quoted 6 lines
Commit
a7eb26392b893("arm64: dts: broadcom: Add reference to Compute Module IO Board V3") adds thebcm2837-rpi-cm3-io3.dtsfile as a target in theMakefile, rather than the .dtb name. This will skip the generation of the .dtb file at compile time and will fail thedtbs_installtarget.
Quoted 8 lines
Quoted 4 lines
Fixes a7eb26392b893 ("arm64: dts: broadcom: Add reference to ComputeModule IO Board V3")
Signed-off-by Liviu Dudau <[email protected]>Acked-by Stefan Wahren <[email protected]>Thanks, i will add a
dtbs_installstep to my test jobs.
Same here.
Quoted 3 lines
@Arnd @Olof Should this fix for 4.20 go via pull request or can you apply it directly to your tree?
That would be my preference here as well.
Signature · 1 line
Florian
Olof Johansson
AppliedPATCH 1/1 arm64: dts: broadcom: Use the .dtb name in the rule, rather than .dts
Quoted 11 lines · Florian Fainelli
Quoted 10 lines · Stefan Wahren
Am 24.09.2018 um 12:22 schrieb Liviu Dudau:
Quoted 9 lines
Commit
a7eb26392b893("arm64: dts: broadcom: Add reference to Compute Module IO Board V3") adds thebcm2837-rpi-cm3-io3.dtsfile as a target in theMakefile, rather than the .dtb name. This will skip the generation of the .dtb file at compile time and will fail thedtbs_installtarget.Fixes a7eb26392b893 ("arm64: dts: broadcom: Add reference to ComputeModule IO Board V3")
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Liviu Dudau <[email protected]>Acked-by Stefan Wahren <[email protected]>Thanks, i will add a
dtbs_installstep to my test jobs.Same here.
I do but I don't seem to catch any errors from it. :-/
Quoted 4 lines
Quoted 2 lines
@Arnd @Olof Should this fix for 4.20 go via pull request or can you apply it directly to your tree?
That would be my preference here as well.
Applied to next/dt now. Thanks!
-Olof
PATCH 1/1 arm64: dts: broadcom: Use the .dtb name in the rule, rather than .dts
Quoted 18 lines
Olof Johansson <[email protected]> hat am 25. September 2018 um 20:51 geschrieben:
Quoted 13 lines · Florian Fainelli
Quoted 12 lines · Stefan Wahren
Am 24.09.2018 um 12:22 schrieb Liviu Dudau:
Quoted 10 lines
Commit
a7eb26392b893("arm64: dts: broadcom: Add reference to Compute Module IO Board V3") adds thebcm2837-rpi-cm3-io3.dtsfile as a target in theMakefile, rather than the .dtb name. This will skip the generation of the .dtb file at compile time and will fail thedtbs_installtarget.Fixes a7eb26392b893 ("arm64: dts: broadcom: Add reference to ComputeModule IO Board V3")
Signed-off-by Liviu Dudau <[email protected]>
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Acked-by Stefan Wahren <[email protected]>Thanks, i will add a
dtbs_installstep to my test jobs.Same here.
I do but I don't seem to catch any errors from it. :-/
Strange, i'm get getting this:
scripts/Makefile.dtbinst:31: Target ?bcm2837-rpi-cm3-io3.dts? passt nicht zum Ziel-Muster
INSTALL arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dtb
INSTALL arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dtb
INSTALL
cp: Fehlender Zieldatei?Operand hinter '/tmp/broadcom'
?cp --help? liefert weitere Informationen.scripts/Makefile.dtbinst:32: die Regel f?r Ziel ?bcm2837-rpi-cm3-io3.dts? scheiterte make[2]: *** [bcm2837-rpi-cm3-io3.dts] Fehler 1 scripts/Makefile.dtbinst:35: die Regel f?r Ziel ?broadcom? scheiterte make[1]: *** [broadcom] Fehler 2arch/arm64/Makefile:139: die Regel f?r Ziel ?dtbs_install? scheiterte
make: *** [dtbs_install] Fehler 2
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
@Arnd @Olof Should this fix for 4.20 go via pull request or can you apply it directly to your tree?
That would be my preference here as well.
Applied to next/dt now. Thanks!
Thanks
Quoted 9 lines
-Olof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 1/1 arm64: dts: broadcom: Use the .dtb name in the rule, rather than .dts
Quoted 29 lines · Stefan Wahren
Quoted 19 lines
Olof Johansson <[email protected]> hat am 25. September 2018 um 20:51 geschrieben:
Quoted 13 lines · Florian Fainelli
Quoted 12 lines · Stefan Wahren
Am 24.09.2018 um 12:22 schrieb Liviu Dudau:
Quoted 10 lines
Commit
a7eb26392b893("arm64: dts: broadcom: Add reference to Compute Module IO Board V3") adds thebcm2837-rpi-cm3-io3.dtsfile as a target in theMakefile, rather than the .dtb name. This will skip the generation of the .dtb file at compile time and will fail thedtbs_installtarget.Fixes a7eb26392b893 ("arm64: dts: broadcom: Add reference to ComputeModule IO Board V3")
Signed-off-by Liviu Dudau <[email protected]>Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Acked-by Stefan Wahren <[email protected]>Thanks, i will add a
dtbs_installstep to my test jobs.Same here.
I do but I don't seem to catch any errors from it. :-/
Strange, i'm get getting this:
Quoted 12 lines
scripts/Makefile.dtbinst:31: Target ?bcm2837-rpi-cm3-io3.dts? passt nicht zum Ziel-Muster
INSTALLarch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dtb
INSTALLarch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dtb
INSTALL
cp: Fehlender Zieldatei?Operand hinter '/tmp/broadcom'
?cp --help? liefert weitere Informationen.scripts/Makefile.dtbinst:32: die Regel f?r Ziel ?bcm2837-rpi-cm3-io3.dts? scheiterte make[2]: *** [bcm2837-rpi-cm3-io3.dts] Fehler 1scripts/Makefile.dtbinst:35: die Regel f?r Ziel ?broadcom? scheiterte make[1]: *** [broadcom] Fehler 2arch/arm64/Makefile:139: die Regel f?r Ziel ?dtbs_install? scheiterte
make: *** [dtbs_install] Fehler 2
Oh, it fails but my reporting scripts don't notice it since I usually don't capture errors from the install phase.
-Olof
v2 cover ARM: dts: add Raspberry Pi Compute Module 3 and IO board
In reply to Stefan WahrenAm 27.08.2018 um 20:05 schrieb Stefan Wahren:
Quoted 12 lines
This patch series add support for Rasberry Pi Compute Module 3 and Compute Module 3 Lite.
Changes in V2:
- add Reviewed-by tag from Rob
- split arm and arm64 into separate patchesStefan Wahren (3):
dt-bindings: bcm: Add Raspberry Pi CM3 and CM3L
ARM: dts: add Raspberry Pi Compute Module 3 and IO board
arm64: dts: broadcom: Add reference to Compute Module IO Board V3
series applied to bcm2835-dt-next