From patchwork Tue Sep 30 22:49:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Bird X-Patchwork-Id: 395361 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AE084140219 for ; Wed, 1 Oct 2014 08:49:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750850AbaI3Wt4 (ORCPT ); Tue, 30 Sep 2014 18:49:56 -0400 Received: from seldrel01.sonyericsson.com ([212.209.106.2]:16630 "EHLO seldrel01.sonyericsson.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750717AbaI3Wtz (ORCPT ); Tue, 30 Sep 2014 18:49:55 -0400 Message-ID: <542B338D.2040909@sonymobile.com> Date: Tue, 30 Sep 2014 15:49:49 -0700 From: Tim Bird User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.1.2 MIME-Version: 1.0 To: Kumar Gala CC: Bjorn Andersson , Kevin Hilman , "linux-arm-msm@vger.kernel.org" , , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH v3] ARM: dts: Add initial DTS file for Sony Xperia Z1 phone Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 Signed-off-by: Tim Bird Tested-by: Kevin Hilman --- 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 diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index ac7269f..d3a4579 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -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 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index b8c5cd3..cf58321 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -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 \ diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts new file mode 100644 index 0000000..cccc21b --- /dev/null +++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts @@ -0,0 +1,17 @@ +#include "qcom-msm8974.dtsi" + +/ { + model = "Sony Xperia Z1"; + compatible = "sony,xperia-honami", "qcom,msm8974"; + + memory@0 { + reg = <0 0x40000000>, <0x40000000 0x40000000>; + device_type = "memory"; + }; +}; + +&soc { + serial@f991e000 { + status = "ok"; + }; +};