Skip to contentSkip to conversation

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

PATCH Superseded Tim Bird 4 participants 6 messages Sep 16, 2014 – Sep 20, 2014

Subsystems (3)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Tim Bird

author
#0 lore raw

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

This DTS has initial support for just a serial console, for the Sony Xperia Z1 phone. This phone uses a QualComm 8074 processor.

---
 arch/arm/boot/dts/Makefile                   |    1 +
 arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts
arch/arm/boot/dts/Makefile +1 -0
index b8c5cd3..680ce7e 100644
@@ -341,6 +341,7 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
 dtb-$(CONFIG_ARCH_QCOM) += \
 	qcom-apq8064-ifc6410.dtb \
 	qcom-apq8074-dragonboard.dtb \
+	qcom-apq8074-xperia-z1.dtb \
 	qcom-apq8084-mtp.dtb \
 	qcom-msm8660-surf.dtb \
 	qcom-msm8960-cdp.dtb
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts new file +18 -0
new file mode 100644
index 0000000..59b3fa1
@@ -0,0 +1,18 @@
+#include "qcom-msm8974.dtsi"
+
+/ {
+	model = "Sony Xperia Z1 phone";
+	compatible = "qcom,msm8974";
+	qcom,msm-id = <126 8 0>, <185 8 0>, <186 8 0>;
+
+	memory at 0 {
+		reg = <0 0x40000000>, <0x40000000 0x40000000>;
+		device_type = "memory";
+	};
+};
+
+&soc {
+	serial at f991e000 {
+		status = "ok";
+	};
+};
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 3 lines · Tim Bird

This DTS has initial support for just a serial console, for the Sony Xperia Z1 phone. This phone uses a QualComm 8074 processor.

Qualcomm, the C isn?t caps.

Quoted 25 lines

---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts | 18 ++++++++++++++++++

2 files changed, 19 insertions(+)

create mode 100644 arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts

arch/arm/boot/dts/Makefile +1 -0
index b8c5cd3..680ce7e 100644
@@ -341,6 +341,7 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
 dtb-$(CONFIG_ARCH_QCOM) += \
 	qcom-apq8064-ifc6410.dtb \
 	qcom-apq8074-dragonboard.dtb \
+	qcom-apq8074-xperia-z1.dtb \
 	qcom-apq8084-mtp.dtb \
 	qcom-msm8660-surf.dtb \
 	qcom-msm8960-cdp.dtb
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts new file +0 -0
new file mode 100644
index 0000000..59b3fa1

arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts line 5

Quoted 5 lines
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts new file +5 -0
@@ -0,0 +1,18 @@
+#include "qcom-msm8974.dtsi"
+
+/ {
+	model = "Sony Xperia Z1 phone";
+	compatible = "qcom,msm8974?;

Should have a board compat as well

arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts line 6

Quoted 1 line
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts new file +1 -0
+	qcom,msm-id = <126 8 0>, <185 8 0>, <186 8 0>;

We don?t have qcom,msm-id upstream at this time.

Quoted 15 lines
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts new file +12 -0
+
+	memory at 0 {
+		reg = <0 0x40000000>, <0x40000000 0x40000000>;
+		device_type = "memory";
+	};
+};
+
+&soc {
+	serial at f991e000 {
+		status = "ok";
+	};
+};
Signature · 1 line
1.7.9.5
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 8 lines · Kumar Gala
Quoted 3 lines · Tim Bird

This DTS has initial support for just a serial console, for the Sony Xperia Z1 phone. This phone uses a QualComm 8074 processor.

Qualcomm, the C isn?t caps.

Will fix.

Quoted 25 lines
Quoted 25 lines

---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts | 18 ++++++++++++++++++

2 files changed, 19 insertions(+)

create mode 100644 arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts

arch/arm/boot/dts/Makefile +1 -0
index b8c5cd3..680ce7e 100644
@@ -341,6 +341,7 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
 dtb-$(CONFIG_ARCH_QCOM) += \
 	qcom-apq8064-ifc6410.dtb \
 	qcom-apq8074-dragonboard.dtb \
+	qcom-apq8074-xperia-z1.dtb \
 	qcom-apq8084-mtp.dtb \
 	qcom-msm8660-surf.dtb \
 	qcom-msm8960-cdp.dtb
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts new file +0 -0
new file mode 100644
index 0000000..59b3fa1
Quoted 8 lines

arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts line 5

Quoted 6 lines
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts new file +5 -0
@@ -0,0 +1,18 @@
+#include "qcom-msm8974.dtsi"
+
+/ {
+	model = "Sony Xperia Z1 phone";
+	compatible = "qcom,msm8974?;

Should have a board compat as well

I'll ask Bjorn what we want to do here. There was a compat that I stripped, but I'm not sure we settled on the official name we want. In any event, will fix.

Quoted 4 lines

arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts line 6

Quoted 2 lines
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts new file +1 -0
+	qcom,msm-id = <126 8 0>, <185 8 0>, <186 8 0>;

We don?t have qcom,msm-id upstream at this time.

Do I just leave this out, then?

Thanks.
-- Tim

P.S. By now you probably noticed I mis-typed device-tree at vger.kernel.org. I'll fix that also.

#3 lore raw
Quoted 46 lines · Tim Bird
Quoted 8 lines · Kumar Gala
Quoted 3 lines · Tim Bird

This DTS has initial support for just a serial console, for the Sony Xperia Z1 phone. This phone uses a QualComm 8074 processor.

Qualcomm, the C isn?t caps.

Will fix.

Quoted 25 lines
Quoted 25 lines

---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts | 18 ++++++++++++++++++

2 files changed, 19 insertions(+)

create mode 100644 arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts

arch/arm/boot/dts/Makefile +1 -0
index b8c5cd3..680ce7e 100644
@@ -341,6 +341,7 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
 dtb-$(CONFIG_ARCH_QCOM) += \
 	qcom-apq8064-ifc6410.dtb \
 	qcom-apq8074-dragonboard.dtb \
+	qcom-apq8074-xperia-z1.dtb \
 	qcom-apq8084-mtp.dtb \
 	qcom-msm8660-surf.dtb \
 	qcom-msm8960-cdp.dtb
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts new file +0 -0
new file mode 100644
index 0000000..59b3fa1
Quoted 8 lines

arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts line 5

Quoted 6 lines
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts new file +5 -0
@@ -0,0 +1,18 @@
+#include "qcom-msm8974.dtsi"
+
+/ {
+	model = "Sony Xperia Z1 phone";
+	compatible = "qcom,msm8974?;

Should have a board compat as well

Quoted 8 lines

I'll ask Bjorn what we want to do here. There was a compat that I stripped, but I'm not sure we settled on the official name we want. In any event, will fix.

Quoted 4 lines

arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts line 6

Quoted 2 lines
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts new file +1 -0
+	qcom,msm-id = <126 8 0>, <185 8 0>, <186 8 0>;

We don?t have qcom,msm-id upstream at this time.

Do I just leave this out, then?

yes, lets drop it for now, unless you guys need it to boot the upstream kernel on your hw.

Quoted 5 lines

Thanks.
-- Tim

P.S. By now you probably noticed I mis-typed device-tree at vger.kernel.org. I'll fix that also.

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
#4 lore raw
In reply to Tim Bird
Quoted 5 lines · Tim Bird
Quoted 2 lines · Kumar Gala

On Sep 16, 2014, at 4:03 PM, Tim Bird <[email protected]> wrote:

[..]

Quoted 5 lines
Quoted 4 lines

arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts line 6

Quoted 2 lines
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts new file +1 -0
+	qcom,msm-id = <126 8 0>, <185 8 0>, <186 8 0>;

We don’t have qcom,msm-id upstream at this time.

Do I just leave this out, then?

Both our tool to generate boot.img [1] and the Qualcomm equivalent require these to be there.

Last time I tried to concatenate the dtb to zImage and using the Google mkbootimg the bootloader refused to load the result. But please give it a test and maybe we can postpone adding this definition. Otherwise we need to add a definition - covering both the 8974 and 8974ab format.

[1] https://github.com/sonyxperiadev/mkqcdtbootimg

Regards,
Bjorn

#5 lore raw
In reply to Tim Bird
Quoted 6 lines · Tim Bird
Quoted 3 lines · Kumar Gala

On Sep 16, 2014, at 4:03 PM, Tim Bird <[email protected]> wrote:

Quoted 40 lines
Quoted 5 lines
Quoted 3 lines

This DTS has initial support for just a serial console, for the Sony Xperia Z1 phone. This phone uses a QualComm 8074 processor.

Qualcomm, the C isn?t caps.

Will fix.

Quoted 33 lines
Quoted 26 lines

---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts | 18 ++++++++++++++++++

2 files changed, 19 insertions(+)

create mode 100644 arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts

arch/arm/boot/dts/Makefile +1 -0
index b8c5cd3..680ce7e 100644
@@ -341,6 +341,7 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
 dtb-$(CONFIG_ARCH_QCOM) += \
 	qcom-apq8064-ifc6410.dtb \
 	qcom-apq8074-dragonboard.dtb \
+	qcom-apq8074-xperia-z1.dtb \
 	qcom-apq8084-mtp.dtb \
 	qcom-msm8660-surf.dtb \
 	qcom-msm8960-cdp.dtb
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts new file +0 -0
new file mode 100644
index 0000000..59b3fa1

arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts line 5

Quoted 5 lines
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts new file +5 -0
@@ -0,0 +1,18 @@
+#include "qcom-msm8974.dtsi"
+
+/ {
+	model = "Sony Xperia Z1 phone";
+	compatible = "qcom,msm8974?;

Should have a board compat as well

Also need to add the board compat string, and "qcom,msm8974? to the list of strings in arch/arm/mach-qcom/board.c: qcom_dt_match[].

Quoted 19 lines

I'll ask Bjorn what we want to do here. There was a compat that I stripped, but I'm not sure we settled on the official name we want. In any event, will fix.

Quoted 4 lines

arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts line 6

Quoted 2 lines
arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts new file +1 -0
+	qcom,msm-id = <126 8 0>, <185 8 0>, <186 8 0>;

We don?t have qcom,msm-id upstream at this time.

Do I just leave this out, then?

Thanks.
-- Tim

P.S. By now you probably noticed I mis-typed device-tree at vger.kernel.org. I'll fix that also. --
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
.