linux-next: manual merge of the phy-next tree with the phy tree

linux-next: manual merge of the phy-next tree with the phy tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2743 bytes --]

Hi all,

Today's linux-next merge of the phy-next tree got a conflict in:

  drivers/phy/renesas/phy-rcar-gen3-usb2.c

between commits:

  54c4c58713aa ("phy: renesas: rcar-gen3-usb2: Fix role detection on unbind/bind")
  55a387ebb921 ("phy: renesas: rcar-gen3-usb2: Lock around hardware registers and driver data")

from the phy tree and commit:

  3767474d7497 ("phy: renesas: phy-rcar-gen3-usb2: Add USB2.0 PHY support for RZ/V2H(P)")

from the phy-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/phy/renesas/phy-rcar-gen3-usb2.c
index 9fdf17e0848a,867f43132b7a..000000000000
--- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
@@@ -467,16 -472,24 +477,24 @@@ static int rcar_gen3_phy_usb2_init(stru
  	val = readl(usb2_base + USB2_INT_ENABLE);
  	val |= USB2_INT_ENABLE_UCOM_INTEN | rphy->int_enable_bits;
  	writel(val, usb2_base + USB2_INT_ENABLE);
 -	writel(USB2_SPD_RSM_TIMSET_INIT, usb2_base + USB2_SPD_RSM_TIMSET);
 -	writel(USB2_OC_TIMSET_INIT, usb2_base + USB2_OC_TIMSET);
  
 -	/* Initialize otg part */
 -	if (channel->is_otg_channel) {
 -		if (rcar_gen3_needs_init_otg(channel))
 -			rcar_gen3_init_otg(channel);
 -		rphy->otg_initialized = true;
 +	if (!rcar_gen3_is_any_rphy_initialized(channel)) {
 +		writel(USB2_SPD_RSM_TIMSET_INIT, usb2_base + USB2_SPD_RSM_TIMSET);
 +		writel(USB2_OC_TIMSET_INIT, usb2_base + USB2_OC_TIMSET);
  	}
  
 +	/* Initialize otg part (only if we initialize a PHY with IRQs). */
 +	if (rphy->int_enable_bits)
 +		rcar_gen3_init_otg(channel);
 +
+ 	if (channel->utmi_ctrl) {
+ 		val = readl(usb2_base + USB2_REGEN_CG_CTRL) | USB2_REGEN_CG_CTRL_UPHY_WEN;
+ 		writel(val, usb2_base + USB2_REGEN_CG_CTRL);
+ 
+ 		writel(USB2_UTMI_CTRL_INIT, usb2_base + USB2_UTMI_CTRL);
+ 		writel(val & ~USB2_REGEN_CG_CTRL_UPHY_WEN, usb2_base + USB2_REGEN_CG_CTRL);
+ 	}
+ 
  	rphy->initialized = true;
  
  	return 0;
@@@ -764,7 -791,9 +792,9 @@@ static int rcar_gen3_phy_usb2_probe(str
  	if (phy_data->no_adp_ctrl)
  		channel->obint_enable_bits = USB2_OBINT_IDCHG_EN;
  
+ 	channel->utmi_ctrl = phy_data->utmi_ctrl;
+ 
 -	mutex_init(&channel->lock);
 +	spin_lock_init(&channel->lock);
  	for (i = 0; i < NUM_OF_PHYS; i++) {
  		channel->rphys[i].phy = devm_phy_create(dev, NULL,
  							phy_data->phy_usb2_ops);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

RE: linux-next: manual merge of the phy-next tree with the phy tree

[Prabhakar Mahadev Lad]

Hi Stephen,

Thanks for the report and fixing the conflict.

@Vinod, shall a rebase my patches and send a new version?

Cheers,
Prabhakar

> -----Original Message-----
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Sent: 15 May 2025 08:09
> To: Kishon Vijay Abraham I <kishon@kernel.org>; Vinod Koul
> <vkoul@kernel.org>
> Cc: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>; Prabhakar Mahadev
> Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>; Linux Kernel Mailing List
> <linux-kernel@vger.kernel.org>; Linux Next Mailing List <linux-
> next@vger.kernel.org>
> Subject: linux-next: manual merge of the phy-next tree with the phy tree
> 
> Hi all,
> 
> Today's linux-next merge of the phy-next tree got a conflict in:
> 
>   drivers/phy/renesas/phy-rcar-gen3-usb2.c
> 
> between commits:
> 
>   54c4c58713aa ("phy: renesas: rcar-gen3-usb2: Fix role detection on
> unbind/bind")
>   55a387ebb921 ("phy: renesas: rcar-gen3-usb2: Lock around hardware
> registers and driver data")
> 
> from the phy tree and commit:
> 
>   3767474d7497 ("phy: renesas: phy-rcar-gen3-usb2: Add USB2.0 PHY support
> for RZ/V2H(P)")
> 
> from the phy-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This is now
> fixed as far as linux-next is concerned, but any non trivial conflicts
> should be mentioned to your upstream maintainer when your tree is
> submitted for merging.  You may also want to consider cooperating with the
> maintainer of the conflicting tree to minimise any particularly complex
> conflicts.
> 
> --
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/phy/renesas/phy-rcar-gen3-usb2.c
> index 9fdf17e0848a,867f43132b7a..000000000000
> --- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> +++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> @@@ -467,16 -472,24 +477,24 @@@ static int rcar_gen3_phy_usb2_init(stru
>   	val = readl(usb2_base + USB2_INT_ENABLE);
>   	val |= USB2_INT_ENABLE_UCOM_INTEN | rphy->int_enable_bits;
>   	writel(val, usb2_base + USB2_INT_ENABLE);
>  -	writel(USB2_SPD_RSM_TIMSET_INIT, usb2_base + USB2_SPD_RSM_TIMSET);
>  -	writel(USB2_OC_TIMSET_INIT, usb2_base + USB2_OC_TIMSET);
> 
>  -	/* Initialize otg part */
>  -	if (channel->is_otg_channel) {
>  -		if (rcar_gen3_needs_init_otg(channel))
>  -			rcar_gen3_init_otg(channel);
>  -		rphy->otg_initialized = true;
>  +	if (!rcar_gen3_is_any_rphy_initialized(channel)) {
>  +		writel(USB2_SPD_RSM_TIMSET_INIT, usb2_base +
> USB2_SPD_RSM_TIMSET);
>  +		writel(USB2_OC_TIMSET_INIT, usb2_base + USB2_OC_TIMSET);
>   	}
> 
>  +	/* Initialize otg part (only if we initialize a PHY with IRQs). */
>  +	if (rphy->int_enable_bits)
>  +		rcar_gen3_init_otg(channel);
>  +
> + 	if (channel->utmi_ctrl) {
> + 		val = readl(usb2_base + USB2_REGEN_CG_CTRL) |
> USB2_REGEN_CG_CTRL_UPHY_WEN;
> + 		writel(val, usb2_base + USB2_REGEN_CG_CTRL);
> +
> + 		writel(USB2_UTMI_CTRL_INIT, usb2_base + USB2_UTMI_CTRL);
> + 		writel(val & ~USB2_REGEN_CG_CTRL_UPHY_WEN, usb2_base +
> USB2_REGEN_CG_CTRL);
> + 	}
> +
>   	rphy->initialized = true;
> 
>   	return 0;
> @@@ -764,7 -791,9 +792,9 @@@ static int rcar_gen3_phy_usb2_probe(str
>   	if (phy_data->no_adp_ctrl)
>   		channel->obint_enable_bits = USB2_OBINT_IDCHG_EN;
> 
> + 	channel->utmi_ctrl = phy_data->utmi_ctrl;
> +
>  -	mutex_init(&channel->lock);
>  +	spin_lock_init(&channel->lock);
>   	for (i = 0; i < NUM_OF_PHYS; i++) {
>   		channel->rphys[i].phy = devm_phy_create(dev, NULL,
>   							phy_data->phy_usb2_ops);

Re: linux-next: manual merge of the phy-next tree with the phy tree

[Vinod Koul]

On 15-05-25, 09:11, Prabhakar Mahadev Lad wrote:
> Hi Stephen,

Pls do not top post

> 
> Thanks for the report and fixing the conflict.
> 
> @Vinod, shall a rebase my patches and send a new version?

NO, once a patch is picked, it there. We have a way to resolve the
conflicts. Nothing required from you

Thanks

> 
> Cheers,
> Prabhakar
> 
> > -----Original Message-----
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Sent: 15 May 2025 08:09
> > To: Kishon Vijay Abraham I <kishon@kernel.org>; Vinod Koul
> > <vkoul@kernel.org>
> > Cc: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>; Prabhakar Mahadev
> > Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>; Linux Kernel Mailing List
> > <linux-kernel@vger.kernel.org>; Linux Next Mailing List <linux-
> > next@vger.kernel.org>
> > Subject: linux-next: manual merge of the phy-next tree with the phy tree
> > 
> > Hi all,
> > 
> > Today's linux-next merge of the phy-next tree got a conflict in:
> > 
> >   drivers/phy/renesas/phy-rcar-gen3-usb2.c
> > 
> > between commits:
> > 
> >   54c4c58713aa ("phy: renesas: rcar-gen3-usb2: Fix role detection on
> > unbind/bind")
> >   55a387ebb921 ("phy: renesas: rcar-gen3-usb2: Lock around hardware
> > registers and driver data")
> > 
> > from the phy tree and commit:
> > 
> >   3767474d7497 ("phy: renesas: phy-rcar-gen3-usb2: Add USB2.0 PHY support
> > for RZ/V2H(P)")
> > 
> > from the phy-next tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary. This is now
> > fixed as far as linux-next is concerned, but any non trivial conflicts
> > should be mentioned to your upstream maintainer when your tree is
> > submitted for merging.  You may also want to consider cooperating with the
> > maintainer of the conflicting tree to minimise any particularly complex
> > conflicts.
> > 
> > --
> > Cheers,
> > Stephen Rothwell
> > 
> > diff --cc drivers/phy/renesas/phy-rcar-gen3-usb2.c
> > index 9fdf17e0848a,867f43132b7a..000000000000
> > --- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> > +++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> > @@@ -467,16 -472,24 +477,24 @@@ static int rcar_gen3_phy_usb2_init(stru
> >   	val = readl(usb2_base + USB2_INT_ENABLE);
> >   	val |= USB2_INT_ENABLE_UCOM_INTEN | rphy->int_enable_bits;
> >   	writel(val, usb2_base + USB2_INT_ENABLE);
> >  -	writel(USB2_SPD_RSM_TIMSET_INIT, usb2_base + USB2_SPD_RSM_TIMSET);
> >  -	writel(USB2_OC_TIMSET_INIT, usb2_base + USB2_OC_TIMSET);
> > 
> >  -	/* Initialize otg part */
> >  -	if (channel->is_otg_channel) {
> >  -		if (rcar_gen3_needs_init_otg(channel))
> >  -			rcar_gen3_init_otg(channel);
> >  -		rphy->otg_initialized = true;
> >  +	if (!rcar_gen3_is_any_rphy_initialized(channel)) {
> >  +		writel(USB2_SPD_RSM_TIMSET_INIT, usb2_base +
> > USB2_SPD_RSM_TIMSET);
> >  +		writel(USB2_OC_TIMSET_INIT, usb2_base + USB2_OC_TIMSET);
> >   	}
> > 
> >  +	/* Initialize otg part (only if we initialize a PHY with IRQs). */
> >  +	if (rphy->int_enable_bits)
> >  +		rcar_gen3_init_otg(channel);
> >  +
> > + 	if (channel->utmi_ctrl) {
> > + 		val = readl(usb2_base + USB2_REGEN_CG_CTRL) |
> > USB2_REGEN_CG_CTRL_UPHY_WEN;
> > + 		writel(val, usb2_base + USB2_REGEN_CG_CTRL);
> > +
> > + 		writel(USB2_UTMI_CTRL_INIT, usb2_base + USB2_UTMI_CTRL);
> > + 		writel(val & ~USB2_REGEN_CG_CTRL_UPHY_WEN, usb2_base +
> > USB2_REGEN_CG_CTRL);
> > + 	}
> > +
> >   	rphy->initialized = true;
> > 
> >   	return 0;
> > @@@ -764,7 -791,9 +792,9 @@@ static int rcar_gen3_phy_usb2_probe(str
> >   	if (phy_data->no_adp_ctrl)
> >   		channel->obint_enable_bits = USB2_OBINT_IDCHG_EN;
> > 
> > + 	channel->utmi_ctrl = phy_data->utmi_ctrl;
> > +
> >  -	mutex_init(&channel->lock);
> >  +	spin_lock_init(&channel->lock);
> >   	for (i = 0; i < NUM_OF_PHYS; i++) {
> >   		channel->rphys[i].phy = devm_phy_create(dev, NULL,
> >   							phy_data->phy_usb2_ops);

-- 
~Vinod

Re: linux-next: manual merge of the phy-next tree with the phy tree

[Vinod Koul]

On 15-05-25, 17:09, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the phy-next tree got a conflict in:
> 
>   drivers/phy/renesas/phy-rcar-gen3-usb2.c
> 
> between commits:
> 
>   54c4c58713aa ("phy: renesas: rcar-gen3-usb2: Fix role detection on unbind/bind")
>   55a387ebb921 ("phy: renesas: rcar-gen3-usb2: Lock around hardware registers and driver data")
> 
> from the phy tree and commit:
> 
>   3767474d7497 ("phy: renesas: phy-rcar-gen3-usb2: Add USB2.0 PHY support for RZ/V2H(P)")
> 
> from the phy-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks, lgtm, I will merge fixes to resolve them before sending it up

> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/phy/renesas/phy-rcar-gen3-usb2.c
> index 9fdf17e0848a,867f43132b7a..000000000000
> --- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> +++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> @@@ -467,16 -472,24 +477,24 @@@ static int rcar_gen3_phy_usb2_init(stru
>   	val = readl(usb2_base + USB2_INT_ENABLE);
>   	val |= USB2_INT_ENABLE_UCOM_INTEN | rphy->int_enable_bits;
>   	writel(val, usb2_base + USB2_INT_ENABLE);
>  -	writel(USB2_SPD_RSM_TIMSET_INIT, usb2_base + USB2_SPD_RSM_TIMSET);
>  -	writel(USB2_OC_TIMSET_INIT, usb2_base + USB2_OC_TIMSET);
>   
>  -	/* Initialize otg part */
>  -	if (channel->is_otg_channel) {
>  -		if (rcar_gen3_needs_init_otg(channel))
>  -			rcar_gen3_init_otg(channel);
>  -		rphy->otg_initialized = true;
>  +	if (!rcar_gen3_is_any_rphy_initialized(channel)) {
>  +		writel(USB2_SPD_RSM_TIMSET_INIT, usb2_base + USB2_SPD_RSM_TIMSET);
>  +		writel(USB2_OC_TIMSET_INIT, usb2_base + USB2_OC_TIMSET);
>   	}
>   
>  +	/* Initialize otg part (only if we initialize a PHY with IRQs). */
>  +	if (rphy->int_enable_bits)
>  +		rcar_gen3_init_otg(channel);
>  +
> + 	if (channel->utmi_ctrl) {
> + 		val = readl(usb2_base + USB2_REGEN_CG_CTRL) | USB2_REGEN_CG_CTRL_UPHY_WEN;
> + 		writel(val, usb2_base + USB2_REGEN_CG_CTRL);
> + 
> + 		writel(USB2_UTMI_CTRL_INIT, usb2_base + USB2_UTMI_CTRL);
> + 		writel(val & ~USB2_REGEN_CG_CTRL_UPHY_WEN, usb2_base + USB2_REGEN_CG_CTRL);
> + 	}
> + 
>   	rphy->initialized = true;
>   
>   	return 0;
> @@@ -764,7 -791,9 +792,9 @@@ static int rcar_gen3_phy_usb2_probe(str
>   	if (phy_data->no_adp_ctrl)
>   		channel->obint_enable_bits = USB2_OBINT_IDCHG_EN;
>   
> + 	channel->utmi_ctrl = phy_data->utmi_ctrl;
> + 
>  -	mutex_init(&channel->lock);
>  +	spin_lock_init(&channel->lock);
>   	for (i = 0; i < NUM_OF_PHYS; i++) {
>   		channel->rphys[i].phy = devm_phy_create(dev, NULL,
>   							phy_data->phy_usb2_ops);



-- 
~Vinod

linux-next: manual merge of the phy-next tree with the phy tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 5282 bytes --]

Hi all,

Today's linux-next merge of the phy-next tree got a conflict in:

  drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c

between commit:

  f9475055b11c ("phy: phy-rockchip-samsung-hdptx: Fix PHY PLL output 50.25MHz error")

from the phy tree and commit:

  0edf9d2bb9b4 ("phy: rockchip: samsung-hdptx: Avoid Hz<->hHz unit conversion overhead")

from the phy-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
index 77236f012a1f,bb49d69a6f17..000000000000
--- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
+++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
@@@ -444,47 -412,45 +412,47 @@@ struct rk_hdptx_phy 
  };
  
  static const struct ropll_config ropll_tmds_cfg[] = {
- 	{ 5940000, 124, 124, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 62, 1, 16, 5, 0,
+ 	{ 594000000ULL, 124, 124, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 62, 1, 16, 5, 0,
  	  1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 3712500, 155, 155, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 62, 1, 16, 5, 0,
+ 	{ 371250000ULL, 155, 155, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 62, 1, 16, 5, 0,
  	  1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 2970000, 124, 124, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 62, 1, 16, 5, 0,
+ 	{ 297000000ULL, 124, 124, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 62, 1, 16, 5, 0,
  	  1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 1620000, 135, 135, 1, 1, 3, 1, 1, 0, 1, 1, 1, 1, 4, 0, 3, 5, 5, 0x10,
+ 	{ 162000000ULL, 135, 135, 1, 1, 3, 1, 1, 0, 1, 1, 1, 1, 4, 0, 3, 5, 5, 0x10,
  	  1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 1856250, 155, 155, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 62, 1, 16, 5, 0,
+ 	{ 185625000ULL, 155, 155, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 62, 1, 16, 5, 0,
  	  1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 1540000, 193, 193, 1, 1, 5, 1, 1, 1, 1, 1, 1, 1, 193, 1, 32, 2, 1,
+ 	{ 154000000ULL, 193, 193, 1, 1, 5, 1, 1, 1, 1, 1, 1, 1, 193, 1, 32, 2, 1,
  	  1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 1485000, 0x7b, 0x7b, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 4, 0, 3, 5, 5,
+ 	{ 148500000ULL, 0x7b, 0x7b, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 4, 0, 3, 5, 5,
  	  0x10, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 1462500, 122, 122, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 244, 1, 16, 2, 1, 1,
+ 	{ 146250000ULL, 122, 122, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 244, 1, 16, 2, 1, 1,
  	  1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 1190000, 149, 149, 1, 1, 5, 1, 1, 1, 1, 1, 1, 1, 149, 1, 16, 2, 1, 1,
+ 	{ 119000000ULL, 149, 149, 1, 1, 5, 1, 1, 1, 1, 1, 1, 1, 149, 1, 16, 2, 1, 1,
  	  1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 1065000, 89, 89, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 89, 1, 16, 1, 0, 1,
+ 	{ 106500000ULL, 89, 89, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 89, 1, 16, 1, 0, 1,
  	  1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 1080000, 135, 135, 1, 1, 5, 1, 1, 0, 1, 0, 1, 1, 0x9, 0, 0x05, 0,
+ 	{ 108000000ULL, 135, 135, 1, 1, 5, 1, 1, 0, 1, 0, 1, 1, 0x9, 0, 0x05, 0,
  	  0x14, 0x18, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 855000, 214, 214, 1, 1, 11, 1, 1, 1, 1, 1, 1, 1, 214, 1, 16, 2, 1,
+ 	{ 85500000ULL, 214, 214, 1, 1, 11, 1, 1, 1, 1, 1, 1, 1, 214, 1, 16, 2, 1,
  	  1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 835000, 105, 105, 1, 1, 5, 1, 1, 1, 1, 1, 1, 1, 42, 1, 16, 1, 0,
+ 	{ 83500000ULL, 105, 105, 1, 1, 5, 1, 1, 1, 1, 1, 1, 1, 42, 1, 16, 1, 0,
  	  1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 928125, 155, 155, 1, 1, 7, 1, 1, 1, 1, 1, 1, 1, 62, 1, 16, 5, 0,
+ 	{ 92812500ULL, 155, 155, 1, 1, 7, 1, 1, 1, 1, 1, 1, 1, 62, 1, 16, 5, 0,
  	  1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 742500, 124, 124, 1, 1, 7, 1, 1, 1, 1, 1, 1, 1, 62, 1, 16, 5, 0,
+ 	{ 74250000ULL, 124, 124, 1, 1, 7, 1, 1, 1, 1, 1, 1, 1, 62, 1, 16, 5, 0,
  	  1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 650000, 162, 162, 1, 1, 11, 1, 1, 1, 1, 1, 1, 1, 54, 0, 16, 4, 1,
+ 	{ 65000000ULL, 162, 162, 1, 1, 11, 1, 1, 1, 1, 1, 1, 1, 54, 0, 16, 4, 1,
  	  1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 502500, 84, 84, 1, 1, 7, 1, 1, 1, 1, 1, 1, 1, 11, 1, 4, 5,
++	{ 50250000Ull, 84, 84, 1, 1, 7, 1, 1, 1, 1, 1, 1, 1, 11, 1, 4, 5,
 +	  4, 11, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 337500, 0x70, 0x70, 1, 1, 0xf, 1, 1, 1, 1, 1, 1, 1, 0x2, 0, 0x01, 5,
+ 	{ 33750000ULL, 0x70, 0x70, 1, 1, 0xf, 1, 1, 1, 1, 1, 1, 1, 0x2, 0, 0x01, 5,
  	  1, 1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 400000, 100, 100, 1, 1, 11, 1, 1, 0, 1, 0, 1, 1, 0x9, 0, 0x05, 0,
+ 	{ 40000000ULL, 100, 100, 1, 1, 11, 1, 1, 0, 1, 0, 1, 1, 0x9, 0, 0x05, 0,
  	  0x14, 0x18, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 270000, 0x5a, 0x5a, 1, 1, 0xf, 1, 1, 0, 1, 0, 1, 1, 0x9, 0, 0x05, 0,
+ 	{ 27000000ULL, 0x5a, 0x5a, 1, 1, 0xf, 1, 1, 0, 1, 0, 1, 1, 0x9, 0, 0x05, 0,
  	  0x14, 0x18, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
- 	{ 251750, 84, 84, 1, 1, 0xf, 1, 1, 1, 1, 1, 1, 1, 168, 1, 16, 4, 1, 1,
+ 	{ 25175000ULL, 84, 84, 1, 1, 0xf, 1, 1, 1, 1, 1, 1, 1, 168, 1, 16, 4, 1, 1,
  	  1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
  };
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the phy-next tree with the phy tree

[Geert Uytterhoeven]

Hi Stephen,

On Thu, 15 May 2025 at 09:23, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the phy-next tree got a conflict in:
>
>   drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
>
> between commit:
>
>   f9475055b11c ("phy: phy-rockchip-samsung-hdptx: Fix PHY PLL output 50.25MHz error")
>
> from the phy tree and commit:
>
>   0edf9d2bb9b4 ("phy: rockchip: samsung-hdptx: Avoid Hz<->hHz unit conversion overhead")
>
> from the phy-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
> index 77236f012a1f,bb49d69a6f17..000000000000
> --- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
> +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
> @@@ -444,47 -412,45 +412,47 @@@ struct rk_hdptx_phy
>   };
>
>   static const struct ropll_config ropll_tmds_cfg[] = {

[...]

>           1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
> -       { 650000, 162, 162, 1, 1, 11, 1, 1, 1, 1, 1, 1, 1, 54, 0, 16, 4, 1,
> +       { 65000000ULL, 162, 162, 1, 1, 11, 1, 1, 1, 1, 1, 1, 1, 54, 0, 16, 4, 1,
>           1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
> -       { 502500, 84, 84, 1, 1, 7, 1, 1, 1, 1, 1, 1, 1, 11, 1, 4, 5,
> ++      { 50250000Ull, 84, 84, 1, 1, 7, 1, 1, 1, 1, 1, 1, 1, 11, 1, 4, 5,

Note that all other entries are using all-caps ULL.

>  +        4, 11, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },
> -       { 337500, 0x70, 0x70, 1, 1, 0xf, 1, 1, 1, 1, 1, 1, 1, 0x2, 0, 0x01, 5,
> +       { 33750000ULL, 0x70, 0x70, 1, 1, 0xf, 1, 1, 1, 1, 1, 1, 1, 0x2, 0, 0x01, 5,
>           1, 1, 1, 0, 0x20, 0x0c, 1, 0x0e, 0, 0, },

[...]

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

linux-next: manual merge of the phy-next tree with the phy tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1938 bytes --]

Hi all,

Today's linux-next merge of the phy-next tree got a conflict in:

  Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml

between commit:

  16fde3e07677 ("dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Fix X1E80100 resets entries")

from the phy tree and commit:

  26fb23ce35e2 ("dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Document the X1E80100 QMP PCIe PHY Gen4 x8")

from the phy-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml
index 380a9222a51d,680ec3113c2b..000000000000
--- a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml
@@@ -169,9 -172,8 +170,10 @@@ allOf
                - qcom,sc8280xp-qmp-gen3x1-pcie-phy
                - qcom,sc8280xp-qmp-gen3x2-pcie-phy
                - qcom,sc8280xp-qmp-gen3x4-pcie-phy
 +              - qcom,x1e80100-qmp-gen3x2-pcie-phy
 +              - qcom,x1e80100-qmp-gen4x2-pcie-phy
                - qcom,x1e80100-qmp-gen4x4-pcie-phy
+               - qcom,x1e80100-qmp-gen4x8-pcie-phy
      then:
        properties:
          clocks:
@@@ -201,7 -203,7 +203,8 @@@
                - qcom,sm8550-qmp-gen4x2-pcie-phy
                - qcom,sm8650-qmp-gen4x2-pcie-phy
                - qcom,x1e80100-qmp-gen4x2-pcie-phy
 +              - qcom,x1e80100-qmp-gen4x4-pcie-phy
+               - qcom,x1e80100-qmp-gen4x8-pcie-phy
      then:
        properties:
          resets:

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the phy-next tree with the phy tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2185 bytes --]

Hi all,

Today's linux-next merge of the phy-next tree got a conflict in:

  drivers/phy/qualcomm/phy-qcom-qmp-usb.c

between commit:

  d4c08d8b23b2 ("phy: qcom-qmp-usb: fix v3 offsets data")

from the phy tree and commit:

  52cfdc9c6c33 ("phy: qcom: qmp-usb: drop dual-lane handling")

from the phy-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index 5c003988c35d,6b6994cb77d7..000000000000
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@@ -1621,27 -1328,7 +1336,25 @@@ static const struct qmp_usb_offsets qmp
  	.rx		= 0x1000,
  };
  
 +static const struct qmp_phy_cfg ipq6018_usb3phy_cfg = {
 +	.lanes			= 1,
 +
 +	.offsets		= &qmp_usb_offsets_v3,
 +
 +	.serdes_tbl		= ipq9574_usb3_serdes_tbl,
 +	.serdes_tbl_num		= ARRAY_SIZE(ipq9574_usb3_serdes_tbl),
 +	.tx_tbl			= msm8996_usb3_tx_tbl,
 +	.tx_tbl_num		= ARRAY_SIZE(msm8996_usb3_tx_tbl),
 +	.rx_tbl			= ipq8074_usb3_rx_tbl,
 +	.rx_tbl_num		= ARRAY_SIZE(ipq8074_usb3_rx_tbl),
 +	.pcs_tbl		= ipq8074_usb3_pcs_tbl,
 +	.pcs_tbl_num		= ARRAY_SIZE(ipq8074_usb3_pcs_tbl),
 +	.vreg_list		= qmp_phy_vreg_l,
 +	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),
 +	.regs			= qmp_v3_usb3phy_regs_layout,
 +};
 +
  static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = {
- 	.lanes			= 1,
- 
  	.offsets		= &qmp_usb_offsets_v3,
  
  	.serdes_tbl		= ipq8074_usb3_serdes_tbl,
@@@ -1676,9 -1361,7 +1387,7 @@@ static const struct qmp_phy_cfg ipq9574
  };
  
  static const struct qmp_phy_cfg msm8996_usb3phy_cfg = {
- 	.lanes			= 1,
- 
 -	.offsets		= &qmp_usb_offsets_v3,
 +	.offsets		= &qmp_usb_offsets_v3_msm8996,
  
  	.serdes_tbl		= msm8996_usb3_serdes_tbl,
  	.serdes_tbl_num		= ARRAY_SIZE(msm8996_usb3_serdes_tbl),

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the phy-next tree with the phy tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2336 bytes --]

Hi all,

On Mon, 19 Feb 2024 14:44:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the phy-next tree got a conflict in:
> 
>   drivers/phy/qualcomm/phy-qcom-qmp-usb.c
> 
> between commit:
> 
>   d4c08d8b23b2 ("phy: qcom-qmp-usb: fix v3 offsets data")
> 
> from the phy tree and commit:
> 
>   52cfdc9c6c33 ("phy: qcom: qmp-usb: drop dual-lane handling")
> 
> from the phy-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Actually the below ...
-- 
Cheers,
Stephen Rothwell

diff --cc drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index 5c003988c35d,6b6994cb77d7..85253936fac3
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@@ -1621,27 -1328,7 +1336,23 @@@ static const struct qmp_usb_offsets qmp
  	.rx		= 0x1000,
  };
  
 +static const struct qmp_phy_cfg ipq6018_usb3phy_cfg = {
- 	.lanes			= 1,
- 
 +	.offsets		= &qmp_usb_offsets_v3,
 +
 +	.serdes_tbl		= ipq9574_usb3_serdes_tbl,
 +	.serdes_tbl_num		= ARRAY_SIZE(ipq9574_usb3_serdes_tbl),
 +	.tx_tbl			= msm8996_usb3_tx_tbl,
 +	.tx_tbl_num		= ARRAY_SIZE(msm8996_usb3_tx_tbl),
 +	.rx_tbl			= ipq8074_usb3_rx_tbl,
 +	.rx_tbl_num		= ARRAY_SIZE(ipq8074_usb3_rx_tbl),
 +	.pcs_tbl		= ipq8074_usb3_pcs_tbl,
 +	.pcs_tbl_num		= ARRAY_SIZE(ipq8074_usb3_pcs_tbl),
 +	.vreg_list		= qmp_phy_vreg_l,
 +	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),
 +	.regs			= qmp_v3_usb3phy_regs_layout,
 +};
 +
  static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = {
- 	.lanes			= 1,
- 
  	.offsets		= &qmp_usb_offsets_v3,
  
  	.serdes_tbl		= ipq8074_usb3_serdes_tbl,
@@@ -1676,9 -1361,7 +1385,7 @@@ static const struct qmp_phy_cfg ipq9574
  };
  
  static const struct qmp_phy_cfg msm8996_usb3phy_cfg = {
- 	.lanes			= 1,
- 
 -	.offsets		= &qmp_usb_offsets_v3,
 +	.offsets		= &qmp_usb_offsets_v3_msm8996,
  
  	.serdes_tbl		= msm8996_usb3_serdes_tbl,
  	.serdes_tbl_num		= ARRAY_SIZE(msm8996_usb3_serdes_tbl),

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the phy-next tree with the phy tree

[Vinod Koul]

On 19-02-24, 15:06, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 19 Feb 2024 14:44:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > Today's linux-next merge of the phy-next tree got a conflict in:
> > 
> >   drivers/phy/qualcomm/phy-qcom-qmp-usb.c
> > 
> > between commit:
> > 
> >   d4c08d8b23b2 ("phy: qcom-qmp-usb: fix v3 offsets data")
> > 
> > from the phy tree and commit:
> > 
> >   52cfdc9c6c33 ("phy: qcom: qmp-usb: drop dual-lane handling")

Thanks, this lgtm

BR
-- 
~Vinod

linux-next: manual merge of the phy-next tree with the phy tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1959 bytes --]

Hi all,

Today's linux-next merge of the phy-next tree got a conflict in:

  drivers/phy/qualcomm/phy-qcom-qmp-usb.c

between commit:

  f74c35b630d4 ("phy: qcom-qmp-usb: fix register offsets for ipq8074/ipq6018")

from the phy tree and commit:

  52cfdc9c6c33 ("phy: qcom: qmp-usb: drop dual-lane handling")

from the phy-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index 6621246e4ddf,e62539ce99a6..25d8d881b2f3
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@@ -1621,28 -1385,8 +1393,24 @@@ static const struct qmp_usb_offsets qmp
  	.rx		= 0x1000,
  };
  
 +static const struct qmp_phy_cfg ipq6018_usb3phy_cfg = {
- 	.lanes			= 1,
- 
 +	.offsets		= &qmp_usb_offsets_ipq8074,
 +
 +	.serdes_tbl		= ipq9574_usb3_serdes_tbl,
 +	.serdes_tbl_num		= ARRAY_SIZE(ipq9574_usb3_serdes_tbl),
 +	.tx_tbl			= msm8996_usb3_tx_tbl,
 +	.tx_tbl_num		= ARRAY_SIZE(msm8996_usb3_tx_tbl),
 +	.rx_tbl			= ipq8074_usb3_rx_tbl,
 +	.rx_tbl_num		= ARRAY_SIZE(ipq8074_usb3_rx_tbl),
 +	.pcs_tbl		= ipq8074_usb3_pcs_tbl,
 +	.pcs_tbl_num		= ARRAY_SIZE(ipq8074_usb3_pcs_tbl),
 +	.vreg_list		= qmp_phy_vreg_l,
 +	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),
 +	.regs			= qmp_v3_usb3phy_regs_layout,
 +};
 +
  static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = {
- 	.lanes			= 1,
- 
 -	.offsets		= &qmp_usb_offsets_v3,
 +	.offsets		= &qmp_usb_offsets_ipq8074,
  
  	.serdes_tbl		= ipq8074_usb3_serdes_tbl,
  	.serdes_tbl_num		= ARRAY_SIZE(ipq8074_usb3_serdes_tbl),

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the phy-next tree with the phy tree

[Vinod Koul]

On 25-01-24, 12:33, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the phy-next tree got a conflict in:
> 
>   drivers/phy/qualcomm/phy-qcom-qmp-usb.c
> 
> between commit:
> 
>   f74c35b630d4 ("phy: qcom-qmp-usb: fix register offsets for ipq8074/ipq6018")
> 
> from the phy tree and commit:
> 
>   52cfdc9c6c33 ("phy: qcom: qmp-usb: drop dual-lane handling")
> 
> from the phy-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks Stephen, this looks good to me. I will notify Linus when he pulls
this

BR

> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/phy/qualcomm/phy-qcom-qmp-usb.c
> index 6621246e4ddf,e62539ce99a6..25d8d881b2f3
> --- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
> @@@ -1621,28 -1385,8 +1393,24 @@@ static const struct qmp_usb_offsets qmp
>   	.rx		= 0x1000,
>   };
>   
>  +static const struct qmp_phy_cfg ipq6018_usb3phy_cfg = {
> - 	.lanes			= 1,
> - 
>  +	.offsets		= &qmp_usb_offsets_ipq8074,
>  +
>  +	.serdes_tbl		= ipq9574_usb3_serdes_tbl,
>  +	.serdes_tbl_num		= ARRAY_SIZE(ipq9574_usb3_serdes_tbl),
>  +	.tx_tbl			= msm8996_usb3_tx_tbl,
>  +	.tx_tbl_num		= ARRAY_SIZE(msm8996_usb3_tx_tbl),
>  +	.rx_tbl			= ipq8074_usb3_rx_tbl,
>  +	.rx_tbl_num		= ARRAY_SIZE(ipq8074_usb3_rx_tbl),
>  +	.pcs_tbl		= ipq8074_usb3_pcs_tbl,
>  +	.pcs_tbl_num		= ARRAY_SIZE(ipq8074_usb3_pcs_tbl),
>  +	.vreg_list		= qmp_phy_vreg_l,
>  +	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),
>  +	.regs			= qmp_v3_usb3phy_regs_layout,
>  +};
>  +
>   static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = {
> - 	.lanes			= 1,
> - 
>  -	.offsets		= &qmp_usb_offsets_v3,
>  +	.offsets		= &qmp_usb_offsets_ipq8074,
>   
>   	.serdes_tbl		= ipq8074_usb3_serdes_tbl,
>   	.serdes_tbl_num		= ARRAY_SIZE(ipq8074_usb3_serdes_tbl),



-- 
~Vinod

linux-next: manual merge of the phy-next tree with the phy tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2360 bytes --]

Hi all,

Today's linux-next merge of the phy-next tree got a conflict in:

  drivers/phy/qualcomm/phy-qcom-qmp-usb.c

between commit:

  c599dc5cca4d ("phy: qcom-qmp-usb: split PCS_USB init table for sc8280xp and sa8775p")

from the phy tree and commits:

  7233090aba54 ("phy: qcom-qmp-usb: simplify clock handling")
  fcf63482f6a9 ("phy: qcom-qmp-usb: rework reset handling")

from the phy-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index c69577601ae0,2a094f2345f0..000000000000
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@@ -1389,12 -1378,6 +1384,10 @@@ static const struct qmp_phy_cfg sa8775p
  	.rx_tbl_num		= ARRAY_SIZE(sc8280xp_usb3_uniphy_rx_tbl),
  	.pcs_tbl		= sa8775p_usb3_uniphy_pcs_tbl,
  	.pcs_tbl_num		= ARRAY_SIZE(sa8775p_usb3_uniphy_pcs_tbl),
 +	.pcs_usb_tbl		= sa8775p_usb3_uniphy_pcs_usb_tbl,
 +	.pcs_usb_tbl_num	= ARRAY_SIZE(sa8775p_usb3_uniphy_pcs_usb_tbl),
 +	.clk_list		= qmp_v4_phy_clk_l,
 +	.num_clks		= ARRAY_SIZE(qmp_v4_phy_clk_l),
- 	.reset_list		= qcm2290_usb3phy_reset_l,
- 	.num_resets		= ARRAY_SIZE(qcm2290_usb3phy_reset_l),
  	.vreg_list		= qmp_phy_vreg_l,
  	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),
  	.regs			= qmp_v5_usb3phy_regs_layout,
@@@ -1413,12 -1396,6 +1406,10 @@@ static const struct qmp_phy_cfg sc8280x
  	.rx_tbl_num		= ARRAY_SIZE(sc8280xp_usb3_uniphy_rx_tbl),
  	.pcs_tbl		= sc8280xp_usb3_uniphy_pcs_tbl,
  	.pcs_tbl_num		= ARRAY_SIZE(sc8280xp_usb3_uniphy_pcs_tbl),
 +	.pcs_usb_tbl		= sc8280xp_usb3_uniphy_pcs_usb_tbl,
 +	.pcs_usb_tbl_num	= ARRAY_SIZE(sc8280xp_usb3_uniphy_pcs_usb_tbl),
 +	.clk_list		= qmp_v4_phy_clk_l,
 +	.num_clks		= ARRAY_SIZE(qmp_v4_phy_clk_l),
- 	.reset_list		= qcm2290_usb3phy_reset_l,
- 	.num_resets		= ARRAY_SIZE(qcm2290_usb3phy_reset_l),
  	.vreg_list		= qmp_phy_vreg_l,
  	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),
  	.regs			= qmp_v5_usb3phy_regs_layout,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the phy-next tree with the phy tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2522 bytes --]

Hi all,

On Mon, 25 Sep 2023 13:16:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the phy-next tree got a conflict in:
> 
>   drivers/phy/qualcomm/phy-qcom-qmp-usb.c
> 
> between commit:
> 
>   c599dc5cca4d ("phy: qcom-qmp-usb: split PCS_USB init table for sc8280xp and sa8775p")
> 
> from the phy tree and commits:
> 
>   7233090aba54 ("phy: qcom-qmp-usb: simplify clock handling")
>   fcf63482f6a9 ("phy: qcom-qmp-usb: rework reset handling")
> 
> from the phy-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

-- 
Cheers,
Stephen Rothwell

Actually the resolution is this:

diff --cc drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index c69577601ae0,2a094f2345f0..02f156298e77
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@@ -1389,12 -1378,6 +1384,8 @@@ static const struct qmp_phy_cfg sa8775p
  	.rx_tbl_num		= ARRAY_SIZE(sc8280xp_usb3_uniphy_rx_tbl),
  	.pcs_tbl		= sa8775p_usb3_uniphy_pcs_tbl,
  	.pcs_tbl_num		= ARRAY_SIZE(sa8775p_usb3_uniphy_pcs_tbl),
 +	.pcs_usb_tbl		= sa8775p_usb3_uniphy_pcs_usb_tbl,
 +	.pcs_usb_tbl_num	= ARRAY_SIZE(sa8775p_usb3_uniphy_pcs_usb_tbl),
- 	.clk_list		= qmp_v4_phy_clk_l,
- 	.num_clks		= ARRAY_SIZE(qmp_v4_phy_clk_l),
- 	.reset_list		= qcm2290_usb3phy_reset_l,
- 	.num_resets		= ARRAY_SIZE(qcm2290_usb3phy_reset_l),
  	.vreg_list		= qmp_phy_vreg_l,
  	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),
  	.regs			= qmp_v5_usb3phy_regs_layout,
@@@ -1413,12 -1396,6 +1404,8 @@@ static const struct qmp_phy_cfg sc8280x
  	.rx_tbl_num		= ARRAY_SIZE(sc8280xp_usb3_uniphy_rx_tbl),
  	.pcs_tbl		= sc8280xp_usb3_uniphy_pcs_tbl,
  	.pcs_tbl_num		= ARRAY_SIZE(sc8280xp_usb3_uniphy_pcs_tbl),
 +	.pcs_usb_tbl		= sc8280xp_usb3_uniphy_pcs_usb_tbl,
 +	.pcs_usb_tbl_num	= ARRAY_SIZE(sc8280xp_usb3_uniphy_pcs_usb_tbl),
- 	.clk_list		= qmp_v4_phy_clk_l,
- 	.num_clks		= ARRAY_SIZE(qmp_v4_phy_clk_l),
- 	.reset_list		= qcm2290_usb3phy_reset_l,
- 	.num_resets		= ARRAY_SIZE(qcm2290_usb3phy_reset_l),
  	.vreg_list		= qmp_phy_vreg_l,
  	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),
  	.regs			= qmp_v5_usb3phy_regs_layout,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the phy-next tree with the phy tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2546 bytes --]

Hi all,

Today's linux-next merge of the phy-next tree got a conflict in:

  drivers/phy/qualcomm/phy-qcom-m31.c

between commits:

  5f7cd740a6b6 ("phy: qcom: phy-qcom-m31: fix wrong pointer pass to PTR_ERR()")
  426e05ce126e ("phy: qcom: phy-qcom-m31: change m31_ipq5332_regs to static")

from the phy tree and commits:

  90f7af497a78 ("phy: qcom: m31: Fix indentation issues")
  68320e35f8cb ("phy: qcom-m31: Add compatible, phy init sequence for IPQ5018")

from the phy-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/phy/qualcomm/phy-qcom-m31.c
index 5cb7e79b99b3,d5af4dde6960..000000000000
--- a/drivers/phy/qualcomm/phy-qcom-m31.c
+++ b/drivers/phy/qualcomm/phy-qcom-m31.c
@@@ -82,7 -82,51 +82,51 @@@ struct m31_priv_data 
  	unsigned int			nregs;
  };
  
+ static const struct m31_phy_regs m31_ipq5018_regs[] = {
+ 	{
+ 		.off = USB_PHY_CFG0,
+ 		.val = UTMI_PHY_OVERRIDE_EN
+ 	},
+ 	{
+ 		.off = USB_PHY_UTMI_CTRL5,
+ 		.val = POR_EN,
+ 		.delay = 15
+ 	},
+ 	{
+ 		.off = USB_PHY_FSEL_SEL,
+ 		.val = FREQ_SEL
+ 	},
+ 	{
+ 		.off = USB_PHY_HS_PHY_CTRL_COMMON0,
+ 		.val = COMMONONN | FSEL | RETENABLEN
+ 	},
+ 	{
+ 		.off = USB_PHY_REFCLK_CTRL,
+ 		.val = CLKCORE
+ 	},
+ 	{
+ 		.off = USB_PHY_UTMI_CTRL5,
+ 		.val = POR_EN
+ 	},
+ 	{
+ 		.off = USB_PHY_HS_PHY_CTRL2,
+ 		.val = USB2_SUSPEND_N_SEL | USB2_SUSPEND_N | USB2_UTMI_CLK_EN
+ 	},
+ 	{
+ 		.off = USB_PHY_UTMI_CTRL5,
+ 		.val = 0x0
+ 	},
+ 	{
+ 		.off = USB_PHY_HS_PHY_CTRL2,
+ 		.val = USB2_SUSPEND_N | USB2_UTMI_CLK_EN
+ 	},
+ 	{
+ 		.off = USB_PHY_CFG0,
+ 		.val = 0x0
+ 	},
+ };
+ 
 -struct m31_phy_regs m31_ipq5332_regs[] = {
 +static struct m31_phy_regs m31_ipq5332_regs[] = {
  	{
  		USB_PHY_CFG0,
  		UTMI_PHY_OVERRIDE_EN,
@@@ -255,8 -300,8 +299,8 @@@ static int m31usb_phy_probe(struct plat
  
  	qphy->vreg = devm_regulator_get(dev, "vdda-phy");
  	if (IS_ERR(qphy->vreg))
 -		return dev_err_probe(dev, PTR_ERR(qphy->phy),
 +		return dev_err_probe(dev, PTR_ERR(qphy->vreg),
- 						"failed to get vreg\n");
+ 				     "failed to get vreg\n");
  
  	phy_set_drvdata(qphy->phy, qphy);
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]