From patchwork Mon Oct 23 18:56:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 829585 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.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=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hmkN8K7X"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yLQkb4Vr1z9rxj for ; Tue, 24 Oct 2017 06:02:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751851AbdJWS6r (ORCPT ); Mon, 23 Oct 2017 14:58:47 -0400 Received: from mail-wr0-f176.google.com ([209.85.128.176]:51043 "EHLO mail-wr0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751848AbdJWS6m (ORCPT ); Mon, 23 Oct 2017 14:58:42 -0400 Received: by mail-wr0-f176.google.com with SMTP id p96so4538493wrb.7; Mon, 23 Oct 2017 11:58:41 -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; bh=QLJwSMXFBmYh3O1sFLbcXcCgfk/m5TzRm9gw6cJhDrY=; b=hmkN8K7XwQN3XdoACVTh4WRGA6kBJQb4mUX2hFldkgpubCjQYhgVfYiWcXyzytNknS i/9H3yRlKO4zVLNR6st8XEGJUY9NhmSqyaCtZZehJ/wXE1T45/ND/f8g0CnypXCQzGQT 00f2PmC4dSBl/iBRsMAMltOJ8zCotTHYEWKGOaKhW/ggXGh6DvqiOqFL0nkH8GQkb4EE +lkUT0DCTDpXqY8Mev9lVLJ/ukhKSRRcNT11yVCNdHwZZb2gSyIa4XQQ48+GN2j+/8wE 2ZVAFARZ0Xnosmaa1+KZvdz+C2gCqZ5EC3hp6BleNFT4lPFEk071trCf4ezfaU2nUqVF L+UA== 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; bh=QLJwSMXFBmYh3O1sFLbcXcCgfk/m5TzRm9gw6cJhDrY=; b=lJpkWVD42T/hhVkpRRQIeg3V08r5CJlksyb9BxPi0wvELeZbTmV6qSpVQsuvDHFWYM +GMSZkJgQuk/QoagK3l+kMLjcaCKYeckfDJtI0Dc1d8grmD0zulNMwuggTpFGPnDMTnw I+yqkEhMa+uAQjCELJnonOpVUiOXp3aa23JWGaxDRuONBk840omj2ZO1Gg7pHbAQ6zgy 5DZhoKUUa/f4IR0FPS2guRjwHM/6/S1qE2ykqR9/ORkgnYplitedEcReJmGjLhrF2OL0 G80SCwbUnXHCxxD+Qlh4oV6tvLJ8mInJYMA4NMRMycQwAyxdVdCiLhu3L0U0s9GVU3kR 6liQ== X-Gm-Message-State: AMCzsaXwN9nyzdX9fZrk0fClXP4dKjDjuNgGasudzXZEdPYWQIA8Yv5a G0eEAg9c+apxZlPKEi+bzars7Kxf X-Google-Smtp-Source: ABhQp+QfdN/7D9Kptj/7JkA7Dh8ADUITUVL4oigw2Dq6x0khRudPMazpWn+aaHFWDa3SNpK+DvaWcw== X-Received: by 10.223.151.9 with SMTP id r9mr13250263wrb.238.1508785120684; Mon, 23 Oct 2017 11:58:40 -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.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Oct 2017 11:58:40 -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 00/10] net: stmmac: dwmac-sun8i: Handle integrated PHY Date: Mon, 23 Oct 2017 20:56:16 +0200 Message-Id: <20171023185626.31793-1-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.6 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Hello The current way to find if the PHY is internal is to compare DT phy-mode and emac_variant/internal_phy. But it will negate a possible future SoC where an external PHY use the same phy mode than the integrated one. This patchs series adds a new way to handle this problem via a mdio-mux. The first try was to create a new MDIO mux "mdio-mux-syscon". mdio-mux-syscon working the same way than mdio-mux-mmioreg with the exception that the register is used via syscon/regmap. But this solution does not work for two reason: - changing the MDIO selection need the reset of MAC which cannot be done by the mdio-mux-syscon driver - There were driver loading order problem: - mdio-mux-syscon needing that stmmac register the parent MDIO - stmmac needing that child MDIO was registered just after registering parent MDIO So we cannot use any external MDIO-mux. The final solution was to represent the mdio-mux in MAC node and let the MAC handle all things. Since DT bits was reverted in 4.13, this patch series include the revert of the revert. I have let patch splited for easy review. (for seeing what's new) But the final serie could have some patch squashed if someone want. Like squashing patch and 1 and 2 (documentation) Regards Changes since v7: - moved mdio-mux ouf of mdio as asked by Andrew Lunn - reordered patchs order Changes since v6: - renamed external mdio to "external_mdio" - added compatible to mdio-mux and internal-mdio - removed usage of phy-is-integrated - renamed do_not_scan to compatible_muxes (patch 10) - patch 8 9 of v6 are squashed Changes since v5: - reordered patch 1 and 2 - mdio-mux node is now a mdio's child - added patch 11 for removing unnecessary scan of mdio-mux Changes since v4: - Update documentation for new bindings - Added 4 patchs for bring back reverted stuff of 4.13 - dwmac-sun8i now handle mdio-mux - MDIO use now compatible = "snps,dwmac-mdio"; Changes since v3: - Added a patch for handling fixed-link - Updated documentation Changes since v2: - Add a MDIO mux for creating distinction between integrated and external MDIO. - phy-is-integrated is not set in dtsi. Changes since v1: - Dropped phy-is-integrated documentation patch since another same patch was already merged - Moved phy-is-integrated from SoC dtsi to final board DT. Corentin Labbe (10): dt-bindings: net: Restore sun8i dwmac binding dt-bindings: net: dwmac-sun8i: update documentation about integrated PHY arm: dts: sunxi: h3/h5: Restore EMAC changes arm: dts: sunxi: h3/h5: represent the mdio switch used by sun8i-h3-emac arm: dts: sunxi: Restore EMAC changes (boards) arm64: dts: allwinner: Restore EMAC changes arm64: dts: allwinner: add snps,dwmac-mdio compatible to emac/mdio net: stmmac: snps,dwmac-mdio MDIOs are automatically registered net: stmmac: dwmac-sun8i: Handle integrated/external MDIOs net: stmmac: sun8i: Restore the compatibles .../devicetree/bindings/net/dwmac-sun8i.txt | 199 ++++++++++++ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 9 + arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 19 ++ arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 19 ++ arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 7 + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 8 + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 8 + arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 5 + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 8 + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 22 ++ arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts | 16 + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 47 +++ .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 16 + .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 15 + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 17 + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 16 + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 21 ++ .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 17 + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 17 + .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 17 + drivers/net/ethernet/stmicro/stmmac/Kconfig | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 361 +++++++++++++-------- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 4 - 23 files changed, 735 insertions(+), 134 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/dwmac-sun8i.txt Acked-by: Florian Fainelli