linux-next: manual merge of the devicetree tree with the qcom tree

[Mark Brown]

Hi all,

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

  drivers/soc/qcom/qcom_pd_mapper.c

between commit:

  cdf0e445ee211 ("soc: qcom: pd-mapper: Simplify code using of_root to get root device tree node")

from the qcom tree and commit:

  3ee3d8a44976a ("soc: qcom: pd-mapper: Convert to of_machine_get_match()")

from the devicetree 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.

diff --combined drivers/soc/qcom/qcom_pd_mapper.c
index 21e4dd594295b,8a1a18f8c8594..0000000000000
--- a/drivers/soc/qcom/qcom_pd_mapper.c
+++ b/drivers/soc/qcom/qcom_pd_mapper.c
@@@ -401,16 -401,6 +401,16 @@@ static const struct qcom_pdm_domain_dat
  	NULL,
  };
  
 +static const struct qcom_pdm_domain_data *qcs615_domains[] = {
 +	&adsp_audio_pd,
 +	&adsp_root_pd,
 +	&adsp_sensor_pd,
 +	&cdsp_root_pd,
 +	&mpss_root_pd,
 +	&mpss_wlan_pd,
 +	NULL,
 +};
 +
  static const struct qcom_pdm_domain_data *sc7180_domains[] = {
  	&adsp_audio_pd,
  	&adsp_root_pd_pdr,
@@@ -582,7 -572,6 +582,7 @@@ static const struct of_device_id qcom_p
  	{ .compatible = "qcom,qcm2290", .data = qcm2290_domains, },
  	{ .compatible = "qcom,qcm6490", .data = sc7280_domains, },
  	{ .compatible = "qcom,qcs404", .data = qcs404_domains, },
 +	{ .compatible = "qcom,qcs615", .data = qcs615_domains, },
  	{ .compatible = "qcom,sc7180", .data = sc7180_domains, },
  	{ .compatible = "qcom,sc7280", .data = sc7280_domains, },
  	{ .compatible = "qcom,sc8180x", .data = sc8180x_domains, },
@@@ -628,7 -617,7 +628,7 @@@ static struct qcom_pdm_data *qcom_pdm_s
  	struct qcom_pdm_data *data;
  	int ret, i;
  
- 	match = of_match_node(qcom_pdm_domains, of_root);
+ 	match = of_machine_get_match(qcom_pdm_domains);
  	if (!match) {
  		pr_notice("PDM: no support for the platform, userspace daemon might be required.\n");
  		return ERR_PTR(-ENODEV);
@@@ -661,7 -650,7 +661,7 @@@
  			goto err_stop;
  	}
  
 -	ret = qmi_add_server(&data->handle, SERVREG_LOCATOR_SERVICE,
 +	ret = qmi_add_server(&data->handle, QMI_SERVICE_ID_SERVREG_LOC,
  			     SERVREG_QMI_VERSION, SERVREG_QMI_INSTANCE);
  	if (ret) {
  		pr_err("PDM: error adding server %d\n", ret);

Attachment: signature.asc
Description: PGP signature