From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C378C55178 for ; Tue, 3 Nov 2020 01:24:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E5949223AB for ; Tue, 3 Nov 2020 01:24:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604366676; bh=SP13kvh9iveV945LcTbLbG/Obdgo6Jsct8TDscYes+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=q4nQnhkLuSk1UEG0KpYvcvSVdEDkmb4WMy9oNRRJp0cjdnLr1idlNTwNfp/QhtFUN UrFmlFTgVdAuQZEgvrTjyk0D8MBrLEO711Kz6maIQT9ygkyK6cuIPBYVSc6dQRZHlq BEnOyHk7u0iLHaUu6X28YXs4JkH+HHyZpXzdrbF4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727208AbgKCBYf (ORCPT ); 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: stable@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