diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-07-22 13:16:41 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-07-22 13:16:41 +1000 |
| commit | 4b575f3e8aba07688fc48025efde41036e5d5eee (patch) | |
| tree | 4bbccce83e80af179500be45f9e8080315f5e32e /arch/powerpc/boot/dts | |
| parent | f7723f0eaf53d51ee54374116b25ac33e0be8542 (diff) | |
| parent | a8e616b9a41212655042f59c969f30bb7de1ec73 (diff) | |
| download | op-kernel-dev-4b575f3e8aba07688fc48025efde41036e5d5eee.zip op-kernel-dev-4b575f3e8aba07688fc48025efde41036e5d5eee.tar.gz | |
Merge remote-tracking branch 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/boot/dts')
| -rw-r--r-- | arch/powerpc/boot/dts/taishan.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/taishan.dts b/arch/powerpc/boot/dts/taishan.dts index 058438f..1657ad0 100644 --- a/arch/powerpc/boot/dts/taishan.dts +++ b/arch/powerpc/boot/dts/taishan.dts @@ -337,7 +337,7 @@ rx-fifo-size = <4096>; tx-fifo-size = <2048>; phy-mode = "rgmii"; - phy-map = <0x00000001>; + phy-address = <1>; rgmii-device = <&RGMII0>; rgmii-channel = <0>; zmii-device = <&ZMII0>; @@ -361,7 +361,7 @@ rx-fifo-size = <4096>; tx-fifo-size = <2048>; phy-mode = "rgmii"; - phy-map = <0x00000003>; + phy-address = <3>; rgmii-device = <&RGMII0>; rgmii-channel = <1>; zmii-device = <&ZMII0>; |
