diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-20 23:45:20 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-20 23:45:20 -0800 |
| commit | 451146c26b58fdeed492934d0df8962c295b9db5 (patch) | |
| tree | 0ce2709ed2cb100304dc5b820d1d83320b4a9144 | |
| parent | dba91385de4b65fe8c69e557ba409b7c823dc46c (diff) | |
| parent | ba138f450b2121cbf2c6faf102bec7db6ef395e5 (diff) | |
Merge "ARM: dts: msm: Add msmfalcon device tree files for internal codec"
| -rw-r--r-- | arch/arm/boot/dts/qcom/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmfalcon-internal-codec-cdp.dts | 23 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmfalcon-internal-codec-mtp.dts | 23 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmfalcon-internal-codec-rcm.dts | 23 |
4 files changed, 72 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile index bc918a9a6402..07c869c28a0d 100644 --- a/arch/arm/boot/dts/qcom/Makefile +++ b/arch/arm/boot/dts/qcom/Makefile @@ -137,8 +137,11 @@ dtb-$(CONFIG_ARCH_MSMHAMSTER) += msmhamster-rumi.dtb dtb-$(CONFIG_ARCH_MSMFALCON) += msmfalcon-sim.dtb \ msmfalcon-rumi.dtb \ msmfalcon-cdp.dtb \ + msmfalcon-internal-codec-cdp.dtb \ msmfalcon-mtp.dtb \ + msmfalcon-internal-codec-mtp.dtb \ msmfalcon-rcm.dtb \ + msmfalcon-internal-codec-rcm.dtb \ msmfalcon-qrd.dtb dtb-$(CONFIG_ARCH_MSMTRITON) += msmtriton-rumi.dtb diff --git a/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-cdp.dts b/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-cdp.dts new file mode 100644 index 000000000000..108328bd91f0 --- /dev/null +++ b/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-cdp.dts @@ -0,0 +1,23 @@ +/* Copyright (c) 2016, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + + +/dts-v1/; + +#include "msmfalcon.dtsi" +#include "msmfalcon-cdp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. MSM FALCON Int. Audio Codec CDP"; + compatible = "qcom,msmfalcon-cdp", "qcom,msmfalcon", "qcom,cdp"; + qcom,board-id = <1 1>; +}; diff --git a/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-mtp.dts b/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-mtp.dts new file mode 100644 index 000000000000..3697ee8f97a0 --- /dev/null +++ b/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-mtp.dts @@ -0,0 +1,23 @@ +/* Copyright (c) 2016, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + + +/dts-v1/; + +#include "msmfalcon.dtsi" +#include "msmfalcon-mtp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. MSM FALCON Int. Audio Codec MTP"; + compatible = "qcom,msmfalcon-mtp", "qcom,msmfalcon", "qcom,mtp"; + qcom,board-id = <8 1>; +}; diff --git a/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-rcm.dts b/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-rcm.dts new file mode 100644 index 000000000000..bbdc41b97574 --- /dev/null +++ b/arch/arm/boot/dts/qcom/msmfalcon-internal-codec-rcm.dts @@ -0,0 +1,23 @@ +/* Copyright (c) 2016, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + + +/dts-v1/; + +#include "msmfalcon.dtsi" +#include "msmfalcon-cdp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. MSM FALCON Int. Audio Codec RCM"; + compatible = "qcom,msmfalcon-cdp", "qcom,msmfalcon", "qcom,cdp"; + qcom,board-id = <21 1>; +}; |
