dt/bindings: Remove all references to device_type "ethernet-phy"

The device_type property is deprecated for the flattened device tree and
the value "ethernet-phy" has never been defined as having a useful
meaning. Neither the kernel nor u-boot depend on it. It should never
have appeared in PHY bindings. This patch removes all references to
"ethernet-phy" as a device_type value from the documentation and the
.dts files.

This patch was generated mechanically with the following command and
then verified by looking at the diff.

sed -i '/"ethernet-phy"/d' `git grep -l '"ethernet-phy"'`

Signed-off-by: Grant Likely <grant.likely@linaro.org>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/Documentation/devicetree/bindings/marvell.txt b/Documentation/devicetree/bindings/marvell.txt
index f7a0da6b4022564d24ce47e0a27fde0e4a04b5b4..73a3d251acb1632140a22aca140787593d430e03 100644 (file)
--- a/Documentation/devicetree/bindings/marvell.txt
+++ b/Documentation/devicetree/bindings/marvell.txt
@@ -159,7 +159,6 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd.
    c) Marvell Discovery PHY nodes
 
    Required properties:
-     - device_type : Should be "ethernet-phy"
      - interrupts : <a> where a is the interrupt number for this phy.
      - interrupt-parent : the phandle for the interrupt controller that
        services interrupts for this device.
@@ -167,7 +166,6 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd.
 
    Example Discovery PHY node:
      ethernet-phy@1 {
-            device_type = "ethernet-phy";
             compatible = "broadcom,bcm5421";
             interrupts = <76>;      /* GPP 12 */
             interrupt-parent = <&PIC>;

diff --git a/Documentation/devicetree/bindings/net/marvell-orion-net.txt b/Documentation/devicetree/bindings/net/marvell-orion-net.txt
index a73b79f227e12866364e416955e7ca3d521b3a73..4a10716ff59dd7eae36e01beead6444d02c2890d 100644 (file)
--- a/Documentation/devicetree/bindings/net/marvell-orion-net.txt
+++ b/Documentation/devicetree/bindings/net/marvell-orion-net.txt
@@ -61,7 +61,6 @@ or
 mdio-bus {
        ...
        ethphy: ethernet-phy@8 {
-               device_type = "ethernet-phy";
                ...
        };
 };

diff --git a/Documentation/devicetree/bindings/net/phy.txt b/Documentation/devicetree/bindings/net/phy.txt
index 7cd18fbfcf71e702249d1f1aeada02611e2bed52..506db4ba3e8aa3e814a3481d9bd9e8fd01641d3e 100644 (file)
--- a/Documentation/devicetree/bindings/net/phy.txt
+++ b/Documentation/devicetree/bindings/net/phy.txt
@@ -2,7 +2,6 @@ PHY nodes
 
 Required properties:
 
- - device_type : Should be "ethernet-phy"
  - interrupts : <a b> where a is the interrupt number and b is a
    field that represents an encoding of the sense and level
    information for the interrupt.  This should be encoded based on
@@ -31,5 +30,4 @@ ethernet-phy@0 {
        interrupt-parent = <40000>;
        interrupts = <35 1>;
        reg = <0>;
-       device_type = "ethernet-phy";
 };

diff --git a/Documentation/devicetree/booting-without-of.txt b/Documentation/devicetree/booting-without-of.txt
index b2fb2f5e19220e6b59bab121a521af2fe7ce2b54..1f013bd0d32026f92e72351469dff05903d233b0 100644 (file)
--- a/Documentation/devicetree/booting-without-of.txt
+++ b/Documentation/devicetree/booting-without-of.txt
@@ -1364,19 +1364,16 @@ Appendix A - Sample SOC node for MPC8540
                                phy0: ethernet-phy@0 {
                                        interrupts = <5 1>;
                                        reg = <0>;
-                                       device_type = "ethernet-phy";
                                };
 
                                phy1: ethernet-phy@1 {
                                        interrupts = <5 1>;
                                        reg = <1>;
-                                       device_type = "ethernet-phy";
                                };
 
                                phy3: ethernet-phy@3 {
                                        interrupts = <7 1>;
                                        reg = <3>;
-                                       device_type = "ethernet-phy";
                                };
                        };
                };

diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 113a8bc7bee73649a33cc3e212336536f47399b3..9311edf441c6e5d0e3175fbbba772d981b03dc3d 100644 (file)
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -559,7 +559,6 @@
                                status = "disabled";
 
                                ethphy: ethernet-phy {
-                                       device-type = "ethernet-phy";
                                        /* set phy address in board file */
                                };
                        };

diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts
index 142b9cd3b4541d9fbc8205ad2770c2084a6dfee3..14fd53d1bf8ab2532d0d5352fec2483d171ee656 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
+++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
@@ -94,7 +94,6 @@
        status = "okay";
 
        ethphy0: ethernet-phy@0 {
-               device_type = "ethernet-phy";
                reg = <0>;
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi
index 053aa20fb30f88a0e13be1878e9d9d6ba241c4c2..0de6d7110c357e85bbe977343bf36b74054b64d5 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-db.dtsi
+++ b/arch/arm/boot/dts/kirkwood-db.dtsi
@@ -84,7 +84,6 @@
        status = "okay";
 
        ethphy0: ethernet-phy@8 {
-               device_type = "ethernet-phy";
                reg = <8>;
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
index aefa375a550d3ac0e7615cd76ba50e83c99ac094..e5ede2fe05ba059e07a619688b09494caa671cc2 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi
+++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
@@ -224,7 +224,6 @@
        status = "okay";
 
        ethphy0: ethernet-phy@8 {
-               device_type = "ethernet-phy";
                reg = <8>;
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts
index 33ff368fbfa5696353353fc5151b4fefd7cc6198..aa6725577fc67937f42817979c2bd4aa33f4822f 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-dockstar.dts
+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts
@@ -95,7 +95,6 @@
        status = "okay";
 
        ethphy0: ethernet-phy@0 {
-               device_type = "ethernet-phy";
                compatible = "marvell,88e1116";
                reg = <0>;
        };

diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
index 6f62af99c9cbebe4da42d000c6ae28c34054e52f..12dc7d6b32310e52c3a781a78cde17a5f71d28bc 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
@@ -104,12 +104,10 @@
        status = "okay";
 
        ethphy0: ethernet-phy@0 {
-               device_type = "ethernet-phy";
                reg = <0>;
        };
 
        ethphy1: ethernet-phy@1 {
-               device_type = "ethernet-phy";
                reg = <1>;
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts
index a43bebb251102fbbfcde84e58f1955ce52f5de5b..df1f5a8b05bb45aa20b063ffba4824529ea16d3a 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts
+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts
@@ -176,7 +176,6 @@
        status = "okay";
 
        ethphy0: ethernet-phy@0 {
-               device_type = "ethernet-phy";
                reg = <0>;
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
index d30a91a5047d6939c2dfdd69989bde39c359f9b7..b68bd22b0d77bb7b231a87738700eff6f817466e 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
+++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
@@ -101,13 +101,11 @@
        status = "okay";
 
        ethphy0: ethernet-phy@0 {
-               device_type = "ethernet-phy";
                compatible = "marvell,88e1121";
                reg = <0>;
        };
 
        ethphy1: ethernet-phy@1 {
-               device_type = "ethernet-phy";
                compatible = "marvell,88e1121";
                reg = <1>;
        };

diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
index c5fb02f7ebc3e33107ac067d46a6394d6c21b27d..5c0d7250efd5dc5cab009d20e5a3276225027e7a 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -133,7 +133,6 @@
        status = "okay";
 
        ethphy0: ethernet-phy@8 {
-               device_type = "ethernet-phy";
                reg = <8>;
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
index 4a62b206f680b4c1261a404ce16ce26fb498f6c0..42f2bd774d71ca049b0240faa14b227987fa3f1d 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
@@ -183,7 +183,6 @@
        status = "okay";
 
        ethphy0: ethernet-phy@11 {
-               device_type = "ethernet-phy";
                reg = <11>;
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
index d15395d671ededf4caf501518bb1e33ffba0cba8..4ff9f65de2a08dcb1e0252d7ad15f8eb59e58c50 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
@@ -200,7 +200,6 @@
        status = "okay";
 
        ethphy1: ethernet-phy@11 {
-               device_type = "ethernet-phy";
                reg = <11>;
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
index cd44f37e54b5b7fb81f6c53f966abc9e3e511c8e..0dc3cfeca4c89610d2dcda941786ebac27199757 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
+++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
@@ -55,7 +55,6 @@
        status = "okay";
 
        ethphy0: ethernet-phy@0 {
-               device_type = "ethernet-phy";
                reg = <0>;
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index 4e8f9e42c5929135e05109142bcec7100ed83d02..addcc89916ebcef68840a7477101d4c7dd599279 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -212,12 +212,10 @@
        status = "okay";
 
        ethphy0: ethernet-phy@0 {
-               device_type = "ethernet-phy";
                reg = <0>;
        };
 
        ethphy1: ethernet-phy@8 {
-               device_type = "ethernet-phy";
                reg = <8>;
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts
index 6c1ec2786e6e2f77c334292bab84b4e24d4cfef6..8b78241dfe6df56e80dc923d8da4f714f97e7659 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
@@ -197,12 +197,10 @@
        status = "okay";
 
        ethphy0: ethernet-phy@1 {
-               device_type = "ethernet-phy";
                reg = <1>;
        };
 
        ethphy1: ethernet-phy@2 {
-               device_type = "ethernet-phy";
                reg = <2>;
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
index e6a102cf424cd646d9e121acd2b821ea46bb81be..00c0669b1b8c91cc35a8be62a98d6796f86d99fd 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
@@ -211,7 +211,6 @@
        status = "okay";
 
        ethphy0: ethernet-phy@0 {
-               device_type = "ethernet-phy";
                reg = <0>;
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index 2fcb82e208288e6f0d9e72afc7d7650a2ec946aa..53ca709c8e292630ffb820043c6b24bf03520516 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -89,7 +89,6 @@
        status = "okay";
 
        ethphy0: ethernet-phy {
-               device_type = "ethernet-phy";
                 /* overwrite reg property in board file */
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index f0e3d213604c975b760173bc854d624d68e38ccd..3d2f2b18bde086e2d9fb76b08d731769df888173 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -171,7 +171,6 @@
        status = "okay";
 
        ethphy0: ethernet-phy@0 {
-               device_type = "ethernet-phy";
                reg = <0>;
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index 851fb2a60f20bd7c34401accd522cf6c38aeea67..24b063f1b698686bfd345885c65e1ae270d79635 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -196,12 +196,10 @@
        status = "okay";
 
        ethphy0: ethernet-phy@0 {
-               device_type = "ethernet-phy";
                reg = <0>;
        };
 
        ethphy1: ethernet-phy@1 {
-               device_type = "ethernet-phy";
                reg = <1>;
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
index 1173d7fb31b23f9e11565a45592fcb99f17e41bf..428aeff275ead25c37d64e0f4b161dd0b4b2056e 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
@@ -96,7 +96,6 @@
        status = "okay";
 
        ethphy0: ethernet-phy@0 {
-               device_type = "ethernet-phy";
                reg = <0>;
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
index 320da677b9847e94f0aba2bcc634bd90890686a6..67b8c91bca4d0ba34b7f501ad5d4ca52ad509b03 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -208,7 +208,6 @@
        status = "okay";
 
        ethphy0: ethernet-phy@0 {
-               device_type = "ethernet-phy";
                reg = <0>;
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 39158cf16258c9480de422996b8bda5c7a84dfc2..911f3a8cee23ec0d5d28f07451338147eeb01893 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -104,7 +104,6 @@
        status = "okay";
 
        ethphy0: ethernet-phy {
-               device_type = "ethernet-phy";
                 /* overwrite reg property in board file */
        };
 };

diff --git a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
index aed83deaa991c9b8856218ef0792f1c3f51cc2b4..5ed6c137690183c4586e6bdb7f00baa19f7b7054 100644 (file)
--- a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
+++ b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
@@ -58,7 +58,6 @@
        status = "okay";
 
        ethphy: ethernet-phy {
-               device-type = "ethernet-phy";
                reg = <8>;
        };
 };

diff --git a/arch/powerpc/boot/dts/adder875-redboot.dts b/arch/powerpc/boot/dts/adder875-redboot.dts
index 28e9cd3d7a216c841ee8b8c6bd119b6194bed2cb..083984720b2f624cd4fcf5bf3c6cb5f39364c8bc 100644 (file)
--- a/arch/powerpc/boot/dts/adder875-redboot.dts
+++ b/arch/powerpc/boot/dts/adder875-redboot.dts
@@ -87,12 +87,10 @@
 
                        PHY0: ethernet-phy@0 {
                                reg = <0>;
-                               device_type = "ethernet-phy";
                        };
 
                        PHY1: ethernet-phy@1 {
                                reg = <1>;
-                               device_type = "ethernet-phy";
                        };
                };
 

diff --git a/arch/powerpc/boot/dts/adder875-uboot.dts b/arch/powerpc/boot/dts/adder875-uboot.dts
index 54fb60ec03e540c06a37556f4535aa19c13ce959..e4554caf8f8d3b6a40ba27ac8a02c67a39abf724 100644 (file)
--- a/arch/powerpc/boot/dts/adder875-uboot.dts
+++ b/arch/powerpc/boot/dts/adder875-uboot.dts
@@ -86,12 +86,10 @@
 
                        PHY0: ethernet-phy@0 {
                                reg = <0>;
-                               device_type = "ethernet-phy";
                        };
 
                        PHY1: ethernet-phy@1 {
                                reg = <1>;
-                               device_type = "ethernet-phy";
                        };
                };
 

diff --git a/arch/powerpc/boot/dts/asp834x-redboot.dts b/arch/powerpc/boot/dts/asp834x-redboot.dts
index 227290db866dab5e3d6771b0b633b5615a3271d0..9198745f45fb745fba31d8ccfb241ae22853685b 100644 (file)
--- a/arch/powerpc/boot/dts/asp834x-redboot.dts
+++ b/arch/powerpc/boot/dts/asp834x-redboot.dts
@@ -207,14 +207,12 @@
                                        interrupt-parent = <&ipic>;
                                        interrupts = <17 0x8>;
                                        reg = <0x1>;
-                                       device_type = "ethernet-phy";
                                };
 
                                phy1: ethernet-phy@1 {
                                        interrupt-parent = <&ipic>;
                                        interrupts = <18 0x8>;
                                        reg = <0x2>;
-                                       device_type = "ethernet-phy";
                                };
 
                                tbi0: tbi-phy@11 {

diff --git a/arch/powerpc/boot/dts/c2k.dts b/arch/powerpc/boot/dts/c2k.dts
index f5d625fa3e523c8019c62a89c970dc9cb4cf202c..de2044b33336e208e20a31b831cca0f2774e139d 100644 (file)
--- a/arch/powerpc/boot/dts/c2k.dts
+++ b/arch/powerpc/boot/dts/c2k.dts
@@ -73,19 +73,16 @@
                        compatible = "marvell,mv64360-mdio";
                        reg = <0x2000 4>;
                        PHY0: ethernet-phy@0 {
-                               device_type = "ethernet-phy";
                                interrupts = <76>;      /* GPP 12 */
                                interrupt-parent = <&PIC>;
                                reg = <0>;
                        };
                        PHY1: ethernet-phy@1 {
-                               device_type = "ethernet-phy";
                                interrupts = <76>;      /* GPP 12 */
                                interrupt-parent = <&PIC>;
                                reg = <1>;
                        };
                        PHY2: ethernet-phy@2 {
-                               device_type = "ethernet-phy";
                                interrupts = <76>;      /* GPP 12 */
                                interrupt-parent = <&PIC>;
                                reg = <2>;

diff --git a/arch/powerpc/boot/dts/ep8248e.dts b/arch/powerpc/boot/dts/ep8248e.dts
index 756758fb5b7b45369fc7f3138eea3ae5f9d93bd5..244934fa24193e20bbc0ffbffb9bb6d72e973729 100644 (file)
--- a/arch/powerpc/boot/dts/ep8248e.dts
+++ b/arch/powerpc/boot/dts/ep8248e.dts
@@ -76,13 +76,11 @@
                                PHY0: ethernet-phy@0 {
                                        interrupt-parent = <&PIC>;
                                        reg = <0>;
-                                       device_type = "ethernet-phy";
                                };
 
                                PHY1: ethernet-phy@1 {
                                        interrupt-parent = <&PIC>;
                                        reg = <1>;
-                                       device_type = "ethernet-phy";
                                };
                        };
                };

diff --git a/arch/powerpc/boot/dts/ep88xc.dts b/arch/powerpc/boot/dts/ep88xc.dts
index ae57d62401209c5a5ad80abc3fd1bbdafd0013b0..2aa5bf5596459830f30ef95bd84089a47d423b1f 100644 (file)
--- a/arch/powerpc/boot/dts/ep88xc.dts
+++ b/arch/powerpc/boot/dts/ep88xc.dts
@@ -85,12 +85,10 @@
 
                        PHY0: ethernet-phy@0 {
                                reg = <0x0>;
-                               device_type = "ethernet-phy";
                        };
 
                        PHY1: ethernet-phy@1 {
                                reg = <0x1>;
-                               device_type = "ethernet-phy";
                        };
                };
 

diff --git a/arch/powerpc/boot/dts/gef_ppc9a.dts b/arch/powerpc/boot/dts/gef_ppc9a.dts
index 38dcb96c8e269f195a96118fdd897ba78e94f6a1..83eb0fda2666079c73d67e0db37c7ee24f0a5c34 100644 (file)
--- a/arch/powerpc/boot/dts/gef_ppc9a.dts
+++ b/arch/powerpc/boot/dts/gef_ppc9a.dts
@@ -292,13 +292,11 @@
                                        interrupt-parent = <&gef_pic>;
                                        interrupts = <0x9 0x4>;
                                        reg = <1>;
-                                       device_type = "ethernet-phy";
                                };
                                phy2: ethernet-phy@2 {
                                        interrupt-parent = <&gef_pic>;
                                        interrupts = <0x8 0x4>;
                                        reg = <3>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/gef_sbc310.dts b/arch/powerpc/boot/dts/gef_sbc310.dts
index 5ab8932d09b7370aa9824131c5e74290874e823e..d426dd3de9ef7f4af36e75dd1b9bfcb33109e91f 100644 (file)
--- a/arch/powerpc/boot/dts/gef_sbc310.dts
+++ b/arch/powerpc/boot/dts/gef_sbc310.dts
@@ -290,13 +290,11 @@
                                        interrupt-parent = <&gef_pic>;
                                        interrupts = <0x9 0x4>;
                                        reg = <1>;
-                                       device_type = "ethernet-phy";
                                };
                                phy2: ethernet-phy@2 {
                                        interrupt-parent = <&gef_pic>;
                                        interrupts = <0x8 0x4>;
                                        reg = <3>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/gef_sbc610.dts b/arch/powerpc/boot/dts/gef_sbc610.dts
index d5341f5741aac402a29ff71fe16896a8f4c47e2d..5db3399b76b747cd3e0b7b1027e41beb965f4965 100644 (file)
--- a/arch/powerpc/boot/dts/gef_sbc610.dts
+++ b/arch/powerpc/boot/dts/gef_sbc610.dts
@@ -290,13 +290,11 @@
                                        interrupt-parent = <&gef_pic>;
                                        interrupts = <0x9 0x4>;
                                        reg = <1>;
-                                       device_type = "ethernet-phy";
                                };
                                phy2: ethernet-phy@2 {
                                        interrupt-parent = <&gef_pic>;
                                        interrupts = <0x8 0x4>;
                                        reg = <3>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/ksi8560.dts b/arch/powerpc/boot/dts/ksi8560.dts
index 296c572ea605e991d79de406088cfab943603aa4..5d68236e7c3ce09c6993d2568bba79737c8f42c0 100644 (file)
--- a/arch/powerpc/boot/dts/ksi8560.dts
+++ b/arch/powerpc/boot/dts/ksi8560.dts
@@ -161,13 +161,11 @@
                                PHY1: ethernet-phy@1 {
                                        interrupt-parent = <&mpic>;
                                        reg = <0x1>;
-                                       device_type = "ethernet-phy";
                                };
 
                                PHY2: ethernet-phy@2 {
                                        interrupt-parent = <&mpic>;
                                        reg = <0x2>;
-                                       device_type = "ethernet-phy";
                                };
 
                                tbi0: tbi-phy@11 {
@@ -284,7 +282,6 @@
                                PHY0: ethernet-phy@0 {
                                        interrupt-parent = <&mpic>;
                                        reg = <0x0>;
-                                       device_type = "ethernet-phy";
                                };
                        };
 

diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts
index e802ebd88cb1f01c7a426037261aa83840e25226..0c92de74d065f86626184afcef56779a7906a884 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8272ads.dts
+++ b/arch/powerpc/boot/dts/mpc8272ads.dts
@@ -196,14 +196,12 @@
                                        interrupt-parent = <&PIC>;
                                        interrupts = <23 8>;
                                        reg = <0x0>;
-                                       device_type = "ethernet-phy";
                                };
 
                                PHY1: ethernet-phy@1 {
                                        interrupt-parent = <&PIC>;
                                        interrupts = <23 8>;
                                        reg = <0x3>;
-                                       device_type = "ethernet-phy";
                                };
                        };
 

diff --git a/arch/powerpc/boot/dts/mpc8308_p1m.dts b/arch/powerpc/boot/dts/mpc8308_p1m.dts
index 22b0832b6c31baf51d3662de94e36a93c1ce429e..651e4f55acdbf6f6187b1792315c780f127effde 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8308_p1m.dts
+++ b/arch/powerpc/boot/dts/mpc8308_p1m.dts
@@ -189,13 +189,11 @@
                                        interrupt-parent = <&ipic>;
                                        interrupts = <17 0x8>;
                                        reg = <0x1>;
-                                       device_type = "ethernet-phy";
                                };
                                phy2: ethernet-phy@2 {
                                        interrupt-parent = <&ipic>;
                                        interrupts = <19 0x8>;
                                        reg = <0x2>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/mpc8308rdb.dts b/arch/powerpc/boot/dts/mpc8308rdb.dts
index f66d10d95a8d5f35005cb32f8c847d79064b235f..9ce45f2efd34907014d8b228823cb0d6d3254ead 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8308rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8308rdb.dts
@@ -166,7 +166,6 @@
                                        interrupt-parent = <&ipic>;
                                        interrupts = <17 0x8>;
                                        reg = <0x2>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index 1c836c6c5be63f32bbfa4da8efbf63d6159cac27..4b635dc4ecded8c0e4729582ac1e5cc9d0f143bd 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -217,7 +217,6 @@
                                        interrupt-parent = <&ipic>;
                                        interrupts = <20 0x8>;
                                        reg = <0x4>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts
index 811848e93aef0f90eaab3f51878c8bbd0af56406..43546844ea5a9ceac95128a641f6bc7f4ca0b871 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8315erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8315erdb.dts
@@ -216,14 +216,12 @@
                                        interrupt-parent = <&ipic>;
                                        interrupts = <20 0x8>;
                                        reg = <0x0>;
-                                       device_type = "ethernet-phy";
                                };
 
                                phy1: ethernet-phy@1 {
                                        interrupt-parent = <&ipic>;
                                        interrupts = <19 0x8>;
                                        reg = <0x1>;
-                                       device_type = "ethernet-phy";
                                };
 
                                tbi0: tbi-phy@11 {

diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index da9c72ddc3436366443939614e04c916b2a3666a..0793cdf0d46e49a8bef08ffd0d29e537a947c9d4 100644 (file)
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -356,13 +356,11 @@
                                interrupt-parent = <&ipic>;
                                interrupts = <17 0x8>;
                                reg = <0x3>;
-                               device_type = "ethernet-phy";
                        };
                        phy4: ethernet-phy@04 {
                                interrupt-parent = <&ipic>;
                                interrupts = <18 0x8>;
                                reg = <0x4>;
-                               device_type = "ethernet-phy";
                        };
                };
 

diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index ff7b15b340a337dee3432cf269e2975cd4fcac8d..91df1eb166673c8e9be80934c3fb2be1a8e54381 100644 (file)
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -314,13 +314,11 @@
                                interrupt-parent = <&ipic>;
                                interrupts = <0>;
                                reg = <0x0>;
-                               device_type = "ethernet-phy";
                        };
                        phy04:ethernet-phy@04 {
                                interrupt-parent = <&ipic>;
                                interrupts = <0>;
                                reg = <0x4>;
-                               device_type = "ethernet-phy";
                        };
                };
 

diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index 2608679d0d4a4baa4072449717d8a67fdeb68608..cf8542401a3cc0a598911752dd763d506962a9a8 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -240,7 +240,6 @@
                                        interrupt-parent = <&ipic>;
                                        interrupts = <18 0x8>;
                                        reg = <0x1c>;
-                                       device_type = "ethernet-phy";
                                };
 
                                tbi0: tbi-phy@11 {

diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index 6cd044d8fb8952085757feb8f67a841a5c1298ab..f00066dcc8ded8ea9c6db53883cf54bc2feeb929 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -176,7 +176,6 @@
                                        interrupt-parent = <&ipic>;
                                        interrupts = <18 0x8>;
                                        reg = <0x1c>;
-                                       device_type = "ethernet-phy";
                                };
 
                                tbi0: tbi-phy@11 {

diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index 4552864082c271ae421e40648a1f026bfd673b5c..4843c3ff7166495a4deac82300df472f8e42210f 100644 (file)
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -193,14 +193,12 @@
                                        interrupt-parent = <&ipic>;
                                        interrupts = <17 0x8>;
                                        reg = <0x0>;
-                                       device_type = "ethernet-phy";
                                };
 
                                phy1: ethernet-phy@1 {
                                        interrupt-parent = <&ipic>;
                                        interrupts = <18 0x8>;
                                        reg = <0x1>;
-                                       device_type = "ethernet-phy";
                                };
 
                                tbi0: tbi-phy@11 {

diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 81dd513d6308554fea3f891dcc129a70525bce69..ecb6ccd3a6aad7e2dc03daf6a577b7a6fb76b4e4 100644 (file)
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -397,13 +397,11 @@
                                interrupt-parent = <&ipic>;
                                interrupts = <17 0x8>;
                                reg = <0x0>;
-                               device_type = "ethernet-phy";
                        };
                        phy1: ethernet-phy@01 {
                                interrupt-parent = <&ipic>;
                                interrupts = <18 0x8>;
                                reg = <0x1>;
-                               device_type = "ethernet-phy";
                        };
                        tbi-phy@2 {
                                device_type = "tbi-phy";

diff --git a/arch/powerpc/boot/dts/mpc836x_rdk.dts b/arch/powerpc/boot/dts/mpc836x_rdk.dts
index b6e9aec1d86061dc7035a4f0ecdb5f7e0288563c..daeacbdcf8b4648eafb9f2247f35257a08cb935f 100644 (file)
--- a/arch/powerpc/boot/dts/mpc836x_rdk.dts
+++ b/arch/powerpc/boot/dts/mpc836x_rdk.dts
@@ -332,25 +332,21 @@
                                reg = <0x2120 0x18>;
 
                                phy1: ethernet-phy@1 {
-                                       device_type = "ethernet-phy";
                                        compatible = "national,DP83848VV";
                                        reg = <1>;
                                };
 
                                phy2: ethernet-phy@2 {
-                                       device_type = "ethernet-phy";
                                        compatible = "broadcom,BCM5481UA2KMLG";
                                        reg = <2>;
                                };
 
                                phy3: ethernet-phy@3 {
-                                       device_type = "ethernet-phy";
                                        compatible = "national,DP83848VV";
                                        reg = <3>;
                                };
 
                                phy4: ethernet-phy@4 {
-                                       device_type = "ethernet-phy";
                                        compatible = "broadcom,BCM5481UA2KMLG";
                                        reg = <4>;
                                };

diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts
index cfccef57cd1df0ab3559047b04b624183e9dc52c..c2c062e8175d823f9165a055ad85d45a41e0455f 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8377_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8377_mds.dts
@@ -225,14 +225,12 @@
                                        interrupt-parent = <&ipic>;
                                        interrupts = <17 0x8>;
                                        reg = <0x2>;
-                                       device_type = "ethernet-phy";
                                };
 
                                phy3: ethernet-phy@3 {
                                        interrupt-parent = <&ipic>;
                                        interrupts = <18 0x8>;
                                        reg = <0x3>;
-                                       device_type = "ethernet-phy";
                                };
 
                                tbi0: tbi-phy@11 {

diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts
index 353deff1b7f6872d91ee7d68c6aaae996aab063f..2b4b6532d69c0fbf5f2f541098cc2a693494d364 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8377_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts
@@ -277,7 +277,6 @@
                                        interrupt-parent = <&ipic>;
                                        interrupts = <17 0x8>;
                                        reg = <0x2>;
-                                       device_type = "ethernet-phy";
                                };
 
                                tbi0: tbi-phy@11 {

diff --git a/arch/powerpc/boot/dts/mpc8377_wlan.dts b/arch/powerpc/boot/dts/mpc8377_wlan.dts
index ef4a305a0d0c07d99debe94c393f47e8a300cf62..c0c790168b96a824f726b45236ee86f1152d8b0c 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8377_wlan.dts
+++ b/arch/powerpc/boot/dts/mpc8377_wlan.dts
@@ -253,14 +253,12 @@
                                        interrupt-parent = <&ipic>;
                                        interrupts = <17 0x8>;
                                        reg = <0x2>;
-                                       device_type = "ethernet-phy";
                                };
 
                                phy3: ethernet-phy@3 {
                                        interrupt-parent = <&ipic>;
                                        interrupts = <18 0x8>;
                                        reg = <0x3>;
-                                       device_type = "ethernet-phy";
                                };
 
                                tbi0: tbi-phy@11 {

diff --git a/arch/powerpc/boot/dts/mpc8378_mds.dts b/arch/powerpc/boot/dts/mpc8378_mds.dts
index 538fcb927337c74af27733ccccc3278a8dfbc1d9..1b82b77f94157e2b9b50e59a796bbf46c50bd60a 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8378_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8378_mds.dts
@@ -264,14 +264,12 @@
                                        interrupt-parent = <&ipic>;
                                        interrupts = <17 0x8>;
                                        reg = <0x2>;
-                                       device_type = "ethernet-phy";
                                };
 
                                phy3: ethernet-phy@3 {
                                        interrupt-parent = <&ipic>;
                                        interrupts = <18 0x8>;
                                        reg = <0x3>;
-                                       device_type = "ethernet-phy";
                                };
 
                                tbi0: tbi-phy@11 {

diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts
index 32333a908f3d1fa373adb5937264b9dc790c5adc..74b6a535a413bfbf9bb7621ce8eb7ac9c0abe412 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8378_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts
@@ -277,7 +277,6 @@
                                        interrupt-parent = <&ipic>;
                                        interrupts = <17 0x8>;
                                        reg = <0x2>;
-                                       device_type = "ethernet-phy";
                                };
 
                                tbi0: tbi-phy@11 {

diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts
index 5387092fdfb44c76a4befb3fe959b0549873ad5d..38e5048d65d2faed4740a0c947b6f482683ba2c5 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8379_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8379_mds.dts
@@ -262,14 +262,12 @@
                                        interrupt-parent = <&ipic>;
                                        interrupts = <17 0x8>;
                                        reg = <0x2>;
-                                       device_type = "ethernet-phy";
                                };
 
                                phy3: ethernet-phy@3 {
                                        interrupt-parent = <&ipic>;
                                        interrupts = <18 0x8>;
                                        reg = <0x3>;
-                                       device_type = "ethernet-phy";
                                };
 
                                tbi0: tbi-phy@11 {

diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts
index 46224c2430ff0ab45d7aeeddcb3753752170c340..3b5cbac8536804eb404f4de32fc70bb9dcd5f538 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8379_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts
@@ -275,7 +275,6 @@
                                        interrupt-parent = <&ipic>;
                                        interrupts = <17 0x8>;
                                        reg = <0x2>;
-                                       device_type = "ethernet-phy";
                                };
 
                                tbi0: tbi-phy@11 {

diff --git a/arch/powerpc/boot/dts/mpc8536ds.dtsi b/arch/powerpc/boot/dts/mpc8536ds.dtsi
index 7c3dde84d193f18c98a1a8d58e1baaaf3626c36f..937ad7e461196087a21da1f476b0b97c322e139e 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8536ds.dtsi
+++ b/arch/powerpc/boot/dts/mpc8536ds.dtsi
@@ -200,12 +200,10 @@
                phy0: ethernet-phy@0 {
                        interrupts = <10 0x1 0 0>;
                        reg = <0>;
-                       device_type = "ethernet-phy";
                };
                phy1: ethernet-phy@1 {
                        interrupts = <10 0x1 0 0>;
                        reg = <1>;
-                       device_type = "ethernet-phy";
                };
                sgmii_phy0: sgmii-phy@0 {
                        interrupts = <6 1 0 0>;

diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts
index 2d31863accf5331112d575d6e44bc0152c6e47ab..7ce274c9a2d5becdefa863a9d5736cd9c277faf0 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -165,19 +165,16 @@
                                        interrupt-parent = <&mpic>;
                                        interrupts = <5 1>;
                                        reg = <0x0>;
-                                       device_type = "ethernet-phy";
                                };
                                phy1: ethernet-phy@1 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <5 1>;
                                        reg = <0x1>;
-                                       device_type = "ethernet-phy";
                                };
                                phy3: ethernet-phy@3 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <7 1>;
                                        reg = <0x3>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts
index 1c03c2667373b41181552cef1c7d64a3caac6833..4d35a3e0fb028b16af00678754f3e07e5345507e 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8541cds.dts
+++ b/arch/powerpc/boot/dts/mpc8541cds.dts
@@ -165,13 +165,11 @@
                                        interrupt-parent = <&mpic>;
                                        interrupts = <5 1>;
                                        reg = <0x0>;
-                                       device_type = "ethernet-phy";
                                };
                                phy1: ethernet-phy@1 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <5 1>;
                                        reg = <0x1>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/mpc8544ds.dtsi b/arch/powerpc/boot/dts/mpc8544ds.dtsi
index b219d035d7943d64a6ca13fb09b3a0c95dfcf01f..47d986b041f69b98c9ff02c4c44c2006f5c80746 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8544ds.dtsi
+++ b/arch/powerpc/boot/dts/mpc8544ds.dtsi
@@ -82,12 +82,10 @@
                phy0: ethernet-phy@0 {
                        interrupts = <10 1 0 0>;
                        reg = <0x0>;
-                       device_type = "ethernet-phy";
                };
                phy1: ethernet-phy@1 {
                        interrupts = <10 1 0 0>;
                        reg = <0x1>;
-                       device_type = "ethernet-phy";
                };
 
                sgmii_phy0: sgmii-phy@0 {

diff --git a/arch/powerpc/boot/dts/mpc8548cds.dtsi b/arch/powerpc/boot/dts/mpc8548cds.dtsi
index c61f525e474028bbd1022adca1da0840b031832d..3bc7d4711220f41e27d1cf08ca08541da882b798 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8548cds.dtsi
+++ b/arch/powerpc/boot/dts/mpc8548cds.dtsi
@@ -109,22 +109,18 @@
                phy0: ethernet-phy@0 {
                        interrupts = <5 1 0 0>;
                        reg = <0x0>;
-                       device_type = "ethernet-phy";
                };
                phy1: ethernet-phy@1 {
                        interrupts = <5 1 0 0>;
                        reg = <0x1>;
-                       device_type = "ethernet-phy";
                };
                phy2: ethernet-phy@2 {
                        interrupts = <5 1 0 0>;
                        reg = <0x2>;
-                       device_type = "ethernet-phy";
                };
                phy3: ethernet-phy@3 {
                        interrupts = <5 1 0 0>;
                        reg = <0x3>;
-                       device_type = "ethernet-phy";
                };
                tbi0: tbi-phy@11 {
                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts
index 36a7ea138c2f4a5c89e9596e8ec9fd41cb4f9f3c..f115f21cb0ae6defc1d55556cfdaea548aba160d 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8555cds.dts
+++ b/arch/powerpc/boot/dts/mpc8555cds.dts
@@ -165,13 +165,11 @@
                                        interrupt-parent = <&mpic>;
                                        interrupts = <5 1>;
                                        reg = <0x0>;
-                                       device_type = "ethernet-phy";
                                };
                                phy1: ethernet-phy@1 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <5 1>;
                                        reg = <0x1>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts
index 1a43f5a968f565c1a33787e4ae02d938758f35c1..0d70921d61258c13dd0e2246c71b19d2214c808a 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8560ads.dts
+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -154,25 +154,21 @@
                                        interrupt-parent = <&mpic>;
                                        interrupts = <5 1>;
                                        reg = <0x0>;
-                                       device_type = "ethernet-phy";
                                };
                                phy1: ethernet-phy@1 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <5 1>;
                                        reg = <0x1>;
-                                       device_type = "ethernet-phy";
                                };
                                phy2: ethernet-phy@2 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <7 1>;
                                        reg = <0x2>;
-                                       device_type = "ethernet-phy";
                                };
                                phy3: ethernet-phy@3 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <7 1>;
                                        reg = <0x3>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index 09598bb5d443497669ebdc998fbbca30e085371f..bead2b655b9f04e4660e2440979ff89e78f2e73c 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -91,22 +91,18 @@
                        phy0: ethernet-phy@7 {
                                interrupts = <1 1 0 0>;
                                reg = <0x7>;
-                               device_type = "ethernet-phy";
                        };
                        phy1: ethernet-phy@1 {
                                interrupts = <2 1 0 0>;
                                reg = <0x1>;
-                               device_type = "ethernet-phy";
                        };
                        phy2: ethernet-phy@2 {
                                interrupts = <1 1 0 0>;
                                reg = <0x2>;
-                               device_type = "ethernet-phy";
                        };
                        phy3: ethernet-phy@3 {
                                interrupts = <2 1 0 0>;
                                reg = <0x3>;
-                               device_type = "ethernet-phy";
                        };
                        tbi0: tbi-phy@11 {
                                reg = <0x11>;
@@ -236,25 +232,21 @@
                                interrupt-parent = <&mpic>;
                                interrupts = <1 1 0 0>;
                                reg = <0x7>;
-                               device_type = "ethernet-phy";
                        };
                        qe_phy1: ethernet-phy@01 {
                                interrupt-parent = <&mpic>;
                                interrupts = <2 1 0 0>;
                                reg = <0x1>;
-                               device_type = "ethernet-phy";
                        };
                        qe_phy2: ethernet-phy@02 {
                                interrupt-parent = <&mpic>;
                                interrupts = <1 1 0 0>;
                                reg = <0x2>;
-                               device_type = "ethernet-phy";
                        };
                        qe_phy3: ethernet-phy@03 {
                                interrupt-parent = <&mpic>;
                                interrupts = <2 1 0 0>;
                                reg = <0x3>;
-                               device_type = "ethernet-phy";
                        };
                };
        };

diff --git a/arch/powerpc/boot/dts/mpc8569mds.dts b/arch/powerpc/boot/dts/mpc8569mds.dts
index fe0d60935e9be10109d2ed0ee7c65b9e493d9777..d0dcdafa5eb22d752ae723a49756f61eed4b0870 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8569mds.dts
+++ b/arch/powerpc/boot/dts/mpc8569mds.dts
@@ -276,33 +276,27 @@
                                interrupt-parent = <&mpic>;
                                interrupts = <1 1 0 0>;
                                reg = <0x7>;
-                               device_type = "ethernet-phy";
                        };
                        qe_phy1: ethernet-phy@01 {
                                interrupt-parent = <&mpic>;
                                interrupts = <2 1 0 0>;
                                reg = <0x1>;
-                               device_type = "ethernet-phy";
                        };
                        qe_phy2: ethernet-phy@02 {
                                interrupt-parent = <&mpic>;
                                interrupts = <3 1 0 0>;
                                reg = <0x2>;
-                               device_type = "ethernet-phy";
                        };
                        qe_phy3: ethernet-phy@03 {
                                interrupt-parent = <&mpic>;
                                interrupts = <4 1 0 0>;
                                reg = <0x3>;
-                               device_type = "ethernet-phy";
                        };
                        qe_phy5: ethernet-phy@04 {
                                reg = <0x04>;
-                               device_type = "ethernet-phy";
                        };
                        qe_phy7: ethernet-phy@06 {
                                reg = <0x6>;
-                               device_type = "ethernet-phy";
                        };
                        tbi1: tbi-phy@11 {
                                reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index 1e8666ccbed89b2ac6e2943d515f165e5399d156..1c03060dd0b8559d09c2c7b7d9caad6bd7d70f7f 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -211,25 +211,21 @@
                                        interrupt-parent = <&mpic>;
                                        interrupts = <10 1>;
                                        reg = <0>;
-                                       device_type = "ethernet-phy";
                                };
                                phy1: ethernet-phy@1 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <10 1>;
                                        reg = <1>;
-                                       device_type = "ethernet-phy";
                                };
                                phy2: ethernet-phy@2 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <10 1>;
                                        reg = <2>;
-                                       device_type = "ethernet-phy";
                                };
                                phy3: ethernet-phy@3 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <10 1>;
                                        reg = <3>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts b/arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts
index fd4cd4da60b5785b256f877937c2c20d8c3c5e1c..bb575e28042a2aa8483f8fc97e17dd0f49190c32 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts
@@ -211,25 +211,21 @@
                                        interrupt-parent = <&mpic>;
                                        interrupts = <10 1>;
                                        reg = <0>;
-                                       device_type = "ethernet-phy";
                                };
                                phy1: ethernet-phy@1 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <10 1>;
                                        reg = <1>;
-                                       device_type = "ethernet-phy";
                                };
                                phy2: ethernet-phy@2 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <10 1>;
                                        reg = <2>;
-                                       device_type = "ethernet-phy";
                                };
                                phy3: ethernet-phy@3 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <10 1>;
                                        reg = <3>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/mpc866ads.dts b/arch/powerpc/boot/dts/mpc866ads.dts
index bd700651f360d220e4b7d85c2261532f5095f68c..34c1f48b1a09835b5d73abda38ea5ffad15ce603 100644 (file)
--- a/arch/powerpc/boot/dts/mpc866ads.dts
+++ b/arch/powerpc/boot/dts/mpc866ads.dts
@@ -74,7 +74,6 @@
                        #size-cells = <0>;
                        PHY: ethernet-phy@f {
                                reg = <0xf>;
-                               device_type = "ethernet-phy";
                        };
                };
 

diff --git a/arch/powerpc/boot/dts/mpc885ads.dts b/arch/powerpc/boot/dts/mpc885ads.dts
index b123e9f7a5a860d2125682918bf9f46fe690dff4..4e93bd961e0f6c2c9638e79e0a7f38bbebb12cdf 100644 (file)
--- a/arch/powerpc/boot/dts/mpc885ads.dts
+++ b/arch/powerpc/boot/dts/mpc885ads.dts
@@ -86,17 +86,14 @@
 
                        PHY0: ethernet-phy@0 {
                                reg = <0x0>;
-                               device_type = "ethernet-phy";
                        };
 
                        PHY1: ethernet-phy@1 {
                                reg = <0x1>;
-                               device_type = "ethernet-phy";
                        };
 
                        PHY2: ethernet-phy@2 {
                                reg = <0x2>;
-                               device_type = "ethernet-phy";
                        };
                };
 

diff --git a/arch/powerpc/boot/dts/p1021mds.dts b/arch/powerpc/boot/dts/p1021mds.dts
index 97116f198a37fa1c793e1fb09d11090bd7f51515..76559044df419e32dd85197b35771fe8eef0b21a 100644 (file)
--- a/arch/powerpc/boot/dts/p1021mds.dts
+++ b/arch/powerpc/boot/dts/p1021mds.dts
@@ -295,13 +295,11 @@
                                interrupt-parent = <&mpic>;
                                interrupts = <4 1 0 0>;
                                reg = <0x0>;
-                               device_type = "ethernet-phy";
                        };
                        qe_phy1: ethernet-phy@03 {
                                interrupt-parent = <&mpic>;
                                interrupts = <5 1 0 0>;
                                reg = <0x3>;
-                               device_type = "ethernet-phy";
                        };
                        tbi-phy@11 {
                                reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/p1025rdb_32b.dts b/arch/powerpc/boot/dts/p1025rdb_32b.dts
index ac5729c14eda6eec69aa9dcc0850410e7486992c..a2ed6280ba7a3a8072892f7385311a32560baae0 100644 (file)
--- a/arch/powerpc/boot/dts/p1025rdb_32b.dts
+++ b/arch/powerpc/boot/dts/p1025rdb_32b.dts
@@ -105,13 +105,11 @@
                                interrupt-parent = <&mpic>;
                                interrupts = <4 1 0 0>;
                                reg = <0x6>;
-                               device_type = "ethernet-phy";
                        };
                        qe_phy1: ethernet-phy@03 {
                                interrupt-parent = <&mpic>;
                                interrupts = <5 1 0 0>;
                                reg = <0x3>;
-                               device_type = "ethernet-phy";
                        };
                        tbi-phy@11 {
                                reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/ppa8548.dts b/arch/powerpc/boot/dts/ppa8548.dts
index f97eceed610a5873a680813a8118670282cdc9b6..27b0699ee923bc158a50316f7b6cb724b8b62954 100644 (file)
--- a/arch/powerpc/boot/dts/ppa8548.dts
+++ b/arch/powerpc/boot/dts/ppa8548.dts
@@ -110,12 +110,10 @@
                phy0: ethernet-phy@0 {
                        interrupts = <7 1 0 0>;
                        reg = <0x0>;
-                       device_type = "ethernet-phy";
                };
                phy1: ethernet-phy@1 {
                        interrupts = <8 1 0 0>;
                        reg = <0x1>;
-                       device_type = "ethernet-phy";
                };
                tbi0: tbi-phy@11 {
                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/pq2fads.dts b/arch/powerpc/boot/dts/pq2fads.dts
index 0bb6693767437bcbe8fe66e96fb16abbc07b8034..9d065cdeb5eb2d218f1f844bfde73013c31bfed8 100644 (file)
--- a/arch/powerpc/boot/dts/pq2fads.dts
+++ b/arch/powerpc/boot/dts/pq2fads.dts
@@ -212,14 +212,12 @@
                                        interrupt-parent = <&PIC>;
                                        interrupts = <25 2>;
                                        reg = <0x0>;
-                                       device_type = "ethernet-phy";
                                };
 
                                PHY1: ethernet-phy@1 {
                                        interrupt-parent = <&PIC>;
                                        interrupts = <25 2>;
                                        reg = <0x3>;
-                                       device_type = "ethernet-phy";
                                };
                        };
 

diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index 1ee6ff43dd57e772e543297a7b22b5809e7f6f48..909e8b0ead26a6c3687ef8aac212881aa9db8fd4 100644 (file)
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -76,14 +76,12 @@
                        device_type = "mdio";
                        compatible = "marvell,mv64360-mdio";
                        PHY0: ethernet-phy@1 {
-                               device_type = "ethernet-phy";
                                compatible = "broadcom,bcm5421";
                                interrupts = <76>;      /* GPP 12 */
                                interrupt-parent = <&PIC>;
                                reg = <1>;
                        };
                        PHY1: ethernet-phy@3 {
-                               device_type = "ethernet-phy";
                                compatible = "broadcom,bcm5421";
                                interrupts = <76>;      /* GPP 12 */
                                interrupt-parent = <&PIC>;

diff --git a/arch/powerpc/boot/dts/sbc8349.dts b/arch/powerpc/boot/dts/sbc8349.dts
index b1e45a8537a5b30b5b9d575757e4f3a5413c4492..fc89e00b765cf3f100ac567c803f4da4193c149e 100644 (file)
--- a/arch/powerpc/boot/dts/sbc8349.dts
+++ b/arch/powerpc/boot/dts/sbc8349.dts
@@ -173,14 +173,12 @@
                                        interrupt-parent = <&ipic>;
                                        interrupts = <20 0x8>;
                                        reg = <0x19>;
-                                       device_type = "ethernet-phy";
                                };
 
                                phy1: ethernet-phy@1a {
                                        interrupt-parent = <&ipic>;
                                        interrupts = <21 0x8>;
                                        reg = <0x1a>;
-                                       device_type = "ethernet-phy";
                                };
 
                                tbi0: tbi-phy@11 {

diff --git a/arch/powerpc/boot/dts/sbc8548-post.dtsi b/arch/powerpc/boot/dts/sbc8548-post.dtsi
index 33a47e27a11e3578665efc4aeb005967abb1be27..9b505c8e53507f6aae4f23b9f4d4fdc3b7f05bce 100644 (file)
--- a/arch/powerpc/boot/dts/sbc8548-post.dtsi
+++ b/arch/powerpc/boot/dts/sbc8548-post.dtsi
@@ -137,13 +137,11 @@
                                        interrupt-parent = <&mpic>;
                                        interrupts = <0x6 0x1>;
                                        reg = <0x19>;
-                                       device_type = "ethernet-phy";
                                };
                                phy1: ethernet-phy@1a {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <0x7 0x1>;
                                        reg = <0x1a>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/sbc8641d.dts b/arch/powerpc/boot/dts/sbc8641d.dts
index 56bebce878425ff113b477a87af706474662f578..631ede72e226c31c8d9f610bc583fc9f93802191 100644 (file)
--- a/arch/powerpc/boot/dts/sbc8641d.dts
+++ b/arch/powerpc/boot/dts/sbc8641d.dts
@@ -230,25 +230,21 @@
                                        interrupt-parent = <&mpic>;
                                        interrupts = <10 1>;
                                        reg = <0x1f>;
-                                       device_type = "ethernet-phy";
                                };
                                phy1: ethernet-phy@0 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <10 1>;
                                        reg = <0>;
-                                       device_type = "ethernet-phy";
                                };
                                phy2: ethernet-phy@1 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <10 1>;
                                        reg = <1>;
-                                       device_type = "ethernet-phy";
                                };
                                phy3: ethernet-phy@2 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <10 1>;
                                        reg = <2>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/stx_gp3_8560.dts b/arch/powerpc/boot/dts/stx_gp3_8560.dts
index b670d03fbcd91ba172bb14d14fb8db519aa2fd2c..78a72ee4820572bae6cf74f5334b41032b671d93 100644 (file)
--- a/arch/powerpc/boot/dts/stx_gp3_8560.dts
+++ b/arch/powerpc/boot/dts/stx_gp3_8560.dts
@@ -161,13 +161,11 @@
                                        interrupt-parent = <&mpic>;
                                        interrupts = <5 4>;
                                        reg = <2>;
-                                       device_type = "ethernet-phy";
                                };
                                phy4: ethernet-phy@4 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <5 4>;
                                        reg = <4>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/stxssa8555.dts b/arch/powerpc/boot/dts/stxssa8555.dts
index 4f166b01c1b6ba4969baca7478269a70fdce5bc3..859f854ba538331369c6f8a5b0705cab1a5d81c1 100644 (file)
--- a/arch/powerpc/boot/dts/stxssa8555.dts
+++ b/arch/powerpc/boot/dts/stxssa8555.dts
@@ -164,13 +164,11 @@
                                        interrupt-parent = <&mpic>;
                                        interrupts = <5 1>;
                                        reg = <0x2>;
-                                       device_type = "ethernet-phy";
                                };
                                phy1: ethernet-phy@4 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <5 1>;
                                        reg = <0x4>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/tqm8540.dts b/arch/powerpc/boot/dts/tqm8540.dts
index ed264d9ae3566ebbc5f8778a11b9ef81e35c5a52..91cbd7acd276a228fd0339fff36edaefafbb8b88 100644 (file)
--- a/arch/powerpc/boot/dts/tqm8540.dts
+++ b/arch/powerpc/boot/dts/tqm8540.dts
@@ -172,19 +172,16 @@
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <1>;
-                                       device_type = "ethernet-phy";
                                };
                                phy2: ethernet-phy@2 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <2>;
-                                       device_type = "ethernet-phy";
                                };
                                phy3: ethernet-phy@3 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <3>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/tqm8541.dts b/arch/powerpc/boot/dts/tqm8541.dts
index 925242115814284fa9065949955438b9094a5a17..84dce2d5fc482e914c1025d89ea6083f9f2ac505 100644 (file)
--- a/arch/powerpc/boot/dts/tqm8541.dts
+++ b/arch/powerpc/boot/dts/tqm8541.dts
@@ -172,19 +172,16 @@
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <1>;
-                                       device_type = "ethernet-phy";
                                };
                                phy2: ethernet-phy@2 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <2>;
-                                       device_type = "ethernet-phy";
                                };
                                phy3: ethernet-phy@3 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <3>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/tqm8548-bigflash.dts b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
index 6e1ac50852a44992fa973cc1450600c745e092db..7a333dd02d9ca4c2a16a45a56920fbc597d6e58a 100644 (file)
--- a/arch/powerpc/boot/dts/tqm8548-bigflash.dts
+++ b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
@@ -185,31 +185,26 @@
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <1>;
-                                       device_type = "ethernet-phy";
                                };
                                phy2: ethernet-phy@1 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <2>;
-                                       device_type = "ethernet-phy";
                                };
                                phy3: ethernet-phy@3 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <3>;
-                                       device_type = "ethernet-phy";
                                };
                                phy4: ethernet-phy@4 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <4>;
-                                       device_type = "ethernet-phy";
                                };
                                phy5: ethernet-phy@5 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <5>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/tqm8548.dts b/arch/powerpc/boot/dts/tqm8548.dts
index 161e75eac7f7450361738dc4010688c28ccec969..c737caff10c78634fcad1dbfd09ceb9196bb27f4 100644 (file)
--- a/arch/powerpc/boot/dts/tqm8548.dts
+++ b/arch/powerpc/boot/dts/tqm8548.dts
@@ -185,31 +185,26 @@
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <1>;
-                                       device_type = "ethernet-phy";
                                };
                                phy2: ethernet-phy@1 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <2>;
-                                       device_type = "ethernet-phy";
                                };
                                phy3: ethernet-phy@3 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <3>;
-                                       device_type = "ethernet-phy";
                                };
                                phy4: ethernet-phy@4 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <4>;
-                                       device_type = "ethernet-phy";
                                };
                                phy5: ethernet-phy@5 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <5>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/tqm8555.dts b/arch/powerpc/boot/dts/tqm8555.dts
index aa6ff0d3dd9af1546c59ec96c15f90d878d24b63..d0416a5cdddf08392a7e821021a15b2267fd33bb 100644 (file)
--- a/arch/powerpc/boot/dts/tqm8555.dts
+++ b/arch/powerpc/boot/dts/tqm8555.dts
@@ -172,19 +172,16 @@
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <1>;
-                                       device_type = "ethernet-phy";
                                };
                                phy2: ethernet-phy@2 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <2>;
-                                       device_type = "ethernet-phy";
                                };
                                phy3: ethernet-phy@3 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <3>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/tqm8560.dts b/arch/powerpc/boot/dts/tqm8560.dts
index 7665a16a8b9a70c9643f9a9a4f47a2fbf4f7b819..f9a11ebf736c47948d6815009aa06afe207f5f56 100644 (file)
--- a/arch/powerpc/boot/dts/tqm8560.dts
+++ b/arch/powerpc/boot/dts/tqm8560.dts
@@ -174,19 +174,16 @@
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <1>;
-                                       device_type = "ethernet-phy";
                                };
                                phy2: ethernet-phy@2 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <2>;
-                                       device_type = "ethernet-phy";
                                };
                                phy3: ethernet-phy@3 {
                                        interrupt-parent = <&mpic>;
                                        interrupts = <8 1>;
                                        reg = <3>;
-                                       device_type = "ethernet-phy";
                                };
                                tbi0: tbi-phy@11 {
                                        reg = <0x11>;

diff --git a/arch/powerpc/boot/dts/tqm8xx.dts b/arch/powerpc/boot/dts/tqm8xx.dts
index c3dba2518d8cb06ea219906dfb6dae0e9959de2f..3d1446b99c7e711bbbe7e8aacacd0d82af47a394 100644 (file)
--- a/arch/powerpc/boot/dts/tqm8xx.dts
+++ b/arch/powerpc/boot/dts/tqm8xx.dts
@@ -107,7 +107,6 @@
                        #size-cells = <0>;
                        PHY: ethernet-phy@f {
                                reg = <0xf>;
-                               device_type = "ethernet-phy";
                        };
                };