diff options
Diffstat (limited to 'drivers/net/ucc_geth.c')
-rw-r--r-- | drivers/net/ucc_geth.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 639e1e6913bf..12d394ffade7 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
@@ -4080,16 +4080,16 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma | |||
4080 | 4080 | ||
4081 | ugeth_vdbg("%s: IN", __FUNCTION__); | 4081 | ugeth_vdbg("%s: IN", __FUNCTION__); |
4082 | 4082 | ||
4083 | prop = get_property(np, "device-id", NULL); | 4083 | prop = of_get_property(np, "device-id", NULL); |
4084 | ucc_num = *prop - 1; | 4084 | ucc_num = *prop - 1; |
4085 | if ((ucc_num < 0) || (ucc_num > 7)) | 4085 | if ((ucc_num < 0) || (ucc_num > 7)) |
4086 | return -ENODEV; | 4086 | return -ENODEV; |
4087 | 4087 | ||
4088 | ug_info = &ugeth_info[ucc_num]; | 4088 | ug_info = &ugeth_info[ucc_num]; |
4089 | ug_info->uf_info.ucc_num = ucc_num; | 4089 | ug_info->uf_info.ucc_num = ucc_num; |
4090 | prop = get_property(np, "rx-clock", NULL); | 4090 | prop = of_get_property(np, "rx-clock", NULL); |
4091 | ug_info->uf_info.rx_clock = *prop; | 4091 | ug_info->uf_info.rx_clock = *prop; |
4092 | prop = get_property(np, "tx-clock", NULL); | 4092 | prop = of_get_property(np, "tx-clock", NULL); |
4093 | ug_info->uf_info.tx_clock = *prop; | 4093 | ug_info->uf_info.tx_clock = *prop; |
4094 | err = of_address_to_resource(np, 0, &res); | 4094 | err = of_address_to_resource(np, 0, &res); |
4095 | if (err) | 4095 | if (err) |
@@ -4098,15 +4098,15 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma | |||
4098 | ug_info->uf_info.regs = res.start; | 4098 | ug_info->uf_info.regs = res.start; |
4099 | ug_info->uf_info.irq = irq_of_parse_and_map(np, 0); | 4099 | ug_info->uf_info.irq = irq_of_parse_and_map(np, 0); |
4100 | 4100 | ||
4101 | ph = get_property(np, "phy-handle", NULL); | 4101 | ph = of_get_property(np, "phy-handle", NULL); |
4102 | phy = of_find_node_by_phandle(*ph); | 4102 | phy = of_find_node_by_phandle(*ph); |
4103 | 4103 | ||
4104 | if (phy == NULL) | 4104 | if (phy == NULL) |
4105 | return -ENODEV; | 4105 | return -ENODEV; |
4106 | 4106 | ||
4107 | prop = get_property(phy, "reg", NULL); | 4107 | prop = of_get_property(phy, "reg", NULL); |
4108 | ug_info->phy_address = *prop; | 4108 | ug_info->phy_address = *prop; |
4109 | prop = get_property(phy, "interface", NULL); | 4109 | prop = of_get_property(phy, "interface", NULL); |
4110 | ug_info->enet_interface = *prop; | 4110 | ug_info->enet_interface = *prop; |
4111 | ug_info->phy_interrupt = irq_of_parse_and_map(phy, 0); | 4111 | ug_info->phy_interrupt = irq_of_parse_and_map(phy, 0); |
4112 | ug_info->board_flags = (ug_info->phy_interrupt == NO_IRQ)? | 4112 | ug_info->board_flags = (ug_info->phy_interrupt == NO_IRQ)? |
@@ -4127,7 +4127,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma | |||
4127 | /* timing. */ | 4127 | /* timing. */ |
4128 | /* The following compensates by writing to the reserved */ | 4128 | /* The following compensates by writing to the reserved */ |
4129 | /* QE Port Output Hold Registers (CPOH1?). */ | 4129 | /* QE Port Output Hold Registers (CPOH1?). */ |
4130 | prop = get_property(phy, "interface", NULL); | 4130 | prop = of_get_property(phy, "interface", NULL); |
4131 | phy_interface = *prop; | 4131 | phy_interface = *prop; |
4132 | if ((phy_interface == ENET_1000_RGMII) || | 4132 | if ((phy_interface == ENET_1000_RGMII) || |
4133 | (phy_interface == ENET_100_RGMII) || | 4133 | (phy_interface == ENET_100_RGMII) || |
@@ -4140,7 +4140,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma | |||
4140 | soc = of_find_node_by_type(NULL, "soc"); | 4140 | soc = of_find_node_by_type(NULL, "soc"); |
4141 | if (soc) { | 4141 | if (soc) { |
4142 | unsigned int size; | 4142 | unsigned int size; |
4143 | const void *prop = get_property(soc, "reg", &size); | 4143 | const void *prop = of_get_property(soc, "reg", &size); |
4144 | immrbase = of_translate_address(soc, prop); | 4144 | immrbase = of_translate_address(soc, prop); |
4145 | of_node_put(soc); | 4145 | of_node_put(soc); |
4146 | }; | 4146 | }; |