| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 27 May 2016 00:22:46 -0700
From: Iyappan Subramanian <isubramanian@....com>
To: davem@...emloft.net, netdev@...r.kernel.org,
devicetree@...r.kernel.org
Cc: linux-arm-kernel@...ts.infradead.org, patches@....com,
Iyappan Subramanian <isubramanian@....com>
Subject: [PATCH v1 4/6] dtb: xgene: Add MDIO node
Added mdio node for mdio driver. Also added phy-handle
reference to the ethernet nodes. Removed unused mdio
subnode within ethernet node.
Signed-off-by: Iyappan Subramanian <isubramanian@....com>
Tested-by: Fushen Chen <fchen@....com>
Tested-by: Toan Le <toanle@....com>
---
arch/arm64/boot/dts/apm/apm-merlin.dts | 10 ++++++++++
arch/arm64/boot/dts/apm/apm-mustang.dts | 12 ++++++++++++
arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 11 +++++++++++
arch/arm64/boot/dts/apm/apm-storm.dtsi | 20 ++++++++++----------
4 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/boot/dts/apm/apm-merlin.dts b/arch/arm64/boot/dts/apm/apm-merlin.dts
index 387c6a8..7d47a0f 100644
--- a/arch/arm64/boot/dts/apm/apm-merlin.dts
+++ b/arch/arm64/boot/dts/apm/apm-merlin.dts
@@ -83,3 +83,13 @@
status = "ok";
};
};
+
+&mdio {
+ sgenet0phy: phy@3 {
+ reg = <0x0>;
+ };
+ sgenet1phy: phy@2 {
+ reg = <0x2>;
+ };
+};
+
diff --git a/arch/arm64/boot/dts/apm/apm-mustang.dts b/arch/arm64/boot/dts/apm/apm-mustang.dts
index 44db32e..c4e2bc4 100644
--- a/arch/arm64/boot/dts/apm/apm-mustang.dts
+++ b/arch/arm64/boot/dts/apm/apm-mustang.dts
@@ -79,3 +79,15 @@
&mmc0 {
status = "ok";
};
+
+&mdio {
+ menetphy: phy@3 {
+ reg = <0x3>;
+ };
+ sgenet0phy: phy@4 {
+ reg = <0x4>;
+ };
+ sgenet1phy: phy@5 {
+ reg = <0x5>;
+ };
+};
diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
index ba04877..8106957 100644
--- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
@@ -625,6 +625,15 @@
apm,irq-start = <8>;
};
+ mdio: mdio@...f610000 {
+ compatible = "apm,xgene-mdio-sgmii";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x0 0x1f610000 0x0 0x100>,
+ <0x0 0X1f61d000 0x0 0X100>;
+ clocks = <&xge0clk 0>;
+ };
+
sgenet0: ethernet@...10000 {
compatible = "apm,xgene2-sgenet";
status = "disabled";
@@ -637,6 +646,7 @@
clocks = <&xge0clk 0>;
local-mac-address = [00 01 73 00 00 01];
phy-connection-type = "sgmii";
+ phy-handle = <&sgenet0phy>;
};
xgenet1: ethernet@...20000 {
@@ -659,6 +669,7 @@
clocks = <&xge1clk 0>;
local-mac-address = [00 01 73 00 00 02];
phy-connection-type = "xgmii";
+ phy-handle = <&sgenet1phy>;
};
rng: rng@...20000 {
diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi
index 5147d76..18f694ea 100644
--- a/arch/arm64/boot/dts/apm/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi
@@ -921,6 +921,14 @@
clocks = <&rtcclk 0>;
};
+ mdio: mdio@...7020000 {
+ compatible = "apm,xgene-mdio-rgmii";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x0 0x17020000 0x0 0xd100>;
+ clocks = <&menetclk 0>;
+ };
+
menet: ethernet@...20000 {
compatible = "apm,xgene-enet";
status = "disabled";
@@ -935,16 +943,6 @@
local-mac-address = [00 00 00 00 00 00];
phy-connection-type = "rgmii";
phy-handle = <&menetphy>;
- mdio {
- compatible = "apm,xgene-mdio";
- #address-cells = <1>;
- #size-cells = <0>;
- menetphy: menetphy@3 {
- compatible = "ethernet-phy-id001c.c915";
- reg = <0x3>;
- };
-
- };
};
sgenet0: ethernet@...10000 {
@@ -960,6 +958,7 @@
clocks = <&sge0clk 0>;
local-mac-address = [00 00 00 00 00 00];
phy-connection-type = "sgmii";
+ phy-handle = <&sgenet0phy>;
};
sgenet1: ethernet@...10030 {
@@ -976,6 +975,7 @@
clocks = <&sge1clk 0>;
local-mac-address = [00 00 00 00 00 00];
phy-connection-type = "sgmii";
+ phy-handle = <&sgenet1phy>;
};
xgenet: ethernet@...10000 {
--
1.9.1
Powered by blists - more mailing lists