From patchwork Tue Oct 31 08:19:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 832288 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="H/E52Q+9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yR4D802MNz9sRn for ; Tue, 31 Oct 2017 19:25:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753272AbdJaIZK (ORCPT ); Tue, 31 Oct 2017 04:25:10 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:49527 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752747AbdJaIV0 (ORCPT ); Tue, 31 Oct 2017 04:21:26 -0400 Received: by mail-wr0-f194.google.com with SMTP id g90so15094710wrd.6; Tue, 31 Oct 2017 01:21:25 -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=nNZjkm5Junn5P5OvaA3soZ4C9o/4dyUFCrOJhgrmhNM=; b=H/E52Q+91Yrj2l3NA5a1V77KbGCjURZMprDGCUzmi/zJxfbj4wkVaXu1bGLIzD91L3 n8q+szNCSUsH+Vg6KH9qXboH1GoF4BCQCxtbP+jMAn8/zjNrQj5dU6fanAcWIGnq1FXW o04KYMcQAgTtOzRTdzWmDc3tObRX/60y4pmaqejyvLjQvJYxoo3fsMB0g4y43PZV2JXg /+j/v0ZNrGMJwvAKlwplxRNSQrR5fAH9qf19D6wspxrD0vymH6qtZL7fcohzlS5TsE9Q C5Sv1CLqnGunI7EVd211LA4kXc2W+3pQn8Wkimk2orAthg1v+b4YpN/HPS3K1l8c9x8e snTg== 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=nNZjkm5Junn5P5OvaA3soZ4C9o/4dyUFCrOJhgrmhNM=; b=CxsYrbNPghQBEQ8n70b6i0KQKxLJDIpZEKd8WetpG4BHgv0h9RgOOg+wEjXjj4CbVZ VcCZFNpzYEx144IJ3LRQE6zGDhCW8qEY2dhzau2Pc7TWS7hzLROf/OuSGAjfg7j5WNsV XmcGQbDvPhRNTSf0CHyFOh/M+F9yJxzlfoqOvKzIRQVDdtLzn2lZnI/mudbYtYTM+sct DvS2tJmmuRPmZdhJmX5tUcH0C/ppDxLGrPu0lMxrHMqwA8xb/cMN0W2ST6uOcPRoSlhx O8fyKxmGtkmrayshSabAsRhTOxuxBryVPykrdY8KjTNhs2UllLpTU35LXGqmyrOwo5hZ r1wQ== X-Gm-Message-State: AMCzsaXlRxXKFetkpvAyP+JlJJYOM79Z9UWnj1tMBMglu2gjvOTLJ5cn sCrR/BxVRsDpBt95/tSoyEk= X-Google-Smtp-Source: ABhQp+RAmGQDp5tntSnNIHOkutikbp7xmrObRk977cNdzi0DNO5Ga54fMBF4XO/v1G2swQszXBW76A== X-Received: by 10.223.184.125 with SMTP id u58mr942115wrf.8.1509438084862; Tue, 31 Oct 2017 01:21:24 -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 d18sm796423wra.50.2017.10.31.01.21.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 Oct 2017 01:21:24 -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 Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Corentin Labbe Subject: [PATCH v10 3/8] arm: dts: sunxi: h3/h5: Restore EMAC changes Date: Tue, 31 Oct 2017 09:19:10 +0100 Message-Id: <20171031081915.18960-4-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171031081915.18960-1-clabbe.montjoie@gmail.com> References: <20171031081915.18960-1-clabbe.montjoie@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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 sunxi-h3-h5.dtsi This reverts partially commit fe45174b72ae ("arm: dts: sunxi: Revert EMAC changes") Signed-off-by: Corentin Labbe Acked-by: Florian Fainelli --- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi index c1bd09dab3da..d762098fc589 100644 --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi @@ -408,6 +408,32 @@ clocks = <&osc24M>; }; + emac: ethernet@1c30000 { + compatible = "allwinner,sun8i-h3-emac"; + syscon = <&syscon>; + reg = <0x01c30000 0x10000>; + interrupts = ; + interrupt-names = "macirq"; + resets = <&ccu RST_BUS_EMAC>; + reset-names = "stmmaceth"; + clocks = <&ccu CLK_BUS_EMAC>; + clock-names = "stmmaceth"; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + + mdio: mdio { + #address-cells = <1>; + #size-cells = <0>; + int_mii_phy: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + clocks = <&ccu CLK_BUS_EPHY>; + resets = <&ccu RST_BUS_EPHY>; + }; + }; + }; + spi0: spi@1c68000 { compatible = "allwinner,sun8i-h3-spi"; reg = <0x01c68000 0x1000>;