tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

phy: phy-rockchip-inno-usb2: support #address_cells = 2

Browse Source 
New Rockchip devices have the usb phy nodes as standalone devices.
These nodes have register nodes with #address_cells = 2, but only use 32
bit addresses.

Adjust the driver to check if the returned address is "0", and adjust
the index in that case.

Signed-off-by: Peter Geis <pgwipeout@gmail.com>
Tested-by: Michael Riesch <michael.riesch@wolfvision.net>
Link: https://lore.kernel.org/r/20211215210252.120923-4-pgwipeout@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Peter Geis
2021-12-15 16:02:47 -05:00
committed by Vinod Koul
parent 8eff5b9904
commit 9c19c531dc
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+10 -1
View File
@@ -1090,12 +1090,21 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
rphy->usbgrf = NULL; rphy->usbgrf = NULL;
} }
if (of_property_read_u32(np, "reg", &reg)) { if (of_property_read_u32_index(np, "reg", 0, &reg)) {
dev_err(dev, "the reg property is not assigned in %pOFn node\n", dev_err(dev, "the reg property is not assigned in %pOFn node\n",
np); np);
return -EINVAL; return -EINVAL;
} }
/* support address_cells=2 */
if (reg == 0) {
if (of_property_read_u32_index(np, "reg", 1, &reg)) {
dev_err(dev, "the reg property is not assigned in %pOFn node\n",
np);
return -EINVAL;
}
}
rphy->dev = dev; rphy->dev = dev;
phy_cfgs = match->data; phy_cfgs = match->data;
rphy->chg_state = USB_CHG_STATE_UNDEFINED; rphy->chg_state = USB_CHG_STATE_UNDEFINED;