Commit 9c19c531 authored by Peter Geis's avatar Peter Geis Committed by Vinod Koul
Browse files

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: default avatarPeter Geis <pgwipeout@gmail.com>
Tested-by: default avatarMichael Riesch <michael.riesch@wolfvision.net>
Link: https://lore.kernel.org/r/20211215210252.120923-4-pgwipeout@gmail.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 8eff5b99

drivers/phy/rockchip/phy-rockchip-inno-usb2.c

+10 −1
Original line number Diff line number Diff line
@@ -1090,12 +1090,21 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev) 
		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",

			np);

		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;

	phy_cfgs = match->data;

	rphy->chg_state = USB_CHG_STATE_UNDEFINED;