From 1ffd5dc143d9ae3d39a5bd508b84a5b738832b9c Mon Sep 17 00:00:00 2001 From: Teng Fei Fan Date: Fri, 28 Sep 2018 15:47:30 +0800 Subject: [PATCH] ARM: dts: msm: Add initial dts support for SDM455 RCM devices Add initial device trees for SDM455 RCM devices for both external and internal codec variant. Change-Id: Idd6034727acc8b9ef600da421963becf5f2305cd Signed-off-by: Teng Fei Fan Signed-off-by: Maria Yu Signed-off-by: Tengfei Fan --- arch/arm/boot/dts/qcom/Makefile | 4 ++- .../dts/qcom/sdm455-internal-codec-rcm.dts | 24 +++++++++++++ arch/arm/boot/dts/qcom/sdm455-rcm.dts | 34 +++++++++++++++++++ arch/arm/boot/dts/qcom/sdm455-rcm.dtsi | 13 +++++++ 4 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/qcom/sdm455-internal-codec-rcm.dts create mode 100644 arch/arm/boot/dts/qcom/sdm455-rcm.dts create mode 100644 arch/arm/boot/dts/qcom/sdm455-rcm.dtsi diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile index 0bd48399205b..c56b1c2be598 100644 --- a/arch/arm/boot/dts/qcom/Makefile +++ b/arch/arm/boot/dts/qcom/Makefile @@ -292,7 +292,9 @@ dtb-$(CONFIG_ARCH_SDM630) += sdm630-rumi.dtb \ sdm630-pm660a-headset-jacktype-no-rcm.dtb \ sdm455-mtp.dtb \ sdm455-qrd.dtb \ - sdm455-cdp.dtb + sdm455-cdp.dtb \ + sdm455-rcm.dtb \ + sdm455-internal-codec-rcm.dtb ifeq ($(CONFIG_ARM64),y) always := $(dtb-y) diff --git a/arch/arm/boot/dts/qcom/sdm455-internal-codec-rcm.dts b/arch/arm/boot/dts/qcom/sdm455-internal-codec-rcm.dts new file mode 100644 index 000000000000..a43de6111483 --- /dev/null +++ b/arch/arm/boot/dts/qcom/sdm455-internal-codec-rcm.dts @@ -0,0 +1,24 @@ +/* Copyright (c) 2018, 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 "sdm455.dtsi" +#include "sdm455-rcm.dtsi" +#include "sdm660-internal-codec.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. SDM455 Int. Audio Codec RCM"; + compatible = "qcom,sdm630-cdp", "qcom,sdm630", "qcom,cdp"; + qcom,board-id = <21 1>; +}; diff --git a/arch/arm/boot/dts/qcom/sdm455-rcm.dts b/arch/arm/boot/dts/qcom/sdm455-rcm.dts new file mode 100644 index 000000000000..868f8b940737 --- /dev/null +++ b/arch/arm/boot/dts/qcom/sdm455-rcm.dts @@ -0,0 +1,34 @@ +/* Copyright (c) 2018, 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 "sdm455.dtsi" +#include "sdm455-rcm.dtsi" +#include "sdm660-external-codec.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L RCM"; + compatible = "qcom,sdm630-cdp", "qcom,sdm630", "qcom,cdp"; + qcom,board-id = <21 0>; +}; + +&tavil_snd { + qcom,msm-mbhc-hphl-swh = <0>; + qcom,msm-mbhc-gnd-swh = <0>; +}; + +&tasha_snd { + qcom,msm-mbhc-hphl-swh = <0>; + qcom,msm-mbhc-gnd-swh = <0>; +}; diff --git a/arch/arm/boot/dts/qcom/sdm455-rcm.dtsi b/arch/arm/boot/dts/qcom/sdm455-rcm.dtsi new file mode 100644 index 000000000000..bc54d29450e1 --- /dev/null +++ b/arch/arm/boot/dts/qcom/sdm455-rcm.dtsi @@ -0,0 +1,13 @@ +/* Copyright (c) 2018, 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. + */ + +#include "sdm630-cdp.dtsi"