mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 14:23:38 +00:00
64b3d5a061
Manually rebased: target/linux/generic/hack-5.15/953-net-patch-linux-kernel-to-support-shortcut-fe.patch All other patches automatically rebased. Build system: x86_64 Fixes: #10071 Signed-off-by: Linhui Liu <liulinhui36@gmail.com>
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From 9c19c531dc98d7ba49b44802a607042e763ebe21 Mon Sep 17 00:00:00 2001
|
|
From: Peter Geis <pgwipeout@gmail.com>
|
|
Date: Wed, 15 Dec 2021 16:02:47 -0500
|
|
Subject: [PATCH] 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>
|
|
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>
|
|
---
|
|
drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 11 ++++++++++-
|
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
--- 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
|
|
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;
|