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: 116855 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4971124qgn; Mon, 23 Oct 2017 11:59:00 -0700 (PDT) X-Received: by 10.98.61.147 with SMTP id x19mr13957853pfj.258.1508785140178; Mon, 23 Oct 2017 11:59:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508785140; cv=none; d=google.com; s=arc-20160816; b=t8tcPhn4jMmGT2ZxjbVIiRFcfXrfadqMV4iU3hdI76n2dJ/o52mbZDFI3yAq7ulg5M mFYSHJGFDwVYqLrQUDOXzqcl8YkEfR88vXk4MsXwBHIem2f5hMwuS4b/JRtLIhvfzZo6 rsGS5ZbA6jGHzG27syk3bSbAV/PmRM32yTYr7wP4RR5FfzxDkvXoBOAo+lzYBEfXjgoN c/x9po12l+vqAgRvHOJ/fMsN9QCNnjfjjG2IU+HYR75O4TFA+6w+BI5UQL04gWLAlmDf gyyjiK9tXif/lxouprA2xBojTIk+VrCqx7NHpvVRFdlRD3Do0KSLAUb2VgQkqlkCXIRv lffA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=g4DwBW21baoi+fHJrNBIJ4zYUowYA79ljQDUeIXUjW4=; b=KzrR8QUNaZjBBxVrT+WTD/dV8XQHJyApnhZC8X8oVhpXeaohCASIBnd6Ew0U6D6neP ZR8Yt5wc72s6XisCfr01+OL3FDMTa8BSJ05S6Gjx1Wz7FLm+FcD5Gxz6qu4gN43hhkH6 KhY5JJ8x208ed3P8/afXfWo/zUHBEQLYIW3oYBYyXRhY5rF8kPzomo6bueDRivxoGF3z Y5fzjjLI/9qESYzYfo9PO9AukrG85jvFqqxRNeTnJccrLA8VeDDU5I6XAAvYGq7/dPx7 HRj4eQuElu/lUAUQBvJfGeKUSEXB9bf/PVkfaNXcwvnAibb0aglqwFPHLmGtFkFvYiOh JzkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=rFi9iNq7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ay2si1564297plb.434.2017.10.23.11.58.59; Mon, 23 Oct 2017 11:59:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=rFi9iNq7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751995AbdJWS67 (ORCPT + 27 others); Mon, 23 Oct 2017 14:58:59 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:47477 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751854AbdJWS6x (ORCPT ); Mon, 23 Oct 2017 14:58:53 -0400 Received: by mail-wr0-f194.google.com with SMTP id y39so18430134wrd.4; Mon, 23 Oct 2017 11:58:52 -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=jVJs56xTcS63E/fBvd/75mRCfJ3rxS0dmqvwaSAeFGRmua93dkgL9o3APUJ7eRbe1X oBA/vR0GlXffjpHWNgjrJweSj9H1yFl3aogI+7nKreF/gdVEMKD1UOpztdsvzf8oVy0C TOnlBd517PxgO/ZuwknGiUlVQXclKlF9nkcgBYbJ/VvV2wZ4vIUpRRohuf/Kk+f8NrM9 KrIcBLQm+rayG8/R3xTLhAZQlsM87ux0A7BDd4i4/tkeD4YU8S5NXhC6ZAEw9R8SySbT bAiK7j8owTr79W3Z288XDWcu7g4DYL23HSC8ivSxhYmLlsFQWAtEjE4BB8sgWr1lZuq1 TWSA== X-Gm-Message-State: AMCzsaXVLZYqPiJ8euTgUM/BLo2+Ez0cl7XXWAQv/O8RL+HpwT5unaPp 779zTzRTTabv7dnINg9D1t0= 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 Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Corentin Labbe 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(+) -- 2.13.6 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);