From patchwork Thu Feb 27 14:54:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1245899 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=OViWu8rb; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48SwhS0dPgz9sTm for ; Fri, 28 Feb 2020 01:55:36 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=b78ONjO5ySBCYuSVv5SOX0Z/gNW1GSGR3Qj+CQJVCWc=; b=OViWu8rbF1iqoT cf2ymNXupzVFA7GiDmlcQ40dbZBLZcrkOiGcr43osyMIsiHaF6RNl4bpS+iqtyJmeXOAYn8+8h4ln 1rh6AX0wNOi6pbHDovrHwq73wSRi0mbbuS671Ge5T8WYzXfAa8EVRuPAKVEsHbWdo6Y2xWuC5fYK+ sPDvbj/p7+UrIc8ms2G5YyOSaAT+2tKX1KG0is1hssthyXx/O/B28iBFsdA8fjTZ6qopSOwWWcInt rR9VV4yoH3Tc0luE+l4XLlzCCy93aRlgjai1tr7Gfd5eSKF1ZjVjMZSkQdM3phDZjJftDs60jdjLi nm378ZT+9DYpGW2io3FQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j7KZX-0002La-Lr; Thu, 27 Feb 2020 14:55:31 +0000 Received: from mout.kundenserver.de ([212.227.126.187]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j7KZN-0002CH-Ft for openwrt-devel@lists.openwrt.org; Thu, 27 Feb 2020 14:55:23 +0000 Received: from buildfff.adridolf.com ([188.193.229.61]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1My3Ad-1jKa3l1dHj-00zTEt; Thu, 27 Feb 2020 15:55:18 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Date: Thu, 27 Feb 2020 15:54:30 +0100 Message-Id: <20200227145431.42534-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:NMUOQhOrXaX65GfBfU5/0W7iHW0snilBH1tMWqPgWSCySOd+2cy cev2jkPjTa9p4oF9cMSvLdNvxG+RfQVuKuqsTT+hXBxqO1XsiPZySLPzEPNUYcMC8AI0Jx9 oOwfhj7NdBfIdyZfLNtwwRL5kx0fFfROSE7hwfLKtE9xN9RKStcY+qKIRGn/C01Rn+wE1n/ 4UQAla7pxFL/rNqTKKp1A== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:n5pJr/a0HmQ=:GOMFPO/VbEh5Y3mPhA9fmc rlqC7ebkmzTjq4kNmcdr7N9khv3IRL+MlkssWFewCVjfdwUJk9VqsjAYS9sWg1Nen69fsO8YJ mdw3JFh/8iF1JmawRsCFNIiD1XSxfTA4EBvxJp79BEl45Sv22nXpg+tXZ+1TjrnpSB2ho0Tc9 8r+pnK0vW4o32Ajfo+ezIn2c/lIMLD9REkDi1FAPPFjhUkkEZSPd8nSBIs80dhlZ1emHhJ+Ij qxn6hWwU7Xl9UlfzJlN6drVJ54fXrQa49WCpXe9+3n1Z04tAJbSXO0tZMGaj2gZMUiyeJfvlT 0TNoH78y0SK88DFlOZZa/9sHb7F+ksvg9hs3NqIQtXG36I7HjUCwyMCoDhdhaXFC34vgwF9tm cmjwfT3bOlL/guxQ4E22a3vQJ5y/xkX2NRYL5+Gp158tDRyNQI3t0HQKAJ3GsbOekra9U+HqJ lqijazIC+juEEQN3cGgQn5es2lBKfNd0j3MYcMF+XxF4CZyl4bBX+ZmYV/bqmoSO8L23mHSWm si9YWsKc3BSctKj/fUl0NZ51dmpS4VnYvFdyArE/EMkpKHSlLPqStqGJvrJ/CwqAWHih6wIqi 4aD1raTvh9t35kMKKL2qG/emkG5lAoouH/bz+14y2mqeKCh4u8xMNon2boKhEPszt2LUUV1jk SlWgsDkazOH+6OoZUo6WVJc/qbFqJ41Gzs5UbyqLIPU12mrscW80JyIwdpvft92tZknk+imOK EEpTXWbK+Pq/TCEHcP/Nl8ar2kqUG68fPC4xTCW8ur7qTgxghxeREbBsguFcMw7rVRp9MKC8P S49HxbhuM+wVO0VbXQsGJV0KQVMaDkLjmNOvRnWc8ceyfJo/3WFPa24G1E5W9N7LwN5GBAj X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200227_065521_814913_4ABE76CB X-CRM114-Status: UNSURE ( 8.86 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.187 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [PATCH 1/2] kirkwood: fix switch DTS node for EA4500 and EA3500 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcin Fedan , Pawel Dembicki Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Pawel Dembicki Changes made in switch nodes in d42c9ce commit cause problems with correct mvsw61xx detection. This commit undoes those changes. Fixes: d42c9ce326aa ("kirkwood: add kernel 4.19 support") Tested-by: Marcin Fedan [EA4500] Signed-off-by: Pawel Dembicki [rebased, minor commit message/title adjustments] Signed-off-by: Adrian Schmutzler --- .../arm/boot/dts/kirkwood-linksys-audi.dts | 23 ++++++-------- .../kirkwood/patches-4.19/105-ea4500.patch | 31 ++++++++----------- 2 files changed, 22 insertions(+), 32 deletions(-) diff --git a/target/linux/kirkwood/files-4.19/arch/arm/boot/dts/kirkwood-linksys-audi.dts b/target/linux/kirkwood/files-4.19/arch/arm/boot/dts/kirkwood-linksys-audi.dts index 0d00943dfd..05e24aa93f 100644 --- a/target/linux/kirkwood/files-4.19/arch/arm/boot/dts/kirkwood-linksys-audi.dts +++ b/target/linux/kirkwood/files-4.19/arch/arm/boot/dts/kirkwood-linksys-audi.dts @@ -67,20 +67,15 @@ }; }; - switches { - #address-cells = <1>; - #size-cells = <0>; - - mvsw61xx@10 { - compatible = "marvell,88e6171"; - status = "okay"; - reg = <0x10>; - - mii-bus = <&mdio>; - cpu-port-0 = <5>; - cpu-port-1 = <6>; - is-indirect; - }; + mvsw61xx { + compatible = "marvell,88e6171"; + status = "okay"; + reg = <0x10>; + + mii-bus = <&mdio>; + cpu-port-0 = <5>; + cpu-port-1 = <6>; + is-indirect; }; dsa { diff --git a/target/linux/kirkwood/patches-4.19/105-ea4500.patch b/target/linux/kirkwood/patches-4.19/105-ea4500.patch index 5948a1bdf1..3e6f936c5a 100644 --- a/target/linux/kirkwood/patches-4.19/105-ea4500.patch +++ b/target/linux/kirkwood/patches-4.19/105-ea4500.patch @@ -23,33 +23,28 @@ }; white-pulse { -@@ -67,9 +72,23 @@ +@@ -67,9 +72,18 @@ }; }; - dsa { - status = "disabled"; -+ switches { -+ #address-cells = <1>; -+ #size-cells = <0>; - -+ mvsw61xx@10 { -+ compatible = "marvell,88e6171"; -+ status = "okay"; -+ reg = <0x10>; ++ mvsw61xx@10 { ++ compatible = "marvell,88e6171"; ++ status = "okay"; ++ reg = <0x10>; + -+ mii-bus = <&mdio>; -+ cpu-port-0 = <5>; -+ cpu-port-1 = <6>; -+ is-indirect; -+ }; ++ mii-bus = <&mdio>; ++ cpu-port-0 = <5>; ++ cpu-port-1 = <6>; ++ is-indirect; + }; -+ + + dsa { compatible = "marvell,dsa"; #address-cells = <2>; #size-cells = <0>; -@@ -161,22 +180,22 @@ +@@ -161,22 +175,22 @@ }; partition@200000 { @@ -76,7 +71,7 @@ reg = <0x1EA0000 0x1760000>; }; -@@ -207,53 +226,6 @@ +@@ -207,53 +221,6 @@ &mdio { status = "okay"; @@ -130,7 +125,7 @@ }; &uart0 { -@@ -272,10 +244,14 @@ +@@ -272,10 +239,14 @@ }; /* eth1 is connected to the switch at port 6. However DSA only supports a From patchwork Thu Feb 27 14:54:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1245898 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=AIE8iQek; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48SwhP5CpTz9sTh for ; Fri, 28 Feb 2020 01:55:33 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PTTPLQDAkBELqri3ttg13DC1tBL0R4tkUCPZ5ZG5wzQ=; b=AIE8iQekdZKVYs 7CAu78UNskkUyJfVp3xgqvf6hHqVQ8WiAvx8H/XpPVeXXLdrkePb9TKicEg/NJ3o3TQY0X+EX/wN3 98q9vnogGNvs8Fm19M6TkdkcoizzvO2pz6XeEw/IIlL1IVS9sv6a+5+xuPR6irsQBA7S/GxIokVgR 1iBdd5XzyuowmNNyuEnp+oRQ4fSgE8ywJLwz8cFruYo2weSFNhyk3UPDCFsb9ovF57SYgtAk1rqaF MwuAGvDvFWvlR08dKTWSWf4H04Pea5MQ6hnIc5+9PivzoNWC/PK/hG6eBXeVxjGmxsTSqnyVARAkl 2rX1VWyBy3M+QnxDb0qw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j7KZQ-0002D3-F1; Thu, 27 Feb 2020 14:55:24 +0000 Received: from mout.kundenserver.de ([212.227.126.135]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j7KZN-0002CF-Ej for openwrt-devel@lists.openwrt.org; Thu, 27 Feb 2020 14:55:23 +0000 Received: from buildfff.adridolf.com ([188.193.229.61]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MtwQm-1jPorK2KMu-00uGZw; Thu, 27 Feb 2020 15:55:18 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Date: Thu, 27 Feb 2020 15:54:31 +0100 Message-Id: <20200227145431.42534-2-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200227145431.42534-1-freifunk@adrianschmutzler.de> References: <20200227145431.42534-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:YYt4j1FyV1eXAoREooUMLA63u+hDS0iuwGWEbg4u1kuG2xMehu3 EOtYCuOo6oENH9BVPSM1oj23wl8EbyP0bIvFGWTJF8L+u/vjXtYT/GibrocnclSgyhYbGdh czItnQyVOpBABswBNqIL5wCXIMUWxzdzRf67r2hcd7sxzjjtNNP+ViQcMcSxa3TT5hPgn3N 11dyIV53EIl25Ik2/bR3w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:3y5xl59BR0Q=:qWL/iPS1ezLbha6DEQGOZS ru9idlxv7HDJu7bD+r5RUTrx4YmP8r3DV4AZktdq2khDnAK06IUPUmxjTMwGjlMTVdmdX1aPx DYxo5NO1HBNIU9d2XpuxIOuiO5t05FYDyZqLAXADp9YlrpCnW4n2f91kLM1C4GClUoaTHZFs1 bQyB9s4yYBd4yXP7tVXVVUAWOiFvMz6kcHrJHoMhjROI3VcxinTE5EmZ90FztRuvGp3jLiKt5 sw/HcaDa97xNCGmNbihv0PcXIywFuG3CAIOXza3hAtTk1yPCUqumPctRqFLMa6f8ToFOdUpoo 0k9LhAg5uxqOp7gzoYLwEWkfVyQmfilX2WfTOiMgQfC02qdOD1a93zqMEjKJyWUVfbNcUPNPS 7MjWxpkhF5llOEg7tOPwj1eooUXorkd7KLJ9LLqN7gVLg/UxySB3hJG3tiQ5xQFzRYTMEn/vI AElbzgwzruGCezXLPBZZZ6BHLZFEJB+cv8SUcqvolLdz13ojFcJjv2VPqW1Y+ekbhvNJ9NMb0 UBXtl8BdIUfGgQ5ywLNVOQGTobEEPHXf761IhIW9GiHsZytIgI7eQS+0fhzlPbUAhBq1oKUq6 PTkKm0lD594vn0UAxAqinR12UO2L/LnCli2V+on5RUnCzEwdYTZ0e/kR0v0bl7Ox4v5EdOT9t hlIrxUJzQl60aV8PGu+SVYdCuNyA6GQVNMkABPBZ+TEKFmMzUpP/WVW9Tvzl6uWttarcreVjI FJyNPu40DP3slVVxNeo537r8fkJBCFKZ6q9Rh6gIlWBVr2/vil3qq+munLdF7B/8RmPkpNokg TZcisrTJHChKJNaDC+q8STtjbawWcvfzLVr7cWXLxtDPdrX0N1rYHYEKPxniy+AD05TrCQr X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200227_065521_793829_76ED88D1 X-CRM114-Status: UNSURE ( 9.80 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.135 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [PATCH 2/2] kirkwood: switch to kernel 4.19 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pawel Dembicki Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Pawel Dembicki Signed-off-by: Pawel Dembicki --- Since I've mostly done cosmetic changes on this target, I'd be happy about an Acked-by so I can push this bump. The patch for adding 4.19 support on this target is actually from 2018. Adrian --- target/linux/kirkwood/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile index adc7a496e1..2e615e42bd 100644 --- a/target/linux/kirkwood/Makefile +++ b/target/linux/kirkwood/Makefile @@ -13,8 +13,7 @@ FEATURES:=usb nand squashfs ramdisk CPU_TYPE:=xscale MAINTAINER:=Luka Perkov -KERNEL_PATCHVER:=4.14 -KERNEL_TESTING_PATCHVER := 4.19 +KERNEL_PATCHVER:=4.19 include $(INCLUDE_DIR)/target.mk