From patchwork Tue Oct 24 17:57:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10025301 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 073EE6035E for ; Tue, 24 Oct 2017 18:04:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0C8128607 for ; Tue, 24 Oct 2017 18:04:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E575928A11; Tue, 24 Oct 2017 18:04:06 +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 7065128607 for ; Tue, 24 Oct 2017 18:04:06 +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=g3SsdZiVaYSZhajInl780WKdJT UIJFyEpyNc7awfomcU8g4qUKlkJxhrk6orQZv+clFjWkcwJT+yl0iDGQ3ILLe6g253QcAMly5Zdsg 2bZhjwQeh46B4IgJ3w7U54C/uaYLa1XIrxzfJqAQAni9Ss3FBSG8poAl3v8XHKUj8bxGRuJn2yOeb y6vTT4w/slNaqRW6HTKVfBOcba22WJRphTYLdPFGZpJG3iXYO8/veazNynkSn2bVB1yUcW2IPGUO6 bQA+124kkHobbgbmBlcuuAvI09pnKMqLWpAvMJcLXwxKd3EsUJh3hGj75P8UmeF761pBcgm74lDWs wTXQITEQ==; 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 1e73Yb-0008BR-5c; Tue, 24 Oct 2017 18:04:05 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e73Vp-0006Gx-BU for linux-arm-kernel@lists.infradead.org; Tue, 24 Oct 2017 18:01:16 +0000 Received: by mail-wm0-x243.google.com with SMTP id u138so18003891wmu.4 for ; Tue, 24 Oct 2017 11:00:56 -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=vb3y5LGKFDgAUj2DPqGhAYG7pM1XJahL4+m6tG9RKkmisaYiba2cHnkH9N8kKOOzMx 43Bs0a+/NosVAiIT+jv6iyhntbzz1K0B9buPJFvfdI9/0pt+52CC8uIHccYpQPFLI1sI 5ZiXXoSx2Nbit3Y99WltyNhhM42Fr0VyzLGgIM++Zg++i7OA243ToJYT7/raYDBDe3uG 1Igr7kfQP+dZAwrKTDlFIyBm1bGRou97tqNtXpiI7zlN4Qh4vy8yyMUuiFcPX2SxDbzs YPUQizRq61gS2Q+orQyIppHFsmXBkhWXjk08qvd7SK14yZvGb0EBpcGenVsLkw4WpxYy wh9Q== 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=RxMYqEwQUz57AOrrsv3m9Vw5AGK5t0ITbPHYvpnHDQ6vNF9W2W/+DA/13tGlFgJrx5 +HSDas+KK8e+j1gI9JrZh+iIYz/WnejUBWBTyIQWsiY5VmU81OfwXswQimYKz7be0q91 LA0gDeS1tnqNSXe6rlvajtHvUuGZ6tOvOSS05Eyd7LFdq8CsVukzLQx1h0TGZoN/WKa5 SgxYKeX3Po1ySLKj9/fT3qyu3/Q/et8Hr41EqciMYvTarAm42pOYO2sd3BqXBPo5/Uiu i1+pdRGHrwhYTLPhjq+Pmd5LUgtbFKQ5Dd+YUstMM8vV8wJobswZEEzy2fviuM9zr8al CHvw== X-Gm-Message-State: AMCzsaVdNI8tS5mLDLBp6HdITjs2VkJhL1OCWqL7V2bDY4g+OKF3uYzt j9VZCWNJ8gLOFcJtkjdO8t0= X-Google-Smtp-Source: ABhQp+SFQWAB1GKYfgZFNP9J5aefiCx//Ndz+HxbTt+t32tbUts5zl8HBo7LYALsQ6x/x7SCId2V8g== X-Received: by 10.28.224.87 with SMTP id x84mr8278176wmg.118.1508868055382; Tue, 24 Oct 2017 11:00:55 -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 s18sm818968wrg.87.2017.10.24.11.00.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Oct 2017 11:00:54 -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 v9 10/10] net: stmmac: sun8i: Restore the compatibles Date: Tue, 24 Oct 2017 19:57:14 +0200 Message-Id: <20171024175714.15840-11-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171024175714.15840-1-clabbe.montjoie@gmail.com> References: <20171024175714.15840-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171024_110113_663678_8F0E432A X-CRM114-Status: UNSURE ( 9.89 ) 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);