hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

device property: Introduce fwnode_get_phy_mode() 

Until now there were two almost identical functions for
obtaining network PHY mode - of_get_phy_mode() and,
more generic, device_get_phy_mode(). However it is not uncommon,
that the network interface is represented as a child
of the actual controller, hence it is not associated
directly to any struct device, required by the latter
routine.

This commit allows for getting the PHY mode for
children nodes in the ACPI world by introducing a new function -
fwnode_get_phy_mode(). This commit also changes
device_get_phy_mode() routine to be its wrapper, in order
to prevent unnecessary duplication.

Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Marcin Wojtas 2018-01-18 13:31:39 +01:00 committed by David S. Miller
parent babe2dbb28
commit b28f263b86
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/base/property.c
View File

@ -1126,21 +1126,21 @@ enum dev_dma_attr device_get_dma_attr(struct device *dev)
EXPORT_SYMBOL_GPL(device_get_dma_attr); EXPORT_SYMBOL_GPL(device_get_dma_attr);
/** /**
* device_get_phy_mode - Get phy mode for given device * fwnode_get_phy_mode - Get phy mode for given firmware node
* @dev: Pointer to the given device * @fwnode: Pointer to the given node
* *
* The function gets phy interface string from property 'phy-mode' or * The function gets phy interface string from property 'phy-mode' or
* 'phy-connection-type', and return its index in phy_modes table, or errno in * 'phy-connection-type', and return its index in phy_modes table, or errno in
* error case. * error case.
*/ */
int device_get_phy_mode(struct device *dev) int fwnode_get_phy_mode(struct fwnode_handle *fwnode)
{ {
const char *pm; const char *pm;
int err, i; int err, i;
err = device_property_read_string(dev, "phy-mode", &pm); err = fwnode_property_read_string(fwnode, "phy-mode", &pm);
if (err < 0) if (err < 0)
err = device_property_read_string(dev, err = fwnode_property_read_string(fwnode,
"phy-connection-type", &pm); "phy-connection-type", &pm);
if (err < 0) if (err < 0)
return err; return err;
@ -1151,6 +1151,20 @@ int device_get_phy_mode(struct device *dev)
return -ENODEV; return -ENODEV;
} }
EXPORT_SYMBOL_GPL(fwnode_get_phy_mode);
/**
* device_get_phy_mode - Get phy mode for given device
* @dev: Pointer to the given device
*
* The function gets phy interface string from property 'phy-mode' or
* 'phy-connection-type', and return its index in phy_modes table, or errno in
* error case.
*/
int device_get_phy_mode(struct device *dev)
{
return fwnode_get_phy_mode(dev_fwnode(dev));
}
EXPORT_SYMBOL_GPL(device_get_phy_mode); EXPORT_SYMBOL_GPL(device_get_phy_mode);
static void *fwnode_get_mac_addr(struct fwnode_handle *fwnode, static void *fwnode_get_mac_addr(struct fwnode_handle *fwnode,

1
include/linux/property.h
View File

@ -279,6 +279,7 @@ int device_get_phy_mode(struct device *dev);
void *device_get_mac_address(struct device *dev, char *addr, int alen); void *device_get_mac_address(struct device *dev, char *addr, int alen);
int fwnode_get_phy_mode(struct fwnode_handle *fwnode);
void *fwnode_get_mac_address(struct fwnode_handle *fwnode, void *fwnode_get_mac_address(struct fwnode_handle *fwnode,
char *addr, int alen); char *addr, int alen);
struct fwnode_handle *fwnode_graph_get_next_endpoint( struct fwnode_handle *fwnode_graph_get_next_endpoint(