From nobody Tue Dec 16 22:45:55 2025 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE01F22A7E6 for ; Thu, 29 May 2025 12:42:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748522566; cv=none; b=k27Sl4MiPd2v5II36gveIjXiVgRcCD7s5ckE+AtjsduHDRA9uhTgFkca8EyIYgTSn6Mbgawto2wrzBjXfgvjVQ9iEm8ZXsAbIreF7wxwHRo8+RflqjBdNgpRuc2CPzW2C27qX2X4eAaGvdFkWYsJ57vcA74vdeLrIuhumd5v0QQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748522566; c=relaxed/simple; bh=QW7VTm572jmsB5I7p8SLx6Wb3evUoSSkHBGzBXDeejA=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HyMuBWtNS+P2QHkeqrfWG9oixNBF/JLfwvTc7lwD8HO1f4mPWWZmTs28R3AxhNtmV/WJnJ5re+J54KxuIp0T1OjL0l6jj71dTIlGdb5XXT2fKz4YlCXKpF4Q93WqFolguSs7rsxPPLWfAjUFaklHeERpQN0Z/bov4QDw3cIit2M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=UyxOQ99P; arc=none smtp.client-ip=209.85.218.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="UyxOQ99P" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-ad88d77314bso161492066b.1 for ; Thu, 29 May 2025 05:42:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1748522561; x=1749127361; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=WZ7xUfAXguvsPdu5QAJbu8MyCaxUyBGB0j1AZF9I7as=; b=UyxOQ99PPt9WhDc387h4KqixnXMRs3PXYZ6tpVxPoE6yFRAsagDBSmt5saqMM3JCq8 3i46p5iCnHisPoKh9e7Z4mSj7Qt+Gsc5rO+kwZHlUNN3c61/7yu60MuMO7airVbhFtPz GhYdTw4FtEtPpWxS/NPPhdhr/O5sMVXLKY+UNV0l/R0x8aos8P7uQzRKyKUxdSABm5ua AyqSK+shicY5Lf82iTo6pcNSR1jkNifxTL0JjkegvTZV8BFzi1DrJwCGvQygdooo/Ab2 9DIM0xczihWsL91Qwr/jzeUP4af+Jj+x2fj5kLsI4ebC6GUTjvOtGjOXdURzgXYyvLNG h7jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748522561; x=1749127361; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WZ7xUfAXguvsPdu5QAJbu8MyCaxUyBGB0j1AZF9I7as=; b=IubtHCC+nd8MRPaZajh4cVh/CLV5SPcKqb41BsPeqdOXh5M1QZHN8hWxcjwIRrUtJj P07sbLdjy4Mh4kBk/Tqkz4ykuXwBQTQuFYvLtNSj01wy/rkMcZJntlQxlJaLzmghcel9 y0VGYPiNfZJ/kxZZqt4jPzUtDl08lCdVoM/UQIjyXlP3gD5ds1MOf71t6AjTip36Cak7 aOkZASRVsAzPY4xBR5riRbFlYj25dHk1gemtsLbrHcFrhq21Fv56/LV3Hm9amLBsXXpF kV3wG79a0eP20THkO5esDS3jh99Oiwr2shHWKbAUBs3omrwifBlej9dba3bhQ/jNEiwL 6rlQ== X-Forwarded-Encrypted: i=1; AJvYcCXfloOXuTaPOVHMQmQQuO5ISsjkWrRzW+JJ3tgAhk+A/4CP6WB6g3vpDTmkxlFuKsXZQRJ7k4ojuufVEww=@vger.kernel.org X-Gm-Message-State: AOJu0YxFfdSpJzyHDrb1MhRkRkj5oPfS/hftTCWIueEyQudjqs8LMuoG et2kne52JayQFSYhg3b8j4M07SMPTdqus8onveor3UXeECWWWhjNG2qF5PDGLbbLIIs= X-Gm-Gg: ASbGnct17vFhgN5SlLWwM2SRyR8njm5PKrG8R/fJ/zGNCUu6cfvl0RTAzA4nT1N69Qz B/zZ5/WWlFcvXf0YUmf20q97dczu943pLvCfhPjMfFS15mWoSK4b2NTPl81PMpxJZyEdOK+GvhL yPnDru4YMZXtvNaVMqQeTZVNoen+iC0/3XqA1aNR4kTK5U0Q5cj2FRL8bHiefuiyp557YTr730n bO9lPLRCjX5iIjdlOwEhPhIB73SeAx2jinvsM6AdwVfXEWE17F4MCJmTyFLTzVIeekXZ3/cgeiV JbThN630XdHK5jvEGduCKB63144R6WsmNcVeWNqZjMA50U7oob8u9VKYv1nNvQcnv4Jx/YMuAAS 5ahNcUHbV3reSXiZ56zd1Fw== X-Google-Smtp-Source: AGHT+IG+1hfj8KXssbTADOE+Jqmgulq4eboidPcOQ6rlfffvAwJG+7qGyXwNclx6wBbDEJ2YEzW2Gg== X-Received: by 2002:a17:907:3fa4:b0:ad8:89c7:2735 with SMTP id a640c23a62f3a-adadf2a1317mr197516766b.58.1748522560846; Thu, 29 May 2025 05:42:40 -0700 (PDT) Received: from localhost (host-87-21-228-106.retail.telecomitalia.it. [87.21.228.106]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ada5dd045edsm133522566b.119.2025.05.29.05.42.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 May 2025 05:42:40 -0700 (PDT) From: Andrea della Porta To: Andrea della Porta , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Broadcom internal kernel review list , Lorenzo Pieralisi , Krzysztof Wilczynski , Manivannan Sadhasivam , Bjorn Helgaas , Linus Walleij , Catalin Marinas , Will Deacon , Bartosz Golaszewski , Derek Kiernan , Dragan Cvetic , Arnd Bergmann , Greg Kroah-Hartman , Saravana Kannan , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-gpio@vger.kernel.org, Masahiro Yamada , Stefan Wahren , Herve Codina , Luca Ceresoli , Thomas Petazzoni , Andrew Lunn , Phil Elwell , Dave Stevenson , kernel-list@raspberrypi.com, Matthias Brugger Subject: [PATCH v11 09/13] arm64: dts: broadcom: Add board DTS for Rpi5 which includes RP1 node Date: Thu, 29 May 2025 14:43:58 +0200 Message-ID: <20250529124412.26311-4-andrea.porta@suse.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add the fully populated DTS for RaspberryPi 5 which includes the RP1 node definition. The inclusion tree is as follow (the arrow points to the includer): rp1-common.dtsi ----> rp1-nexus.dtsi ----> bcm2712-rpi-5-b.dts ^ | bcm2712-rpi-5-b-ovl-rp1.dts This is designed to maximize the compatibility with downstream DT while ensuring that a fully defined DT (one which includes the RP1 node as opposed to load it from overlay at runtime) is present since early boot stage. Since the preferred board DT is the fully populated one, name it bcm2712-rpi-5-b.dts and move the previous one into bcm2712-rpi-5-b-ovl-rp1.dts. Signed-off-by: Andrea della Porta --- arch/arm64/boot/dts/broadcom/Makefile | 1 + .../dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts | 121 ++++++++++++++++++ .../boot/dts/broadcom/bcm2712-rpi-5-b.dts | 118 ++--------------- 3 files changed, 133 insertions(+), 107 deletions(-) create mode 100644 arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/br= oadcom/Makefile index 01ecfa304184..031875a277d7 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile @@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_BCM2835) +=3D bcm2711-rpi-400.dtb \ bcm2711-rpi-4-b.dtb \ bcm2711-rpi-cm4-io.dtb \ bcm2712-rpi-5-b.dtb \ + bcm2712-rpi-5-b-ovl-rp1.dtb \ bcm2712-d-rpi-5-b.dtb \ bcm2837-rpi-2-b.dtb \ bcm2837-rpi-3-a-plus.dtb \ diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts b/arc= h/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts new file mode 100644 index 000000000000..6ea3c102e0d6 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts @@ -0,0 +1,121 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/dts-v1/; + +#include +#include "bcm2712.dtsi" + +/ { + compatible =3D "raspberrypi,5-model-b", "brcm,bcm2712"; + model =3D "Raspberry Pi 5"; + + aliases { + serial10 =3D &uart10; + }; + + chosen: chosen { + stdout-path =3D "serial10:115200n8"; + }; + + clk_rp1_xosc: clock-50000000 { + compatible =3D "fixed-clock"; + #clock-cells =3D <0>; + clock-output-names =3D "rp1-xosc"; + clock-frequency =3D <50000000>; + }; + + /* Will be filled by the bootloader */ + memory@0 { + device_type =3D "memory"; + reg =3D <0 0 0 0x28000000>; + }; + + sd_io_1v8_reg: sd-io-1v8-reg { + compatible =3D "regulator-gpio"; + regulator-name =3D "vdd-sd-io"; + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <3300000>; + regulator-boot-on; + regulator-always-on; + regulator-settling-time-us =3D <5000>; + gpios =3D <&gio_aon 3 GPIO_ACTIVE_HIGH>; + states =3D <1800000 1>, + <3300000 0>; + }; + + sd_vcc_reg: sd-vcc-reg { + compatible =3D "regulator-fixed"; + regulator-name =3D "vcc-sd"; + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + regulator-boot-on; + enable-active-high; + gpios =3D <&gio_aon 4 GPIO_ACTIVE_HIGH>; + }; +}; + +/* The Debug UART, on Rpi5 it's on JST-SH 1.0mm 3-pin connector + * labeled "UART", i.e. the interface with the system console. + */ +&uart10 { + status =3D "okay"; +}; + +/* SDIO1 is used to drive the SD card */ +&sdio1 { + vqmmc-supply =3D <&sd_io_1v8_reg>; + vmmc-supply =3D <&sd_vcc_reg>; + bus-width =3D <4>; + sd-uhs-sdr50; + sd-uhs-ddr50; + sd-uhs-sdr104; +}; + +&soc { + firmware: firmware { + compatible =3D "raspberrypi,bcm2835-firmware", "simple-mfd"; + #address-cells =3D <1>; + #size-cells =3D <1>; + + mboxes =3D <&mailbox>; + dma-ranges; + + firmware_clocks: clocks { + compatible =3D "raspberrypi,firmware-clocks"; + #clock-cells =3D <1>; + }; + + reset: reset { + compatible =3D "raspberrypi,firmware-reset"; + #reset-cells =3D <1>; + }; + }; + + power: power { + compatible =3D "raspberrypi,bcm2835-power"; + firmware =3D <&firmware>; + #power-domain-cells =3D <1>; + }; +}; + +&hvs { + clocks =3D <&firmware_clocks 4>, <&firmware_clocks 16>; + clock-names =3D "core", "disp"; +}; + +&hdmi0 { + clocks =3D <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_= 27MHz>; + clock-names =3D "hdmi", "bvb", "audio", "cec"; +}; + +&hdmi1 { + clocks =3D <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_= 27MHz>; + clock-names =3D "hdmi", "bvb", "audio", "cec"; +}; + +&pcie1 { + status =3D "okay"; +}; + +&pcie2 { + status =3D "okay"; +}; diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts b/arch/arm64/= boot/dts/broadcom/bcm2712-rpi-5-b.dts index 1850a575e708..adad85e68f1b 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts @@ -1,113 +1,17 @@ // SPDX-License-Identifier: (GPL-2.0 OR MIT) -/dts-v1/; - -#include -#include "bcm2712.dtsi" - -/ { - compatible =3D "raspberrypi,5-model-b", "brcm,bcm2712"; - model =3D "Raspberry Pi 5"; - - aliases { - serial10 =3D &uart10; - }; - - chosen: chosen { - stdout-path =3D "serial10:115200n8"; - }; - - clk_rp1_xosc: clock-50000000 { - compatible =3D "fixed-clock"; - #clock-cells =3D <0>; - clock-output-names =3D "rp1-xosc"; - clock-frequency =3D <50000000>; - }; - - /* Will be filled by the bootloader */ - memory@0 { - device_type =3D "memory"; - reg =3D <0 0 0 0x28000000>; - }; - - sd_io_1v8_reg: sd-io-1v8-reg { - compatible =3D "regulator-gpio"; - regulator-name =3D "vdd-sd-io"; - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <3300000>; - regulator-boot-on; - regulator-always-on; - regulator-settling-time-us =3D <5000>; - gpios =3D <&gio_aon 3 GPIO_ACTIVE_HIGH>; - states =3D <1800000 1>, - <3300000 0>; - }; - - sd_vcc_reg: sd-vcc-reg { - compatible =3D "regulator-fixed"; - regulator-name =3D "vcc-sd"; - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; - regulator-boot-on; - enable-active-high; - gpios =3D <&gio_aon 4 GPIO_ACTIVE_HIGH>; - }; -}; - -/* The Debug UART, on Rpi5 it's on JST-SH 1.0mm 3-pin connector - * labeled "UART", i.e. the interface with the system console. +/* + * bcm2712-rpi-5-b-ovl-rp1.dts is the overlay-ready DT which will make + * the RP1 driver to load the RP1 dtb overlay at runtime, while + * bcm2712-rpi-5-b.dts (this file) is the fully defined one (i.e. it + * already contains RP1 node, so no overlay is loaded nor needed). + * This file is not intended to be modified, nodes should be added + * to the included bcm2712-rpi-5-b-ovl-rp1.dts. */ -&uart10 { - status =3D "okay"; -}; =20 -/* SDIO1 is used to drive the SD card */ -&sdio1 { - vqmmc-supply =3D <&sd_io_1v8_reg>; - vmmc-supply =3D <&sd_vcc_reg>; - bus-width =3D <4>; - sd-uhs-sdr50; - sd-uhs-ddr50; - sd-uhs-sdr104; -}; - -&soc { - firmware: firmware { - compatible =3D "raspberrypi,bcm2835-firmware", "simple-mfd"; - #address-cells =3D <1>; - #size-cells =3D <1>; - - mboxes =3D <&mailbox>; - dma-ranges; - - firmware_clocks: clocks { - compatible =3D "raspberrypi,firmware-clocks"; - #clock-cells =3D <1>; - }; - - reset: reset { - compatible =3D "raspberrypi,firmware-reset"; - #reset-cells =3D <1>; - }; - }; - - power: power { - compatible =3D "raspberrypi,bcm2835-power"; - firmware =3D <&firmware>; - #power-domain-cells =3D <1>; - }; -}; - -&hvs { - clocks =3D <&firmware_clocks 4>, <&firmware_clocks 16>; - clock-names =3D "core", "disp"; -}; +/dts-v1/; =20 -&hdmi0 { - clocks =3D <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_= 27MHz>; - clock-names =3D "hdmi", "bvb", "audio", "cec"; -}; +#include "bcm2712-rpi-5-b-ovl-rp1.dts" =20 -&hdmi1 { - clocks =3D <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_= 27MHz>; - clock-names =3D "hdmi", "bvb", "audio", "cec"; +&pcie2 { + #include "rp1-nexus.dtsi" }; --=20 2.35.3