From patchwork Mon Oct 23 18:56:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10022977 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 388DF60245 for ; Mon, 23 Oct 2017 19:01:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2AD81288AA for ; Mon, 23 Oct 2017 19:01:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1EF40288AC; Mon, 23 Oct 2017 19:01:50 +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 B0AB92893A for ; Mon, 23 Oct 2017 19:01:49 +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=146lJs6g47ngHAclLL7HF8McHf0+xVcMQ2y3dGeRjn8=; b=t6RnE0a1zYKDO7KtqTS/vLTeHK y6Pf3gHMSVBuLbfeiXREXfD3gBF059NM2NEVIKm4rSAhtKkC0++rEoZZcb/qrYfxUN857VEYsi2HB 2GRz4aP38tqNxHXcI+rfgS80L5wIx94pxA5b54S8ujASubF5jx9psX0BGEO0IOKiJY0X5FkXSOuOe 4A73mGnqR4IEVPbiTIlQBwr7vEPQKzUZRoIYxdHXRuDsD2x4BH3IBW042OQV/8120ZYNmqpvkSlbb wd+uTVDeEzb0dCnS+c9OLLaWJbpfuaWugDhvpe2u76fh7cePTMZd8zQ9JUvq9NOG4irMzpGTo2Kt2 gvU6txJg==; 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 1e6hyo-0007fy-EF; Mon, 23 Oct 2017 19:01:42 +0000 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e6hwP-0004Rr-RR for linux-arm-kernel@lists.infradead.org; Mon, 23 Oct 2017 18:59:18 +0000 Received: by mail-wr0-x242.google.com with SMTP id l8so5550620wre.12 for ; Mon, 23 Oct 2017 11:58:53 -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=g4DwBW21baoi+fHJrNBIJ4zYUowYA79ljQDUeIXUjW4=; b=rFi9iNq7THXuAdBka++A+yFbgI1oc0Crw045LhvO5mE91wC/4BeYpm7/dO8r5XcC9x Uo6cJ5gvYz/13UGP1xs5zcy9HJTpmg3hVeUFlt5hH8T5vAYRx0amw/6btlXuqsapiEjl 52bbhfLtZ1pR0QpLb6ideQ4lm3HT48lUISNLC3l8aKeFNJYDYb3c2de+LDZJKFaKFFP7 j5t+igORGctTFS4qEB1Pjxfa15nGWDA12+TKAKUe15a4CelCSNGChjSec7A4+EW2c+3+ ij/GktWkpkeZyQTb8JvqBqq15p8fi9kSgeGhlr/PYI5cXSzBjmWKq9yzWMQ8BuwsLD1q jkfA== 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=g4DwBW21baoi+fHJrNBIJ4zYUowYA79ljQDUeIXUjW4=; b=Rcit8nOYVaIEA264Om3FoiEGBScwc+3ryyR9L3ve5SZH1USlXhw9FTqaVdvApQqc43 /rSZgNa4+wS1HFx/yIV/Ntl2I5RqCIaKrWNeOd+JBuX8OfCHeimpONgu1osjG31K+/XV nn8e8h/6qyFJigDjHRTe+baphVzTIXK1lUCzXjJuhX4Y+w8EPnB7KZAtZollGJnTiZPl 8MESERH9Dw7QqHDr+74cw9tr6oWIg2de03c6/CCkT4qQpg6GxdUJbDEpt7QBvxCnx6D+ dvjrl7WNMGC8e7L1bHCsOOzKKRK8PNlt7E/f9DH70mFoSHQVrKJUYVtr+Ha+xiu6cwl6 jCxg== X-Gm-Message-State: AMCzsaUlBO7QvfflXXJI0RLSEDu3vuIR6IphPYePnqL4WigMb1hQ6zra gLVYmyvujXf/gm1oCj8qdtw= X-Google-Smtp-Source: ABhQp+SDLLgWrghQ3i9rJk7ro+mrUBdEkR9SeXk8FLJDuKTtX/j4kASfIK4j6WtizkjnBiBx3Yx+yw== X-Received: by 10.223.160.161 with SMTP id m30mr6491881wrm.27.1508785132183; Mon, 23 Oct 2017 11:58:52 -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 s196sm5370490wmb.26.2017.10.23.11.58.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Oct 2017 11:58:51 -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 Subject: [PATCH v8 10/10] net: stmmac: sun8i: Restore the compatibles Date: Mon, 23 Oct 2017 20:56:26 +0200 Message-Id: <20171023185626.31793-11-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171023185626.31793-1-clabbe.montjoie@gmail.com> References: <20171023185626.31793-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171023_115914_360074_B663841A X-CRM114-Status: UNSURE ( 9.49 ) 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: netdev@vger.kernel.org, Corentin Labbe , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.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 b3eb344bb158..e5ff734d4f9b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -1072,6 +1072,14 @@ return ret; } 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);