Skip to contentSkip to conversation

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

PATCH In review Tim Bird 3 participants 3 messages Sep 30, 2014 – Oct 9, 2014 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore

Tim Bird

author
#0 lore raw

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

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 V2
- fixed dtb name in Makefile

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

---

This version fixes the dtb name. I asked previously about adding to qcom_dt_match, but apparently board compatibles are being removed from that list in mach_qcom/board.c
See https://lkml.org/lkml/2014/9/24/952

Kevin tested this (modulu re-adding back the qcom,msm-id). I have a new mkqcdtbootimg which works without requiring the qcom,msm-id attribute, that I'll send to Kevin shortly (and publish on github).

 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..cf58321 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-xperia-honami.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

A message that is not in the archive (sent off-list or not yet received): CA+bK7J5x60WyyAp6+hGDf-fyAC=skQu9EdPUabPrzhMCDnOCrA@mail.gmail.com

#2 lore raw

Will not make the 3.18 merge window. I will queue it up for 3.19.

- k

Quoted 90 lines · Tim Bird

Kumar,

Any chance this could make the 3.18 merge window? Have you had time to take a look at it?
-- Tim

On Tue, Sep 30, 2014 at 3:49 PM, Tim Bird <[email protected]> wrote:
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 V2
- fixed dtb name in Makefile

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

---

This version fixes the dtb name. I asked previously about adding to qcom_dt_match, but apparently board compatibles are being removed from that list in mach_qcom/board.c
See https://lkml.org/lkml/2014/9/24/952

Kevin tested this (modulu re-adding back the qcom,msm-id). I have a new mkqcdtbootimg which works without requiring the qcom,msm-id attribute, that I'll send to Kevin shortly (and publish on github).

 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..cf58321 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-xperia-honami.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

Signature · 3 lines
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
#3 lore raw

Hi Kumar,

Quoted 1 line · Kumar Gala

Will not make the 3.18 merge window. I will queue it up for 3.19.

Yes, it's too late for the merge window proper, but since it's DT only support for new platform, you can submit it as a fix to us (arm-soc) for v3.18-rc.

In fact, if you chose (and if it's known to work for v3.17 and/or earlier), you can even mark it for stable. Greg has said he's OK with DT-only changes like this that only affect a specific platform to go into stable.

Kevin