linux-next: manual merge of the pmdomain tree with the xilinx tree

linux-next: manual merge of the pmdomain tree with the xilinx tree

[Stephen Rothwell]

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

Hi all,

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

  drivers/firmware/xilinx/zynqmp.c

between commit:

  ef32394c6d34 ("drivers: firmware: xilinx: Add unique family code for all platforms")

from the xilinx tree and commits:

  3da405ead651 ("firmware/pmdomain: xilinx: Move ->sync_state() support to firmware driver")
  29ea33866d6d ("firmware: xilinx: Use of_genpd_sync_state()")

from the pmdomain 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/firmware/xilinx/zynqmp.c
index 906a7aae719e,02da3e48bc8f..000000000000
--- a/drivers/firmware/xilinx/zynqmp.c
+++ b/drivers/firmware/xilinx/zynqmp.c
@@@ -2143,22 -2100,22 +2143,35 @@@ static void zynqmp_firmware_remove(stru
  	platform_device_unregister(em_dev);
  }
  
+ static void zynqmp_firmware_sync_state(struct device *dev)
+ {
+ 	struct device_node *np = dev->of_node;
+ 
+ 	if (!of_device_is_compatible(np, "xlnx,zynqmp-firmware"))
+ 		return;
+ 
+ 	of_genpd_sync_state(np);
+ 
+ 	if (zynqmp_pm_init_finalize())
+ 		dev_warn(dev, "failed to release power management to firmware\n");
+ }
+ 
 +static const struct platform_fw_data platform_fw_data_versal = {
 +	.family_code = PM_VERSAL_FAMILY_CODE,
 +};
 +
 +static const struct platform_fw_data platform_fw_data_versal_net = {
 +	.family_code = PM_VERSAL_NET_FAMILY_CODE,
 +};
 +
 +static const struct platform_fw_data platform_fw_data_zynqmp = {
 +	.family_code = PM_ZYNQMP_FAMILY_CODE,
 +};
 +
  static const struct of_device_id zynqmp_firmware_of_match[] = {
 -	{.compatible = "xlnx,zynqmp-firmware"},
 -	{.compatible = "xlnx,versal-firmware"},
 +	{.compatible = "xlnx,zynqmp-firmware", .data = &platform_fw_data_zynqmp},
 +	{.compatible = "xlnx,versal-firmware", .data = &platform_fw_data_versal},
 +	{.compatible = "xlnx,versal-net-firmware", .data = &platform_fw_data_versal_net},
  	{},
  };
  MODULE_DEVICE_TABLE(of, zynqmp_firmware_of_match);

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

Re: linux-next: manual merge of the pmdomain tree with the xilinx tree

[Michal Simek]

Hi Stephen and Ulf,

po 21. 7. 2025 v 4:38 odesílatel Stephen Rothwell <sfr@canb.auug.org.au> napsal:
>
> Hi all,
>
> Today's linux-next merge of the pmdomain tree got a conflict in:
>
>   drivers/firmware/xilinx/zynqmp.c
>
> between commit:
>
>   ef32394c6d34 ("drivers: firmware: xilinx: Add unique family code for all platforms")
>
> from the xilinx tree and commits:
>
>   3da405ead651 ("firmware/pmdomain: xilinx: Move ->sync_state() support to firmware driver")
>   29ea33866d6d ("firmware: xilinx: Use of_genpd_sync_state()")
>
> from the pmdomain 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.

Ulf: change in your tree should come first and I will deal with the
fix via my tree.

Thanks,
MIchal