dt/bindings: remove device_type "network" references

device_type is deprecated and the kernel doesn't require it in most
cases. The only exceptions for flat tree users are the "gianfar",
"ucc_geth" and "ibm,emac" bindings, and arguably that requirement could
be relaxed for ucc_geth and ibm,emac (that is a task for separate
patches though).

This patch removes references to device_type="network" from the binding
documentation where possible and removes the properties from ARM and
microblaze dts files. This patch does not modify the powerpc .dts files
since there are a much larger number of them affected and I think the
ucc_geth, ibm,emac and gianfar users should be addressed before clearing
out the references to reduce the chance of breakage.

Signed-off-by: Grant Likely <grant.likely@linaro.org>
Acked-by: Michal Simek <monstr@monstr.eu>
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>

diff --git a/Documentation/devicetree/bindings/marvell.txt b/Documentation/devicetree/bindings/marvell.txt
index a5409ca27bc2c0af638873767d54272dbd850086..bc287efea4756ec6a29c15e18b810e8d4f834811 100644 (file)
--- a/Documentation/devicetree/bindings/marvell.txt
+++ b/Documentation/devicetree/bindings/marvell.txt
@@ -130,7 +130,6 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd.
    Ethernet port node
 
    Required properties:
-     - device_type : Should be "network".
      - compatible : Should be "marvell,mv64360-eth".
      - reg : Should be <0>, <1>, or <2>, according to which registers
        within the silicon block the device uses.
@@ -143,7 +142,6 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd.
 
    Example Discovery Ethernet port node:
      ethernet@0 {
-            device_type = "network";
             compatible = "marvell,mv64360-eth";
             reg = <0>;
             interrupts = <32>;

diff --git a/Documentation/devicetree/bindings/net/marvell-orion-net.txt b/Documentation/devicetree/bindings/net/marvell-orion-net.txt
index 4a10716ff59dd7eae36e01beead6444d02c2890d..c233b61142427c0c2793b936798aad4eaf17403b 100644 (file)
--- a/Documentation/devicetree/bindings/net/marvell-orion-net.txt
+++ b/Documentation/devicetree/bindings/net/marvell-orion-net.txt
@@ -32,7 +32,6 @@ Optional controller properties:
 * Ethernet port node
 
 Required port properties:
- - device_type: shall be "network".
  - compatible: shall be one of "marvell,orion-eth-port",
       "marvell,kirkwood-eth-port".
  - reg: port number relative to ethernet controller, shall be 0, 1, or 2.
@@ -74,7 +73,6 @@ eth: ethernet-controller@72000 {
        marvell,tx-checksum-limit = <1600>;
 
        ethernet@0 {
-               device_type = "network";
                compatible = "marvell,orion-eth-port";
                reg = <0>;
                interrupts = <29>;

diff --git a/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/network.txt b/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/network.txt
index 38cc6c9849ec223563fc41107db5a7ff30877021..29b28b8f9a89b830c9a498c60445f51fe0d9d8f0 100644 (file)
--- a/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/network.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/network.txt
@@ -10,7 +10,6 @@ Currently defined compatibles:
 Example:
 
        ethernet@11300 {
-               device_type = "network";
                compatible = "fsl,mpc8272-fcc-enet",
                             "fsl,cpm2-fcc-enet";
                reg = <11300 20 8400 100 11390 1>;

diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 9311edf441c6e5d0e3175fbbba772d981b03dc3d..39ffabe04cc53b345c85f674354d8387f226f4e1 100644 (file)
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -573,7 +573,6 @@
                                status = "disabled";
 
                                ethernet-port@0 {
-                                       device_type = "network";
                                        compatible = "marvell,orion-eth-port";
                                        reg = <0>;
                                        interrupts = <29>;

diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 8b73c80f1dad40995be65547ee5caa4a4fbffdaa..2c9d3808d61d1e6384d110ebcc1e870815807864 100644 (file)
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -253,7 +253,6 @@
                        status = "disabled";
 
                        ethernet0-port@0 {
-                               device_type = "network";
                                compatible = "marvell,kirkwood-eth-port";
                                reg = <0>;
                                interrupts = <11>;
@@ -273,7 +272,6 @@
                        status = "disabled";
 
                        ethernet1-port@0 {
-                               device_type = "network";
                                compatible = "marvell,kirkwood-eth-port";
                                reg = <0>;
                                interrupts = <15>;

diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
index e06c37e91ac69b0ebbbe0d772264cb61b45be906..b1645462e2709941697d23d757ed92cdd7a5b069 100644 (file)
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -154,7 +154,6 @@
                        status = "disabled";
 
                        ethernet-port@0 {
-                               device_type = "network";
                                compatible = "marvell,orion-eth-port";
                                reg = <0>;
                                /* overwrite MAC address in bootloader */

diff --git a/arch/microblaze/platform/generic/system.dts b/arch/microblaze/platform/generic/system.dts
index 3f85df2b73b3ecd21fb4a0d4d118544e4fc290f0..b620da23febbfda27eb5eaddd89937c6618b321f 100644 (file)
--- a/arch/microblaze/platform/generic/system.dts
+++ b/arch/microblaze/platform/generic/system.dts
@@ -222,7 +222,6 @@
                        ranges ;
                        ethernet@81c00000 {
                                compatible = "xlnx,xps-ll-temac-1.01.b", "xlnx,xps-ll-temac-1.00.a";
-                               device_type = "network";
                                interrupt-parent = <&xps_intc_0>;
                                interrupts = < 5 2 >;
                                llink-connected = <&PIM3>;