From: Soren Brinkmann <soren.brinkmann@xilinx.com>
To: Michal Simek <michal.simek@xilinx.com>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
"Rob Herring" <robh+dt@kernel.org>,
"Pawel Moll" <pawel.moll@arm.com>,
"Mark Rutland" <mark.rutland@arm.com>,
"Ian Campbell" <ijc+devicetree@hellion.org.uk>,
"Kumar Gala" <galak@codeaurora.org>,
"Russell King" <linux@arm.linux.org.uk>,
"Soren Brinkmann" <soren.brinkmann@xilinx.com>,
"Andreas Färber" <afaerber@suse.de>
Subject: [PATCH 2/3] ARM: zynq: DT: Move size/address properties to dtsi
Date: Wed, 20 Aug 2014 08:56:58 -0700 [thread overview]
Message-ID: <1408550219-19825-2-git-send-email-soren.brinkmann@xilinx.com> (raw)
In-Reply-To: <1408550219-19825-1-git-send-email-soren.brinkmann@xilinx.com>
Move the GEM's size and address cells properties to the common
dtsi file.
Cc: Andreas Färber <afaerber@suse.de>
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
arch/arm/boot/dts/zynq-7000.dtsi | 4 ++++
arch/arm/boot/dts/zynq-parallella.dts | 2 --
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index 6cc83d4c6c76..4e6e96ef7bd0 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -195,6 +195,8 @@
interrupts = <0 22 4>;
clocks = <&clkc 30>, <&clkc 30>, <&clkc 13>;
clock-names = "pclk", "hclk", "tx_clk";
+ #address-cells = <1>;
+ #size-cells = <0>;
};
gem1: ethernet@e000c000 {
@@ -204,6 +206,8 @@
interrupts = <0 45 4>;
clocks = <&clkc 31>, <&clkc 31>, <&clkc 14>;
clock-names = "pclk", "hclk", "tx_clk";
+ #address-cells = <1>;
+ #size-cells = <0>;
};
sdhci0: sdhci@e0100000 {
diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts
index 41afd9da6876..690e6206beac 100644
--- a/arch/arm/boot/dts/zynq-parallella.dts
+++ b/arch/arm/boot/dts/zynq-parallella.dts
@@ -38,8 +38,6 @@
status = "okay";
phy-mode = "rgmii-id";
phy-handle = <ðernet_phy>;
- #address-cells = <1>;
- #size-cells = <0>;
ethernet_phy: ethernet-phy@0 {
/* Marvell 88E1318 */
--
2.0.1.1.gfbfc394
next prev parent reply other threads:[~2014-08-20 15:57 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-20 15:56 [PATCH 1/3] ARM: zynq: DT: Fix Ethernet phy modes Soren Brinkmann
2014-08-20 15:56 ` Soren Brinkmann [this message]
2014-08-20 16:00 ` [PATCH 2/3] ARM: zynq: DT: Move size/address properties to dtsi Andreas Färber
2014-08-21 8:42 ` Michal Simek
2014-08-20 15:56 ` [PATCH 3/3] ARM: zynq: DT: Add Ethernet phys Soren Brinkmann
2014-08-21 8:41 ` Michal Simek
2014-08-21 11:32 ` Andreas Färber
2014-08-21 15:49 ` Sören Brinkmann
2014-08-22 16:20 ` Jason Gunthorpe
2014-08-22 16:31 ` Sören Brinkmann
2014-08-22 16:48 ` Jason Gunthorpe
2014-08-22 20:47 ` Florian Fainelli
2014-08-25 17:46 ` Jason Gunthorpe
2014-08-25 20:21 ` Florian Fainelli
2014-08-29 14:08 ` Michal Simek
2014-08-29 15:18 ` Andreas Färber
2014-08-29 15:35 ` Sören Brinkmann
2014-08-29 15:46 ` Andreas Färber
2014-08-29 17:31 ` Jason Gunthorpe
2014-08-29 18:23 ` Florian Fainelli
2014-08-29 23:22 ` Jason Gunthorpe
2014-08-30 0:43 ` Florian Fainelli
2014-09-01 11:26 ` Michal Simek
2014-08-21 8:42 ` [PATCH 1/3] ARM: zynq: DT: Fix Ethernet phy modes Michal Simek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408550219-19825-2-git-send-email-soren.brinkmann@xilinx.com \
--to=soren.brinkmann@xilinx.com \
--cc=afaerber@suse.de \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
--cc=michal.simek@xilinx.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®