Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp162315pxb; Mon, 2 Nov 2020 17:22:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJx+Y+rndoJ7pQpdM7eVQveyKpYPMIW1IqKhCnp/bnsvpyQH43t4Z5eatp5PSRY3cgl+HMLc X-Received: by 2002:aa7:cf99:: with SMTP id z25mr19531839edx.139.1604366562778; Mon, 02 Nov 2020 17:22:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604366562; cv=none; d=google.com; s=arc-20160816; b=yblFKwSP3jpqsMcPFKM9RpeyuAaaKNl6Umg2pfnQoaxpV8155d2cphQ2Hb3Xg5gMjV GJ3EIPNYsvATkhvUppE4xRY7t3fXCgBq6UAQe6xXrG/COZ7ai/gJsvc00ifgtx+uyHrS mm6tF/EkheGJ1bys9Ucv64SkzTkqVp2zD/8l/2KUXxLdx7yMQ5b+7jX4KvTJUW4zHnd6 A0uX2i8VcjJhmcKO88r+fCfAZFz6iM0ZPv0qH+VpTAsUJOCgnqT1zlFKYTEHKGV/kt5e L66KP4y6wYQaHqWmEGYms0wkC9d9j/wLX4MGv4W2ab6HdymztdMsvnZ7IeZ2dhvfbhlG /+Tg== 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=RpyAAZhmeCKgWPzL/01ImxWhHoBFiPscthSDWESLoa4=; b=mWJ2uK7fe/jVZpWb6cO1KamEvi4+uOAh9Uw5vnwgsXHk6V6HmLSe0To6oG/7DV/xSf +NaJR+MSizAH0q46tsybgqlDcZDBsIHoSvPm9Q/YNWVQIrqhjoB2dGtBhHvJeisD/Mwy fVQdmgeC2dWT3g2028B0qXdKVBMkp0bzRlEaQu3Tz14iOf/xLdcbyUjN0oWvC0BGyd/r v0mXbeTHH8amH2YNbOAfX6oJdyz+0dOoMR7dZseIGPQlgR3RzRjXLS78wM9/1lSYGZxy srHmhN7lA9UXCWeLjEda/k/JlfQdaB/kmXX0Oi6Dt1vyu0FPwnN4cKHDFLt0bOVJLcb/ Hu3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CY5aNZfk; 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 a17si4287022eda.321.2020.11.02.17.22.20; Mon, 02 Nov 2020 17:22:42 -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=CY5aNZfk; 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 S1727321AbgKCBSx (ORCPT + 99 others); Mon, 2 Nov 2020 20:18:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:60230 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727230AbgKCBSs (ORCPT ); Mon, 2 Nov 2020 20:18:48 -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 10ED92224E; Tue, 3 Nov 2020 01:18:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604366328; bh=GqKT6i40ajuxJf/D/uNqqSvUqtxYTu4OvsP3l3xYp1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CY5aNZfkieRn+6+eKXxiR3a1xrJRswkgemfFaA5KLZqdauy5NuAfYcbwz2LPnEUsT PNIciPgfl86LUzbSDmjSMnh1A+scj6UDYTX6DJOHnNEHNW5yGKDFZPVSa/5u6ZMrsL 7ammKQdePSSEo4gTS2i1bIyWNFwML8wXTxsT4XlA= 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.9 05/35] arm64: dts: amlogic: meson-g12: use the G12A specific dwmac compatible Date: Mon, 2 Nov 2020 20:18:10 -0500 Message-Id: <20201103011840.182814-5-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201103011840.182814-1-sashal@kernel.org> References: <20201103011840.182814-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 81f490e404ca5..c95ebe6151766 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -209,7 +209,7 @@ map { }; 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