From patchwork Tue Oct 24 17:57:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10025367 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 A1CE660375 for ; Tue, 24 Oct 2017 18:29:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76EA928A3B for ; Tue, 24 Oct 2017 18:29:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B11C28A21; Tue, 24 Oct 2017 18:29:08 +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 1A00B28A21 for ; Tue, 24 Oct 2017 18:29:08 +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=4w4Lvot4waKFrHn+/tG8tbMkyE4U4XRcrsTUpkgVNWM=; b=L7id1Q2lOm2D9Qw1pC6j/sQfCg IYzRrTh9YUaEW6nL/GdxQocCqgMD/xyz0lqTqDWCSNNbMhRGeHb7ZCiS8JnOUyH5IMu+4Pv6PWqA+ LZz5/wK/jfIBtqiemBIvKKJ2ZxkB3xvghWtSFO2nJOy/FCzomqHugq1KNfPxr32aJc6uwNKhPDTIK ABVS8XR1QQTts+ARKnlENcmonyd7DyMt9TfSQ0dAcOJlpM6cqDNXadKrD2MDI8QLgYy03urdV7JQs gYTULX0Lw00y9oKJNc5JVjVM+fQbiVXiq3iJSeZVJkf5j/7P9K9l25ajhjXuqHiQ2YpTbHkYHu1jX BwcmjP+w==; 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 1e73wT-0003i0-D2; Tue, 24 Oct 2017 18:28:45 +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 1e73Vk-0006G5-Lp for linux-arm-kernel@lists.infradead.org; Tue, 24 Oct 2017 18:01:11 +0000 Received: by mail-wm0-x243.google.com with SMTP id r196so791611wmf.2 for ; Tue, 24 Oct 2017 11:00:48 -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=bZoVHS3dVwiMo0Kx9CpA8ml5rqRdl2WFAzPrr/Qotjg=; b=CZAXXxtBJOsr6wWBCVPXjIFxrVwyBWswfsgSoZEnL1jngTRjJhQnU/gt2ymO0+4EdE xaaTUQYdc/sW+foMv7nWtMCp7Lzu+stsiPgwQ9YuQq6lVtYNM2Sfg8KXbFnmnLoiTG8b Enh/uYtCTJnbmAHXoACNYN8SuBUyMXkiFtwyUMXGKEi8/c9Pcn0XPpxmg1B+zSR5E24i tij3zolW0os5QFYZp63uT4AIUKnwAaIcBEZ4Hx9OEwg4HQvKgjurQ3fdX+K8D/cYNz6b 9OefzrwUbVmci2y9KV0pdJgLbvArKD7fl25kywhm8pa9NEloGoaR1C10uNLGFkmuFfPk XipA== 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=bZoVHS3dVwiMo0Kx9CpA8ml5rqRdl2WFAzPrr/Qotjg=; b=udDahoL+8VKQnxMeWN39Y6YlSoOjfca+MtFHYbhFBh14ue9InUvyueNW32EQMBYsEN LeYbks0FrV5Sq932Bk2MPTzWvqETBWxkfZExEboz/iKurT+WleCGjaRy0ZzArR6VM1qA +DDjQ56hhp+099zHctDQL3Zo21jkkbrvv8y3efi5WOXf8HghrNQblcu+Duyh30GY6k5U 5vltChyBbLSHx75vv7mJAMlbgOMqFDHoj22Pb88TWHrEExWQk/kx733uSisjF7wBU2y4 iDjxru7v91EbTSygDIr1reARn8HWb7urKeWpm4yXWe8XjK1xTqOEKtVYznAMzIzGDlUP fZ1A== X-Gm-Message-State: AMCzsaXqujOSUUsYIF+7zGe+QvP7v0SZOzztenkXfUtvcfM2LQdimkCo k7xpuBtDVT+YzdtwpKxF/S0= X-Google-Smtp-Source: ABhQp+SfSkIIcbVIava0dS2ez89+2VMIBukJdmD+3/d90DDZIyTm2mt++XxCv9Jb31jj0yNblhS3LQ== X-Received: by 10.28.12.65 with SMTP id 62mr9819960wmm.129.1508868046891; Tue, 24 Oct 2017 11:00:46 -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.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Oct 2017 11:00:46 -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 03/10] arm: dts: sunxi: h3/h5: Restore EMAC changes Date: Tue, 24 Oct 2017 19:57:07 +0200 Message-Id: <20171024175714.15840-4-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_110109_143171_087A1F03 X-CRM114-Status: UNSURE ( 8.90 ) 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 sunxi-h3-h5.dtsi This reverts partially commit fe45174b72ae ("arm: dts: sunxi: Revert EMAC changes") Signed-off-by: Corentin Labbe --- 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>;