Commit 40aad3c1 authored by Grant Likely's avatar Grant Likely
Browse files

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: default avatarGrant Likely <grant.likely@linaro.org>
Acked-by: default avatarSrinivas 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>
parent d6e0a2dd

Documentation/devicetree/bindings/marvell.txt

+0 −2
Original line number Original line Diff line number Diff line
@@ -159,7 +159,6 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd. 
   c) Marvell Discovery PHY nodes

   c) Marvell Discovery PHY nodes





   Required properties:

   Required properties:

     - device_type : Should be "ethernet-phy"

     - interrupts : <a> where a is the interrupt number for this phy.

     - interrupts : <a> where a is the interrupt number for this phy.

     - interrupt-parent : the phandle for the interrupt controller that

     - interrupt-parent : the phandle for the interrupt controller that

       services interrupts for this device.

       services interrupts for this device.
@@ -167,7 +166,6 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd. 




   Example Discovery PHY node:

   Example Discovery PHY node:

     ethernet-phy@1 {

     ethernet-phy@1 {

	     device_type = "ethernet-phy";

	     compatible = "broadcom,bcm5421";

	     compatible = "broadcom,bcm5421";

	     interrupts = <76>;      /* GPP 12 */

	     interrupts = <76>;      /* GPP 12 */

	     interrupt-parent = <&PIC>;

	     interrupt-parent = <&PIC>;

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,6 @@ or 
mdio-bus {

mdio-bus {

	...

	...

	ethphy: ethernet-phy@8 {

	ethphy: ethernet-phy@8 {

		device_type = "ethernet-phy";

		...

		...

	};

	};

};

};

Documentation/devicetree/bindings/net/phy.txt

+0 −2
Original line number Original line Diff line number Diff line
@@ -2,7 +2,6 @@ PHY nodes 




Required properties:

Required properties:





 - device_type : Should be "ethernet-phy"

 - interrupts : <a b> where a is the interrupt number and b is a

 - interrupts : <a b> where a is the interrupt number and b is a

   field that represents an encoding of the sense and level

   field that represents an encoding of the sense and level

   information for the interrupt.  This should be encoded based on

   information for the interrupt.  This should be encoded based on
@@ -31,5 +30,4 @@ ethernet-phy@0 { 
	interrupt-parent = <40000>;

	interrupt-parent = <40000>;

	interrupts = <35 1>;

	interrupts = <35 1>;

	reg = <0>;

	reg = <0>;

	device_type = "ethernet-phy";

};
 
};

Documentation/devicetree/booting-without-of.txt

+0 −3
Original line number Original line Diff line number Diff line
@@ -1364,19 +1364,16 @@ Appendix A - Sample SOC node for MPC8540 
				phy0: ethernet-phy@0 {

				phy0: ethernet-phy@0 {

					interrupts = <5 1>;

					interrupts = <5 1>;

					reg = <0>;

					reg = <0>;

					device_type = "ethernet-phy";

				};

				};





				phy1: ethernet-phy@1 {

				phy1: ethernet-phy@1 {

					interrupts = <5 1>;

					interrupts = <5 1>;

					reg = <1>;

					reg = <1>;

					device_type = "ethernet-phy";

				};

				};





				phy3: ethernet-phy@3 {

				phy3: ethernet-phy@3 {

					interrupts = <7 1>;

					interrupts = <7 1>;

					reg = <3>;

					reg = <3>;

					device_type = "ethernet-phy";

				};

				};

			};

			};

		};

		};

arch/arm/boot/dts/dove.dtsi

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

				status = "disabled";





				ethphy: ethernet-phy {

				ethphy: ethernet-phy {

					device-type = "ethernet-phy";

					/* set phy address in board file */

					/* set phy address in board file */

				};

				};

			};

			};

CRA Git | Maintained and supported by SUSTech CRA and CCSE