* linux-next: manual merge of the devicetree tree with the qcom tree
@ 2024-11-05 3:44 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2024-11-05 3:44 UTC (permalink / raw)
To: Rob Herring, Andy Gross
Cc: Abel Vesa, Bjorn Andersson, Jingyi Wang,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 810 bytes --]
Hi all,
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/cache/qcom,llcc.yaml
between commit:
a83e18ca8358 ("dt-bindings: cache: qcom,llcc: Document the QCS8300 LLCC")
from the qcom tree and commit:
f9759e2b5704 ("dt-bindings: cache: qcom,llcc: Fix X1E80100 reg entries")
from the devicetree tree.
I fixed it up (the 3 way diff comes out empty) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* linux-next: manual merge of the devicetree tree with the qcom tree
@ 2026-03-19 13:46 Mark Brown
0 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2026-03-19 13:46 UTC (permalink / raw)
To: Rob Herring
Cc: Bjorn Andersson, Krzysztof Kozlowski, Linux Kernel Mailing List,
Linux Next Mailing List, Sibi Sankar
[-- Attachment #1: Type: text/plain, Size: 9604 bytes --]
Hi all,
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/arm/cpus.yaml
between commit:
96e71f817b02c ("dt-bindings: arm: cpus: Extend Qualcomm Oryon compatibles")
from the qcom tree and commit:
0220405d7e099 ("dt-bindings: arm: cpus: Deprecate Qualcomm generic compatibles")
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 --cc Documentation/devicetree/bindings/arm/cpus.yaml
index 07f3c6a525541,700255e9a0022..0000000000000
--- a/Documentation/devicetree/bindings/arm/cpus.yaml
+++ b/Documentation/devicetree/bindings/arm/cpus.yaml
@@@ -79,156 -79,153 +79,160 @@@ properties
All other bits in the reg cells must be set to 0.
compatible:
- enum:
- - apm,potenza
- - apm,strega
- - apple,avalanche
- - apple,blizzard
- - apple,cyclone
- - apple,firestorm
- - apple,hurricane-zephyr
- - apple,icestorm
- - apple,mistral
- - apple,monsoon
- - apple,twister
- - apple,typhoon
- - arm,arm710t
- - arm,arm720t
- - arm,arm740t
- - arm,arm7ej-s
- - arm,arm7tdmi
- - arm,arm7tdmi-s
- - arm,arm9es
- - arm,arm9ej-s
- - arm,arm920t
- - arm,arm922t
- - arm,arm925
- - arm,arm926e-s
- - arm,arm926ej-s
- - arm,arm940t
- - arm,arm946e-s
- - arm,arm966e-s
- - arm,arm968e-s
- - arm,arm9tdmi
- - arm,arm1020e
- - arm,arm1020t
- - arm,arm1022e
- - arm,arm1026ej-s
- - arm,arm1136j-s
- - arm,arm1136jf-s
- - arm,arm1156t2-s
- - arm,arm1156t2f-s
- - arm,arm1176jzf
- - arm,arm1176jz-s
- - arm,arm1176jzf-s
- - arm,arm11mpcore
- - arm,armv8 # Only for s/w models
- - arm,c1-nano
- - arm,c1-premium
- - arm,c1-pro
- - arm,c1-ultra
- - arm,cortex-a5
- - arm,cortex-a7
- - arm,cortex-a8
- - arm,cortex-a9
- - arm,cortex-a12
- - arm,cortex-a15
- - arm,cortex-a17
- - arm,cortex-a32
- - arm,cortex-a34
- - arm,cortex-a35
- - arm,cortex-a53
- - arm,cortex-a55
- - arm,cortex-a57
- - arm,cortex-a65
- - arm,cortex-a72
- - arm,cortex-a73
- - arm,cortex-a75
- - arm,cortex-a76
- - arm,cortex-a77
- - arm,cortex-a78
- - arm,cortex-a78ae
- - arm,cortex-a78c
- - arm,cortex-a320
- - arm,cortex-a510
- - arm,cortex-a520
- - arm,cortex-a520ae
- - arm,cortex-a710
- - arm,cortex-a715
- - arm,cortex-a720
- - arm,cortex-a720ae
- - arm,cortex-a725
- - arm,cortex-m0
- - arm,cortex-m0+
- - arm,cortex-m1
- - arm,cortex-m3
- - arm,cortex-m4
- - arm,cortex-r4
- - arm,cortex-r5
- - arm,cortex-r7
- - arm,cortex-r52
- - arm,cortex-x1
- - arm,cortex-x1c
- - arm,cortex-x2
- - arm,cortex-x3
- - arm,cortex-x4
- - arm,cortex-x925
- - arm,neoverse-e1
- - arm,neoverse-n1
- - arm,neoverse-n2
- - arm,neoverse-n3
- - arm,neoverse-v1
- - arm,neoverse-v2
- - arm,neoverse-v3
- - arm,neoverse-v3ae
- - arm,rainier
- - brcm,brahma-b15
- - brcm,brahma-b53
- - brcm,vulcan
- - cavium,thunder
- - cavium,thunder2
- - faraday,fa526
- - intel,sa110
- - intel,sa1100
- - marvell,feroceon
- - marvell,mohawk
- - marvell,pj4a
- - marvell,pj4b
- - marvell,sheeva-v5
- - marvell,sheeva-v7
- - nvidia,tegra132-denver
- - nvidia,tegra186-denver
- - nvidia,tegra194-carmel
- - qcom,krait
- - qcom,kryo
- - qcom,kryo240
- - qcom,kryo250
- - qcom,kryo260
- - qcom,kryo280
- - qcom,kryo360
- - qcom,kryo385
- - qcom,kryo465
- - qcom,kryo468
- - qcom,kryo470
- - qcom,kryo485
- - qcom,kryo560
- - qcom,kryo570
- - qcom,kryo660
- - qcom,kryo670
- - qcom,kryo685
- - qcom,kryo780
- - qcom,oryon
- - qcom,oryon-1-1
- - qcom,oryon-1-2
- - qcom,oryon-1-3
- - qcom,oryon-1-4
- - qcom,oryon-2-1
- - qcom,oryon-2-2
- - qcom,oryon-2-3
- - qcom,scorpion
- - samsung,mongoose-m2
- - samsung,mongoose-m3
- - samsung,mongoose-m5
+ oneOf:
+ - enum:
+ - apm,potenza
+ - apm,strega
+ - apple,avalanche
+ - apple,blizzard
+ - apple,cyclone
+ - apple,firestorm
+ - apple,hurricane-zephyr
+ - apple,icestorm
+ - apple,mistral
+ - apple,monsoon
+ - apple,twister
+ - apple,typhoon
+ - arm,arm710t
+ - arm,arm720t
+ - arm,arm740t
+ - arm,arm7ej-s
+ - arm,arm7tdmi
+ - arm,arm7tdmi-s
+ - arm,arm9es
+ - arm,arm9ej-s
+ - arm,arm920t
+ - arm,arm922t
+ - arm,arm925
+ - arm,arm926e-s
+ - arm,arm926ej-s
+ - arm,arm940t
+ - arm,arm946e-s
+ - arm,arm966e-s
+ - arm,arm968e-s
+ - arm,arm9tdmi
+ - arm,arm1020e
+ - arm,arm1020t
+ - arm,arm1022e
+ - arm,arm1026ej-s
+ - arm,arm1136j-s
+ - arm,arm1136jf-s
+ - arm,arm1156t2-s
+ - arm,arm1156t2f-s
+ - arm,arm1176jzf
+ - arm,arm1176jz-s
+ - arm,arm1176jzf-s
+ - arm,arm11mpcore
+ - arm,armv8 # Only for s/w models
+ - arm,c1-nano
+ - arm,c1-premium
+ - arm,c1-pro
+ - arm,c1-ultra
+ - arm,cortex-a5
+ - arm,cortex-a7
+ - arm,cortex-a8
+ - arm,cortex-a9
+ - arm,cortex-a12
+ - arm,cortex-a15
+ - arm,cortex-a17
+ - arm,cortex-a32
+ - arm,cortex-a34
+ - arm,cortex-a35
+ - arm,cortex-a53
+ - arm,cortex-a55
+ - arm,cortex-a57
+ - arm,cortex-a65
+ - arm,cortex-a72
+ - arm,cortex-a73
+ - arm,cortex-a75
+ - arm,cortex-a76
+ - arm,cortex-a77
+ - arm,cortex-a78
+ - arm,cortex-a78ae
+ - arm,cortex-a78c
+ - arm,cortex-a320
+ - arm,cortex-a510
+ - arm,cortex-a520
+ - arm,cortex-a520ae
+ - arm,cortex-a710
+ - arm,cortex-a715
+ - arm,cortex-a720
+ - arm,cortex-a720ae
+ - arm,cortex-a725
+ - arm,cortex-m0
+ - arm,cortex-m0+
+ - arm,cortex-m1
+ - arm,cortex-m3
+ - arm,cortex-m4
+ - arm,cortex-r4
+ - arm,cortex-r5
+ - arm,cortex-r7
+ - arm,cortex-r52
+ - arm,cortex-x1
+ - arm,cortex-x1c
+ - arm,cortex-x2
+ - arm,cortex-x3
+ - arm,cortex-x4
+ - arm,cortex-x925
+ - arm,neoverse-e1
+ - arm,neoverse-n1
+ - arm,neoverse-n2
+ - arm,neoverse-n3
+ - arm,neoverse-v1
+ - arm,neoverse-v2
+ - arm,neoverse-v3
+ - arm,neoverse-v3ae
+ - arm,rainier
+ - brcm,brahma-b15
+ - brcm,brahma-b53
+ - brcm,vulcan
+ - cavium,thunder
+ - cavium,thunder2
+ - faraday,fa526
+ - intel,sa110
+ - intel,sa1100
+ - marvell,feroceon
+ - marvell,mohawk
+ - marvell,pj4a
+ - marvell,pj4b
+ - marvell,sheeva-v5
+ - marvell,sheeva-v7
+ - nvidia,tegra132-denver
+ - nvidia,tegra186-denver
+ - nvidia,tegra194-carmel
+ - qcom,krait
+ - qcom,kryo240
+ - qcom,kryo250
+ - qcom,kryo260
+ - qcom,kryo280
+ - qcom,kryo360
+ - qcom,kryo385
+ - qcom,kryo465
+ - qcom,kryo468
+ - qcom,kryo470
+ - qcom,kryo485
+ - qcom,kryo560
+ - qcom,kryo570
+ - qcom,kryo660
+ - qcom,kryo670
+ - qcom,kryo685
+ - qcom,kryo780
++ - qcom,oryon-1-1
++ - qcom,oryon-1-2
++ - qcom,oryon-1-3
++ - qcom,oryon-1-4
++ - qcom,oryon-2-1
++ - qcom,oryon-2-2
++ - qcom,oryon-2-3
+ - qcom,scorpion
+ - samsung,mongoose-m2
+ - samsung,mongoose-m3
+ - samsung,mongoose-m5
+ - enum:
+ - qcom,kryo
+ - qcom,oryon
+ # Too generic, do not use in new code
+ deprecated: true
enable-method:
$ref: /schemas/types.yaml#/definitions/string
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* linux-next: manual merge of the devicetree tree with the qcom tree
@ 2026-03-17 16:19 Mark Brown
2026-03-17 17:09 ` Geert Uytterhoeven
0 siblings, 1 reply; 5+ messages in thread
From: Mark Brown @ 2026-03-17 16:19 UTC (permalink / raw)
To: Rob Herring
Cc: Bjorn Andersson, Geert Uytterhoeven, Linux Kernel Mailing List,
Linux Next Mailing List, Vladimir Zapolskiy
[-- Attachment #1: Type: text/plain, Size: 2538 bytes --]
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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the devicetree tree with the qcom tree
2026-03-17 16:19 Mark Brown
@ 2026-03-17 17:09 ` Geert Uytterhoeven
0 siblings, 0 replies; 5+ messages in thread
From: Geert Uytterhoeven @ 2026-03-17 17:09 UTC (permalink / raw)
To: Mark Brown
Cc: Rob Herring, Bjorn Andersson, Linux Kernel Mailing List,
Linux Next Mailing List, Vladimir Zapolskiy, Bartosz Golaszewski
Hi Mark,
CC bartosz,
On Tue, 17 Mar 2026 at 17:19, Mark Brown <broonie@kernel.org> wrote:
> 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")
Hmm, obviously not all qcom people were aware a qcom person was
removing direct accesses to of_root ;-)
"[PATCH v2 0/9] soc: remove direct accesses to of_root from drivers/soc/"
https://lore.kernel.org/20260223-soc-of-root-v2-0-b45da45903c8@oss.qualcomm.com/
>
> 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.
Thanks, the resolution LGTM.
>
> 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);
--
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] 5+ messages in thread
* linux-next: manual merge of the devicetree tree with the qcom tree
@ 2018-10-02 3:31 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2018-10-02 3:31 UTC (permalink / raw)
To: Rob Herring, Andy Gross
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Niklas Cassel
[-- Attachment #1: Type: text/plain, Size: 1355 bytes --]
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
drivers/soc/qcom/apr.c
between commit:
4fadb26574cb ("soc: qcom: apr: Avoid string overflow")
from the qcom tree and commit:
b2efb5b04591 ("soc: Convert to using %pOFn instead of device_node.name")
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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/soc/qcom/apr.c
index 716762d59c1f,4bda793ba6ae..000000000000
--- a/drivers/soc/qcom/apr.c
+++ b/drivers/soc/qcom/apr.c
@@@ -219,9 -219,9 +219,9 @@@ static int apr_add_device(struct devic
adev->domain_id = id->domain_id;
adev->version = id->svc_version;
if (np)
- strscpy(adev->name, np->name, APR_NAME_SIZE);
+ snprintf(adev->name, APR_NAME_SIZE, "%pOFn", np);
else
- strncpy(adev->name, id->name, APR_NAME_SIZE);
+ strscpy(adev->name, id->name, APR_NAME_SIZE);
dev_set_name(&adev->dev, "aprsvc:%s:%x:%x", adev->name,
id->domain_id, id->svc_id);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2026-03-19 13:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-05 3:44 linux-next: manual merge of the devicetree tree with the qcom tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2026-03-19 13:46 Mark Brown
2026-03-17 16:19 Mark Brown
2026-03-17 17:09 ` Geert Uytterhoeven
2018-10-02 3:31 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox