diff options
| author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2008-01-24 18:40:01 +0300 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2008-01-28 08:32:56 -0600 |
| commit | d0a2f82da949283027a7da6a8b2a70ada46e7b55 (patch) | |
| tree | 5d1a72da88e3d30a93dbac27927269919d3f2a27 | |
| parent | a2dd70a11d4c9cb8a4e4bb41f53a9b430e08559b (diff) | |
| download | kernel_samsung_smdk4412-d0a2f82da949283027a7da6a8b2a70ada46e7b55.zip kernel_samsung_smdk4412-d0a2f82da949283027a7da6a8b2a70ada46e7b55.tar.gz kernel_samsung_smdk4412-d0a2f82da949283027a7da6a8b2a70ada46e7b55.tar.bz2 | |
ucc_geth: get rid of device_type for mdio
device_type property is bogus, thus use proper compatible.
Also change compatible property to "fsl,ucc-mdio".
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/boot/dts/mpc832x_mds.dts | 3 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/mpc832x_rdb.dts | 3 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/mpc836x_mds.dts | 3 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8568mds.dts | 2 | ||||
| -rw-r--r-- | drivers/net/ucc_geth_mii.c | 3 |
5 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts index e300df4..1bb75ef 100644 --- a/arch/powerpc/boot/dts/mpc832x_mds.dts +++ b/arch/powerpc/boot/dts/mpc832x_mds.dts @@ -304,8 +304,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <2320 18>; - device_type = "mdio"; - compatible = "ucc_geth_phy"; + compatible = "fsl,ucc-mdio"; phy3: ethernet-phy@03 { interrupt-parent = < &ipic >; diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts index 4d5cfd3..f6a8633 100644 --- a/arch/powerpc/boot/dts/mpc832x_rdb.dts +++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts @@ -237,8 +237,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <3120 18>; - device_type = "mdio"; - compatible = "ucc_geth_phy"; + compatible = "fsl,ucc-mdio"; phy00:ethernet-phy@00 { interrupt-parent = <&pic>; diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts index 9a2581b..fa98bdf 100644 --- a/arch/powerpc/boot/dts/mpc836x_mds.dts +++ b/arch/powerpc/boot/dts/mpc836x_mds.dts @@ -288,8 +288,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <2120 18>; - device_type = "mdio"; - compatible = "ucc_geth_phy"; + compatible = "fsl,ucc-mdio"; phy0: ethernet-phy@00 { interrupt-parent = < &ipic >; diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts index 04f5c6f..692d5bd 100644 --- a/arch/powerpc/boot/dts/mpc8568mds.dts +++ b/arch/powerpc/boot/dts/mpc8568mds.dts @@ -357,7 +357,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <2120 18>; - compatible = "ucc_geth_phy"; + compatible = "fsl,ucc-mdio"; /* These are the same PHYs as on * gianfar's MDIO bus */ diff --git a/drivers/net/ucc_geth_mii.c b/drivers/net/ucc_geth_mii.c index df884f0..e3ba14a 100644 --- a/drivers/net/ucc_geth_mii.c +++ b/drivers/net/ucc_geth_mii.c @@ -256,6 +256,9 @@ static struct of_device_id uec_mdio_match[] = { .type = "mdio", .compatible = "ucc_geth_phy", }, + { + .compatible = "fsl,ucc-mdio", + }, {}, }; |