From patchwork Thu Sep 4 12:11:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Heiko_St=C3=BCbner?= X-Patchwork-Id: 4844991 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7B9019F390 for ; Thu, 4 Sep 2014 12:10:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 88A7C2026C for ; Thu, 4 Sep 2014 12:10:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B21B620035 for ; Thu, 4 Sep 2014 12:10:08 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XPVrc-0001f4-Fd; Thu, 04 Sep 2014 12:10:08 +0000 Received: from gloria.sntech.de ([95.129.55.99]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XPVra-0000RE-5q; Thu, 04 Sep 2014 12:10:07 +0000 Received: from ip9234458b.dynamic.kabel-deutschland.de ([146.52.69.139] helo=diego.localnet) by gloria.sntech.de with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1XPVrC-00019v-70; Thu, 04 Sep 2014 14:09:42 +0200 From: Heiko =?ISO-8859-1?Q?St=FCbner?= To: Romain Perier Subject: Re: [PATCH 3/4] ARM: dts: Add emac nodes to the rk3188 device tree Date: Thu, 04 Sep 2014 14:11:51 +0200 Message-ID: <2772929.YUnUK3Vc00@diego> User-Agent: KMail/4.12.4 (Linux/3.13-1-amd64; KDE/4.13.3; x86_64; ; ) In-Reply-To: <1409763165-16461-3-git-send-email-romain.perier@gmail.com> References: <1409763165-16461-1-git-send-email-romain.perier@gmail.com> <1409763165-16461-3-git-send-email-romain.perier@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140904_051006_411155_E828FC08 X-CRM114-Status: GOOD ( 12.07 ) X-Spam-Score: -1.6 (-) Cc: linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, arnd@arndb.de, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Am Mittwoch, 3. September 2014, 16:52:44 schrieb Romain Perier: > This adds support for EMAC Rockchip driver on RK3188 SoCs. > > Signed-off-by: Romain Perier could you think about changing patches 3 and 4 with the diff below? For one the comment style is not really following the coding style. I guess either remove the comments completely or switch to a /* ... */ form. More importantly, I think the compatible is a property of the SoC and does not need to be replicated into every board, so it should live in a small &emac node in the rk3188.dtsi to adapt the property. Heiko > --- > arch/arm/boot/dts/rk3188.dtsi | 18 ++++++++++++++++++ > arch/arm/boot/dts/rk3xxx.dtsi | 17 +++++++++++++++++ > 2 files changed, 35 insertions(+) > > diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi > index ee801a9..a182713 100644 > --- a/arch/arm/boot/dts/rk3188.dtsi > +++ b/arch/arm/boot/dts/rk3188.dtsi > @@ -147,6 +147,24 @@ > bias-disable; > }; > > + emac { > + emac_xfer: emac-xfer { > + rockchip,pins = , //tx_en > + , //txd1 > + , //txd0 > + , //rxd0 > + , //rxd1 > + , //mac_clk > + , //rx_err > + ; //crs_dvalid > + }; > + > + emac_mdio: emac-mdio { > + rockchip,pins = , > + ; > + }; > + }; > + > i2c0 { > i2c0_xfer: i2c0-xfer { > rockchip,pins = , > diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi > index 8caf85d..208b1df 100644 > --- a/arch/arm/boot/dts/rk3xxx.dtsi > +++ b/arch/arm/boot/dts/rk3xxx.dtsi > @@ -91,6 +91,23 @@ > status = "disabled"; > }; > > + emac: ethernet@10204000 { > + compatible = "snps,arc-emac"; > + reg = <0x10204000 0x3c>; > + interrupts = ; > + #address-cells = <1>; > + #size-cells = <0>; > + > + rockchip,grf = <&grf>; > + > + clocks = <&cru HCLK_EMAC>, <&cru SCLK_MAC>; > + clock-names = "hclk", "macref"; > + max-speed = <100>; > + phy-mode = "rmii"; > + > + status = "disabled"; > + }; > + > mmc0: dwmmc@10214000 { > compatible = "rockchip,rk2928-dw-mshc"; > reg = <0x10214000 0x1000>; diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts index 9f37c6f..a5c90e1 100644 --- a/arch/arm/boot/dts/rk3188-radxarock.dts +++ b/arch/arm/boot/dts/rk3188-radxarock.dts @@ -100,7 +100,6 @@ &emac { status = "okay"; - compatible = "rockchip,rk3188-emac"; pinctrl-names = "default"; pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&phy_int>; diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi index 1261358..fd7511e 100644 --- a/arch/arm/boot/dts/rk3188.dtsi +++ b/arch/arm/boot/dts/rk3188.dtsi @@ -193,14 +193,14 @@ emac { emac_xfer: emac-xfer { - rockchip,pins = , //tx_en - , //txd1 - , //txd0 - , //rxd0 - , //rxd1 - , //mac_clk - , //rx_err - ; //crs_dvalid + rockchip,pins = , /* tx_en */ + , /* txd1 */ + , /* txd0 */ + , /* rxd0 */ + , /* rxd1 */ + , /* mac_clk */ + , /* rx_err */ + ; /* crs_dvalid */ }; emac_mdio: emac-mdio { @@ -385,6 +385,10 @@ }; }; +&emac { + compatible = "rockchip,rk3188-emac"; +}; + &global_timer { interrupts = ; };