From 9faf9f8f23f43300bfb892abe6513ead30374e20 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 10 Jul 2020 10:28:13 +0200 Subject: mvebu: fix support for Marvell 8040 MACCHIATOBin Between kernels 4.20 and 5.0, a new variant of this board has been introduced ("Single Shot"), and the existing one has been renamed with the appendix "Double Shot". [1] This also adjusted the first compatible in the list: marvell,armada8040-mcbin -> marvell,armada8040-mcbin-doubleshot This patch updates the OpenWrt implementation of this device by adjusting the relevant references to that compatible (i.e., our board name). To still provide support for 4.19 with our setup, this adds a small patch to change the compatible there as well. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=b1f0bbe2700051886b954192b6c1751233fe0f52 Cc: Tomasz Maciej Nowak Signed-off-by: Adrian Schmutzler Reviewed-by: Tomasz Maciej Nowak --- .../patches-4.19/260-align-mcbin-compatible-with-5.4.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 target/linux/mvebu/patches-4.19/260-align-mcbin-compatible-with-5.4.patch (limited to 'target/linux/mvebu/patches-4.19/260-align-mcbin-compatible-with-5.4.patch') diff --git a/target/linux/mvebu/patches-4.19/260-align-mcbin-compatible-with-5.4.patch b/target/linux/mvebu/patches-4.19/260-align-mcbin-compatible-with-5.4.patch new file mode 100644 index 0000000000..53e34300db --- /dev/null +++ b/target/linux/mvebu/patches-4.19/260-align-mcbin-compatible-with-5.4.patch @@ -0,0 +1,14 @@ +--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts ++++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts +@@ -10,8 +10,9 @@ + #include + + / { +- model = "Marvell 8040 MACCHIATOBin"; +- compatible = "marvell,armada8040-mcbin", "marvell,armada8040", ++ model = "Marvell 8040 MACCHIATOBin Double-shot"; ++ compatible = "marvell,armada8040-mcbin-doubleshot", ++ "marvell,armada8040-mcbin", "marvell,armada8040", + "marvell,armada-ap806-quad", "marvell,armada-ap806"; + + chosen { -- cgit v1.2.3