49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
|
From b8d2ade6a08d350c15efcb257881761765ae1eb6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Geis <pgwipeout@gmail.com>
|
||
|
|
Date: Tue, 27 Jul 2021 13:25:23 -0400
|
||
|
|
Subject: [PATCH 426/478] phy: phy-rockchip-inno-usb2: support #address_cells =
|
||
|
|
2
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 11 ++++++++++-
|
||
|
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
|
||
|
|
index 4f569d9307b9..9dc5c5dbb4ad 100644
|
||
|
|
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
|
||
|
|
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
|
||
|
|
@@ -1098,12 +1098,21 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
|
||
|
|
rphy->usbgrf = NULL;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (of_property_read_u32(np, "reg", ®)) {
|
||
|
|
+ if (of_property_read_u32_index(np, "reg", 0, ®)) {
|
||
|
|
dev_err(dev, "the reg property is not assigned in %pOFn node\n",
|
||
|
|
np);
|
||
|
|
return -EINVAL;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ /* support address_cells=2 */
|
||
|
|
+ if (reg == 0) {
|
||
|
|
+ if (of_property_read_u32_index(np, "reg", 1, ®)) {
|
||
|
|
+ dev_err(dev, "the reg property is not assigned in %pOFn node\n",
|
||
|
|
+ np);
|
||
|
|
+ return -EINVAL;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
rphy->dev = dev;
|
||
|
|
phy_cfgs = match->data;
|
||
|
|
rphy->chg_state = USB_CHG_STATE_UNDEFINED;
|
||
|
|
--
|
||
|
|
2.35.3
|
||
|
|
|