Stefan, On Mon, 15 Apr 2024 at 10:06, Stefan Wahren <wahrenst@xxxxxxx> wrote: > > Hi Phil, > > Am 15.04.24 um 10:52 schrieb Phil Elwell: > > Stefan, > > > > > > On Mon, 15 Apr 2024 at 09:20, Stefan Wahren <wahrenst@xxxxxxx> wrote: > >> Hi Phil, > >> > >> Am 14.04.24 um 00:14 schrieb Andrea della Porta: > >>> Signed-off-by: Andrea della Porta <andrea.porta@xxxxxxxx> > >>> --- > >>> arch/arm64/boot/dts/broadcom/Makefile | 1 + > >>> .../boot/dts/broadcom/bcm2712-rpi-5-b.dts | 313 +++++++ > >>> arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi | 81 ++ > >>> arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 841 ++++++++++++++++++ > >>> 4 files changed, 1236 insertions(+) > >>> create mode 100644 arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts > >>> create mode 100644 arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi > >>> create mode 100644 arch/arm64/boot/dts/broadcom/bcm2712.dtsi > >>> > >>> diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile > >>> index 8b4591ddd27c..92565e9781ad 100644 > >>> --- a/arch/arm64/boot/dts/broadcom/Makefile > >>> +++ b/arch/arm64/boot/dts/broadcom/Makefile > >>> @@ -6,6 +6,7 @@ DTC_FLAGS := -@ > >>> dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb \ > >>> bcm2711-rpi-4-b.dtb \ > >>> bcm2711-rpi-cm4-io.dtb \ > >>> + bcm2712-rpi-5-b.dtb \ > >>> bcm2837-rpi-3-a-plus.dtb \ > >>> bcm2837-rpi-3-b.dtb \ > >>> bcm2837-rpi-3-b-plus.dtb \ > >>> diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts > >>> new file mode 100644 > >>> index 000000000000..2ce180a54e5b > >>> --- /dev/null > >>> +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts > >>> @@ -0,0 +1,313 @@ > >>> +// SPDX-License-Identifier: GPL-2.0 > >>> +/dts-v1/; > >>> + > >>> +#include <dt-bindings/gpio/gpio.h> > >>> +#include <dt-bindings/interrupt-controller/irq.h> > >>> +#include <dt-bindings/pwm/pwm.h> > >>> +#include <dt-bindings/reset/raspberrypi,firmware-reset.h> > >>> + > >>> +#define spi0 _spi0 > >>> +#define uart0 _uart0 > >>> + > >>> +#include "bcm2712.dtsi" > >>> + > >>> +#undef spi0 > >>> +#undef uart0 > >>> + > >>> +/ { > >>> + compatible = "raspberrypi,5-model-b", "brcm,bcm2712"; > >>> + model = "Raspberry Pi 5"; > >>> + > >>> > >> according to this downstream commit [1] it's just called "Raspberry Pi > >> 5" without Model B, but the filename and the compatible says something > >> different. Is there still a chance to get this consistent or is it too > >> late because the firmware expect the compatible? > >> > >> [1] - > >> https://github.com/raspberrypi/linux/commit/99e359d2f2da2c820fd2a30b1ad08b32c9549adb > > Nothing cares about the compatible string, but the product name was > > changed too late for the firmware, which expects the current DTB file > > name. > should i send a pull request to address the compatible? This would avoid > a little bit confusion in the upstreaming process, because > devicetree/bindings/arm/bcm/bcm2835.yaml needs to be updated as well. You think it is better to have the compatible string different to the file name, rather than just the human-readable model string being different? I don't agree. Phil