diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-06 01:02:38 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-06 01:02:38 +0000 |
commit | 08b74a000942a380fe028845f92cd3a0dee827d5 (patch) | |
tree | aa78b4e12607c3e1fcce8d5cc42df4330792f118 /debian/patches/features/arm64 | |
parent | Adding upstream version 4.19.249. (diff) | |
download | linux-08b74a000942a380fe028845f92cd3a0dee827d5.tar.xz linux-08b74a000942a380fe028845f92cd3a0dee827d5.zip |
Adding debian version 4.19.249-2.debian/4.19.249-2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/features/arm64')
4 files changed, 157 insertions, 0 deletions
diff --git a/debian/patches/features/arm64/arm64-dts-allwinner-a64-Add-Pine64-LTS-device-tree-f.patch b/debian/patches/features/arm64/arm64-dts-allwinner-a64-Add-Pine64-LTS-device-tree-f.patch new file mode 100644 index 000000000..c87b9f1a9 --- /dev/null +++ b/debian/patches/features/arm64/arm64-dts-allwinner-a64-Add-Pine64-LTS-device-tree-f.patch @@ -0,0 +1,55 @@ +From: Andre Przywara <andre.przywara@arm.com> +Date: Mon, 30 Jul 2018 13:31:20 +0100 +Subject: arm64: dts: allwinner: a64: Add Pine64-LTS device tree file +Origin: https://git.kernel.org/linus/b3ee15a509ffd7473b77b21cb921b3128efdd005 + +The Pine64-LTS is a variant of the Pine64 board, from the software +visible side resembling a SoPine module on a baseboard, though the +board has the SoC and DRAM integrated on one PCB. +Due to this it basically shares the DT with the SoPine baseboard, which +we mimic in our DT by inclucing the boardboard .dts into the new file, +just overwriting the model name. +Having a separate .dts for this seems useful, since we don't know yet if +there are subtle differences between the two. Also the SoC on the LTS +board is technically an "R18" instead of the original "A64", although as +far as we know this is just a relabelled version of the original SoC. + +Signed-off-by: Andre Przywara <andre.przywara@arm.com> +Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> +Signed-off-by: Chen-Yu Tsai <wens@csie.org> +--- + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 13 +++++++++++++ + 2 files changed, 14 insertions(+) + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts + +Index: linux/arch/arm64/boot/dts/allwinner/Makefile +=================================================================== +--- linux.orig/arch/arm64/boot/dts/allwinner/Makefile ++++ linux/arch/arm64/boot/dts/allwinner/Makefile +@@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-b + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-nanopi-a64.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-olinuxino.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-orangepi-win.dtb ++dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pine64-lts.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pine64-plus.dtb sun50i-a64-pine64.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinebook.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb +Index: linux/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts +=================================================================== +--- /dev/null ++++ linux/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts +@@ -0,0 +1,13 @@ ++/* ++ * SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++ * ++ * Copyright (c) 2018 ARM Ltd. ++ */ ++ ++#include "sun50i-a64-sopine-baseboard.dts" ++ ++/ { ++ model = "Pine64 LTS"; ++ compatible = "pine64,pine64-lts", "allwinner,sun50i-r18", ++ "allwinner,sun50i-a64"; ++}; diff --git a/debian/patches/features/arm64/arm64-dts-broadcom-Add-reference-to-Compute-Module-I.patch b/debian/patches/features/arm64/arm64-dts-broadcom-Add-reference-to-Compute-Module-I.patch new file mode 100644 index 000000000..1d34ce743 --- /dev/null +++ b/debian/patches/features/arm64/arm64-dts-broadcom-Add-reference-to-Compute-Module-I.patch @@ -0,0 +1,35 @@ +From: Stefan Wahren <stefan.wahren@i2se.com> +Date: Mon, 27 Aug 2018 19:33:28 +0200 +Subject: arm64: dts: broadcom: Add reference to Compute Module IO Board V3 +Origin: https://git.kernel.org/linus/a7eb26392b893bff92b1eb6483f4af3d2eb19510 + +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 <stefan.wahren@i2se.com> +--- + 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 + +Index: linux/arch/arm64/boot/dts/broadcom/Makefile +=================================================================== +--- linux.orig/arch/arm64/boot/dts/broadcom/Makefile ++++ linux/arch/arm64/boot/dts/broadcom/Makefile +@@ -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 +Index: linux/arch/arm64/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts +=================================================================== +--- /dev/null ++++ linux/arch/arm64/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts +@@ -0,0 +1,2 @@ ++// SPDX-License-Identifier: GPL-2.0 ++#include "arm/bcm2837-rpi-cm3-io3.dts" diff --git a/debian/patches/features/arm64/arm64-dts-broadcom-Add-reference-to-RPi-3-A-Plus.patch b/debian/patches/features/arm64/arm64-dts-broadcom-Add-reference-to-RPi-3-A-Plus.patch new file mode 100644 index 000000000..745cc8d09 --- /dev/null +++ b/debian/patches/features/arm64/arm64-dts-broadcom-Add-reference-to-RPi-3-A-Plus.patch @@ -0,0 +1,35 @@ +From: Stefan Wahren <stefan.wahren@i2se.com> +Date: Fri, 28 Dec 2018 23:09:27 +0100 +Subject: arm64: dts: broadcom: Add reference to RPi 3 A+ +Origin: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=441d8020d8fc8654698f5518cdf76832f84101f4 + +This adds a reference to the dts of the Raspberry Pi 3 A+, +so we don't need to maintain the content in arm64. + +Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> +Reviewed-by: Eric Anholt <eric@anholt.net> +--- + arch/arm64/boot/dts/broadcom/Makefile | 3 ++- + arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-a-plus.dts | 2 ++ + 2 files changed, 4 insertions(+), 1 deletion(-) + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-a-plus.dts + +Index: debian-kernel/arch/arm64/boot/dts/broadcom/Makefile +=================================================================== +--- debian-kernel.orig/arch/arm64/boot/dts/broadcom/Makefile ++++ debian-kernel/arch/arm64/boot/dts/broadcom/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 +-dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb \ ++dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-a-plus.dtb \ ++ bcm2837-rpi-3-b.dtb \ + bcm2837-rpi-3-b-plus.dtb \ + bcm2837-rpi-cm3-io3.dtb + +Index: debian-kernel/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-a-plus.dts +=================================================================== +--- /dev/null ++++ debian-kernel/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-a-plus.dts +@@ -0,0 +1,2 @@ ++// SPDX-License-Identifier: GPL-2.0 ++#include "arm/bcm2837-rpi-3-a-plus.dts" diff --git a/debian/patches/features/arm64/arm64-dts-broadcom-Use-the-.dtb-name-in-the-rule-rat.patch b/debian/patches/features/arm64/arm64-dts-broadcom-Use-the-.dtb-name-in-the-rule-rat.patch new file mode 100644 index 000000000..d2c9849bb --- /dev/null +++ b/debian/patches/features/arm64/arm64-dts-broadcom-Use-the-.dtb-name-in-the-rule-rat.patch @@ -0,0 +1,32 @@ +From: Liviu Dudau <liviu@dudau.co.uk> +Date: Mon, 24 Sep 2018 11:22:28 +0100 +Subject: arm64: dts: broadcom: Use the .dtb name in the rule, rather than .dts +Origin: https://git.kernel.org/linus/74cf77e8be35795b4cc57b7010bc348295e421b9 + +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. + +Fixes: a7eb26392b893 ("arm64: dts: broadcom: Add reference to Compute Module IO Board V3") +Signed-off-by: Liviu Dudau <liviu@dudau.co.uk> +Acked-by: Stefan Wahren <stefan.wahren@i2se.com> +Signed-off-by: Olof Johansson <olof@lixom.net> +--- + arch/arm64/boot/dts/broadcom/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: linux/arch/arm64/boot/dts/broadcom/Makefile +=================================================================== +--- linux.orig/arch/arm64/boot/dts/broadcom/Makefile ++++ linux/arch/arm64/boot/dts/broadcom/Makefile +@@ -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 |