LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Peter Geis <pgwipeout@gmail.com>
To: Kishon Vijay Abraham I <kishon@ti.com>,
	Vinod Koul <vkoul@kernel.org>, Heiko Stuebner <heiko@sntech.de>
Cc: Peter Geis <pgwipeout@gmail.com>,
	linux-phy@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 3/8] phy: phy-rockchip-inno-usb2: support #address_cells = 2
Date: Thu, 12 Aug 2021 16:41:11 -0400	[thread overview]
Message-ID: <20210812204116.2303617-4-pgwipeout@gmail.com> (raw)
In-Reply-To: <20210812204116.2303617-1-pgwipeout@gmail.com>

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 beacac1dd253..5d2916143df7 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", &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;
-- 
2.25.1


  parent reply	other threads:[~2021-08-12 20:42 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-12 20:41 [PATCH v2 0/8] phy-rockchip-inno-usb2: support rk356x usb2phy Peter Geis
2021-08-12 20:41 ` [PATCH v2 1/8] dt-bindings: soc: rockchip: add rk3568-usb2phy-grf Peter Geis
2021-08-17 21:31   ` Rob Herring
2021-08-12 20:41 ` [PATCH v2 2/8] dt-bindings: phy: phy-rockchip-inno-usb2: add rk3568 documentation Peter Geis
2021-08-17 16:52   ` Johan Jonker
2021-08-17 21:43     ` Rob Herring
2021-08-12 20:41 ` Peter Geis [this message]
2021-08-12 20:41 ` [PATCH v2 4/8] phy: phy-rockchip-inno-usb2: support standalone phy nodes Peter Geis
2021-08-12 20:41 ` [PATCH v2 5/8] phy: phy-rockchip-inno-usb2: support muxed interrupts Peter Geis
2021-08-12 20:41 ` [PATCH v2 6/8] phy: phy-rockchip-inno-usb2: add rk3568 support Peter Geis
2021-08-12 20:41 ` [PATCH v2 7/8] arm64: dts: rockchip: add usb2 nodes to rk3568 device tree Peter Geis
2021-10-14 10:02   ` Michael Riesch
2021-08-12 20:41 ` [PATCH v2 8/8] arm64: dts: rockchip: add Quartz64-A usb2 support Peter Geis
2021-10-14 10:11 ` [PATCH v2 0/8] phy-rockchip-inno-usb2: support rk356x usb2phy Michael Riesch

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210812204116.2303617-4-pgwipeout@gmail.com \
    --to=pgwipeout@gmail.com \
    --cc=heiko@sntech.de \
    --cc=kishon@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-phy@lists.infradead.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=vkoul@kernel.org \
    --subject='Re: [PATCH v2 3/8] phy: phy-rockchip-inno-usb2: support #address_cells = 2' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).