From 5454dfc211a79274ff266e10ffcfe6ae19709cce Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso Date: Thu, 20 Feb 2020 12:05:27 +0100 Subject: [PATCH] Refresh "ARM: dts: bcm283x: Correct vchiq compatible string" for context changes in 4.19.99 --- debian/changelog | 2 ++ ...M-dts-bcm283x-Correct-vchiq-compatible-string.patch | 10 +--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 57c110a3b..d7c11d2a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -445,6 +445,8 @@ linux (4.19.99-1) UNRELEASED; urgency=medium * vfs: fix do_last() regression * Refresh "Revert "objtool: Fix CONFIG_STACK_VALIDATION=y warning for out-of-tree modules"" for context changes in 4.19.99 + * Refresh "ARM: dts: bcm283x: Correct vchiq compatible string" for context + changes in 4.19.99 [ Ben Hutchings ] * [x86] Drop "Add a SysRq option to lift kernel lockdown" (Closes: #947021) diff --git a/debian/patches/features/arm/ARM-dts-bcm283x-Correct-vchiq-compatible-string.patch b/debian/patches/features/arm/ARM-dts-bcm283x-Correct-vchiq-compatible-string.patch index c42eb526f..8dfed0cb1 100644 --- a/debian/patches/features/arm/ARM-dts-bcm283x-Correct-vchiq-compatible-string.patch +++ b/debian/patches/features/arm/ARM-dts-bcm283x-Correct-vchiq-compatible-string.patch @@ -13,8 +13,6 @@ Signed-off-by: Romain Perier 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/bcm2836-rpi.dtsi -diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi -index cb2d6d78a7fb..b3da141bb793 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -30,7 +30,7 @@ @@ -24,11 +22,8 @@ index cb2d6d78a7fb..b3da141bb793 100644 - mailbox@7e00b840 { + vchiq: mmailbox@7e00b840 { compatible = "brcm,bcm2835-vchiq"; - reg = <0x7e00b840 0xf>; + reg = <0x7e00b840 0x3c>; interrupts = <0 2>; -diff --git a/arch/arm/boot/dts/bcm2836-rpi.dtsi b/arch/arm/boot/dts/bcm2836-rpi.dtsi -new file mode 100644 -index 000000000000..c4c858b984c6 --- /dev/null +++ b/arch/arm/boot/dts/bcm2836-rpi.dtsi @@ -0,0 +1,6 @@ @@ -38,6 +33,3 @@ index 000000000000..c4c858b984c6 +&vchiq { + compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq"; +}; --- -2.23.0 -