Skip to contentSkip to conversation

ARM: dts: Add initial DTS file for Sony Xperia Z1

PATCH Superseded Tim Bird 3 participants 4 messages Sep 24, 2014 – Sep 25, 2014

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Tim Bird

author
#0 lore raw

PATCH v2 1/1 ARM: dts: Add initial DTS file for Sony Xperia Z1

This DTS has support for the Sony Xperia Z1 phone (codenamed Honami). This first version of the DTS supports just a serial console.

changes from v1
- removed qcom,msm-id attribute
- removed mis-capitalized Qualcomm word
- changed dts file name
- added board-specific compatible-string

---
 Documentation/devicetree/bindings/vendor-prefixes.txt |  1 +
 arch/arm/boot/dts/Makefile                            |  3 ++-
 arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0
index ac7269f..d3a4579 100644
@@ -128,6 +128,7 @@ sirf	SiRF Technology, Inc.
 smsc	Standard Microsystems Corporation
 snps 	Synopsys, Inc.
 solidrun	SolidRun
+sony	Sony Corporation
 spansion	Spansion Inc.
 st	STMicroelectronics
 ste	ST-Ericsson
arch/arm/boot/dts/Makefile +2 -1
index b8c5cd3..0c2702e 100644
@@ -343,7 +343,8 @@ dtb-$(CONFIG_ARCH_QCOM) += \
 	qcom-apq8074-dragonboard.dtb \
 	qcom-apq8084-mtp.dtb \
 	qcom-msm8660-surf.dtb \
-	qcom-msm8960-cdp.dtb
+	qcom-msm8960-cdp.dtb \
+	qcom-msm8974-sony-honami-xperia.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3066a-bqcurie2.dtb \
 	rk3188-radxarock.dtb \
arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts new file +17 -0
new file mode 100644
index 0000000..cccc21b
@@ -0,0 +1,17 @@
+#include "qcom-msm8974.dtsi"
+
+/ {
+	model = "Sony Xperia Z1";
+	compatible = "sony,xperia-honami", "qcom,msm8974";
+
+	memory at 0 {
+		reg = <0 0x40000000>, <0x40000000 0x40000000>;
+		device_type = "memory";
+	};
+};
+
+&soc {
+	serial at f991e000 {
+		status = "ok";
+	};
+};
Signature · 1 line
1.8.2.2
#1 lore raw
Quoted 11 lines · Tim Bird

This DTS has support for the Sony Xperia Z1 phone (codenamed Honami). This first version of the DTS supports just a serial console.

changes from v1
- removed qcom,msm-id attribute
- removed mis-capitalized Qualcomm word
- changed dts file name
- added board-specific compatible-string

?

Does this actually boot? I?d be surprised since ?qcom,msm8974? isn?t in the match table (just sent a patch for that).

Quoted 62 lines
Documentation/devicetree/bindings/vendor-prefixes.txt |  1 +
arch/arm/boot/dts/Makefile                            |  3 ++-
arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts | 17 +++++++++++++++++
3 files changed, 20 insertions(+), 1 deletion(-)

create mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts

Documentation/devicetree/bindings/vendor-prefixes.txt +0 -0
index ac7269f..d3a4579 100644
@@ -128,6 +128,7 @@ sirf	SiRF Technology, Inc.

smsc Standard Microsystems Corporation
snps Synopsys, Inc.
solidrun SolidRun
+sony Sony Corporation
spansion Spansion Inc.
st STMicroelectronics
ste ST-Ericsson

arch/arm/boot/dts/Makefile +2 -1
index b8c5cd3..0c2702e 100644
@@ -343,7 +343,8 @@ dtb-$(CONFIG_ARCH_QCOM) += \
 	qcom-apq8074-dragonboard.dtb \
 	qcom-apq8084-mtp.dtb \
 	qcom-msm8660-surf.dtb \
-	qcom-msm8960-cdp.dtb
+	qcom-msm8960-cdp.dtb \
+	qcom-msm8974-sony-honami-xperia.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3066a-bqcurie2.dtb \
 	rk3188-radxarock.dtb \
arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts new file +17 -0
new file mode 100644
index 0000000..cccc21b
@@ -0,0 +1,17 @@
+#include "qcom-msm8974.dtsi"
+
+/ {
+	model = "Sony Xperia Z1";
+	compatible = "sony,xperia-honami", "qcom,msm8974";
+
+	memory at 0 {
+		reg = <0 0x40000000>, <0x40000000 0x40000000>;
+		device_type = "memory";
+	};
+};
+
+&soc {
+	serial at f991e000 {
+		status = "ok";
+	};
+};
Signature · 6 lines
1.8.2.2

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
author
#2 lore raw
Quoted 12 lines · Kumar Gala [galak at codeaurora.org]
Quoted 9 lines · Tim Bird

This DTS has support for the Sony Xperia Z1 phone (codenamed Honami). This first version of the DTS supports just a serial console.

changes from v1
- removed qcom,msm-id attribute
- removed mis-capitalized Qualcomm word
- changed dts file name
- added board-specific compatible-string

Quoted 4 lines
Quoted 2 lines

?

Does this actually boot? I?d be surprised since ?qcom,msm8974? isn?t in the match table (just sent a patch for that).

Yeah. It booted just fine. Apparently with CONFIG_ARCH_MULTIPLATFORM the match table entry is not needed.

Do you want me to re-spin with an addition for "sony,xperia-honami" in the match table?

-- Tim

Quoted 67 lines
Quoted 58 lines
Documentation/devicetree/bindings/vendor-prefixes.txt |  1 +
arch/arm/boot/dts/Makefile                            |  3 ++-
arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts | 17 +++++++++++++++++
3 files changed, 20 insertions(+), 1 deletion(-)

create mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts

Documentation/devicetree/bindings/vendor-prefixes.txt +0 -0
index ac7269f..d3a4579 100644
@@ -128,6 +128,7 @@ sirf      SiRF Technology, Inc.

smsc Standard Microsystems Corporation
snps Synopsys, Inc.
solidrun SolidRun
+sony Sony Corporation
spansion Spansion Inc.
st STMicroelectronics
ste ST-Ericsson

arch/arm/boot/dts/Makefile +2 -1
index b8c5cd3..0c2702e 100644
@@ -343,7 +343,8 @@ dtb-$(CONFIG_ARCH_QCOM) += \
      qcom-apq8074-dragonboard.dtb \
      qcom-apq8084-mtp.dtb \
      qcom-msm8660-surf.dtb \
-     qcom-msm8960-cdp.dtb
+     qcom-msm8960-cdp.dtb \
+     qcom-msm8974-sony-honami-xperia.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += \
      rk3066a-bqcurie2.dtb \
      rk3188-radxarock.dtb \
arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts new file +17 -1
new file mode 100644
index 0000000..cccc21b
@@ -0,0 +1,17 @@
+#include "qcom-msm8974.dtsi"
+
+/ {
+     model = "Sony Xperia Z1";
+     compatible = "sony,xperia-honami", "qcom,msm8974";
+
+     memory at 0 {
+             reg = <0 0x40000000>, <0x40000000 0x40000000>;
+             device_type = "memory";
+     };
+};
+
+&soc {
+     serial at f991e000 {
+             status = "ok";
+     };
+};
--

1.8.2.2

Quoted 4 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

Tested-by on v2 1/1
#3 lore raw
In reply to Tim Bird

Hi Tim,

Quoted 10 lines · Tim Bird

This DTS has support for the Sony Xperia Z1 phone (codenamed Honami). This first version of the DTS supports just a serial console.

changes from v1
- removed qcom,msm-id attribute
- removed mis-capitalized Qualcomm word
- changed dts file name
- added board-specific compatible-string

[...]

arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_QCOM) += \ · line 347

Quoted 11 lines
arch/arm/boot/dts/Makefile +2 -1
index b8c5cd3..0c2702e 100644
@@ -343,7 +343,8 @@ dtb-$(CONFIG_ARCH_QCOM) += \
 	qcom-apq8074-dragonboard.dtb \
 	qcom-apq8084-mtp.dtb \
 	qcom-msm8660-surf.dtb \
-	qcom-msm8960-cdp.dtb
+	qcom-msm8960-cdp.dtb \
+	qcom-msm8974-sony-honami-xperia.dtb

This doesn't compile becase the filename added is xperia-honami (not honami-xperia)

After fixing that up, I was able to test it on my Z1 (Thanks Tim/Bjorn!) but found I needed to add in the qcom,msm-id stuff first. I guess that will be remedied with the updated mkbootimg tool, correct?

Anyways, after fixing the filename, feel free to add:

Kevin