diff options
| author | Tom Rini <trini@konsulko.com> | 2024-09-20 09:10:30 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-09-20 09:10:30 -0600 |
| commit | e10b72f4b77922c564f4bbcef054fdb67f039563 (patch) | |
| tree | b28f703231ce940128b7bb2e9e7d61c1b78c8d49 /drivers | |
| parent | c97ada2dc66934ee00a7a03d9ed078bdfb7b4039 (diff) | |
| parent | 28a4e4314902aa48de61a8abf3596df3544541e0 (diff) | |
Merge patch series "mux: mmio: support "reg-mux" compatible"
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.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mux/mmio.c | 7 | ||||
| -rw-r--r-- | drivers/phy/cadence/phy-cadence-sierra.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/mux/mmio.c b/drivers/mux/mmio.c index e1125458a62..e06f4462b5a 100644 --- a/drivers/mux/mmio.c +++ b/drivers/mux/mmio.c @@ -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), ®map); + if (IS_ERR(regmap)) { ret = PTR_ERR(regmap); dev_err(dev, "failed to get regmap: %d\n", ret); diff --git a/drivers/phy/cadence/phy-cadence-sierra.c b/drivers/phy/cadence/phy-cadence-sierra.c index f5e23f36c56..2c9d5a12127 100644 --- a/drivers/phy/cadence/phy-cadence-sierra.c +++ b/drivers/phy/cadence/phy-cadence-sierra.c @@ -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: |