diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:50:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:50:19 -0400 |
commit | df6d3916f3b7b7e2067567a256dd4f0c1ea854a2 (patch) | |
tree | 0fdeab1ab5d566605fc99aeb5ea3f621f11e7608 /drivers/net/ucc_geth.c | |
parent | 74add80cbd7fe246c893b93ee75ac59acdd01dd4 (diff) | |
parent | 197686dfe0038fd190326d118b743ff65ad20c0e (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits)
[POWERPC] Abolish powerpc_flash_init()
[POWERPC] Early serial debug support for PPC44x
[POWERPC] Support for the Ebony 440GP reference board in arch/powerpc
[POWERPC] Add device tree for Ebony
[POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now
[POWERPC] MPIC U3/U4 MSI backend
[POWERPC] MPIC MSI allocator
[POWERPC] Enable MSI mappings for MPIC
[POWERPC] Tell Phyp we support MSI
[POWERPC] RTAS MSI implementation
[POWERPC] PowerPC MSI infrastructure
[POWERPC] Rip out the existing powerpc msi stubs
[POWERPC] Remove use of 4level-fixup.h for ppc32
[POWERPC] Add powerpc PCI-E reset API implementation
[POWERPC] Holly bootwrapper
[POWERPC] Holly DTS
[POWERPC] Holly defconfig
[POWERPC] Add support for 750CL Holly board
[POWERPC] Generalize tsi108 PCI setup
[POWERPC] Generalize tsi108 PHY types
...
Fixed conflict in include/asm-powerpc/kdebug.h manually
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/ucc_geth.c')
-rw-r--r-- | drivers/net/ucc_geth.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 16b9acdabbe8..d7aff8189377 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
@@ -3787,7 +3787,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma | |||
3787 | 3787 | ||
3788 | ugeth_vdbg("%s: IN", __FUNCTION__); | 3788 | ugeth_vdbg("%s: IN", __FUNCTION__); |
3789 | 3789 | ||
3790 | prop = get_property(np, "device-id", NULL); | 3790 | prop = of_get_property(np, "device-id", NULL); |
3791 | ucc_num = *prop - 1; | 3791 | ucc_num = *prop - 1; |
3792 | if ((ucc_num < 0) || (ucc_num > 7)) | 3792 | if ((ucc_num < 0) || (ucc_num > 7)) |
3793 | return -ENODEV; | 3793 | return -ENODEV; |
@@ -3795,9 +3795,9 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma | |||
3795 | ug_info = &ugeth_info[ucc_num]; | 3795 | ug_info = &ugeth_info[ucc_num]; |
3796 | ug_info->uf_info.ucc_num = ucc_num; | 3796 | ug_info->uf_info.ucc_num = ucc_num; |
3797 | 3797 | ||
3798 | prop = get_property(np, "rx-clock", NULL); | 3798 | prop = of_get_property(np, "rx-clock", NULL); |
3799 | ug_info->uf_info.rx_clock = *prop; | 3799 | ug_info->uf_info.rx_clock = *prop; |
3800 | prop = get_property(np, "tx-clock", NULL); | 3800 | prop = of_get_property(np, "tx-clock", NULL); |
3801 | ug_info->uf_info.tx_clock = *prop; | 3801 | ug_info->uf_info.tx_clock = *prop; |
3802 | err = of_address_to_resource(np, 0, &res); | 3802 | err = of_address_to_resource(np, 0, &res); |
3803 | if (err) | 3803 | if (err) |
@@ -3806,23 +3806,23 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma | |||
3806 | ug_info->uf_info.regs = res.start; | 3806 | ug_info->uf_info.regs = res.start; |
3807 | ug_info->uf_info.irq = irq_of_parse_and_map(np, 0); | 3807 | ug_info->uf_info.irq = irq_of_parse_and_map(np, 0); |
3808 | 3808 | ||
3809 | ph = get_property(np, "phy-handle", NULL); | 3809 | ph = of_get_property(np, "phy-handle", NULL); |
3810 | phy = of_find_node_by_phandle(*ph); | 3810 | phy = of_find_node_by_phandle(*ph); |
3811 | 3811 | ||
3812 | if (phy == NULL) | 3812 | if (phy == NULL) |
3813 | return -ENODEV; | 3813 | return -ENODEV; |
3814 | 3814 | ||
3815 | /* set the PHY address */ | 3815 | /* set the PHY address */ |
3816 | prop = get_property(phy, "reg", NULL); | 3816 | prop = of_get_property(phy, "reg", NULL); |
3817 | if (prop == NULL) | 3817 | if (prop == NULL) |
3818 | return -1; | 3818 | return -1; |
3819 | ug_info->phy_address = *prop; | 3819 | ug_info->phy_address = *prop; |
3820 | 3820 | ||
3821 | /* get the phy interface type, or default to MII */ | 3821 | /* get the phy interface type, or default to MII */ |
3822 | prop = get_property(np, "interface-type", NULL); | 3822 | prop = of_get_property(np, "interface-type", NULL); |
3823 | if (!prop) { | 3823 | if (!prop) { |
3824 | /* handle interface property present in old trees */ | 3824 | /* handle interface property present in old trees */ |
3825 | prop = get_property(phy, "interface", NULL); | 3825 | prop = of_get_property(phy, "interface", NULL); |
3826 | if (prop != NULL) | 3826 | if (prop != NULL) |
3827 | phy_interface = enet_to_phy_interface[*prop]; | 3827 | phy_interface = enet_to_phy_interface[*prop]; |
3828 | else | 3828 | else |
@@ -3832,10 +3832,10 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma | |||
3832 | } | 3832 | } |
3833 | 3833 | ||
3834 | /* get speed, or derive from interface */ | 3834 | /* get speed, or derive from interface */ |
3835 | prop = get_property(np, "max-speed", NULL); | 3835 | prop = of_get_property(np, "max-speed", NULL); |
3836 | if (!prop) { | 3836 | if (!prop) { |
3837 | /* handle interface property present in old trees */ | 3837 | /* handle interface property present in old trees */ |
3838 | prop = get_property(phy, "interface", NULL); | 3838 | prop = of_get_property(phy, "interface", NULL); |
3839 | if (prop != NULL) | 3839 | if (prop != NULL) |
3840 | max_speed = enet_to_speed[*prop]; | 3840 | max_speed = enet_to_speed[*prop]; |
3841 | } else { | 3841 | } else { |