From patchwork Fri Jun 3 16:35:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12869209 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10146C43334 for ; Fri, 3 Jun 2022 16:35:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244811AbiFCQfu (ORCPT ); Fri, 3 Jun 2022 12:35:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231305AbiFCQft (ORCPT ); Fri, 3 Jun 2022 12:35:49 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1AA442CDFF; Fri, 3 Jun 2022 09:35:48 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id er5so10852281edb.12; Fri, 03 Jun 2022 09:35:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nZjdpGq3ZYXbY5zAXh1coaTBlM0d2+j1gz8dKGWC3cg=; b=psSthRqtqvEn805uIy6r1574/iVQK9CygbJXrNGs8uODz/6BVapl/o1OACuAart9w4 vU43KBFkwNhn+hXKbRvj8YyKbkpcJxj1EnpFGDjY0NhszBcuFXSvrJs0undf827HeaWC eMj8je1mza5j2mvBvXPCyuh3Bt5urniGB4qhs8d6u4IOTSRNTfDWQLCtNUqKZ+vKLOoI ZwEStRVRYbsaUKteX+H6sv5drtDzKozfq8L5DvIDaizp1MgExcQ54mOq+b1UILj0DNKh 73zPnxsdEbPa0rDQx8LvsN3YK5pfQ7Xhf0EozaoMgWB5w+E1jgU8xdEu/6qNG3sf/jjK 7S/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nZjdpGq3ZYXbY5zAXh1coaTBlM0d2+j1gz8dKGWC3cg=; b=jFuffSwc2U4tSJJxeJCA4cTx0YwzS6e4l5MH87DbE9qU1/eIHFpwETj/GEG5pVxUUf gllVRMbQfOA3/0VGJi7FIQnO1+vrcw5OI/W4QKwBk9sc7yzzEtul21xhL9I468n+Suye mkiEaQa4pDjhJ7f9638Mb8h9iOuqW53jJ97jxh9CkLsrUo4cYXLaY6MICWt6Vht9VQux Prh2MFInqMzAayNiwgElmFG2t85niTOk1GIVHys7WkmRAc1Hc4HyyYCKe+Xqkqlzh1GZ 3vIoV5VzCCtwRjTOZQEBmcB+CilNAJyAAyDhojPTSHzsaqQuM7xvWk2Y9KzToneNM4Ed wVuw== X-Gm-Message-State: AOAM530lJqR4TL4WotlOpix1LIzpxCVawOsuGTZxQ4yrvIWJgWC0ARqm U7aycxBX86NinMOV4bwhfLIhSIlreyE= X-Google-Smtp-Source: ABdhPJy0HKMRGc+iDvuMVKrapUUyNranJyczR/nceafawj39x/qaFUJp/cGVGGZA1RG4uGtEYY2U/A== X-Received: by 2002:a05:6402:1e88:b0:42f:b1ff:7858 with SMTP id f8-20020a0564021e8800b0042fb1ff7858mr1166862edf.407.1654274146550; Fri, 03 Jun 2022 09:35:46 -0700 (PDT) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id n13-20020a056402060d00b0042dd630eb2csm4106189edv.96.2022.06.03.09.35.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 09:35:46 -0700 (PDT) From: Johan Jonker To: heiko@sntech.de Cc: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] dt-bindings: net: convert emac_rockchip.txt to YAML Date: Fri, 3 Jun 2022 18:35:37 +0200 Message-Id: <20220603163539.537-1-jbx6244@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Convert emac_rockchip.txt to YAML. Changes against original bindings: Add mdio sub node. Add extra clock for rk3036 Signed-off-by: Johan Jonker Reviewed-by: Rob Herring --- Changed V2: use phy rename to rockchip,emac.yaml add more requirements --- .../devicetree/bindings/net/emac_rockchip.txt | 52 -------- .../bindings/net/rockchip,emac.yaml | 115 ++++++++++++++++++ 2 files changed, 115 insertions(+), 52 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/emac_rockchip.txt create mode 100644 Documentation/devicetree/bindings/net/rockchip,emac.yaml diff --git a/Documentation/devicetree/bindings/net/emac_rockchip.txt b/Documentation/devicetree/bindings/net/emac_rockchip.txt deleted file mode 100644 index 05bd7dafc..000000000 --- a/Documentation/devicetree/bindings/net/emac_rockchip.txt +++ /dev/null @@ -1,52 +0,0 @@ -* ARC EMAC 10/100 Ethernet platform driver for Rockchip RK3036/RK3066/RK3188 SoCs - -Required properties: -- compatible: should be "rockchip,-emac" - "rockchip,rk3036-emac": found on RK3036 SoCs - "rockchip,rk3066-emac": found on RK3066 SoCs - "rockchip,rk3188-emac": found on RK3188 SoCs -- reg: Address and length of the register set for the device -- interrupts: Should contain the EMAC interrupts -- rockchip,grf: phandle to the syscon grf used to control speed and mode - for emac. -- phy: see ethernet.txt file in the same directory. -- phy-mode: see ethernet.txt file in the same directory. - -Optional properties: -- phy-supply: phandle to a regulator if the PHY needs one - -Clock handling: -- clocks: Must contain an entry for each entry in clock-names. -- clock-names: Shall be "hclk" for the host clock needed to calculate and set - polling period of EMAC and "macref" for the reference clock needed to transfer - data to and from the phy. - -Child nodes of the driver are the individual PHY devices connected to the -MDIO bus. They must have a "reg" property given the PHY address on the MDIO bus. - -Examples: - -ethernet@10204000 { - compatible = "rockchip,rk3188-emac"; - reg = <0xc0fc2000 0x3c>; - interrupts = <6>; - mac-address = [ 00 11 22 33 44 55 ]; - - clocks = <&cru HCLK_EMAC>, <&cru SCLK_MAC>; - clock-names = "hclk", "macref"; - - pinctrl-names = "default"; - pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&phy_int>; - - rockchip,grf = <&grf>; - - phy = <&phy0>; - phy-mode = "rmii"; - phy-supply = <&vcc_rmii>; - - #address-cells = <1>; - #size-cells = <0>; - phy0: ethernet-phy@0 { - reg = <1>; - }; -}; diff --git a/Documentation/devicetree/bindings/net/rockchip,emac.yaml b/Documentation/devicetree/bindings/net/rockchip,emac.yaml new file mode 100644 index 000000000..a6d4f14df --- /dev/null +++ b/Documentation/devicetree/bindings/net/rockchip,emac.yaml @@ -0,0 +1,115 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/rockchip,emac.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Rockchip RK3036/RK3066/RK3188 Ethernet Media Access Controller (EMAC) + +maintainers: + - Heiko Stuebner + +properties: + compatible: + enum: + - rockchip,rk3036-emac + - rockchip,rk3066-emac + - rockchip,rk3188-emac + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + minItems: 2 + items: + - description: host clock + - description: reference clock + - description: mac TX/RX clock + + clock-names: + minItems: 2 + items: + - const: hclk + - const: macref + - const: macclk + + rockchip,grf: + $ref: /schemas/types.yaml#/definitions/phandle + description: + Phandle to the syscon GRF used to control speed and mode for the EMAC. + + phy-supply: + description: + Phandle to a regulator if the PHY needs one. + + mdio: + $ref: mdio.yaml# + unevaluatedProperties: false + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - rockchip,grf + - phy + - phy-mode + - mdio + +allOf: + - $ref: "ethernet-controller.yaml#" + - if: + properties: + compatible: + contains: + const: rockchip,rk3036-emac + + then: + properties: + clocks: + minItems: 3 + + clock-names: + minItems: 3 + + else: + properties: + clocks: + maxItems: 2 + + clock-names: + maxItems: 2 + +unevaluatedProperties: false + +examples: + - | + #include + #include + + ethernet@10204000 { + compatible = "rockchip,rk3188-emac"; + reg = <0xc0fc2000 0x3c>; + interrupts = ; + clocks = <&cru HCLK_EMAC>, <&cru SCLK_MAC>; + clock-names = "hclk", "macref"; + rockchip,grf = <&grf>; + pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&phy_int>; + pinctrl-names = "default"; + phy = <&phy0>; + phy-mode = "rmii"; + phy-supply = <&vcc_rmii>; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + + phy0: ethernet-phy@0 { + reg = <1>; + }; + }; + }; From patchwork Fri Jun 3 16:35:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12869210 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F6EECCA47C for ; Fri, 3 Jun 2022 16:35:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343960AbiFCQfw (ORCPT ); Fri, 3 Jun 2022 12:35:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343680AbiFCQfu (ORCPT ); Fri, 3 Jun 2022 12:35:50 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C27BA2D1D8; Fri, 3 Jun 2022 09:35:48 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id z7so10850664edm.13; Fri, 03 Jun 2022 09:35:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OyWs2PSSxtF9m14bGEh5PR47UxvU/WKdZospW5gj6qg=; b=NYJAcTRebySOX6VXOcR1b629TpydpneKhjZyajgtjblANJD7wbf4AY+x9jW1EpBVUt lGOsmDwCx48Nm8a9wXvYpnX8+hLedbSJ8fXTSe7HGhlMfTsa64RrT0bLJuD7TKd/MJGQ YF8m7vHMBQoywDepTbmkq67XnDKXZdO2pJL/FUSBzrdJvbZMJ3kxgJmzUHUQ3eqkPwsc fTt/EfgtdEypT2/Tg8AcYKkKsoCnnwuVXVnjV7J67onIy+82V/nk1Yz+WxA3KpWpq7eg Rator4qTI9TrZPIEfG94s0UNhvj9mnUvXlgwzgRZ1UJ71EF5/HpQQ9eFL28mRmy9My1o X0HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OyWs2PSSxtF9m14bGEh5PR47UxvU/WKdZospW5gj6qg=; b=gV0O3hugn+l1PaYR5jZkHOj8biK6X+Qy4oxDRgNnrEkCNrL2vnObUJkMm0PnXtNbzG MHfCK1QZ1f9pC3HJkTWNsz6f9ekyQvwGOtHOfbbF2RdtjgRnZDn/7fdSrKR8svhqs0RI yU36u+zmL/d0vk2wMluPJ2WEUefXyDHaMT4sIwy8srNT96bKMZrNCbgUsX0LN7Y70X+/ l/quIe4e98U8PoXin0CGzMEn9VogP2/1uWKNajT2s92ZoYgJ59GFZJ6WsbAQd5PCPiJO SAXl9kI5CAzaenyhfAEQ3rdiXV+M8vEgIl02vRCqWAU9w1bALrbXRlIOkMVWlI11lWcq V64g== X-Gm-Message-State: AOAM532KYlSktKLTyyX3AOJYCP1203/Y7bYgNggi6yKQnCmGs6LkfoCL J3P7BFw4ijTrPrbPTy0NSjA= X-Google-Smtp-Source: ABdhPJx22AJ4k2j6daZDoLSGFOkcXakF4VCwMPxXRdpFi8edJyvcMoWFNFK1GK2IrDo0a/2huS8CNQ== X-Received: by 2002:aa7:d895:0:b0:42e:985:40f7 with SMTP id u21-20020aa7d895000000b0042e098540f7mr10936583edq.351.1654274147400; Fri, 03 Jun 2022 09:35:47 -0700 (PDT) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id n13-20020a056402060d00b0042dd630eb2csm4106189edv.96.2022.06.03.09.35.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 09:35:47 -0700 (PDT) From: Johan Jonker To: heiko@sntech.de Cc: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] ARM: dts: rockchip: fix rk3036 emac node compatible string Date: Fri, 3 Jun 2022 18:35:38 +0200 Message-Id: <20220603163539.537-2-jbx6244@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220603163539.537-1-jbx6244@gmail.com> References: <20220603163539.537-1-jbx6244@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The Linux kernel has no logic to decide which driver to probe first. To prevent race conditions remove the rk3036 emac node fall back compatible string. Signed-off-by: Johan Jonker --- arch/arm/boot/dts/rk3036.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index 9b0f04975..e240b89b0 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -225,7 +225,7 @@ }; emac: ethernet@10200000 { - compatible = "rockchip,rk3036-emac", "snps,arc-emac"; + compatible = "rockchip,rk3036-emac"; reg = <0x10200000 0x4000>; interrupts = ; #address-cells = <1>; From patchwork Fri Jun 3 16:35:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12869211 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 844CECCA473 for ; Fri, 3 Jun 2022 16:36:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343975AbiFCQgH (ORCPT ); Fri, 3 Jun 2022 12:36:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343968AbiFCQfw (ORCPT ); Fri, 3 Jun 2022 12:35:52 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B160D2CDFF; Fri, 3 Jun 2022 09:35:49 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id n28so10865933edb.9; Fri, 03 Jun 2022 09:35:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ehXZdnyYhQGdFWJC4VGnIHkQy4QBmtpZ6LdmrEF0kKs=; b=K+WAfwU/ngrjgvC2OP5zpGacNsUc/k/WvO2zX9AsWAq0WG4hgiPbpROPoEZWaB/Hl0 SyYiXHMJ1IMf37UGRk7w25J6H082YxYGD8usNPc2ZizIfy7g5UCxiS3ZR5AI8ybRhl+h MskLOIiMapwzluUhrWCvMPFKMMKZA4zzhh0B4Vwchm9hPBF8v4n3bI0oUkBxivIUna1h x9RITpAVIIc+S7pvd9hjUYu+Q40xo03vBbC26R9ckZVRbuEQiqIFa6mgj9xcm8pm19d5 Wobl7EYgvoQ7aA3nphMtkmeJBg1frxNCp0t4ILvkceIMkcg/HBIf2rHzoxsEEJHZ3X3A NRtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ehXZdnyYhQGdFWJC4VGnIHkQy4QBmtpZ6LdmrEF0kKs=; b=GGk6yzajhbGFntumYTlE6EkfbwFUFQGjs5JKQi+a5Jno4HO1PEmWl2sJh2Yi9zftRS 1vuILqmi9eRtlSPAwVjHvldCX/pcAl9mJBaYGgXxsZMiZ2A18BkKvJ6orYrJG+tDAUJI 1bL6xeXixUGAtHA26cUDjRSRw+vZHCLoGIT2xIt4pNOct2HZfzpNuM111JkUwrjr5dQs 1m6sPp/52sD0MZqamE4leNAADI82zhqDgpQ5BisqXgE6GLdbHU+XAzP4+5dzyFIB5srN OHIGwdrhBzXm8xsIG7VbQKkJjkvmWP2DiQaB4fnZQwog+g3P3/MCr49bqdgln7CWvA/o J6QA== X-Gm-Message-State: AOAM531Z9Wm8RKYxPC5uhKr3ExmVihwMaxNSGClXPf941hR6uDeVXizu eSNbQN1O63MAUSOct5AvC48= X-Google-Smtp-Source: ABdhPJwir3sPXB/4KhHIbARo7v439Y/LK1tCuHGIf2ZJnNdNJNvHo/x3d80XUZleYQGtthQOTcBYUg== X-Received: by 2002:a05:6402:1e92:b0:42d:dc34:e233 with SMTP id f18-20020a0564021e9200b0042ddc34e233mr11965467edf.386.1654274148266; Fri, 03 Jun 2022 09:35:48 -0700 (PDT) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id n13-20020a056402060d00b0042dd630eb2csm4106189edv.96.2022.06.03.09.35.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 09:35:47 -0700 (PDT) From: Johan Jonker To: heiko@sntech.de Cc: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] ARM: dts: rockchip: restyle emac nodes Date: Fri, 3 Jun 2022 18:35:39 +0200 Message-Id: <20220603163539.537-3-jbx6244@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220603163539.537-1-jbx6244@gmail.com> References: <20220603163539.537-1-jbx6244@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The emac_rockchip.txt file is converted to YAML. Phy nodes are now a subnode of mdio, so restyle the emac nodes of rk3036/rk3066/rk3188. Signed-off-by: Johan Jonker --- Changed V2: use phy --- arch/arm/boot/dts/rk3036-evb.dts | 16 ++++++++++------ arch/arm/boot/dts/rk3036-kylin.dts | 16 ++++++++++------ arch/arm/boot/dts/rk3036.dtsi | 2 -- arch/arm/boot/dts/rk3066a-marsboard.dts | 17 ++++++++++------- arch/arm/boot/dts/rk3066a-rayeager.dts | 15 ++++++++++----- arch/arm/boot/dts/rk3188-radxarock.dts | 19 +++++++++++-------- arch/arm/boot/dts/rk3xxx.dtsi | 2 -- 7 files changed, 51 insertions(+), 36 deletions(-) diff --git a/arch/arm/boot/dts/rk3036-evb.dts b/arch/arm/boot/dts/rk3036-evb.dts index 2a7e6624e..9fd4d9db9 100644 --- a/arch/arm/boot/dts/rk3036-evb.dts +++ b/arch/arm/boot/dts/rk3036-evb.dts @@ -15,16 +15,20 @@ }; &emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_xfer>, <&emac_mdio>; phy = <&phy0>; - phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */ phy-reset-duration = <10>; /* millisecond */ - + phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */ + pinctrl-names = "default"; + pinctrl-0 = <&emac_xfer>, <&emac_mdio>; status = "okay"; - phy0: ethernet-phy@0 { - reg = <0>; + mdio { + #address-cells = <1>; + #size-cells = <0>; + + phy0: ethernet-phy@0 { + reg = <0>; + }; }; }; diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts index e817eba8c..67e1e0413 100644 --- a/arch/arm/boot/dts/rk3036-kylin.dts +++ b/arch/arm/boot/dts/rk3036-kylin.dts @@ -80,16 +80,20 @@ }; &emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_xfer>, <&emac_mdio>; phy = <&phy0>; - phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */ phy-reset-duration = <10>; /* millisecond */ - + phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */ + pinctrl-names = "default"; + pinctrl-0 = <&emac_xfer>, <&emac_mdio>; status = "okay"; - phy0: ethernet-phy@0 { - reg = <0>; + mdio { + #address-cells = <1>; + #size-cells = <0>; + + phy0: ethernet-phy@0 { + reg = <0>; + }; }; }; diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index e240b89b0..78686fc72 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -228,8 +228,6 @@ compatible = "rockchip,rk3036-emac"; reg = <0x10200000 0x4000>; interrupts = ; - #address-cells = <1>; - #size-cells = <0>; rockchip,grf = <&grf>; clocks = <&cru HCLK_MAC>, <&cru SCLK_MACREF>, <&cru SCLK_MAC>; clock-names = "hclk", "macref", "macclk"; diff --git a/arch/arm/boot/dts/rk3066a-marsboard.dts b/arch/arm/boot/dts/rk3066a-marsboard.dts index a66d915aa..8beecd628 100644 --- a/arch/arm/boot/dts/rk3066a-marsboard.dts +++ b/arch/arm/boot/dts/rk3066a-marsboard.dts @@ -150,18 +150,21 @@ #include "tps65910.dtsi" &emac { - status = "okay"; - phy = <&phy0>; phy-supply = <&vcc_rmii>; - pinctrl-names = "default"; pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&phy_int>; + status = "okay"; + + mdio { + #address-cells = <1>; + #size-cells = <0>; - phy0: ethernet-phy@0 { - reg = <0>; - interrupt-parent = <&gpio1>; - interrupts = ; + phy0: ethernet-phy@0 { + reg = <0>; + interrupt-parent = <&gpio1>; + interrupts = ; + }; }; }; diff --git a/arch/arm/boot/dts/rk3066a-rayeager.dts b/arch/arm/boot/dts/rk3066a-rayeager.dts index 12b2e59ae..9aeef36ca 100644 --- a/arch/arm/boot/dts/rk3066a-rayeager.dts +++ b/arch/arm/boot/dts/rk3066a-rayeager.dts @@ -142,15 +142,20 @@ }; &emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&rmii_rst>; phy = <&phy0>; phy-supply = <&vcc_rmii>; + pinctrl-names = "default"; + pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&rmii_rst>; status = "okay"; - phy0: ethernet-phy@0 { - reg = <0>; - reset-gpios = <&gpio1 RK_PD6 GPIO_ACTIVE_LOW>; + mdio { + #address-cells = <1>; + #size-cells = <0>; + + phy0: ethernet-phy@0 { + reg = <0>; + reset-gpios = <&gpio1 RK_PD6 GPIO_ACTIVE_LOW>; + }; }; }; diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts index 36c0945f4..bb0942d3e 100644 --- a/arch/arm/boot/dts/rk3188-radxarock.dts +++ b/arch/arm/boot/dts/rk3188-radxarock.dts @@ -126,18 +126,21 @@ }; &emac { - status = "okay"; - + phy = <&phy0>; + phy-supply = <&vcc_rmii>; pinctrl-names = "default"; pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&phy_int>; + status = "okay"; - phy = <&phy0>; - phy-supply = <&vcc_rmii>; + mdio { + #address-cells = <1>; + #size-cells = <0>; - phy0: ethernet-phy@0 { - reg = <0>; - interrupt-parent = <&gpio3>; - interrupts = ; + phy0: ethernet-phy@0 { + reg = <0>; + interrupt-parent = <&gpio3>; + interrupts = ; + }; }; }; diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi index 616a828e0..bf285091a 100644 --- a/arch/arm/boot/dts/rk3xxx.dtsi +++ b/arch/arm/boot/dts/rk3xxx.dtsi @@ -186,8 +186,6 @@ compatible = "snps,arc-emac"; reg = <0x10204000 0x3c>; interrupts = ; - #address-cells = <1>; - #size-cells = <0>; rockchip,grf = <&grf>;