Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp165476pxb; Mon, 2 Nov 2020 17:28:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJywLA4I91tjIB3B3Dc7ZgOnT/4bbyqvbSOttF5Kw/0+DUHHaqZZkFlkgH8Min7y7yjtPWeQ X-Received: by 2002:aa7:c44d:: with SMTP id n13mr3454648edr.138.1604366937988; Mon, 02 Nov 2020 17:28:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604366937; cv=none; d=google.com; s=arc-20160816; b=hlBUkUF61p3K4GWdX7Zp2AWjq7LOEPB/ExdmOoKAu1L4rz/bMIQ4cEAhCmVao/mEh0 v3OEXC/RI1L0u2B3zuSDqFRBsGbgFoGoQ5v6F0fNxgNE13VmYZSfkULWnSEEjN4lrsT6 MX8EQ3ms5X/s/RvBS4rVWH2kv1uywoKDhfy1i/6iBgAob7U4lAO2AIBvW7/J2zIYqP+I w7rcwtM/wTqnauk45ExmRmAQkGJoC8O3HDa+5lXSNcsSeeSOhn5fyZgPuz5oSzWDRrOp O9W2T18k+W0Fk2hoZ7aoX2exjgOehD9d6/T0XCw7Mr1cdshQ1gi5bhvCXCU5d7YHb3Jm gqGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/PcTrh+VmT4kCEfqR9KJG3Xvy473QtD8ivboUebeXWM=; b=HkQZOfEckZTvddJlRvnYF5B4KnhK6B3WsPbJkcq8oclPVMT/OTar2PQZ5B82xykk4p MiWVKPsAtIg+uErFd5iNBVJqFU20IP84lntpBS3RQHJqi3nYuGrcv95PWptNtQjhRQCG AjdXcdRreR5cB1IMpyRD1F6y6aXbcITeDCMFbPcfi89C8xLYYEWpRlNHzusjs9BDDhGk Wk7fkW2GB5UijlynYGRDpYds5IGlJblk7KwbmldLbupsrykfhKv92CGrnCSc7eIe9q06 mjSDvqacV7GCZjoA+VLH/upKOSwOabSd9nA28t4xrmKHFtz+seuEsBrvY1tSU+VfpYmh 8UOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qfTiXQdj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gh13si10259460ejb.108.2020.11.02.17.28.35; Mon, 02 Nov 2020 17:28:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qfTiXQdj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728277AbgKCBYf (ORCPT + 99 others); Mon, 2 Nov 2020 20:24:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:34828 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728032AbgKCBUP (ORCPT ); Mon, 2 Nov 2020 20:20:15 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 581D92244C; Tue, 3 Nov 2020 01:20:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604366415; bh=SP13kvh9iveV945LcTbLbG/Obdgo6Jsct8TDscYes+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qfTiXQdjCExTwbla2SEufDkH4pmp3IEkj2GTKP4Ywm0rLaKGNkFXlz1pRdAiVWomC wKIOP7OPG9rOIPl42o+Zve2TGj1mGXmOf3NDbUf9yljafPaKUnG1hicqTqSpmjPWoh hw9tG7wlq3YAMm3RDdp0hpSQC2iqxN5MSCC0AIZM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin Blumenstingl , Neil Armstrong , Kevin Hilman , Sasha Levin , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 05/24] arm64: dts: amlogic: meson-g12: use the G12A specific dwmac compatible Date: Mon, 2 Nov 2020 20:19:48 -0500 Message-Id: <20201103012007.183429-5-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201103012007.183429-1-sashal@kernel.org> References: <20201103012007.183429-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Martin Blumenstingl [ Upstream commit 1fdc97ae450ede2b4911d6737a57e6fca63b5f4a ] We have a dedicated "amlogic,meson-g12a-dwmac" compatible string for the Ethernet controller since commit 3efdb92426bf4 ("dt-bindings: net: dwmac-meson: Add a compatible string for G12A onwards"). Using the AXG compatible string worked fine so far because the dwmac-meson8b driver doesn't handle the newly introduced register bits for G12A. However, once that changes the driver must be probed with the correct compatible string to manage these new register bits. Signed-off-by: Martin Blumenstingl Reviewed-by: Neil Armstrong Signed-off-by: Kevin Hilman Link: https://lore.kernel.org/r/20200925211743.537496-1-martin.blumenstingl@googlemail.com Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index 354ef2f3eac67..a25fe33baebc2 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -96,7 +96,7 @@ soc { ranges; ethmac: ethernet@ff3f0000 { - compatible = "amlogic,meson-axg-dwmac", + compatible = "amlogic,meson-g12a-dwmac", "snps,dwmac-3.70a", "snps,dwmac"; reg = <0x0 0xff3f0000 0x0 0x10000>, -- 2.27.0