Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/806004/?format=api
{ "id": 806004, "url": "http://patchwork.ozlabs.org/api/patches/806004/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20170825191217.10278-4-maxime.ripard@free-electrons.com/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170825191217.10278-4-maxime.ripard@free-electrons.com>", "list_archive_url": null, "date": "2017-08-25T19:12:16", "name": "[3/4] arm: dts: sunxi: Revert EMAC changes", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": true, "hash": "81305e563617f52648061d35fe3a9bc20365c502", "submitter": { "id": 12916, "url": "http://patchwork.ozlabs.org/api/people/12916/?format=api", "name": "Maxime Ripard", "email": "maxime.ripard@free-electrons.com" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20170825191217.10278-4-maxime.ripard@free-electrons.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/806004/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/806004/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming@ozlabs.org", "Delivered-To": "patchwork-incoming@ozlabs.org", "Authentication-Results": "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xf9mQ3fd7z9sRY\n\tfor <patchwork-incoming@ozlabs.org>;\n\tSat, 26 Aug 2017 05:13:10 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1758255AbdHYTMi (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tFri, 25 Aug 2017 15:12:38 -0400", "from mail.free-electrons.com ([62.4.15.54]:49502 \"EHLO\n\tmail.free-electrons.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1758209AbdHYTMe (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Fri, 25 Aug 2017 15:12:34 -0400", "by mail.free-electrons.com (Postfix, from userid 110)\n\tid 91A342096D; Fri, 25 Aug 2017 21:12:32 +0200 (CEST)", "from localhost (unknown [80.12.58.66])\n\tby mail.free-electrons.com (Postfix) with ESMTPSA id F32F720962;\n\tFri, 25 Aug 2017 21:12:21 +0200 (CEST)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.0 (2014-02-07) on\n\tmail.free-electrons.com", "X-Spam-Level": "", "X-Spam-Status": "No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT,\n\tURIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0", "From": "Maxime Ripard <maxime.ripard@free-electrons.com>", "To": "arm@kernel.org, davem@davemloft.net, Chen-Yu Tsai <wens@csie.org>,\n\tMaxime Ripard <maxime.ripard@free-electrons.com>", "Cc": "linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org,\n\tf.fainelli@gmail.com, clabbe.montjoie@gmail.com, andrew@lunn.ch,\n\tlinux-kernel@vger.kernel.org", "Subject": "[PATCH 3/4] arm: dts: sunxi: Revert EMAC changes", "Date": "Fri, 25 Aug 2017 21:12:16 +0200", "Message-Id": "<20170825191217.10278-4-maxime.ripard@free-electrons.com>", "X-Mailer": "git-send-email 2.13.5", "In-Reply-To": "<20170825191217.10278-1-maxime.ripard@free-electrons.com>", "References": "<20170825191217.10278-1-maxime.ripard@free-electrons.com>", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "Since the discussion is not settled yet for the EMAC, and that the release\nin getting really close, let's revert the changes for now, and we'll\nreintroduce them later.\n\nSigned-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>\n---\n arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 9 --------\n arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 19 -----------------\n arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 8 -------\n arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 7 ------\n arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 8 -------\n arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 8 -------\n arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 5 -----\n arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 8 -------\n arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 22 -------------------\n arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts | 16 --------------\n arch/arm/boot/dts/sunxi-h3-h5.dtsi | 26 -----------------------\n 11 files changed, 136 deletions(-)", "diff": "diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts\nindex 6713d0f2b3f4..b1502df7b509 100644\n--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts\n+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts\n@@ -56,8 +56,6 @@\n \n \taliases {\n \t\tserial0 = &uart0;\n-\t\t/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */\n-\t\tethernet0 = &emac;\n \t\tethernet1 = &xr819;\n \t};\n \n@@ -104,13 +102,6 @@\n \tstatus = \"okay\";\n };\n \n-&emac {\n-\tphy-handle = <&int_mii_phy>;\n-\tphy-mode = \"mii\";\n-\tallwinner,leds-active-low;\n-\tstatus = \"okay\";\n-};\n-\n &mmc0 {\n \tpinctrl-names = \"default\";\n \tpinctrl-0 = <&mmc0_pins_a>;\ndiff --git a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts\nindex d756ff825116..a337af1de322 100644\n--- a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts\n+++ b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts\n@@ -52,7 +52,6 @@\n \tcompatible = \"sinovoip,bpi-m2-plus\", \"allwinner,sun8i-h3\";\n \n \taliases {\n-\t\tethernet0 = &emac;\n \t\tserial0 = &uart0;\n \t\tserial1 = &uart1;\n \t};\n@@ -115,30 +114,12 @@\n \tstatus = \"okay\";\n };\n \n-&emac {\n-\tpinctrl-names = \"default\";\n-\tpinctrl-0 = <&emac_rgmii_pins>;\n-\tphy-supply = <®_gmac_3v3>;\n-\tphy-handle = <&ext_rgmii_phy>;\n-\tphy-mode = \"rgmii\";\n-\n-\tallwinner,leds-active-low;\n-\tstatus = \"okay\";\n-};\n-\n &ir {\n \tpinctrl-names = \"default\";\n \tpinctrl-0 = <&ir_pins_a>;\n \tstatus = \"okay\";\n };\n \n-&mdio {\n-\text_rgmii_phy: ethernet-phy@1 {\n-\t\tcompatible = \"ethernet-phy-ieee802.3-c22\";\n-\t\treg = <0>;\n-\t};\n-};\n-\n &mmc0 {\n \tpinctrl-names = \"default\";\n \tpinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;\ndiff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts\nindex 546837ccd8af..5cd3a391bfd9 100644\n--- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts\n+++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts\n@@ -53,7 +53,6 @@\n \n \taliases {\n \t\tserial0 = &uart0;\n-\t\tethernet0 = &emac;\n \t\tethernet1 = &sdiowifi;\n \t};\n \n@@ -108,13 +107,6 @@\n \tstatus = \"okay\";\n };\n \n-&emac {\n-\tphy-handle = <&int_mii_phy>;\n-\tphy-mode = \"mii\";\n-\tallwinner,leds-active-low;\n-\tstatus = \"okay\";\n-};\n-\n &ir {\n \tpinctrl-names = \"default\";\n \tpinctrl-0 = <&ir_pins_a>;\ndiff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts\nindex 78f6c24952dd..8d2cc6e9a03f 100644\n--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts\n+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts\n@@ -46,10 +46,3 @@\n \tmodel = \"FriendlyARM NanoPi NEO\";\n \tcompatible = \"friendlyarm,nanopi-neo\", \"allwinner,sun8i-h3\";\n };\n-\n-&emac {\n-\tphy-handle = <&int_mii_phy>;\n-\tphy-mode = \"mii\";\n-\tallwinner,leds-active-low;\n-\tstatus = \"okay\";\n-};\ndiff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts\nindex 17cdeae19c6f..8ff71b1bb45b 100644\n--- a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts\n+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts\n@@ -54,7 +54,6 @@\n \taliases {\n \t\tserial0 = &uart0;\n \t\t/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */\n-\t\tethernet0 = &emac;\n \t\tethernet1 = &rtl8189;\n \t};\n \n@@ -118,13 +117,6 @@\n \tstatus = \"okay\";\n };\n \n-&emac {\n-\tphy-handle = <&int_mii_phy>;\n-\tphy-mode = \"mii\";\n-\tallwinner,leds-active-low;\n-\tstatus = \"okay\";\n-};\n-\n &ir {\n \tpinctrl-names = \"default\";\n \tpinctrl-0 = <&ir_pins_a>;\ndiff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts\nindex 6880268e8b87..5fea430e0eb1 100644\n--- a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts\n+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts\n@@ -52,7 +52,6 @@\n \tcompatible = \"xunlong,orangepi-one\", \"allwinner,sun8i-h3\";\n \n \taliases {\n-\t\tethernet0 = &emac;\n \t\tserial0 = &uart0;\n \t};\n \n@@ -98,13 +97,6 @@\n \tstatus = \"okay\";\n };\n \n-&emac {\n-\tphy-handle = <&int_mii_phy>;\n-\tphy-mode = \"mii\";\n-\tallwinner,leds-active-low;\n-\tstatus = \"okay\";\n-};\n-\n &mmc0 {\n \tpinctrl-names = \"default\";\n \tpinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;\ndiff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts\nindex a10281b455f5..8b93f5c781a7 100644\n--- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts\n+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts\n@@ -53,11 +53,6 @@\n \t};\n };\n \n-&emac {\n-\t/* LEDs changed to active high on the plus */\n-\t/delete-property/ allwinner,leds-active-low;\n-};\n-\n &mmc1 {\n \tpinctrl-names = \"default\";\n \tpinctrl-0 = <&mmc1_pins_a>;\ndiff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts\nindex 998b60f8d295..1a044b17d6c6 100644\n--- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts\n+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts\n@@ -52,7 +52,6 @@\n \tcompatible = \"xunlong,orangepi-pc\", \"allwinner,sun8i-h3\";\n \n \taliases {\n-\t\tethernet0 = &emac;\n \t\tserial0 = &uart0;\n \t};\n \n@@ -114,13 +113,6 @@\n \tstatus = \"okay\";\n };\n \n-&emac {\n-\tphy-handle = <&int_mii_phy>;\n-\tphy-mode = \"mii\";\n-\tallwinner,leds-active-low;\n-\tstatus = \"okay\";\n-};\n-\n &ir {\n \tpinctrl-names = \"default\";\n \tpinctrl-0 = <&ir_pins_a>;\ndiff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts\nindex 331ed683ac62..828ae7a526d9 100644\n--- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts\n+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts\n@@ -47,10 +47,6 @@\n \tmodel = \"Xunlong Orange Pi Plus / Plus 2\";\n \tcompatible = \"xunlong,orangepi-plus\", \"allwinner,sun8i-h3\";\n \n-\taliases {\n-\t\tethernet0 = &emac;\n-\t};\n-\n \treg_gmac_3v3: gmac-3v3 {\n \t\tcompatible = \"regulator-fixed\";\n \t\tregulator-name = \"gmac-3v3\";\n@@ -78,24 +74,6 @@\n \tstatus = \"okay\";\n };\n \n-&emac {\n-\tpinctrl-names = \"default\";\n-\tpinctrl-0 = <&emac_rgmii_pins>;\n-\tphy-supply = <®_gmac_3v3>;\n-\tphy-handle = <&ext_rgmii_phy>;\n-\tphy-mode = \"rgmii\";\n-\n-\tallwinner,leds-active-low;\n-\tstatus = \"okay\";\n-};\n-\n-&mdio {\n-\text_rgmii_phy: ethernet-phy@1 {\n-\t\tcompatible = \"ethernet-phy-ieee802.3-c22\";\n-\t\treg = <0>;\n-\t};\n-};\n-\n &mmc2 {\n \tpinctrl-names = \"default\";\n \tpinctrl-0 = <&mmc2_8bit_pins>;\ndiff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts\nindex 80026f3caafc..97920b12a944 100644\n--- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts\n+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts\n@@ -61,19 +61,3 @@\n \t\tgpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */\n \t};\n };\n-\n-&emac {\n-\tpinctrl-names = \"default\";\n-\tpinctrl-0 = <&emac_rgmii_pins>;\n-\tphy-supply = <®_gmac_3v3>;\n-\tphy-handle = <&ext_rgmii_phy>;\n-\tphy-mode = \"rgmii\";\n-\tstatus = \"okay\";\n-};\n-\n-&mdio {\n-\text_rgmii_phy: ethernet-phy@1 {\n-\t\tcompatible = \"ethernet-phy-ieee802.3-c22\";\n-\t\treg = <1>;\n-\t};\n-};\ndiff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi\nindex d38282b9e5d4..11240a8313c2 100644\n--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi\n+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi\n@@ -391,32 +391,6 @@\n \t\t\tclocks = <&osc24M>;\n \t\t};\n \n-\t\temac: ethernet@1c30000 {\n-\t\t\tcompatible = \"allwinner,sun8i-h3-emac\";\n-\t\t\tsyscon = <&syscon>;\n-\t\t\treg = <0x01c30000 0x10000>;\n-\t\t\tinterrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;\n-\t\t\tinterrupt-names = \"macirq\";\n-\t\t\tresets = <&ccu RST_BUS_EMAC>;\n-\t\t\treset-names = \"stmmaceth\";\n-\t\t\tclocks = <&ccu CLK_BUS_EMAC>;\n-\t\t\tclock-names = \"stmmaceth\";\n-\t\t\t#address-cells = <1>;\n-\t\t\t#size-cells = <0>;\n-\t\t\tstatus = \"disabled\";\n-\n-\t\t\tmdio: mdio {\n-\t\t\t\t#address-cells = <1>;\n-\t\t\t\t#size-cells = <0>;\n-\t\t\t\tint_mii_phy: ethernet-phy@1 {\n-\t\t\t\t\tcompatible = \"ethernet-phy-ieee802.3-c22\";\n-\t\t\t\t\treg = <1>;\n-\t\t\t\t\tclocks = <&ccu CLK_BUS_EPHY>;\n-\t\t\t\t\tresets = <&ccu RST_BUS_EPHY>;\n-\t\t\t\t};\n-\t\t\t};\n-\t\t};\n-\n \t\tspi0: spi@01c68000 {\n \t\t\tcompatible = \"allwinner,sun8i-h3-spi\";\n \t\t\treg = <0x01c68000 0x1000>;\n", "prefixes": [ "3/4" ] }