[From nobody Thu Jun 25 05:54:59 2020 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1geIlP-0002Aa-9W for openwrt-devel@lists.openwrt.org; Tue, 01 Jan 2019 12:03:16 +0000 Received: by mail-ed1-x543.google.com with SMTP id f9so24058309eds.10 for <openwrt-devel@lists.openwrt.org>; Tue, 01 Jan 2019 04:03:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=cmnfgL9GZoasFtt4caAfSB+tU6YQv6DRSADFc9G2AkM=; b=ZGaPg1xGpHolYTzSR4dYUVJcElf6Oe4nWCOtjp3qdQBfjhsZTufeRWJUIC6YRrRjzC AwMtfDUkOjWF69St/uH4Ai0nDQxQi1ajOEe98S98J2QuarPkdOtf9cBrJrlP8byw9kYw PtW6tMbAAFMYXMoe8rjfR+Z23gVmZcR3eifh8KnB3tJpc9ungErpJnX8oQ81gE8MX8Qb SIPnc3sEzq+N392GwAqIuAmg814xDhN6Br9DCMooDVvsuD6RK40RYHxUIMuLOsjrpT/V dFylbS8VVabkxdWITmhsxwkVS6GNbr0rpC8B35NpWBmDmxcmXBTBBJRYVfKVi2CDTWK4 huaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=cmnfgL9GZoasFtt4caAfSB+tU6YQv6DRSADFc9G2AkM=; b=LyIZsvIMkRTYwkQZW4iOin0H++uZWy4/PSSCSZZ/iKuyqsr1dkBaQmZvJXj/g3vHvR U65rU2Pumof91Bw9UP+KpLmpEj8JtoCDW64e2a36TlD/HSrbXGtiLThxTymxbUVWI+dj k+b55PGJC41hC9/rycD3JacEOzVFQW7Zyp/EXKdOUJyqmdaADJRBWs1H8FZNFZpAF32K UglaNpRm7dlrwghzDAK0q50fSVe8sopC3iputwHTTuBb1FdyW2xGi06aRExT+R0K+Ny1 MsUeFOKSPmYs4B85VFuB/+Jyx062I51fr/D1+OQ3GP6Xr9ioUBhJrKkCY9d3O/Bmw63H BwkA== X-Gm-Message-State: AA+aEWZKjz+TLR4DeUSdgVi4Gn2rq0TwgzSFtKyaQDwk8WQmNBEFWZJ2 EGzqztNcUeDSjFkKCZ6ord5aEMWa9Vo= X-Google-Smtp-Source: AFSGD/VIDdD7lQ+b97bBpZeHMrkAA8BTefM7ycZKcr2VR14utTOY+ccdjhNRyDRGStyXb6+nEoSfEw== X-Received: by 2002:a50:af43:: with SMTP id g61mr33954460edd.286.1546344191174; Tue, 01 Jan 2019 04:03:11 -0800 (PST) Received: from precision.ffcmesh ([2001:bc8:3f13:ffc2:52b1:6372:ca67:a997]) by smtp.gmail.com with ESMTPSA id k24-v6sm10997804eja.60.2019.01.01.04.03.09 for <openwrt-devel@lists.openwrt.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Jan 2019 04:03:10 -0800 (PST) From: Christoph Krapp <achterin@googlemail.com> To: openwrt-devel@lists.openwrt.org Subject: [PATCH] ath79: align GL-AR750S boardname to other GL.iNet devices Date: Tue, 1 Jan 2019 13:02:57 +0100 Message-Id: <20190101120257.407-1-achterin@googlemail.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190101_040315_358854_E059DB64 X-CRM114-Status: UNSURE ( 9.23 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:543 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (achterin[at]googlemail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain As the official device name is GL-AR750S, rename the board accordingly. Signed-off-by: Christoph Krapp <achterin@googlemail.com> --- target/linux/ath79/base-files/etc/board.d/02_network | 2 +- .../base-files/etc/hotplug.d/firmware/11-ath10k-caldata | 9 +++------ ...63_glinet_ar750s.dts => qca9563_glinet_gl-ar750s.dts} | 2 +- target/linux/ath79/image/generic.mk | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) rename target/linux/ath79/dts/{qca9563_glinet_ar750s.dts => qca9563_glinet_gl-ar750s.dts} (98%) diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network index e24c58e208..6776506893 100755 --- a/target/linux/ath79/base-files/etc/board.d/02_network +++ b/target/linux/ath79/base-files/etc/board.d/02_network @@ -100,7 +100,7 @@ ath79_setup_interfaces() tplink,tl-wr810n-v2) ucidef_set_interfaces_lan_wan "eth1" "eth0" ;; - glinet,ar750s) + glinet,gl-ar750s) ucidef_add_switch "switch0" \ "0@eth0" "2:lan:2" "3:lan:1" "1:wan" ;; diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 441893a752..faee781970 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -99,13 +99,10 @@ case "$FIRMWARE" in elecom,wrc-1750ghbk2-i) ath10kcal_extract "ART" 20480 2116 ;; - glinet,ar750s|\ - tplink,re450-v2) - ath10kcal_extract "art" 20480 2116 - ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1) - ;; engenius,ews511ap|\ - glinet,gl-x750) + glinet,gl-ar750s|\ + glinet,gl-x750|\ + tplink,re450-v2) ath10kcal_extract "art" 20480 2116 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1) ;; diff --git a/target/linux/ath79/dts/qca9563_glinet_ar750s.dts b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts similarity index 98% rename from target/linux/ath79/dts/qca9563_glinet_ar750s.dts rename to target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts index ab33bc13e3..439acaae85 100644 --- a/target/linux/ath79/dts/qca9563_glinet_ar750s.dts +++ b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts @@ -7,7 +7,7 @@ #include "qca956x.dtsi" / { - compatible = "glinet,ar750s", "qca,qca9563"; + compatible = "glinet,gl-ar750s", "qca,qca9563"; model = "GL.iNet GL-AR750S"; chosen { diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 326633835d..858c1662cc 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -289,14 +289,14 @@ define Device/glinet_gl-ar300m-nor endef TARGET_DEVICES += glinet_gl-ar300m-nor -define Device/glinet_ar750s +define Device/glinet_gl-ar750s ATH_SOC := qca9563 DEVICE_TITLE := GL.iNet GL-AR750S DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 16000k SUPPORTED_DEVICES += gl-ar750s endef -TARGET_DEVICES += glinet_ar750s +TARGET_DEVICES += glinet_gl-ar750s define Device/glinet_gl-x750 ATH_SOC := qca9531 -- 2.19.2 ]