Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-02 09:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge patch series "mux: mmio: support "reg-mux" compatible"

Browse Source 
Roger Quadros <rogerq@kernel.org> says:

TI upstream has moved from "mmio-mux" to "reg-mux" that doesn't
require the Mux device node's parent to be a syscon type.

Add support for "reg-mux" compatible.
This commit is contained in:
Tom Rini
2024-09-20 09:10:30 -06:00
parent c97ada2dc6 28a4e43149
commit e10b72f4b7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mux/mmio.c
View File

@@ -31,6 +31,7 @@ static const struct mux_control_ops mux_mmio_ops = {
static const struct udevice_id mmio_mux_of_match[] = {
{ .compatible = "mmio-mux" },
{ .compatible = "reg-mux" },
{ /* sentinel */ },
};
@@ -45,7 +46,11 @@ static int mmio_mux_probe(struct udevice *dev)
int ret;
int i;
regmap = syscon_node_to_regmap(dev_ofnode(dev->parent));
if (ofnode_device_is_compatible(dev_ofnode(dev), "mmio-mux"))
regmap = syscon_node_to_regmap(dev_ofnode(dev->parent));
else
regmap_init_mem(dev_ofnode(dev), &regmap);
if (IS_ERR(regmap)) {
ret = PTR_ERR(regmap);
dev_err(dev, "failed to get regmap: %d\n", ret);

2
drivers/phy/cadence/phy-cadence-sierra.c
View File

@@ -1126,7 +1126,7 @@ static int cdns_sierra_phy_probe(struct udevice *dev)
sp->autoconf = dev_read_bool(dev, "cdns,autoconf");
dev_info(dev, "sierra probed\n");
dev_dbg(dev, "sierra probed\n");
return 0;
clk_disable: