From: Greg Kroah-Hartman Date: Fri, 15 May 2026 06:16:02 +0000 (+0200) Subject: 6.18-stable patches X-Git-Tag: v5.10.256~26 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03c0a20137c509eef1ec17d156322d7fc1688467;p=thirdparty%2Fkernel%2Fstable-queue.git 6.18-stable patches added patches: arm64-dts-broadcom-bcm2712-d-rpi-5-b-add-fixes-for-pinctrl-pinctrl_aon.patch arm64-dts-broadcom-bcm2712-d-rpi-5-b-update-uart10-interrupt.patch --- diff --git a/queue-6.18/arm64-dts-broadcom-bcm2712-d-rpi-5-b-add-fixes-for-pinctrl-pinctrl_aon.patch b/queue-6.18/arm64-dts-broadcom-bcm2712-d-rpi-5-b-add-fixes-for-pinctrl-pinctrl_aon.patch new file mode 100644 index 0000000000..da168e4cca --- /dev/null +++ b/queue-6.18/arm64-dts-broadcom-bcm2712-d-rpi-5-b-add-fixes-for-pinctrl-pinctrl_aon.patch @@ -0,0 +1,40 @@ +From aeb078cebc40d421f61a8f07b0e7919aeb44d751 Mon Sep 17 00:00:00 2001 +From: Gregor Herburger +Date: Thu, 26 Feb 2026 09:55:58 +0100 +Subject: arm64: dts: broadcom: bcm2712-d-rpi-5-b: add fixes for pinctrl/pinctrl_aon + +From: Gregor Herburger + +commit aeb078cebc40d421f61a8f07b0e7919aeb44d751 upstream. + +On the -d revision of the bcm2712 the pinctrl differs from the c0 +revision. The driver already supports both and distinguishes the two +with the compatible string. + +Update the compatible string and reg length to reflect the different +pinctrl. + +Signed-off-by: Gregor Herburger +Link: https://lore.kernel.org/r/20260226-raspi-dts-updates-v1-5-60832d20ff04@linutronix.de +Signed-off-by: Florian Fainelli +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts ++++ b/arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts +@@ -35,3 +35,13 @@ + "PMIC_SCL", // AON_SGPIO_04 + "PMIC_SDA"; // AON_SGPIO_05 + }; ++ ++&pinctrl { ++ compatible = "brcm,bcm2712d0-pinctrl"; ++ reg = <0x7d504100 0x20>; ++}; ++ ++&pinctrl_aon { ++ compatible = "brcm,bcm2712d0-aon-pinctrl"; ++ reg = <0x7d510700 0x1c>; ++}; diff --git a/queue-6.18/arm64-dts-broadcom-bcm2712-d-rpi-5-b-update-uart10-interrupt.patch b/queue-6.18/arm64-dts-broadcom-bcm2712-d-rpi-5-b-update-uart10-interrupt.patch new file mode 100644 index 0000000000..92fba21963 --- /dev/null +++ b/queue-6.18/arm64-dts-broadcom-bcm2712-d-rpi-5-b-update-uart10-interrupt.patch @@ -0,0 +1,31 @@ +From 18d4a06e10051681de074a9250e54afc1f3ee312 Mon Sep 17 00:00:00 2001 +From: Gregor Herburger +Date: Thu, 26 Feb 2026 09:55:59 +0100 +Subject: arm64: dts: broadcom: bcm2712-d-rpi-5-b: update uart10 interrupt + +From: Gregor Herburger + +commit 18d4a06e10051681de074a9250e54afc1f3ee312 upstream. + +On the -d revision of bcm2712 the uart interrupt is on 120. Update it +accordingly. + +Signed-off-by: Gregor Herburger +Link: https://lore.kernel.org/r/20260226-raspi-dts-updates-v1-6-60832d20ff04@linutronix.de +Signed-off-by: Florian Fainelli +Cc: Rasmus Villemoes +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts ++++ b/arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts +@@ -45,3 +45,7 @@ + compatible = "brcm,bcm2712d0-aon-pinctrl"; + reg = <0x7d510700 0x1c>; + }; ++ ++&uart10 { ++ interrupts = ; ++}; diff --git a/queue-6.18/series b/queue-6.18/series index 98377f7806..c00b29e096 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -44,3 +44,5 @@ spi-amlogic-spisg-fix-controller-deregistration.patch spi-aspeed-smc-fix-controller-deregistration.patch platform-x86-hp-wmi-ignore-backlight-and-fnlock-events.patch vsock-virtio-fix-msg_peek-ignoring-skb-offset-when-calculating-bytes-to-copy.patch +arm64-dts-broadcom-bcm2712-d-rpi-5-b-add-fixes-for-pinctrl-pinctrl_aon.patch +arm64-dts-broadcom-bcm2712-d-rpi-5-b-update-uart10-interrupt.patch