Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35129175 authored by Grant Likely's avatar Grant Likely
Browse files

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

Documentation/devicetree/bindings/marvell.txt

+0 −2
Original line number Diff line number Diff line
@@ -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>;

Documentation/devicetree/bindings/net/marvell-orion-net.txt

+0 −2
Original line number Diff line number Diff line
@@ -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>;

Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/network.txt

+0 −1
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/dove.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -573,7 +573,6 @@ 
				status = "disabled";



				ethernet-port@0 {

					device_type = "network";

					compatible = "marvell,orion-eth-port";

					reg = <0>;

					interrupts = <29>;

arch/arm/boot/dts/kirkwood.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -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>;