mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-14 00:47:26 +00:00
dm: core: Provide fallbacks for ofnode_conf_read_...
Because fdt_get_config_str et al. were moved/renamed to
ofnode_conf_read_str, they now depend on CONFIG_DM as well as
CONFIG_OF_CONTROL. Add some fallback implementations, preventing a
linker error when CONFIG_SPL_OF_CONTROL and CONFIG_SPL_ENV_IS_IN_MMC are
enabled and CONFIG_SPL_DM is disabled.
Fixes: 7de8bd03c3
("treewide: fdt: Move fdt_get_config_... to ofnode_conf_read...")
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
This commit is contained in:
parent
24057fe0a8
commit
8b52f237f0
1 changed files with 42 additions and 24 deletions
|
@ -1181,6 +1181,33 @@ int ofnode_write_string(ofnode node, const char *propname, const char *value);
|
||||||
*/
|
*/
|
||||||
int ofnode_set_enabled(ofnode node, bool value);
|
int ofnode_set_enabled(ofnode node, bool value);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ofnode_get_phy_node() - Get PHY node for a MAC (if not fixed-link)
|
||||||
|
*
|
||||||
|
* This function parses PHY handle from the Ethernet controller's ofnode
|
||||||
|
* (trying all possible PHY handle property names), and returns the PHY ofnode.
|
||||||
|
*
|
||||||
|
* Before this is used, ofnode_phy_is_fixed_link() should be checked first, and
|
||||||
|
* if the result to that is true, this function should not be called.
|
||||||
|
*
|
||||||
|
* @eth_node: ofnode belonging to the Ethernet controller
|
||||||
|
* Return: ofnode of the PHY, if it exists, otherwise an invalid ofnode
|
||||||
|
*/
|
||||||
|
ofnode ofnode_get_phy_node(ofnode eth_node);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ofnode_read_phy_mode() - Read PHY connection type from a MAC node
|
||||||
|
*
|
||||||
|
* This function parses the "phy-mode" / "phy-connection-type" property and
|
||||||
|
* returns the corresponding PHY interface type.
|
||||||
|
*
|
||||||
|
* @mac_node: ofnode containing the property
|
||||||
|
* Return: one of PHY_INTERFACE_MODE_* constants, PHY_INTERFACE_MODE_NA on
|
||||||
|
* error
|
||||||
|
*/
|
||||||
|
phy_interface_t ofnode_read_phy_mode(ofnode mac_node);
|
||||||
|
|
||||||
|
#if CONFIG_IS_ENABLED(DM)
|
||||||
/**
|
/**
|
||||||
* ofnode_conf_read_bool() - Read a boolean value from the U-Boot config
|
* ofnode_conf_read_bool() - Read a boolean value from the U-Boot config
|
||||||
*
|
*
|
||||||
|
@ -1218,30 +1245,21 @@ int ofnode_conf_read_int(const char *prop_name, int default_val);
|
||||||
*/
|
*/
|
||||||
const char *ofnode_conf_read_str(const char *prop_name);
|
const char *ofnode_conf_read_str(const char *prop_name);
|
||||||
|
|
||||||
/**
|
#else /* CONFIG_DM */
|
||||||
* ofnode_get_phy_node() - Get PHY node for a MAC (if not fixed-link)
|
static inline bool ofnode_conf_read_bool(const char *prop_name)
|
||||||
*
|
{
|
||||||
* This function parses PHY handle from the Ethernet controller's ofnode
|
return false;
|
||||||
* (trying all possible PHY handle property names), and returns the PHY ofnode.
|
}
|
||||||
*
|
|
||||||
* Before this is used, ofnode_phy_is_fixed_link() should be checked first, and
|
|
||||||
* if the result to that is true, this function should not be called.
|
|
||||||
*
|
|
||||||
* @eth_node: ofnode belonging to the Ethernet controller
|
|
||||||
* Return: ofnode of the PHY, if it exists, otherwise an invalid ofnode
|
|
||||||
*/
|
|
||||||
ofnode ofnode_get_phy_node(ofnode eth_node);
|
|
||||||
|
|
||||||
/**
|
static inline int ofnode_conf_read_int(const char *prop_name, int default_val)
|
||||||
* ofnode_read_phy_mode() - Read PHY connection type from a MAC node
|
{
|
||||||
*
|
return default_val;
|
||||||
* This function parses the "phy-mode" / "phy-connection-type" property and
|
}
|
||||||
* returns the corresponding PHY interface type.
|
|
||||||
*
|
static inline const char *ofnode_conf_read_str(const char *prop_name)
|
||||||
* @mac_node: ofnode containing the property
|
{
|
||||||
* Return: one of PHY_INTERFACE_MODE_* constants, PHY_INTERFACE_MODE_NA on
|
return NULL;
|
||||||
* error
|
}
|
||||||
*/
|
#endif /* CONFIG_DM */
|
||||||
phy_interface_t ofnode_read_phy_mode(ofnode mac_node);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue