From: Marko Ratkaj Date: Fri, 7 Apr 2017 09:07:34 +0000 (+0200) Subject: mvebu: ClearFog DT file renamed upstream X-Git-Tag: v18.06.0-rc1~2971 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=efb49af1f9de6fa73c9a35534563be67f8e63967;p=oweals%2Fopenwrt.git mvebu: ClearFog DT file renamed upstream The conventional model is now known as the "Clearfog Pro". We keep the old armada-388-clearfog.dts file for compatibility reasons. Signed-off-by: Marko Ratkaj --- diff --git a/target/linux/mvebu/patches-4.9/470-ClearFog-renamed-upstream.patch b/target/linux/mvebu/patches-4.9/470-ClearFog-renamed-upstream.patch new file mode 100644 index 0000000000..3eeda9fd3a --- /dev/null +++ b/target/linux/mvebu/patches-4.9/470-ClearFog-renamed-upstream.patch @@ -0,0 +1,80 @@ +From b0db8cc1fe7eab722bc1f7c386132b3905d67f30 Mon Sep 17 00:00:00 2001 +From: Marko Ratkaj +Date: Fri, 7 Apr 2017 11:01:26 +0200 +Subject: [PATCH 1/2] ClearFog renamed upstream + +Signed-off-by: Marko Ratkaj +--- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/armada-388-clearfog-pro.dts | 55 +++++++++++++++++++++++++++ + 2 files changed, 56 insertions(+) + create mode 100644 arch/arm/boot/dts/armada-388-clearfog-pro.dts + +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -924,6 +924,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ + armada-385-linksys-rango.dtb \ + armada-385-linksys-shelby.dtb \ + armada-388-clearfog.dtb \ ++ armada-388-clearfog-pro.dtb \ + armada-388-db.dtb \ + armada-388-gp.dtb \ + armada-388-rd.dtb +--- /dev/null ++++ b/arch/arm/boot/dts/armada-388-clearfog-pro.dts +@@ -0,0 +1,55 @@ ++/* ++ * Device Tree file for SolidRun Clearfog Pro revision A1 rev 2.0 (88F6828) ++ * ++ * Copyright (C) 2015 Russell King ++ * ++ * This board is in development; the contents of this file work with ++ * the A1 rev 2.0 of the board, which does not represent final ++ * production board. Things will change, don't expect this file to ++ * remain compatible info the future. ++ * ++ * This file is dual-licensed: you can use it either under the terms ++ * of the GPL or the X11 license, at your option. Note that this dual ++ * licensing only applies to this file, and not this project as a ++ * whole. ++ * ++ * a) This file is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * version 2 as published by the Free Software Foundation. ++ * ++ * This file is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * Or, alternatively, ++ * ++ * b) Permission is hereby granted, free of charge, to any person ++ * obtaining a copy of this software and associated documentation ++ * files (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use, ++ * copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following ++ * conditions: ++ * ++ * The above copyright notice and this permission notice shall be ++ * included in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES ++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT ++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, ++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ */ ++#include "armada-388-clearfog.dts" ++ ++/ { ++ model = "SolidRun Clearfog Pro A1"; ++ compatible = "solidrun,clearfog-pro-a1", ++ "solidrun,clearfog-a1", "marvell,armada388", ++ "marvell,armada385", "marvell,armada380"; ++};