From patchwork Fri Jul 10 08:28:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1326548 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=2001:8b0:10b:1231::1; helo=merlin.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; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=se9MG+Fe; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4B35rk2jtBz9sRK for ; Fri, 10 Jul 2020 18:32:38 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=5fKfczIijviXpnsHRFMGI2OJQQozSfmYLj+yJnN5Oyo=; b=se9MG+Fe0PtAL9hpksETCIDkAl BJ2kRVbD/q09/PCJBmKu/UcegH/oxt+xcrg3eYpmfKcN6rbMR0I8sXBWC9D21zjABpRaMBq5V4Xyy 763+NPAHS9q/TVtxk+EHA+KI0pojYW8t4+LGk1/WjAxJxudXWJpE/q2HckcqcwJcFOD22Yqjmp263 6/CawMOKjXgYyOeclGXYMRO24LNMkgWM82KxPPVTxG1gd3LcZq+qOKPhU0LX1QOMh36Y8kJUynUmt BzDkO7X4FA1LPQzozmDl9dxCnBOsylyDxKoWWhp+HV4qdpUmvGZzNJ2rU4j954F78yGKEQH7ahU5M RHs+nvGw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtoP2-0003MF-FR; Fri, 10 Jul 2020 08:29:04 +0000 Received: from mout.kundenserver.de ([212.227.126.135]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtoOx-0003LX-KC for openwrt-devel@lists.openwrt.org; Fri, 10 Jul 2020 08:29:01 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mzhzd-1kpVUn3yvh-00veSr; Fri, 10 Jul 2020 10:28:57 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] mvebu: fix support for Marvell 8040 MACCHIATOBin Date: Fri, 10 Jul 2020 10:28:13 +0200 Message-Id: <20200710082813.57843-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:zxMnE5B6hOHgwISN0hE30vcFrlZSLCNPYn6EIGLr0qSg0ayWxAI O415PAWAAFI+bGLZfoSU363mWfWRkJaNPrmvW0utjEAuJtzq9hyyBGt7A6tz651fQGKYMjl VcEgQRMYNsrAbpGgHvYVpN1BJ+HhsCL/4Xu7bLqy471wxTQmIXjk0STcgSNWGIijZkc9eAT JgUp4EvuB/wS0Oo2MCx4Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:JMfWPBOmEQA=:gqD6sEer4aPHsL52uDOn7n BOeWX2LWjN+HvDtgnoF5zv1LvcuxDpd43Tsyb6ywUqyo1rhcwWYot9wZpE0CFtPUBWcL6IlGh 2W+92wBalmOKWYNU2bAki70n5iA9euw5BsOG83MI25tuANaimoMxxBzj7Dz+Y3nwu9UhTKPGG xBrDJ9wqueCj7y0aTdcS9dfj5oNJ9IwLdi20C5at2CuD+24wb5LLcuZtHfVy8amnG3KF7PSk2 UG8HwpZsvTvIcCFmisCOP5U1PS18mlojyqjhgS3vX3Chkj+d61Etp2y67DGiLf8i/xNej64le jKWNelB4vzHWGV6PdUqK1U0s0MQwAH6hzfXr/IpPoXUf6ke7g5S9LNJk7nGMV4sKQuvtBjdtW E+omGw30Wd5XWW9qJt0y6gIsekyWMeGsL9dMBcflixxCKczwfx9qThrkTHxhLPMqGeEz8BgPn +90gxWYG21UHAQrZ4i6WJ0LN0ydMJZATaRt2KqK+hEVfK5IPP0lm17qyBYE58zMENoGVkCCNO USLObI35JzwL8CjK3/mWxcyvcYH9zc5TfrE5RmY6G4uerw8Gg/bimLFNqkKPhVMbAX9AiD2AV udWCGAAIzPLwaTjywfs3JrOKRHGGvk/kzM3PXD54U9FvqpOZhqp977RIR4d2MU5g5POHDLOqa Sui3OzjgnrjDExbxLTxiAUbQJilGNwO12/R5qfCnNpVF3k6Jd72NKfqCgEdxF0X0n0x2gYbnK I/vq5mEhy074Wa23dLOXfpSyTl0CjQzwoYGxmU5cZOvT5LaCerbiVj5RrOH8Yy6wAn9wHdMAb HfXyKgcZ73GqMz0BMs3nPgJ7oonAEk7AHMrPGEaWpuqP0iT2lZtj/Qm2yF/4Jrp4WBdcsimfJ X5lIIATDj2qzRqNwxuIg== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200710_042859_897748_8B4A594F X-CRM114-Status: GOOD ( 15.54 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.135 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tomasz Maciej Nowak Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org 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 --- .../cortexa72/base-files/etc/board.d/02_network | 2 +- .../cortexa72/base-files/lib/upgrade/platform.sh | 6 +++--- target/linux/mvebu/image/cortexa72.mk | 2 +- .../260-align-mcbin-compatible-with-5.4.patch | 14 ++++++++++++++ 4 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 target/linux/mvebu/patches-4.19/260-align-mcbin-compatible-with-5.4.patch diff --git a/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network b/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network index 080e32ada3..32053d74e8 100755 --- a/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network +++ b/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network @@ -11,7 +11,7 @@ board_config_update board=$(board_name) case "$board" in -marvell,armada8040-mcbin) +marvell,armada8040-mcbin-doubleshot) ucidef_set_interfaces_lan_wan "eth0 eth1 eth3" "eth2" ;; marvell,armada8040-db) diff --git a/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh index 2428de08c4..75d2933f05 100755 --- a/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh +++ b/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh @@ -9,7 +9,7 @@ REQUIRE_IMAGE_METADATA=1 platform_check_image() { case "$(board_name)" in - marvell,armada8040-mcbin) + marvell,armada8040-mcbin-doubleshot) platform_check_image_sdcard "$1" ;; *) @@ -20,7 +20,7 @@ platform_check_image() { platform_do_upgrade() { case "$(board_name)" in - marvell,armada8040-mcbin) + marvell,armada8040-mcbin-doubleshot) platform_do_upgrade_sdcard "$1" ;; *) @@ -30,7 +30,7 @@ platform_do_upgrade() { } platform_copy_config() { case "$(board_name)" in - marvell,armada8040-mcbin) + marvell,armada8040-mcbin-doubleshot) platform_copy_config_sdcard ;; esac diff --git a/target/linux/mvebu/image/cortexa72.mk b/target/linux/mvebu/image/cortexa72.mk index 50233540ed..6e52109237 100644 --- a/target/linux/mvebu/image/cortexa72.mk +++ b/target/linux/mvebu/image/cortexa72.mk @@ -24,6 +24,6 @@ define Device/marvell_macchiatobin DEVICE_ALT0_MODEL := Armada 8040 Community Board DEVICE_PACKAGES += kmod-i2c-mux-pca954x DEVICE_DTS := armada-8040-mcbin - SUPPORTED_DEVICES := marvell,armada8040-mcbin + SUPPORTED_DEVICES := marvell,armada8040-mcbin-doubleshot marvell,armada8040-mcbin endef TARGET_DEVICES += marvell_macchiatobin 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 {