* [PATCH 0/5] Add USB2 PHY support for RZ/T2H and RZ/N2H SoCs
@ 2025-08-05 12:25 Prabhakar
2025-08-05 12:25 ` [PATCH 1/5] dt-bindings: phy: renesas,usb2-phy: Add RZ/T2H and RZ/N2H support Prabhakar
` (4 more replies)
0 siblings, 5 replies; 15+ messages in thread
From: Prabhakar @ 2025-08-05 12:25 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Yoshihiro Shimoda,
Geert Uytterhoeven, Magnus Damm
Cc: linux-phy, devicetree, linux-kernel, linux-renesas-soc, Prabhakar,
Biju Das, Fabrizio Castro, Lad Prabhakar
From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Hi All,
This patch series adds support for the USB2 PHY on the Renesas RZ/T2H
and RZ/N2H SoCs. The USB2 PHY driver has been updated to handle
differences in clocking, reset handling, and register configurations
specific to these SoCs.
Cheers,
Prabhakar
Lad Prabhakar (5):
dt-bindings: phy: renesas,usb2-phy: Add RZ/T2H and RZ/N2H support
phy: renesas: rcar-gen3-usb2: Store drvdata pointer in channel
phy: renesas: rcar-gen3-usb2: Allow SoC-specific OBINT bits via
phy_data
phy: renesas: rcar-gen3-usb2: Add support for RZ/T2H SoC
phy: renesas: rcar-gen3-usb2: Move debug print after register value is
updated
.../bindings/phy/renesas,usb2-phy.yaml | 17 +++
drivers/phy/renesas/phy-rcar-gen3-usb2.c | 127 ++++++++++++++----
2 files changed, 115 insertions(+), 29 deletions(-)
--
2.50.1
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/5] dt-bindings: phy: renesas,usb2-phy: Add RZ/T2H and RZ/N2H support
2025-08-05 12:25 [PATCH 0/5] Add USB2 PHY support for RZ/T2H and RZ/N2H SoCs Prabhakar
@ 2025-08-05 12:25 ` Prabhakar
2025-08-05 17:09 ` Conor Dooley
2025-08-05 12:25 ` [PATCH 2/5] phy: renesas: rcar-gen3-usb2: Store drvdata pointer in channel Prabhakar
` (3 subsequent siblings)
4 siblings, 1 reply; 15+ messages in thread
From: Prabhakar @ 2025-08-05 12:25 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Yoshihiro Shimoda,
Geert Uytterhoeven, Magnus Damm
Cc: linux-phy, devicetree, linux-kernel, linux-renesas-soc, Prabhakar,
Biju Das, Fabrizio Castro, Lad Prabhakar
From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Document the USB2 PHY controller for the Renesas RZ/T2H (r9a09g077) and
RZ/N2H (r9a09g087) SoCs. These SoCs share the same PHY block, which is
similar to the one on RZ/G2L but differs in clocks, resets, and register
bits. To account for these differences, a new compatible string
`renesas,usb2-phy-r9a09g077` is introduced.
The RZ/N2H SoC uses the same PHY as RZ/T2H, so it reuses the RZ/T2H
compatible string as a fallback.
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
.../bindings/phy/renesas,usb2-phy.yaml | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml b/Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml
index f45c5f039ae8..179cb4bfc424 100644
--- a/Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml
@@ -44,6 +44,12 @@ properties:
- const: renesas,usb2-phy-r9a09g056 # RZ/V2N
- const: renesas,usb2-phy-r9a09g057
+ - const: renesas,usb2-phy-r9a09g077 # RZ/T2H
+
+ - items:
+ - const: renesas,usb2-phy-r9a09g087 # RZ/N2H
+ - const: renesas,usb2-phy-r9a09g077
+
reg:
maxItems: 1
@@ -120,6 +126,17 @@ allOf:
required:
- resets
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: renesas,usb2-phy-r9a09g077
+ then:
+ properties:
+ clocks:
+ minItems: 2
+ resets: false
+
additionalProperties: false
examples:
--
2.50.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/5] phy: renesas: rcar-gen3-usb2: Store drvdata pointer in channel
2025-08-05 12:25 [PATCH 0/5] Add USB2 PHY support for RZ/T2H and RZ/N2H SoCs Prabhakar
2025-08-05 12:25 ` [PATCH 1/5] dt-bindings: phy: renesas,usb2-phy: Add RZ/T2H and RZ/N2H support Prabhakar
@ 2025-08-05 12:25 ` Prabhakar
2025-08-06 14:06 ` Neil Armstrong
2025-08-05 12:25 ` [PATCH 3/5] phy: renesas: rcar-gen3-usb2: Allow SoC-specific OBINT bits via phy_data Prabhakar
` (2 subsequent siblings)
4 siblings, 1 reply; 15+ messages in thread
From: Prabhakar @ 2025-08-05 12:25 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Yoshihiro Shimoda,
Geert Uytterhoeven, Magnus Damm
Cc: linux-phy, devicetree, linux-kernel, linux-renesas-soc, Prabhakar,
Biju Das, Fabrizio Castro, Lad Prabhakar
From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Store the SoC-specific driver data pointer (struct rcar_gen3_phy_drv_data)
directly in struct rcar_gen3_chan instead of copying individual flags
into separate fields. Update all references to use channel->drvdata->flags,
removing the redundant soc_no_adp_ctrl and utmi_ctrl members from the
channel structure.
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
drivers/phy/renesas/phy-rcar-gen3-usb2.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
index 47beb94cd424..cfa9667c7680 100644
--- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
@@ -122,6 +122,7 @@ struct rcar_gen3_phy {
struct rcar_gen3_chan {
void __iomem *base;
struct device *dev; /* platform_device's device */
+ const struct rcar_gen3_phy_drv_data *drvdata;
struct extcon_dev *extcon;
struct rcar_gen3_phy rphys[NUM_OF_PHYS];
struct regulator *vbus;
@@ -133,8 +134,6 @@ struct rcar_gen3_chan {
bool extcon_host;
bool is_otg_channel;
bool uses_otg_pins;
- bool soc_no_adp_ctrl;
- bool utmi_ctrl;
};
struct rcar_gen3_phy_drv_data {
@@ -204,7 +203,7 @@ static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus)
u32 val;
dev_vdbg(ch->dev, "%s: %08x, %d\n", __func__, val, vbus);
- if (ch->soc_no_adp_ctrl) {
+ if (ch->drvdata->no_adp_ctrl) {
if (ch->vbus)
regulator_hardware_enable(ch->vbus, vbus);
@@ -290,7 +289,7 @@ static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)
if (!ch->uses_otg_pins)
return (ch->dr_mode == USB_DR_MODE_HOST) ? false : true;
- if (ch->soc_no_adp_ctrl)
+ if (ch->drvdata->no_adp_ctrl)
return !!(readl(ch->base + USB2_LINECTRL1) & USB2_LINECTRL1_USB2_IDMON);
return !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG);
@@ -421,7 +420,7 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch)
USB2_LINECTRL1_DMRPD_EN | USB2_LINECTRL1_DM_RPD;
writel(val, usb2_base + USB2_LINECTRL1);
- if (!ch->soc_no_adp_ctrl) {
+ if (!ch->drvdata->no_adp_ctrl) {
val = readl(usb2_base + USB2_VBCTRL);
val &= ~USB2_VBCTRL_OCCLREN;
writel(val | USB2_VBCTRL_DRVVBUSSEL, usb2_base + USB2_VBCTRL);
@@ -487,7 +486,7 @@ static int rcar_gen3_phy_usb2_init(struct phy *p)
if (rphy->int_enable_bits)
rcar_gen3_init_otg(channel);
- if (channel->utmi_ctrl) {
+ if (channel->drvdata->utmi_ctrl) {
val = readl(usb2_base + USB2_REGEN_CG_CTRL) | USB2_REGEN_CG_CTRL_UPHY_WEN;
writel(val, usb2_base + USB2_REGEN_CG_CTRL);
@@ -778,6 +777,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
ret = -EINVAL;
goto error;
}
+ channel->drvdata = phy_data;
platform_set_drvdata(pdev, channel);
channel->dev = dev;
@@ -788,12 +788,9 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
goto error;
}
- channel->soc_no_adp_ctrl = phy_data->no_adp_ctrl;
if (phy_data->no_adp_ctrl)
channel->obint_enable_bits = USB2_OBINT_IDCHG_EN;
- channel->utmi_ctrl = phy_data->utmi_ctrl;
-
spin_lock_init(&channel->lock);
for (i = 0; i < NUM_OF_PHYS; i++) {
channel->rphys[i].phy = devm_phy_create(dev, NULL,
@@ -808,7 +805,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
phy_set_drvdata(channel->rphys[i].phy, &channel->rphys[i]);
}
- if (channel->soc_no_adp_ctrl && channel->is_otg_channel)
+ if (channel->drvdata->no_adp_ctrl && channel->is_otg_channel)
channel->vbus = devm_regulator_get_exclusive(dev, "vbus");
else
channel->vbus = devm_regulator_get_optional(dev, "vbus");
--
2.50.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 3/5] phy: renesas: rcar-gen3-usb2: Allow SoC-specific OBINT bits via phy_data
2025-08-05 12:25 [PATCH 0/5] Add USB2 PHY support for RZ/T2H and RZ/N2H SoCs Prabhakar
2025-08-05 12:25 ` [PATCH 1/5] dt-bindings: phy: renesas,usb2-phy: Add RZ/T2H and RZ/N2H support Prabhakar
2025-08-05 12:25 ` [PATCH 2/5] phy: renesas: rcar-gen3-usb2: Store drvdata pointer in channel Prabhakar
@ 2025-08-05 12:25 ` Prabhakar
2025-08-06 14:07 ` Neil Armstrong
2025-08-05 12:25 ` [PATCH 4/5] phy: renesas: rcar-gen3-usb2: Add support for RZ/T2H SoC Prabhakar
2025-08-05 12:25 ` [PATCH 5/5] phy: renesas: rcar-gen3-usb2: Move debug print after register value is updated Prabhakar
4 siblings, 1 reply; 15+ messages in thread
From: Prabhakar @ 2025-08-05 12:25 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Yoshihiro Shimoda,
Geert Uytterhoeven, Magnus Damm
Cc: linux-phy, devicetree, linux-kernel, linux-renesas-soc, Prabhakar,
Biju Das, Fabrizio Castro, Lad Prabhakar
From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Update the PHY driver to support SoC-specific OBINT enable bits by
introducing the `obint_enable_bits` field in the `rcar_gen3_phy_drv_data`
structure. This allows each SoC to specify bits required.
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
drivers/phy/renesas/phy-rcar-gen3-usb2.c | 27 ++++++++++++------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
index cfa9667c7680..ea387941c6f7 100644
--- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
@@ -71,8 +71,7 @@
/* OBINTSTA and OBINTEN */
#define USB2_OBINT_SESSVLDCHG BIT(12)
#define USB2_OBINT_IDDIGCHG BIT(11)
-#define USB2_OBINT_BITS (USB2_OBINT_SESSVLDCHG | \
- USB2_OBINT_IDDIGCHG)
+#define USB2_OBINT_IDCHG_EN BIT(0) /* RZ/G2L specific */
/* VBCTRL */
#define USB2_VBCTRL_OCCLREN BIT(16)
@@ -93,7 +92,6 @@
#define USB2_ADPCTRL_DRVVBUS BIT(4)
/* RZ/G2L specific */
-#define USB2_OBINT_IDCHG_EN BIT(0)
#define USB2_LINECTRL1_USB2_IDMON BIT(0)
#define NUM_OF_PHYS 4
@@ -130,7 +128,6 @@ struct rcar_gen3_chan {
struct work_struct work;
spinlock_t lock; /* protects access to hardware and driver data structure. */
enum usb_dr_mode dr_mode;
- u32 obint_enable_bits;
bool extcon_host;
bool is_otg_channel;
bool uses_otg_pins;
@@ -141,6 +138,7 @@ struct rcar_gen3_phy_drv_data {
bool no_adp_ctrl;
bool init_bus;
bool utmi_ctrl;
+ u32 obint_enable_bits;
};
/*
@@ -225,9 +223,9 @@ static void rcar_gen3_control_otg_irq(struct rcar_gen3_chan *ch, int enable)
u32 val = readl(usb2_base + USB2_OBINTEN);
if (ch->uses_otg_pins && enable)
- val |= ch->obint_enable_bits;
+ val |= ch->drvdata->obint_enable_bits;
else
- val &= ~ch->obint_enable_bits;
+ val &= ~ch->drvdata->obint_enable_bits;
writel(val, usb2_base + USB2_OBINTEN);
}
@@ -430,7 +428,7 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch)
mdelay(20);
writel(0xffffffff, usb2_base + USB2_OBINTSTA);
- writel(ch->obint_enable_bits, usb2_base + USB2_OBINTEN);
+ writel(ch->drvdata->obint_enable_bits, usb2_base + USB2_OBINTEN);
rcar_gen3_device_recognition(ch);
}
@@ -450,9 +448,9 @@ static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch)
scoped_guard(spinlock, &ch->lock) {
status = readl(usb2_base + USB2_OBINTSTA);
- if (status & ch->obint_enable_bits) {
+ if (status & ch->drvdata->obint_enable_bits) {
dev_vdbg(dev, "%s: %08x\n", __func__, status);
- writel(ch->obint_enable_bits, usb2_base + USB2_OBINTSTA);
+ writel(ch->drvdata->obint_enable_bits, usb2_base + USB2_OBINTSTA);
rcar_gen3_device_recognition(ch);
ret = IRQ_HANDLED;
}
@@ -591,28 +589,35 @@ static const struct phy_ops rz_g1c_phy_usb2_ops = {
static const struct rcar_gen3_phy_drv_data rcar_gen3_phy_usb2_data = {
.phy_usb2_ops = &rcar_gen3_phy_usb2_ops,
.no_adp_ctrl = false,
+ .obint_enable_bits = USB2_OBINT_SESSVLDCHG |
+ USB2_OBINT_IDDIGCHG,
};
static const struct rcar_gen3_phy_drv_data rz_g1c_phy_usb2_data = {
.phy_usb2_ops = &rz_g1c_phy_usb2_ops,
.no_adp_ctrl = false,
+ .obint_enable_bits = USB2_OBINT_SESSVLDCHG |
+ USB2_OBINT_IDDIGCHG,
};
static const struct rcar_gen3_phy_drv_data rz_g2l_phy_usb2_data = {
.phy_usb2_ops = &rcar_gen3_phy_usb2_ops,
.no_adp_ctrl = true,
+ .obint_enable_bits = USB2_OBINT_IDCHG_EN,
};
static const struct rcar_gen3_phy_drv_data rz_g3s_phy_usb2_data = {
.phy_usb2_ops = &rcar_gen3_phy_usb2_ops,
.no_adp_ctrl = true,
.init_bus = true,
+ .obint_enable_bits = USB2_OBINT_IDCHG_EN,
};
static const struct rcar_gen3_phy_drv_data rz_v2h_phy_usb2_data = {
.phy_usb2_ops = &rcar_gen3_phy_usb2_ops,
.no_adp_ctrl = true,
.utmi_ctrl = true,
+ .obint_enable_bits = USB2_OBINT_IDCHG_EN,
};
static const struct of_device_id rcar_gen3_phy_usb2_match_table[] = {
@@ -748,7 +753,6 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
if (IS_ERR(channel->base))
return PTR_ERR(channel->base);
- channel->obint_enable_bits = USB2_OBINT_BITS;
channel->dr_mode = rcar_gen3_get_dr_mode(dev->of_node);
if (channel->dr_mode != USB_DR_MODE_UNKNOWN) {
channel->is_otg_channel = true;
@@ -788,9 +792,6 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
goto error;
}
- if (phy_data->no_adp_ctrl)
- channel->obint_enable_bits = USB2_OBINT_IDCHG_EN;
-
spin_lock_init(&channel->lock);
for (i = 0; i < NUM_OF_PHYS; i++) {
channel->rphys[i].phy = devm_phy_create(dev, NULL,
--
2.50.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 4/5] phy: renesas: rcar-gen3-usb2: Add support for RZ/T2H SoC
2025-08-05 12:25 [PATCH 0/5] Add USB2 PHY support for RZ/T2H and RZ/N2H SoCs Prabhakar
` (2 preceding siblings ...)
2025-08-05 12:25 ` [PATCH 3/5] phy: renesas: rcar-gen3-usb2: Allow SoC-specific OBINT bits via phy_data Prabhakar
@ 2025-08-05 12:25 ` Prabhakar
2025-08-06 14:07 ` Neil Armstrong
` (2 more replies)
2025-08-05 12:25 ` [PATCH 5/5] phy: renesas: rcar-gen3-usb2: Move debug print after register value is updated Prabhakar
4 siblings, 3 replies; 15+ messages in thread
From: Prabhakar @ 2025-08-05 12:25 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Yoshihiro Shimoda,
Geert Uytterhoeven, Magnus Damm
Cc: linux-phy, devicetree, linux-kernel, linux-renesas-soc, Prabhakar,
Biju Das, Fabrizio Castro, Lad Prabhakar
From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Add initial support for the Renesas RZ/T2H SoC to the R-Car Gen3 USB2 PHY
driver. The RZ/T2H SoC requires configuration of additional
hardware-specific bits for proper VBUS level control and OTG operation.
Introduce the `vblvl_ctrl` flag in the SoC-specific driver data to enable
handling of VBUS level selection logic using `VBCTRL.VBLVL` bits. This is
required for managing the VBUS status detection and drive logic based on
SoC-specific needs.
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
drivers/phy/renesas/phy-rcar-gen3-usb2.c | 85 ++++++++++++++++++++++--
1 file changed, 78 insertions(+), 7 deletions(-)
diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
index ea387941c6f7..bc841982a19a 100644
--- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
@@ -69,13 +69,20 @@
#define USB2_COMMCTRL_OTG_PERI BIT(31) /* 1 = Peripheral mode */
/* OBINTSTA and OBINTEN */
+#define USB2_OBINTSTA_CLEAR GENMASK(31, 0)
#define USB2_OBINT_SESSVLDCHG BIT(12)
#define USB2_OBINT_IDDIGCHG BIT(11)
+#define USB2_OBINT_VBSTAINT BIT(3)
#define USB2_OBINT_IDCHG_EN BIT(0) /* RZ/G2L specific */
/* VBCTRL */
+#define USB2_VBCTRL_VBSTA_MASK GENMASK(31, 28)
+#define USB2_VBCTRL_VBSTA_DEFAULT 2
+#define USB2_VBCTRL_VBLVL_MASK GENMASK(23, 20)
+#define USB2_VBCTRL_VBLVL(m) FIELD_PREP_CONST(USB2_VBCTRL_VBLVL_MASK, (m))
#define USB2_VBCTRL_OCCLREN BIT(16)
#define USB2_VBCTRL_DRVVBUSSEL BIT(8)
+#define USB2_VBCTRL_SIDDQREL BIT(2)
#define USB2_VBCTRL_VBOUT BIT(0)
/* LINECTRL1 */
@@ -88,6 +95,7 @@
/* ADPCTRL */
#define USB2_ADPCTRL_OTGSESSVLD BIT(20)
#define USB2_ADPCTRL_IDDIG BIT(19)
+#define USB2_ADPCTRL_VBUSVALID BIT(18)
#define USB2_ADPCTRL_IDPULLUP BIT(5) /* 1 = ID sampling is enabled */
#define USB2_ADPCTRL_DRVVBUS BIT(4)
@@ -138,6 +146,7 @@ struct rcar_gen3_phy_drv_data {
bool no_adp_ctrl;
bool init_bus;
bool utmi_ctrl;
+ bool vblvl_ctrl;
u32 obint_enable_bits;
};
@@ -201,7 +210,7 @@ static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus)
u32 val;
dev_vdbg(ch->dev, "%s: %08x, %d\n", __func__, val, vbus);
- if (ch->drvdata->no_adp_ctrl) {
+ if (ch->drvdata->no_adp_ctrl || ch->drvdata->vblvl_ctrl) {
if (ch->vbus)
regulator_hardware_enable(ch->vbus, vbus);
@@ -284,6 +293,21 @@ static void rcar_gen3_init_from_a_peri_to_a_host(struct rcar_gen3_chan *ch)
static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)
{
+ if (ch->drvdata->vblvl_ctrl) {
+ bool vbus_valid = false;
+ bool device = false;
+
+ device = !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG);
+ vbus_valid = !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_VBUSVALID);
+
+ if (device && vbus_valid)
+ return true;
+ else if (!device && vbus_valid)
+ return false;
+
+ return !(device && !vbus_valid);
+ }
+
if (!ch->uses_otg_pins)
return (ch->dr_mode == USB_DR_MODE_HOST) ? false : true;
@@ -419,11 +443,20 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch)
writel(val, usb2_base + USB2_LINECTRL1);
if (!ch->drvdata->no_adp_ctrl) {
- val = readl(usb2_base + USB2_VBCTRL);
- val &= ~USB2_VBCTRL_OCCLREN;
- writel(val | USB2_VBCTRL_DRVVBUSSEL, usb2_base + USB2_VBCTRL);
- val = readl(usb2_base + USB2_ADPCTRL);
- writel(val | USB2_ADPCTRL_IDPULLUP, usb2_base + USB2_ADPCTRL);
+ if (ch->drvdata->vblvl_ctrl) {
+ val = readl(usb2_base + USB2_VBCTRL);
+ val = (val & ~USB2_VBCTRL_VBLVL_MASK) | USB2_VBCTRL_VBLVL(2);
+ writel(val, usb2_base + USB2_VBCTRL);
+ val = readl(usb2_base + USB2_ADPCTRL);
+ writel(val | USB2_ADPCTRL_IDPULLUP | USB2_ADPCTRL_DRVVBUS,
+ usb2_base + USB2_ADPCTRL);
+ } else {
+ val = readl(usb2_base + USB2_VBCTRL);
+ val &= ~USB2_VBCTRL_OCCLREN;
+ writel(val | USB2_VBCTRL_DRVVBUSSEL, usb2_base + USB2_VBCTRL);
+ val = readl(usb2_base + USB2_ADPCTRL);
+ writel(val | USB2_ADPCTRL_IDPULLUP, usb2_base + USB2_ADPCTRL);
+ }
}
mdelay(20);
@@ -433,6 +466,23 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch)
rcar_gen3_device_recognition(ch);
}
+static void rcar_gen3_configure_vblvl_ctrl(struct rcar_gen3_chan *ch)
+{
+ void __iomem *usb2_base = ch->base;
+ u32 val;
+
+ if (!ch->drvdata->vblvl_ctrl)
+ return;
+
+ val = readl(usb2_base + USB2_VBCTRL);
+ if ((val & USB2_VBCTRL_VBSTA_MASK) ==
+ FIELD_PREP_CONST(USB2_VBCTRL_VBSTA_MASK, USB2_VBCTRL_VBSTA_DEFAULT))
+ val &= ~USB2_VBCTRL_VBLVL_MASK;
+ else
+ val |= USB2_VBCTRL_VBLVL(USB2_VBCTRL_VBSTA_DEFAULT);
+ writel(val, usb2_base + USB2_VBCTRL);
+}
+
static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch)
{
struct rcar_gen3_chan *ch = _ch;
@@ -450,8 +500,12 @@ static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch)
status = readl(usb2_base + USB2_OBINTSTA);
if (status & ch->drvdata->obint_enable_bits) {
dev_vdbg(dev, "%s: %08x\n", __func__, status);
- writel(ch->drvdata->obint_enable_bits, usb2_base + USB2_OBINTSTA);
+ if (ch->drvdata->vblvl_ctrl)
+ writel(USB2_OBINTSTA_CLEAR, usb2_base + USB2_OBINTSTA);
+ else
+ writel(ch->drvdata->obint_enable_bits, usb2_base + USB2_OBINTSTA);
rcar_gen3_device_recognition(ch);
+ rcar_gen3_configure_vblvl_ctrl(ch);
ret = IRQ_HANDLED;
}
}
@@ -484,6 +538,13 @@ static int rcar_gen3_phy_usb2_init(struct phy *p)
if (rphy->int_enable_bits)
rcar_gen3_init_otg(channel);
+ if (channel->drvdata->vblvl_ctrl) {
+ /* SIDDQ mode release */
+ writel(readl(usb2_base + USB2_VBCTRL) | USB2_VBCTRL_SIDDQREL,
+ usb2_base + USB2_VBCTRL);
+ udelay(250);
+ }
+
if (channel->drvdata->utmi_ctrl) {
val = readl(usb2_base + USB2_REGEN_CG_CTRL) | USB2_REGEN_CG_CTRL_UPHY_WEN;
writel(val, usb2_base + USB2_REGEN_CG_CTRL);
@@ -613,6 +674,12 @@ static const struct rcar_gen3_phy_drv_data rz_g3s_phy_usb2_data = {
.obint_enable_bits = USB2_OBINT_IDCHG_EN,
};
+static const struct rcar_gen3_phy_drv_data rz_t2h_phy_usb2_data = {
+ .phy_usb2_ops = &rcar_gen3_phy_usb2_ops,
+ .vblvl_ctrl = true,
+ .obint_enable_bits = USB2_OBINT_IDCHG_EN | USB2_OBINT_VBSTAINT,
+};
+
static const struct rcar_gen3_phy_drv_data rz_v2h_phy_usb2_data = {
.phy_usb2_ops = &rcar_gen3_phy_usb2_ops,
.no_adp_ctrl = true,
@@ -645,6 +712,10 @@ static const struct of_device_id rcar_gen3_phy_usb2_match_table[] = {
.compatible = "renesas,usb2-phy-r9a09g057",
.data = &rz_v2h_phy_usb2_data,
},
+ {
+ .compatible = "renesas,usb2-phy-r9a09g077",
+ .data = &rz_t2h_phy_usb2_data,
+ },
{
.compatible = "renesas,rzg2l-usb2-phy",
.data = &rz_g2l_phy_usb2_data,
--
2.50.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 5/5] phy: renesas: rcar-gen3-usb2: Move debug print after register value is updated
2025-08-05 12:25 [PATCH 0/5] Add USB2 PHY support for RZ/T2H and RZ/N2H SoCs Prabhakar
` (3 preceding siblings ...)
2025-08-05 12:25 ` [PATCH 4/5] phy: renesas: rcar-gen3-usb2: Add support for RZ/T2H SoC Prabhakar
@ 2025-08-05 12:25 ` Prabhakar
2025-08-06 14:08 ` Neil Armstrong
4 siblings, 1 reply; 15+ messages in thread
From: Prabhakar @ 2025-08-05 12:25 UTC (permalink / raw)
To: Vinod Koul, Kishon Vijay Abraham I, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Yoshihiro Shimoda,
Geert Uytterhoeven, Magnus Damm
Cc: linux-phy, devicetree, linux-kernel, linux-renesas-soc, Prabhakar,
Biju Das, Fabrizio Castro, Lad Prabhakar
From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Relocate the debug print in rcar_gen3_enable_vbus_ctrl() to appear after
the `val` variable is assigned and updated based on the VBUS state. This
ensures that the debug log reflects the actual register value being
written, improving debugging accuracy.
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
drivers/phy/renesas/phy-rcar-gen3-usb2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
index bc841982a19a..86689d0cf74a 100644
--- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
@@ -209,7 +209,6 @@ static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus)
u32 vbus_ctrl_val = USB2_ADPCTRL_DRVVBUS;
u32 val;
- dev_vdbg(ch->dev, "%s: %08x, %d\n", __func__, val, vbus);
if (ch->drvdata->no_adp_ctrl || ch->drvdata->vblvl_ctrl) {
if (ch->vbus)
regulator_hardware_enable(ch->vbus, vbus);
@@ -223,6 +222,7 @@ static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus)
val |= vbus_ctrl_val;
else
val &= ~vbus_ctrl_val;
+ dev_vdbg(ch->dev, "%s: %08x, %d\n", __func__, val, vbus);
writel(val, usb2_base + vbus_ctrl_reg);
}
--
2.50.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 1/5] dt-bindings: phy: renesas,usb2-phy: Add RZ/T2H and RZ/N2H support
2025-08-05 12:25 ` [PATCH 1/5] dt-bindings: phy: renesas,usb2-phy: Add RZ/T2H and RZ/N2H support Prabhakar
@ 2025-08-05 17:09 ` Conor Dooley
0 siblings, 0 replies; 15+ messages in thread
From: Conor Dooley @ 2025-08-05 17:09 UTC (permalink / raw)
To: Prabhakar
Cc: Vinod Koul, Kishon Vijay Abraham I, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Yoshihiro Shimoda,
Geert Uytterhoeven, Magnus Damm, linux-phy, devicetree,
linux-kernel, linux-renesas-soc, Biju Das, Fabrizio Castro,
Lad Prabhakar
[-- Attachment #1: Type: text/plain, Size: 712 bytes --]
On Tue, Aug 05, 2025 at 01:25:25PM +0100, Prabhakar wrote:
> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
>
> Document the USB2 PHY controller for the Renesas RZ/T2H (r9a09g077) and
> RZ/N2H (r9a09g087) SoCs. These SoCs share the same PHY block, which is
> similar to the one on RZ/G2L but differs in clocks, resets, and register
> bits. To account for these differences, a new compatible string
> `renesas,usb2-phy-r9a09g077` is introduced.
>
> The RZ/N2H SoC uses the same PHY as RZ/T2H, so it reuses the RZ/T2H
> compatible string as a fallback.
>
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/5] phy: renesas: rcar-gen3-usb2: Store drvdata pointer in channel
2025-08-05 12:25 ` [PATCH 2/5] phy: renesas: rcar-gen3-usb2: Store drvdata pointer in channel Prabhakar
@ 2025-08-06 14:06 ` Neil Armstrong
2025-08-06 20:01 ` Lad, Prabhakar
0 siblings, 1 reply; 15+ messages in thread
From: Neil Armstrong @ 2025-08-06 14:06 UTC (permalink / raw)
To: Prabhakar, Vinod Koul, Kishon Vijay Abraham I, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Yoshihiro Shimoda,
Geert Uytterhoeven, Magnus Damm
Cc: linux-phy, devicetree, linux-kernel, linux-renesas-soc, Biju Das,
Fabrizio Castro, Lad Prabhakar
On 05/08/2025 14:25, Prabhakar wrote:
> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
>
> Store the SoC-specific driver data pointer (struct rcar_gen3_phy_drv_data)
> directly in struct rcar_gen3_chan instead of copying individual flags
> into separate fields. Update all references to use channel->drvdata->flags,
> removing the redundant soc_no_adp_ctrl and utmi_ctrl members from the
> channel structure.
>
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> ---
> drivers/phy/renesas/phy-rcar-gen3-usb2.c | 17 +++++++----------
> 1 file changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> index 47beb94cd424..cfa9667c7680 100644
> --- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> +++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> @@ -122,6 +122,7 @@ struct rcar_gen3_phy {
> struct rcar_gen3_chan {
> void __iomem *base;
> struct device *dev; /* platform_device's device */
> + const struct rcar_gen3_phy_drv_data *drvdata;
Why not phy_data ?
> struct extcon_dev *extcon;
> struct rcar_gen3_phy rphys[NUM_OF_PHYS];
> struct regulator *vbus;
> @@ -133,8 +134,6 @@ struct rcar_gen3_chan {
> bool extcon_host;
> bool is_otg_channel;
> bool uses_otg_pins;
> - bool soc_no_adp_ctrl;
> - bool utmi_ctrl;
> };
>
> struct rcar_gen3_phy_drv_data {
> @@ -204,7 +203,7 @@ static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus)
> u32 val;
>
> dev_vdbg(ch->dev, "%s: %08x, %d\n", __func__, val, vbus);
> - if (ch->soc_no_adp_ctrl) {
> + if (ch->drvdata->no_adp_ctrl) {
> if (ch->vbus)
> regulator_hardware_enable(ch->vbus, vbus);
>
> @@ -290,7 +289,7 @@ static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)
> if (!ch->uses_otg_pins)
> return (ch->dr_mode == USB_DR_MODE_HOST) ? false : true;
>
> - if (ch->soc_no_adp_ctrl)
> + if (ch->drvdata->no_adp_ctrl)
> return !!(readl(ch->base + USB2_LINECTRL1) & USB2_LINECTRL1_USB2_IDMON);
>
> return !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG);
> @@ -421,7 +420,7 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch)
> USB2_LINECTRL1_DMRPD_EN | USB2_LINECTRL1_DM_RPD;
> writel(val, usb2_base + USB2_LINECTRL1);
>
> - if (!ch->soc_no_adp_ctrl) {
> + if (!ch->drvdata->no_adp_ctrl) {
> val = readl(usb2_base + USB2_VBCTRL);
> val &= ~USB2_VBCTRL_OCCLREN;
> writel(val | USB2_VBCTRL_DRVVBUSSEL, usb2_base + USB2_VBCTRL);
> @@ -487,7 +486,7 @@ static int rcar_gen3_phy_usb2_init(struct phy *p)
> if (rphy->int_enable_bits)
> rcar_gen3_init_otg(channel);
>
> - if (channel->utmi_ctrl) {
> + if (channel->drvdata->utmi_ctrl) {
> val = readl(usb2_base + USB2_REGEN_CG_CTRL) | USB2_REGEN_CG_CTRL_UPHY_WEN;
> writel(val, usb2_base + USB2_REGEN_CG_CTRL);
>
> @@ -778,6 +777,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
> ret = -EINVAL;
> goto error;
> }
> + channel->drvdata = phy_data;
Replace the whole block with:
channel->drvdata = device_get_match_data(dev);
if (!channel->drvdata) {
ret = -EINVAL;
goto error;
}
and drop the local phy_data.
>
> platform_set_drvdata(pdev, channel);
> channel->dev = dev;
> @@ -788,12 +788,9 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
> goto error;
> }
>
> - channel->soc_no_adp_ctrl = phy_data->no_adp_ctrl;
> if (phy_data->no_adp_ctrl)
> channel->obint_enable_bits = USB2_OBINT_IDCHG_EN;
>
> - channel->utmi_ctrl = phy_data->utmi_ctrl;
> -
> spin_lock_init(&channel->lock);
> for (i = 0; i < NUM_OF_PHYS; i++) {
> channel->rphys[i].phy = devm_phy_create(dev, NULL,
> @@ -808,7 +805,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
> phy_set_drvdata(channel->rphys[i].phy, &channel->rphys[i]);
> }
>
Thanks,
Neil
> - if (channel->soc_no_adp_ctrl && channel->is_otg_channel)
> + if (channel->drvdata->no_adp_ctrl && channel->is_otg_channel)
> channel->vbus = devm_regulator_get_exclusive(dev, "vbus");
> else
> channel->vbus = devm_regulator_get_optional(dev, "vbus");
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/5] phy: renesas: rcar-gen3-usb2: Allow SoC-specific OBINT bits via phy_data
2025-08-05 12:25 ` [PATCH 3/5] phy: renesas: rcar-gen3-usb2: Allow SoC-specific OBINT bits via phy_data Prabhakar
@ 2025-08-06 14:07 ` Neil Armstrong
0 siblings, 0 replies; 15+ messages in thread
From: Neil Armstrong @ 2025-08-06 14:07 UTC (permalink / raw)
To: Prabhakar, Vinod Koul, Kishon Vijay Abraham I, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Yoshihiro Shimoda,
Geert Uytterhoeven, Magnus Damm
Cc: linux-phy, devicetree, linux-kernel, linux-renesas-soc, Biju Das,
Fabrizio Castro, Lad Prabhakar
On 05/08/2025 14:25, Prabhakar wrote:
> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
>
> Update the PHY driver to support SoC-specific OBINT enable bits by
> introducing the `obint_enable_bits` field in the `rcar_gen3_phy_drv_data`
> structure. This allows each SoC to specify bits required.
>
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> ---
> drivers/phy/renesas/phy-rcar-gen3-usb2.c | 27 ++++++++++++------------
> 1 file changed, 14 insertions(+), 13 deletions(-)
>
<snip>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 4/5] phy: renesas: rcar-gen3-usb2: Add support for RZ/T2H SoC
2025-08-05 12:25 ` [PATCH 4/5] phy: renesas: rcar-gen3-usb2: Add support for RZ/T2H SoC Prabhakar
@ 2025-08-06 14:07 ` Neil Armstrong
2025-08-06 14:51 ` Geert Uytterhoeven
2025-08-06 20:40 ` kernel test robot
2 siblings, 0 replies; 15+ messages in thread
From: Neil Armstrong @ 2025-08-06 14:07 UTC (permalink / raw)
To: Prabhakar, Vinod Koul, Kishon Vijay Abraham I, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Yoshihiro Shimoda,
Geert Uytterhoeven, Magnus Damm
Cc: linux-phy, devicetree, linux-kernel, linux-renesas-soc, Biju Das,
Fabrizio Castro, Lad Prabhakar
On 05/08/2025 14:25, Prabhakar wrote:
> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
>
> Add initial support for the Renesas RZ/T2H SoC to the R-Car Gen3 USB2 PHY
> driver. The RZ/T2H SoC requires configuration of additional
> hardware-specific bits for proper VBUS level control and OTG operation.
>
> Introduce the `vblvl_ctrl` flag in the SoC-specific driver data to enable
> handling of VBUS level selection logic using `VBCTRL.VBLVL` bits. This is
> required for managing the VBUS status detection and drive logic based on
> SoC-specific needs.
>
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> ---
> drivers/phy/renesas/phy-rcar-gen3-usb2.c | 85 ++++++++++++++++++++++--
> 1 file changed, 78 insertions(+), 7 deletions(-)
>
<snip>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 5/5] phy: renesas: rcar-gen3-usb2: Move debug print after register value is updated
2025-08-05 12:25 ` [PATCH 5/5] phy: renesas: rcar-gen3-usb2: Move debug print after register value is updated Prabhakar
@ 2025-08-06 14:08 ` Neil Armstrong
0 siblings, 0 replies; 15+ messages in thread
From: Neil Armstrong @ 2025-08-06 14:08 UTC (permalink / raw)
To: Prabhakar, Vinod Koul, Kishon Vijay Abraham I, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Yoshihiro Shimoda,
Geert Uytterhoeven, Magnus Damm
Cc: linux-phy, devicetree, linux-kernel, linux-renesas-soc, Biju Das,
Fabrizio Castro, Lad Prabhakar
On 05/08/2025 14:25, Prabhakar wrote:
> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
>
> Relocate the debug print in rcar_gen3_enable_vbus_ctrl() to appear after
> the `val` variable is assigned and updated based on the VBUS state. This
> ensures that the debug log reflects the actual register value being
> written, improving debugging accuracy.
>
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> ---
> drivers/phy/renesas/phy-rcar-gen3-usb2.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
<snip>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 4/5] phy: renesas: rcar-gen3-usb2: Add support for RZ/T2H SoC
2025-08-05 12:25 ` [PATCH 4/5] phy: renesas: rcar-gen3-usb2: Add support for RZ/T2H SoC Prabhakar
2025-08-06 14:07 ` Neil Armstrong
@ 2025-08-06 14:51 ` Geert Uytterhoeven
2025-08-06 20:06 ` Lad, Prabhakar
2025-08-06 20:40 ` kernel test robot
2 siblings, 1 reply; 15+ messages in thread
From: Geert Uytterhoeven @ 2025-08-06 14:51 UTC (permalink / raw)
To: Prabhakar
Cc: Vinod Koul, Kishon Vijay Abraham I, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Yoshihiro Shimoda,
Geert Uytterhoeven, Magnus Damm, linux-phy, devicetree,
linux-kernel, linux-renesas-soc, Biju Das, Fabrizio Castro,
Lad Prabhakar
Hi Prabhakar,
On Tue, 5 Aug 2025 at 14:25, Prabhakar <prabhakar.csengg@gmail.com> wrote:
> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
>
> Add initial support for the Renesas RZ/T2H SoC to the R-Car Gen3 USB2 PHY
> driver. The RZ/T2H SoC requires configuration of additional
> hardware-specific bits for proper VBUS level control and OTG operation.
>
> Introduce the `vblvl_ctrl` flag in the SoC-specific driver data to enable
> handling of VBUS level selection logic using `VBCTRL.VBLVL` bits. This is
> required for managing the VBUS status detection and drive logic based on
> SoC-specific needs.
>
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Thanks for your patch!
> --- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> +++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> @@ -284,6 +293,21 @@ static void rcar_gen3_init_from_a_peri_to_a_host(struct rcar_gen3_chan *ch)
>
> static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)
> {
> + if (ch->drvdata->vblvl_ctrl) {
> + bool vbus_valid = false;
> + bool device = false;
No need to preinitialize these two variables.
> +
> + device = !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG);
> + vbus_valid = !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_VBUSVALID);
> +
> + if (device && vbus_valid)
> + return true;
> + else if (!device && vbus_valid)
No need for else after return, but...
> + return false;
> +
> + return !(device && !vbus_valid);
... all logic above can be simplified to
return vbus_valid ? device : !device;
> + }
> +
> if (!ch->uses_otg_pins)
> return (ch->dr_mode == USB_DR_MODE_HOST) ? false : true;
>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/5] phy: renesas: rcar-gen3-usb2: Store drvdata pointer in channel
2025-08-06 14:06 ` Neil Armstrong
@ 2025-08-06 20:01 ` Lad, Prabhakar
0 siblings, 0 replies; 15+ messages in thread
From: Lad, Prabhakar @ 2025-08-06 20:01 UTC (permalink / raw)
To: Neil Armstrong
Cc: Vinod Koul, Kishon Vijay Abraham I, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Yoshihiro Shimoda,
Geert Uytterhoeven, Magnus Damm, linux-phy, devicetree,
linux-kernel, linux-renesas-soc, Biju Das, Fabrizio Castro,
Lad Prabhakar
Hi Neil,
Thank you for the review.
On Wed, Aug 6, 2025 at 3:06 PM Neil Armstrong <neil.armstrong@linaro.org> wrote:
>
> On 05/08/2025 14:25, Prabhakar wrote:
> > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> >
> > Store the SoC-specific driver data pointer (struct rcar_gen3_phy_drv_data)
> > directly in struct rcar_gen3_chan instead of copying individual flags
> > into separate fields. Update all references to use channel->drvdata->flags,
> > removing the redundant soc_no_adp_ctrl and utmi_ctrl members from the
> > channel structure.
> >
> > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> > ---
> > drivers/phy/renesas/phy-rcar-gen3-usb2.c | 17 +++++++----------
> > 1 file changed, 7 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> > index 47beb94cd424..cfa9667c7680 100644
> > --- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> > +++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> > @@ -122,6 +122,7 @@ struct rcar_gen3_phy {
> > struct rcar_gen3_chan {
> > void __iomem *base;
> > struct device *dev; /* platform_device's device */
> > + const struct rcar_gen3_phy_drv_data *drvdata;
>
> Why not phy_data ?
>
Agreed, I will rename it.
> > struct extcon_dev *extcon;
> > struct rcar_gen3_phy rphys[NUM_OF_PHYS];
> > struct regulator *vbus;
> > @@ -133,8 +134,6 @@ struct rcar_gen3_chan {
> > bool extcon_host;
> > bool is_otg_channel;
> > bool uses_otg_pins;
> > - bool soc_no_adp_ctrl;
> > - bool utmi_ctrl;
> > };
> >
> > struct rcar_gen3_phy_drv_data {
> > @@ -204,7 +203,7 @@ static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus)
> > u32 val;
> >
> > dev_vdbg(ch->dev, "%s: %08x, %d\n", __func__, val, vbus);
> > - if (ch->soc_no_adp_ctrl) {
> > + if (ch->drvdata->no_adp_ctrl) {
> > if (ch->vbus)
> > regulator_hardware_enable(ch->vbus, vbus);
> >
> > @@ -290,7 +289,7 @@ static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)
> > if (!ch->uses_otg_pins)
> > return (ch->dr_mode == USB_DR_MODE_HOST) ? false : true;
> >
> > - if (ch->soc_no_adp_ctrl)
> > + if (ch->drvdata->no_adp_ctrl)
> > return !!(readl(ch->base + USB2_LINECTRL1) & USB2_LINECTRL1_USB2_IDMON);
> >
> > return !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG);
> > @@ -421,7 +420,7 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch)
> > USB2_LINECTRL1_DMRPD_EN | USB2_LINECTRL1_DM_RPD;
> > writel(val, usb2_base + USB2_LINECTRL1);
> >
> > - if (!ch->soc_no_adp_ctrl) {
> > + if (!ch->drvdata->no_adp_ctrl) {
> > val = readl(usb2_base + USB2_VBCTRL);
> > val &= ~USB2_VBCTRL_OCCLREN;
> > writel(val | USB2_VBCTRL_DRVVBUSSEL, usb2_base + USB2_VBCTRL);
> > @@ -487,7 +486,7 @@ static int rcar_gen3_phy_usb2_init(struct phy *p)
> > if (rphy->int_enable_bits)
> > rcar_gen3_init_otg(channel);
> >
> > - if (channel->utmi_ctrl) {
> > + if (channel->drvdata->utmi_ctrl) {
> > val = readl(usb2_base + USB2_REGEN_CG_CTRL) | USB2_REGEN_CG_CTRL_UPHY_WEN;
> > writel(val, usb2_base + USB2_REGEN_CG_CTRL);
> >
> > @@ -778,6 +777,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
> > ret = -EINVAL;
> > goto error;
> > }
> > + channel->drvdata = phy_data;
>
> Replace the whole block with:
>
> channel->drvdata = device_get_match_data(dev);
> if (!channel->drvdata) {
> ret = -EINVAL;
> goto error;
> }
>
> and drop the local phy_data.
>
Ok.
Cheers,
Prabhakar
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 4/5] phy: renesas: rcar-gen3-usb2: Add support for RZ/T2H SoC
2025-08-06 14:51 ` Geert Uytterhoeven
@ 2025-08-06 20:06 ` Lad, Prabhakar
0 siblings, 0 replies; 15+ messages in thread
From: Lad, Prabhakar @ 2025-08-06 20:06 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Vinod Koul, Kishon Vijay Abraham I, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Yoshihiro Shimoda,
Geert Uytterhoeven, Magnus Damm, linux-phy, devicetree,
linux-kernel, linux-renesas-soc, Biju Das, Fabrizio Castro,
Lad Prabhakar
Hi Geert,
Thank you for the review.
On Wed, Aug 6, 2025 at 3:59 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> Hi Prabhakar,
>
> On Tue, 5 Aug 2025 at 14:25, Prabhakar <prabhakar.csengg@gmail.com> wrote:
> > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> >
> > Add initial support for the Renesas RZ/T2H SoC to the R-Car Gen3 USB2 PHY
> > driver. The RZ/T2H SoC requires configuration of additional
> > hardware-specific bits for proper VBUS level control and OTG operation.
> >
> > Introduce the `vblvl_ctrl` flag in the SoC-specific driver data to enable
> > handling of VBUS level selection logic using `VBCTRL.VBLVL` bits. This is
> > required for managing the VBUS status detection and drive logic based on
> > SoC-specific needs.
> >
> > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
>
> Thanks for your patch!
>
> > --- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> > +++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
>
> > @@ -284,6 +293,21 @@ static void rcar_gen3_init_from_a_peri_to_a_host(struct rcar_gen3_chan *ch)
> >
> > static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)
> > {
> > + if (ch->drvdata->vblvl_ctrl) {
> > + bool vbus_valid = false;
> > + bool device = false;
>
> No need to preinitialize these two variables.
>
Agreed, I will drop it.
> > +
> > + device = !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG);
> > + vbus_valid = !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_VBUSVALID);
> > +
> > + if (device && vbus_valid)
> > + return true;
> > + else if (!device && vbus_valid)
>
> No need for else after return, but...
>
> > + return false;
> > +
> > + return !(device && !vbus_valid);
>
> ... all logic above can be simplified to
>
> return vbus_valid ? device : !device;
>
Ahha thanks for the pointer!
Cheers,
Prabhakar
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 4/5] phy: renesas: rcar-gen3-usb2: Add support for RZ/T2H SoC
2025-08-05 12:25 ` [PATCH 4/5] phy: renesas: rcar-gen3-usb2: Add support for RZ/T2H SoC Prabhakar
2025-08-06 14:07 ` Neil Armstrong
2025-08-06 14:51 ` Geert Uytterhoeven
@ 2025-08-06 20:40 ` kernel test robot
2 siblings, 0 replies; 15+ messages in thread
From: kernel test robot @ 2025-08-06 20:40 UTC (permalink / raw)
To: Prabhakar, Vinod Koul, Kishon Vijay Abraham I, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Yoshihiro Shimoda,
Geert Uytterhoeven, Magnus Damm
Cc: oe-kbuild-all, linux-phy, devicetree, linux-kernel,
linux-renesas-soc, Prabhakar, Biju Das, Fabrizio Castro,
Lad Prabhakar
Hi Prabhakar,
kernel test robot noticed the following build errors:
[auto build test ERROR on next-20250805]
[also build test ERROR on linus/master]
[cannot apply to geert-renesas-devel/next robh/for-next v6.16 v6.16-rc7 v6.16-rc6 v6.16]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Prabhakar/dt-bindings-phy-renesas-usb2-phy-Add-RZ-T2H-and-RZ-N2H-support/20250806-122832
base: next-20250805
patch link: https://lore.kernel.org/r/20250805122529.2566580-5-prabhakar.mahadev-lad.rj%40bp.renesas.com
patch subject: [PATCH 4/5] phy: renesas: rcar-gen3-usb2: Add support for RZ/T2H SoC
config: riscv-randconfig-002-20250807 (https://download.01.org/0day-ci/archive/20250807/202508070430.wK3sK6kB-lkp@intel.com/config)
compiler: riscv32-linux-gcc (GCC) 8.5.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250807/202508070430.wK3sK6kB-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202508070430.wK3sK6kB-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/phy/renesas/phy-rcar-gen3-usb2.c: In function 'rcar_gen3_init_otg':
>> drivers/phy/renesas/phy-rcar-gen3-usb2.c:82:31: error: implicit declaration of function 'FIELD_PREP_CONST'; did you mean 'FILE_REF_NOREF'? [-Werror=implicit-function-declaration]
#define USB2_VBCTRL_VBLVL(m) FIELD_PREP_CONST(USB2_VBCTRL_VBLVL_MASK, (m))
^~~~~~~~~~~~~~~~
drivers/phy/renesas/phy-rcar-gen3-usb2.c:448:44: note: in expansion of macro 'USB2_VBCTRL_VBLVL'
val = (val & ~USB2_VBCTRL_VBLVL_MASK) | USB2_VBCTRL_VBLVL(2);
^~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
vim +82 drivers/phy/renesas/phy-rcar-gen3-usb2.c
77
78 /* VBCTRL */
79 #define USB2_VBCTRL_VBSTA_MASK GENMASK(31, 28)
80 #define USB2_VBCTRL_VBSTA_DEFAULT 2
81 #define USB2_VBCTRL_VBLVL_MASK GENMASK(23, 20)
> 82 #define USB2_VBCTRL_VBLVL(m) FIELD_PREP_CONST(USB2_VBCTRL_VBLVL_MASK, (m))
83 #define USB2_VBCTRL_OCCLREN BIT(16)
84 #define USB2_VBCTRL_DRVVBUSSEL BIT(8)
85 #define USB2_VBCTRL_SIDDQREL BIT(2)
86 #define USB2_VBCTRL_VBOUT BIT(0)
87
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2025-08-06 20:41 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-05 12:25 [PATCH 0/5] Add USB2 PHY support for RZ/T2H and RZ/N2H SoCs Prabhakar
2025-08-05 12:25 ` [PATCH 1/5] dt-bindings: phy: renesas,usb2-phy: Add RZ/T2H and RZ/N2H support Prabhakar
2025-08-05 17:09 ` Conor Dooley
2025-08-05 12:25 ` [PATCH 2/5] phy: renesas: rcar-gen3-usb2: Store drvdata pointer in channel Prabhakar
2025-08-06 14:06 ` Neil Armstrong
2025-08-06 20:01 ` Lad, Prabhakar
2025-08-05 12:25 ` [PATCH 3/5] phy: renesas: rcar-gen3-usb2: Allow SoC-specific OBINT bits via phy_data Prabhakar
2025-08-06 14:07 ` Neil Armstrong
2025-08-05 12:25 ` [PATCH 4/5] phy: renesas: rcar-gen3-usb2: Add support for RZ/T2H SoC Prabhakar
2025-08-06 14:07 ` Neil Armstrong
2025-08-06 14:51 ` Geert Uytterhoeven
2025-08-06 20:06 ` Lad, Prabhakar
2025-08-06 20:40 ` kernel test robot
2025-08-05 12:25 ` [PATCH 5/5] phy: renesas: rcar-gen3-usb2: Move debug print after register value is updated Prabhakar
2025-08-06 14:08 ` Neil Armstrong
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).