From 5cb904c8a918a798f32fde678ff3030ba209610a Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 4 Mar 2019 07:55:44 -0800 Subject: [PATCH] [arm64] Add patch from v4.20 to enable device-tree for Pine64-LTS. --- debian/changelog | 3 + ...ner-a64-Add-Pine64-LTS-device-tree-f.patch | 59 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 63 insertions(+) create mode 100644 debian/patches/features/arm64/arm64-dts-allwinner-a64-Add-Pine64-LTS-device-tree-f.patch diff --git a/debian/changelog b/debian/changelog index a014b3214..2807301e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,9 @@ linux (4.19.20-2) UNRELEASED; urgency=medium * Btrfs: fix corruption reading shared and compressed extents after hole punching (Closes: #922306) + [ Vagrant Cascadian ] + * [arm64] Add patch from v4.20 to enable device-tree for Pine64-LTS. + -- Ben Hutchings Tue, 12 Feb 2019 12:49:10 +0000 linux (4.19.20-1) unstable; urgency=medium 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..f7ab4a674 --- /dev/null +++ b/debian/patches/features/arm64/arm64-dts-allwinner-a64-Add-Pine64-LTS-device-tree-f.patch @@ -0,0 +1,59 @@ +From b3ee15a509ffd7473b77b21cb921b3128efdd005 Mon Sep 17 00:00:00 2001 +From: Andre Przywara +Date: Mon, 30 Jul 2018 13:31:20 +0100 +Subject: [PATCH] arm64: dts: allwinner: a64: Add Pine64-LTS device tree file + +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 +Acked-by: Maxime Ripard +Signed-off-by: Chen-Yu Tsai +--- + 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 + +diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile +index 9ffa7a038791..b7034327b28b 100644 +--- a/arch/arm64/boot/dts/allwinner/Makefile ++++ b/arch/arm64/boot/dts/allwinner/Makefile +@@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-bananapi-m64.dtb + 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 +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts +new file mode 100644 +index 000000000000..72d6961dc312 +--- /dev/null ++++ b/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"; ++}; +-- +2.20.1 + diff --git a/debian/patches/series b/debian/patches/series index 4296e27da..efdee6915 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -93,6 +93,7 @@ features/x86/x86-acpi-x86-boot-Take-RSDP-address-for-boot-params-.patch features/x86/x86-boot-Mostly-revert-commit-ae7e1238e68f2a-Add-ACP.patch features/x86/x86-acpi-x86-boot-Take-RSDP-address-from-boot-params.patch features/x86/x86-boot-Clear-RSDP-address-in-boot_params-for-broke.patch +features/arm64/arm64-dts-allwinner-a64-Add-Pine64-LTS-device-tree-f.patch # Miscellaneous bug fixes bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch