Commit 35129175 authored by Grant Likely's avatar Grant Likely

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: default avatarGrant Likely <grant.likely@linaro.org>
Acked-by: default avatarMichal 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>
parent dae95c1f
...@@ -130,7 +130,6 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd. ...@@ -130,7 +130,6 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd.
Ethernet port node Ethernet port node
Required properties: Required properties:
- device_type : Should be "network".
- compatible : Should be "marvell,mv64360-eth". - compatible : Should be "marvell,mv64360-eth".
- reg : Should be <0>, <1>, or <2>, according to which registers - reg : Should be <0>, <1>, or <2>, according to which registers
within the silicon block the device uses. within the silicon block the device uses.
...@@ -143,7 +142,6 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd. ...@@ -143,7 +142,6 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd.
Example Discovery Ethernet port node: Example Discovery Ethernet port node:
ethernet@0 { ethernet@0 {
device_type = "network";
compatible = "marvell,mv64360-eth"; compatible = "marvell,mv64360-eth";
reg = <0>; reg = <0>;
interrupts = <32>; interrupts = <32>;
......
...@@ -32,7 +32,6 @@ Optional controller properties: ...@@ -32,7 +32,6 @@ Optional controller properties:
* Ethernet port node * Ethernet port node
Required port properties: Required port properties:
- device_type: shall be "network".
- compatible: shall be one of "marvell,orion-eth-port", - compatible: shall be one of "marvell,orion-eth-port",
"marvell,kirkwood-eth-port". "marvell,kirkwood-eth-port".
- reg: port number relative to ethernet controller, shall be 0, 1, or 2. - reg: port number relative to ethernet controller, shall be 0, 1, or 2.
...@@ -74,7 +73,6 @@ eth: ethernet-controller@72000 { ...@@ -74,7 +73,6 @@ eth: ethernet-controller@72000 {
marvell,tx-checksum-limit = <1600>; marvell,tx-checksum-limit = <1600>;
ethernet@0 { ethernet@0 {
device_type = "network";
compatible = "marvell,orion-eth-port"; compatible = "marvell,orion-eth-port";
reg = <0>; reg = <0>;
interrupts = <29>; interrupts = <29>;
......
...@@ -10,7 +10,6 @@ Currently defined compatibles: ...@@ -10,7 +10,6 @@ Currently defined compatibles:
Example: Example:
ethernet@11300 { ethernet@11300 {
device_type = "network";
compatible = "fsl,mpc8272-fcc-enet", compatible = "fsl,mpc8272-fcc-enet",
"fsl,cpm2-fcc-enet"; "fsl,cpm2-fcc-enet";
reg = <11300 20 8400 100 11390 1>; reg = <11300 20 8400 100 11390 1>;
......
...@@ -573,7 +573,6 @@ eth: ethernet-ctrl@72000 { ...@@ -573,7 +573,6 @@ eth: ethernet-ctrl@72000 {
status = "disabled"; status = "disabled";
ethernet-port@0 { ethernet-port@0 {
device_type = "network";
compatible = "marvell,orion-eth-port"; compatible = "marvell,orion-eth-port";
reg = <0>; reg = <0>;
interrupts = <29>; interrupts = <29>;
......
...@@ -253,7 +253,6 @@ eth0: ethernet-controller@72000 { ...@@ -253,7 +253,6 @@ eth0: ethernet-controller@72000 {
status = "disabled"; status = "disabled";
ethernet0-port@0 { ethernet0-port@0 {
device_type = "network";
compatible = "marvell,kirkwood-eth-port"; compatible = "marvell,kirkwood-eth-port";
reg = <0>; reg = <0>;
interrupts = <11>; interrupts = <11>;
...@@ -273,7 +272,6 @@ eth1: ethernet-controller@76000 { ...@@ -273,7 +272,6 @@ eth1: ethernet-controller@76000 {
status = "disabled"; status = "disabled";
ethernet1-port@0 { ethernet1-port@0 {
device_type = "network";
compatible = "marvell,kirkwood-eth-port"; compatible = "marvell,kirkwood-eth-port";
reg = <0>; reg = <0>;
interrupts = <15>; interrupts = <15>;
......
...@@ -154,7 +154,6 @@ eth: ethernet-controller@72000 { ...@@ -154,7 +154,6 @@ eth: ethernet-controller@72000 {
status = "disabled"; status = "disabled";
ethernet-port@0 { ethernet-port@0 {
device_type = "network";
compatible = "marvell,orion-eth-port"; compatible = "marvell,orion-eth-port";
reg = <0>; reg = <0>;
/* overwrite MAC address in bootloader */ /* overwrite MAC address in bootloader */
......
...@@ -222,7 +222,6 @@ Hard_Ethernet_MAC: xps-ll-temac@81c00000 { ...@@ -222,7 +222,6 @@ Hard_Ethernet_MAC: xps-ll-temac@81c00000 {
ranges ; ranges ;
ethernet@81c00000 { ethernet@81c00000 {
compatible = "xlnx,xps-ll-temac-1.01.b", "xlnx,xps-ll-temac-1.00.a"; compatible = "xlnx,xps-ll-temac-1.01.b", "xlnx,xps-ll-temac-1.00.a";
device_type = "network";
interrupt-parent = <&xps_intc_0>; interrupt-parent = <&xps_intc_0>;
interrupts = < 5 2 >; interrupts = < 5 2 >;
llink-connected = <&PIM3>; llink-connected = <&PIM3>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment