* [PATCH 1/3] ARM: dts: msm8974-FP2: We're msm8974pro
@ 2022-04-21 21:19 Luca Weiss
2022-04-21 21:19 ` [PATCH 2/3] ARM: dts: msm8974-FP2: Add mmc* aliases Luca Weiss
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Luca Weiss @ 2022-04-21 21:19 UTC (permalink / raw)
To: linux-arm-msm
Cc: ~postmarketos/upstreaming, phone-devel, Luca Weiss,
Arnd Bergmann, Olof Johansson, soc, Rob Herring,
Krzysztof Kozlowski, Andy Gross, Bjorn Andersson,
linux-arm-kernel, devicetree, linux-kernel
Fairphone 2 always uses Snapdragon 801, a.k.a msm8974pro so change the
include and filename to that.
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
arch/arm/boot/dts/Makefile | 2 +-
...8974-fairphone-fp2.dts => qcom-msm8974pro-fairphone-fp2.dts} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename arch/arm/boot/dts/{qcom-msm8974-fairphone-fp2.dts => qcom-msm8974pro-fairphone-fp2.dts} (99%)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 3541e5eec611..728bbd0f8c26 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1010,10 +1010,10 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-msm8660-surf.dtb \
qcom-msm8916-samsung-serranove.dtb \
qcom-msm8960-cdp.dtb \
- qcom-msm8974-fairphone-fp2.dtb \
qcom-msm8974-lge-nexus5-hammerhead.dtb \
qcom-msm8974-sony-xperia-rhine-amami.dtb \
qcom-msm8974-sony-xperia-rhine-honami.dtb \
+ qcom-msm8974pro-fairphone-fp2.dtb \
qcom-msm8974pro-samsung-klte.dtb \
qcom-msm8974pro-sony-xperia-shinano-castor.dtb \
qcom-mdm9615-wp8548-mangoh-green.dtb \
diff --git a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
similarity index 99%
rename from arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
rename to arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
index 97d109a5c71d..08e723f2bdfc 100644
--- a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
@@ -1,4 +1,4 @@
-#include "qcom-msm8974.dtsi"
+#include "qcom-msm8974pro.dtsi"
#include "qcom-pm8841.dtsi"
#include "qcom-pm8941.dtsi"
#include <dt-bindings/input/input.h>
--
2.36.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] ARM: dts: msm8974-FP2: Add mmc* aliases
2022-04-21 21:19 [PATCH 1/3] ARM: dts: msm8974-FP2: We're msm8974pro Luca Weiss
@ 2022-04-21 21:19 ` Luca Weiss
2022-04-21 21:19 ` [PATCH 3/3] ARM: dts: qcom: msm8974: Add missing license headers Luca Weiss
2022-05-04 17:21 ` [PATCH 1/3] ARM: dts: msm8974-FP2: We're msm8974pro Bjorn Andersson
2 siblings, 0 replies; 5+ messages in thread
From: Luca Weiss @ 2022-04-21 21:19 UTC (permalink / raw)
To: linux-arm-msm
Cc: ~postmarketos/upstreaming, phone-devel, Luca Weiss, Andy Gross,
Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, devicetree,
linux-kernel
Add aliases for internal storage and SD card so they don't randomly
switch around.
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
index 08e723f2bdfc..5a00a4f9fbe4 100644
--- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
@@ -9,6 +9,8 @@ / {
compatible = "fairphone,fp2", "qcom,msm8974";
aliases {
+ mmc0 = &sdhc_1;
+ mmc1 = &sdhc_2;
serial0 = &blsp1_uart2;
};
--
2.36.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] ARM: dts: qcom: msm8974: Add missing license headers
2022-04-21 21:19 [PATCH 1/3] ARM: dts: msm8974-FP2: We're msm8974pro Luca Weiss
2022-04-21 21:19 ` [PATCH 2/3] ARM: dts: msm8974-FP2: Add mmc* aliases Luca Weiss
@ 2022-04-21 21:19 ` Luca Weiss
2022-05-26 11:08 ` Pavel Machek
2022-05-04 17:21 ` [PATCH 1/3] ARM: dts: msm8974-FP2: We're msm8974pro Bjorn Andersson
2 siblings, 1 reply; 5+ messages in thread
From: Luca Weiss @ 2022-04-21 21:19 UTC (permalink / raw)
To: linux-arm-msm
Cc: ~postmarketos/upstreaming, phone-devel, Luca Weiss, Andy Gross,
Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, devicetree,
linux-kernel
All other msm8974 dts files are licensed as GPL-2.0 so add the same
header to the files where it's missing.
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts | 1 +
arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 1 +
arch/arm/boot/dts/qcom-msm8974pro.dtsi | 1 +
3 files changed, 3 insertions(+)
diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
index 5a00a4f9fbe4..96427d75ea82 100644
--- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
#include "qcom-msm8974pro.dtsi"
#include "qcom-pm8841.dtsi"
#include "qcom-pm8941.dtsi"
diff --git a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
index 34aed41856a6..9bd8faea61a5 100644
--- a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
#include "qcom-msm8974pro.dtsi"
#include "qcom-pm8841.dtsi"
#include "qcom-pm8941.dtsi"
diff --git a/arch/arm/boot/dts/qcom-msm8974pro.dtsi b/arch/arm/boot/dts/qcom-msm8974pro.dtsi
index 973bd1dafbfe..1e882e16a221 100644
--- a/arch/arm/boot/dts/qcom-msm8974pro.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974pro.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
#include "qcom-msm8974.dtsi"
&gcc {
--
2.36.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 3/3] ARM: dts: qcom: msm8974: Add missing license headers
2022-04-21 21:19 ` [PATCH 3/3] ARM: dts: qcom: msm8974: Add missing license headers Luca Weiss
@ 2022-05-26 11:08 ` Pavel Machek
0 siblings, 0 replies; 5+ messages in thread
From: Pavel Machek @ 2022-05-26 11:08 UTC (permalink / raw)
To: Luca Weiss
Cc: linux-arm-msm, ~postmarketos/upstreaming, phone-devel,
Andy Gross, Bjorn Andersson, Rob Herring, Krzysztof Kozlowski,
devicetree, linux-kernel
Hi!
> All other msm8974 dts files are licensed as GPL-2.0 so add the same
> header to the files where it's missing.
>
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
Normally, dts files are dual-licensed. Can that be arranged here?
Pavel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] ARM: dts: msm8974-FP2: We're msm8974pro
2022-04-21 21:19 [PATCH 1/3] ARM: dts: msm8974-FP2: We're msm8974pro Luca Weiss
2022-04-21 21:19 ` [PATCH 2/3] ARM: dts: msm8974-FP2: Add mmc* aliases Luca Weiss
2022-04-21 21:19 ` [PATCH 3/3] ARM: dts: qcom: msm8974: Add missing license headers Luca Weiss
@ 2022-05-04 17:21 ` Bjorn Andersson
2 siblings, 0 replies; 5+ messages in thread
From: Bjorn Andersson @ 2022-05-04 17:21 UTC (permalink / raw)
To: Luca Weiss, linux-arm-msm
Cc: devicetree, phone-devel, linux-arm-kernel, Andy Gross,
Olof Johansson, soc, Arnd Bergmann, linux-kernel,
Krzysztof Kozlowski, Rob Herring, ~postmarketos/upstreaming
On Thu, 21 Apr 2022 23:19:33 +0200, Luca Weiss wrote:
> Fairphone 2 always uses Snapdragon 801, a.k.a msm8974pro so change the
> include and filename to that.
>
>
Applied, thanks!
[1/3] ARM: dts: msm8974-FP2: We're msm8974pro
commit: 3237f21824165b41ef0bbdd3f784579c931b2a21
[2/3] ARM: dts: msm8974-FP2: Add mmc* aliases
commit: 9c5537723429b82561087f8eb8179d065355443c
[3/3] ARM: dts: qcom: msm8974: Add missing license headers
commit: 3912e74c576a56920cde1d5591125cdd5560caae
Best regards,
--
Bjorn Andersson <bjorn.andersson@linaro.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-05-26 11:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-21 21:19 [PATCH 1/3] ARM: dts: msm8974-FP2: We're msm8974pro Luca Weiss
2022-04-21 21:19 ` [PATCH 2/3] ARM: dts: msm8974-FP2: Add mmc* aliases Luca Weiss
2022-04-21 21:19 ` [PATCH 3/3] ARM: dts: qcom: msm8974: Add missing license headers Luca Weiss
2022-05-26 11:08 ` Pavel Machek
2022-05-04 17:21 ` [PATCH 1/3] ARM: dts: msm8974-FP2: We're msm8974pro Bjorn Andersson
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).