rk3528-10-phy-rockchip-inno-usb2: split IS_ERR(rphy->grf) per-branch

Address CodeRabbit's review feedback on PR #9785: the consolidated
IS_ERR(rphy->grf) check at the end of both branches printed
"failed to locate usbgrf" even when the parent-syscon lookup in
the else branch failed (which has nothing to do with the usbgrf
phandle). Split the check per-branch so the diagnostic only fires
when the lookup it refers to actually failed; the else branch now
fails silently before the phy_base alias, matching upstream Linux's
existing per-branch error-handling convention for this driver.

No behavioral change beyond more accurate error logging on the
older-SoC path. Applied identically to rockchip64-6.18, 7.0, 7.1.

Signed-off-by: Shlomi Marco <s.marco@rubycomm.com>

Author: rubycomm

patch/kernel/archive/rockchip64-6.18/rk3528-10-phy-rockchip-inno-usb2-Add-support-for-RK3528.patch

@@ -21,8 +21,8 @@ next-20250910-rk3528 branch.
 
 Signed-off-by: Shlomi Marco <s.marco@rubycomm.com>
 ---
- drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 162 ++++++++--
- 1 file changed, 129 insertions(+), 33 deletions(-)
+ drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 164 ++++++++--
+ 1 file changed, 131 insertions(+), 33 deletions(-)
 
 diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
 index 111111111111..222222222222 100644
@@ -141,7 +141,7 @@ index 111111111111..222222222222 100644
  }
 
  static unsigned long
-@@ -1360,27 +1381,20 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
+@@ -1360,27 +1381,22 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
  	if (!rphy)
  		return -ENOMEM;
 
@@ -157,6 +157,10 @@ index 111111111111..222222222222 100644
 +		if (IS_ERR(rphy->phy_base))
 +			return PTR_ERR(rphy->phy_base);
 +		rphy->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,usbgrf");
++		if (IS_ERR(rphy->grf)) {
++			dev_err(dev, "failed to locate usbgrf\n");
++			return PTR_ERR(rphy->grf);
++		}
  	} else {
  		rphy->grf = syscon_node_to_regmap(dev->parent->of_node);
 -		if (IS_ERR(rphy->grf))
@@ -171,16 +175,14 @@ index 111111111111..222222222222 100644
 -			return PTR_ERR(rphy->usbgrf);
 -	} else {
 -		rphy->usbgrf = NULL;
++		if (IS_ERR(rphy->grf))
++			return PTR_ERR(rphy->grf);
 +		rphy->phy_base = rphy->grf;
  	}
-+	if (IS_ERR(rphy->grf)) {
-+		dev_err(dev, "failed to locate usbgrf\n");
-+		return PTR_ERR(rphy->grf);
-+	}
 
  	if (of_property_read_u32_index(np, "reg", 0, &reg)) {
  		dev_err(dev, "the reg property is not assigned in %pOFn node\n", np);
-@@ -1521,6 +1535,36 @@ static int rk3128_usb2phy_tuning(struct rockchip_usb2phy *rphy)
+@@ -1521,6 +1537,36 @@ static int rk3128_usb2phy_tuning(struct rockchip_usb2phy *rphy)
  				BIT(2) << BIT_WRITEABLE_SHIFT | 0);
  }
 
@@ -217,7 +219,7 @@ index 111111111111..222222222222 100644
  static int rk3576_usb2phy_tuning(struct rockchip_usb2phy *rphy)
  {
  	int ret;
-@@ -1934,6 +1978,57 @@ static const struct rockchip_usb2phy_cfg rk3399_phy_cfgs[] = {
+@@ -1934,6 +1980,57 @@ static const struct rockchip_usb2phy_cfg rk3399_phy_cfgs[] = {
  	{ /* sentinel */ }
  };
 
@@ -275,7 +277,7 @@ index 111111111111..222222222222 100644
  static const struct rockchip_usb2phy_cfg rk3562_phy_cfgs[] = {
  	{
  		.reg = 0xff740000,
-@@ -2301,6 +2396,7 @@ static const struct of_device_id rockchip_usb2phy_dt_match[] = {
+@@ -2301,6 +2398,7 @@ static const struct of_device_id rockchip_usb2phy_dt_match[] = {
  	{ .compatible = "rockchip,rk3328-usb2phy", .data = &rk3328_phy_cfgs },
  	{ .compatible = "rockchip,rk3366-usb2phy", .data = &rk3366_phy_cfgs },
  	{ .compatible = "rockchip,rk3399-usb2phy", .data = &rk3399_phy_cfgs },

patch/kernel/archive/rockchip64-7.0/rk3528-10-phy-rockchip-inno-usb2-Add-support-for-RK3528.patch

@@ -21,8 +21,8 @@ next-20250910-rk3528 branch.
 
 Signed-off-by: Shlomi Marco <s.marco@rubycomm.com>
 ---
- drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 162 ++++++++--
- 1 file changed, 129 insertions(+), 33 deletions(-)
+ drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 164 ++++++++--
+ 1 file changed, 131 insertions(+), 33 deletions(-)
 
 diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
 index 111111111111..222222222222 100644
@@ -141,7 +141,7 @@ index 111111111111..222222222222 100644
  }
 
  static unsigned long
-@@ -1360,27 +1381,20 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
+@@ -1360,27 +1381,22 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
  	if (!rphy)
  		return -ENOMEM;
 
@@ -157,6 +157,10 @@ index 111111111111..222222222222 100644
 +		if (IS_ERR(rphy->phy_base))
 +			return PTR_ERR(rphy->phy_base);
 +		rphy->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,usbgrf");
++		if (IS_ERR(rphy->grf)) {
++			dev_err(dev, "failed to locate usbgrf\n");
++			return PTR_ERR(rphy->grf);
++		}
  	} else {
  		rphy->grf = syscon_node_to_regmap(dev->parent->of_node);
 -		if (IS_ERR(rphy->grf))
@@ -171,16 +175,14 @@ index 111111111111..222222222222 100644
 -			return PTR_ERR(rphy->usbgrf);
 -	} else {
 -		rphy->usbgrf = NULL;
++		if (IS_ERR(rphy->grf))
++			return PTR_ERR(rphy->grf);
 +		rphy->phy_base = rphy->grf;
  	}
-+	if (IS_ERR(rphy->grf)) {
-+		dev_err(dev, "failed to locate usbgrf\n");
-+		return PTR_ERR(rphy->grf);
-+	}
 
  	if (of_property_read_u32_index(np, "reg", 0, &reg)) {
  		dev_err(dev, "the reg property is not assigned in %pOFn node\n", np);
-@@ -1521,6 +1535,36 @@ static int rk3128_usb2phy_tuning(struct rockchip_usb2phy *rphy)
+@@ -1521,6 +1537,36 @@ static int rk3128_usb2phy_tuning(struct rockchip_usb2phy *rphy)
  				BIT(2) << BIT_WRITEABLE_SHIFT | 0);
  }
 
@@ -217,7 +219,7 @@ index 111111111111..222222222222 100644
  static int rk3576_usb2phy_tuning(struct rockchip_usb2phy *rphy)
  {
  	int ret;
-@@ -1934,6 +1978,57 @@ static const struct rockchip_usb2phy_cfg rk3399_phy_cfgs[] = {
+@@ -1934,6 +1980,57 @@ static const struct rockchip_usb2phy_cfg rk3399_phy_cfgs[] = {
  	{ /* sentinel */ }
  };
 
@@ -275,7 +277,7 @@ index 111111111111..222222222222 100644
  static const struct rockchip_usb2phy_cfg rk3562_phy_cfgs[] = {
  	{
  		.reg = 0xff740000,
-@@ -2301,6 +2396,7 @@ static const struct of_device_id rockchip_usb2phy_dt_match[] = {
+@@ -2301,6 +2398,7 @@ static const struct of_device_id rockchip_usb2phy_dt_match[] = {
  	{ .compatible = "rockchip,rk3328-usb2phy", .data = &rk3328_phy_cfgs },
  	{ .compatible = "rockchip,rk3366-usb2phy", .data = &rk3366_phy_cfgs },
  	{ .compatible = "rockchip,rk3399-usb2phy", .data = &rk3399_phy_cfgs },

patch/kernel/archive/rockchip64-7.1/rk3528-10-phy-rockchip-inno-usb2-Add-support-for-RK3528.patch

@@ -21,8 +21,8 @@ next-20250910-rk3528 branch.
 
 Signed-off-by: Shlomi Marco <s.marco@rubycomm.com>
 ---
- drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 162 ++++++++--
- 1 file changed, 129 insertions(+), 33 deletions(-)
+ drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 164 ++++++++--
+ 1 file changed, 131 insertions(+), 33 deletions(-)
 
 diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
 index 111111111111..222222222222 100644
@@ -141,7 +141,7 @@ index 111111111111..222222222222 100644
  }
 
  static unsigned long
-@@ -1360,27 +1381,20 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
+@@ -1360,27 +1381,22 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
  	if (!rphy)
  		return -ENOMEM;
 
@@ -157,6 +157,10 @@ index 111111111111..222222222222 100644
 +		if (IS_ERR(rphy->phy_base))
 +			return PTR_ERR(rphy->phy_base);
 +		rphy->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,usbgrf");
++		if (IS_ERR(rphy->grf)) {
++			dev_err(dev, "failed to locate usbgrf\n");
++			return PTR_ERR(rphy->grf);
++		}
  	} else {
  		rphy->grf = syscon_node_to_regmap(dev->parent->of_node);
 -		if (IS_ERR(rphy->grf))
@@ -171,16 +175,14 @@ index 111111111111..222222222222 100644
 -			return PTR_ERR(rphy->usbgrf);
 -	} else {
 -		rphy->usbgrf = NULL;
++		if (IS_ERR(rphy->grf))
++			return PTR_ERR(rphy->grf);
 +		rphy->phy_base = rphy->grf;
  	}
-+	if (IS_ERR(rphy->grf)) {
-+		dev_err(dev, "failed to locate usbgrf\n");
-+		return PTR_ERR(rphy->grf);
-+	}
 
  	if (of_property_read_u32_index(np, "reg", 0, &reg)) {
  		dev_err(dev, "the reg property is not assigned in %pOFn node\n", np);
-@@ -1521,6 +1535,36 @@ static int rk3128_usb2phy_tuning(struct rockchip_usb2phy *rphy)
+@@ -1521,6 +1537,36 @@ static int rk3128_usb2phy_tuning(struct rockchip_usb2phy *rphy)
  				BIT(2) << BIT_WRITEABLE_SHIFT | 0);
  }
 
@@ -217,7 +219,7 @@ index 111111111111..222222222222 100644
  static int rk3576_usb2phy_tuning(struct rockchip_usb2phy *rphy)
  {
  	int ret;
-@@ -1934,6 +1978,57 @@ static const struct rockchip_usb2phy_cfg rk3399_phy_cfgs[] = {
+@@ -1934,6 +1980,57 @@ static const struct rockchip_usb2phy_cfg rk3399_phy_cfgs[] = {
  	{ /* sentinel */ }
  };
 
@@ -275,7 +277,7 @@ index 111111111111..222222222222 100644
  static const struct rockchip_usb2phy_cfg rk3562_phy_cfgs[] = {
  	{
  		.reg = 0xff740000,
-@@ -2301,6 +2396,7 @@ static const struct of_device_id rockchip_usb2phy_dt_match[] = {
+@@ -2301,6 +2398,7 @@ static const struct of_device_id rockchip_usb2phy_dt_match[] = {
  	{ .compatible = "rockchip,rk3328-usb2phy", .data = &rk3328_phy_cfgs },
  	{ .compatible = "rockchip,rk3366-usb2phy", .data = &rk3366_phy_cfgs },
  	{ .compatible = "rockchip,rk3399-usb2phy", .data = &rk3399_phy_cfgs },