diff options
author | Olof Johansson <olof@lixom.net> | 2014-10-19 13:39:08 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-10-19 13:39:08 -0700 |
commit | 57764512cef5d67623b6ac0a966761f5bbc43aa0 (patch) | |
tree | d473e5c2d3e24d340179dd0a8990c61928060901 /arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts | |
parent | e29c64865f6c7eeb98f7c6e2371f1100101f7562 (diff) | |
parent | 7dac24bdc1dd561573cd8ce534a63dc975f51ca8 (diff) |
Merge tag 'qcom-dt-for-3.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into fixes
Merge "qcom DT changes for v3.18-3" from Kumar Gala:
Qualcomm ARM Based Device Tree Updates for v3.18-3
* Added Board support for CM-QS600 and Sony Xperia Z1 phone
* Added SATA support on IPQ8064/AP148
* tag 'qcom-dt-for-3.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
ARM: dts: qcom: add CM-QS600 board
ARM: dts: qcom: Add initial DTS file for Sony Xperia Z1 phone
ARM: dts: qcom: Add SATA support on IPQ8064/AP148
Diffstat (limited to 'arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts')
-rw-r--r-- | arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts | 17 |
1 files changed, 17 insertions, 0 deletions
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 000000000000..cccc21b7c8fd --- /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"; + }; +}; |