From patchwork Wed Oct 18 11:44:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10014461 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 762F5601E7 for ; Wed, 18 Oct 2017 11:49:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7581F28B05 for ; Wed, 18 Oct 2017 11:49:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 685CE28B24; Wed, 18 Oct 2017 11:49:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 17FB428B05 for ; Wed, 18 Oct 2017 11:49:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To: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:List-Owner; bh=D3NB/LpyK6V/4zSV2xJU3mbCIZwCmQ7qUASKd6GWBCw=; b=JC0bgS8NCmSPBa5v3yWTvm/9k+ KFW5XfN4yEkG41U6d5kuVwsbKzq/tQqN1MfKXFBzugLzB/iSujJJqne2Mmm6gqI+V6HCG/Uo+tFq+ Olhy52SxKt1RAc47WsMT78CB5EcTqv+9bbIcqD++TlnC8V7RcB/JsFDJcMHiynTQfNRqhWLXaYsW5 ZU5ernTWxnDQVFxjuEPOvtRnEB8+c8XQbv+d9VfzxFKY8owEBaVcYnf9MIu4birRIYOIp2jEtLQOa Se1XZX84QGQvcu0ocjxXDAllmzDeRJ98arsb03Wliimgwl1xiuUl326bLbizJz/j2H4U0HfT0cp5c AHYIROuw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e4mqh-0008Oe-1K; Wed, 18 Oct 2017 11:49:23 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e4moz-0006cR-IZ for linux-arm-kernel@lists.infradead.org; Wed, 18 Oct 2017 11:47:41 +0000 Received: by mail-wm0-x241.google.com with SMTP id m72so9517704wmc.1 for ; Wed, 18 Oct 2017 04:47:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=E0VPhLeGsS7zd3Hf+jpXoDsn5fDc2YZtoH6gJi+lA30=; b=MRJMkZUDajg1vhPOc4sqdome3tTuQ8H7Arfoq7Bz2iqk2lXafsbffLqsGqx8TTVSxI CxkNur7cBfarB0ZlyINizONJWauD3y9sNH0KatH6r3cZh8K03+ye4Jk5s8xAvuDoPY0X 6EH1uB1SqDgbG2ZUacq+QEdvtU7lbAzR4DL3y3RFlL3vz4g6n+V8k8wnqhIImBhgXV/Q KUruOsONRYRQFz6bTOxDesm2AcHWU7vwmRdnxmhUhIgqBah1h/3CCLAQrpDJoZKvVD5N eI6qjOUgCVRGAsOl7c6pEYlwY4+9fjQ/wXDNs0FTuac61PkbAuhbbb8yVH0jhEaeqILL 6ijw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=E0VPhLeGsS7zd3Hf+jpXoDsn5fDc2YZtoH6gJi+lA30=; b=ZsOHp+4ZuzDISZf+c0ACaONCUXXCOV1W1P+9y/q6pvDG3NzokErcAlp7fRdydsOLbz DJSKfSTTV8n3MtFyd1XzBP+GKh0O7cw8ZNLN63/48jJ4lGuJtRiMUWCYYeZwUq6oqALr C/+6gLXnff20GnVri2WneAT2PpybPfVS3GWE5Hrh765yN1s4Ofk7pzasjGr0Uu3/FJKj q/KkLVYnFXH1QpT/pnNaHRtSxU9IgwwCXcxRkVZLcrqJ3QMK+k2TDadLMAR7vcP1xPVm jtwh4AUhzcH9dg+ZLhbmz63Q5eU8PwZlDpXp+rNJyFmSwgoggquZzeWCaskhjBucdHqL 7lIg== X-Gm-Message-State: AMCzsaVhQGL8v2QWIvUDqMbqJJ9EFzsYOalkE1zs+uwzImxD5zZldil9 UtQiUgRlVt4Q7nd8//JEpA4= X-Google-Smtp-Source: ABhQp+Q5aJms/ZdmXDmfAgGbyIL1qN6a4QgFXU2EJonqMIWljDk5T8E1YYcHDzSDvPsEmLhDICZJbA== X-Received: by 10.28.22.2 with SMTP id 2mr5943517wmw.47.1508327235827; Wed, 18 Oct 2017 04:47:15 -0700 (PDT) Received: from Red.local (LFbn-MAR-1-580-96.w90-118.abo.wanadoo.fr. [90.118.159.96]) by smtp.googlemail.com with ESMTPSA id 61sm8444391wrg.58.2017.10.18.04.47.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Oct 2017 04:47:15 -0700 (PDT) From: Corentin Labbe To: robh+dt@kernel.org, mark.rutland@arm.com, maxime.ripard@free-electrons.com, wens@csie.org, linux@armlinux.org.uk, catalin.marinas@arm.com, will.deacon@arm.com, peppe.cavallaro@st.com, alexandre.torgue@st.com, andrew@lunn.ch, f.fainelli@gmail.com, frowand.list@gmail.com Subject: [PATCH v7 04/10] net: stmmac: sun8i: Restore the compatibles Date: Wed, 18 Oct 2017 13:44:52 +0200 Message-Id: <20171018114458.17891-5-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171018114458.17891-1-clabbe.montjoie@gmail.com> References: <20171018114458.17891-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171018_044738_034876_712849A0 X-CRM114-Status: UNSURE ( 9.80 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, Corentin Labbe , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The original dwmac-sun8i DT bindings have some issue on how to handle integrated PHY and was reverted in last RC of 4.13. But now we have a solution so we need to get back that was reverted. This patch restore compatibles about dwmac-sun8i This reverts commit ad4540cc5aa3 ("net: stmmac: sun8i: Remove the compatibles") Signed-off-by: Corentin Labbe --- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c index 39c2122a4f26..fffd6d5fc907 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -979,6 +979,14 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) } static const struct of_device_id sun8i_dwmac_match[] = { + { .compatible = "allwinner,sun8i-h3-emac", + .data = &emac_variant_h3 }, + { .compatible = "allwinner,sun8i-v3s-emac", + .data = &emac_variant_v3s }, + { .compatible = "allwinner,sun8i-a83t-emac", + .data = &emac_variant_a83t }, + { .compatible = "allwinner,sun50i-a64-emac", + .data = &emac_variant_a64 }, { } }; MODULE_DEVICE_TABLE(of, sun8i_dwmac_match);