Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b5cdced authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add device tree support for SDM/A 636"

parents bd15860a 1632d11e
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -110,6 +110,12 @@ SoCs:
- SDA630
  compatible = "qcom,sda630"

- SDM636
  compatible = "qcom,sdm636"

- SDA636
  compatible = "qcom,sda636"

- MSM8952
  compatible = "qcom,msm8952"

@@ -295,6 +301,12 @@ compatible = "qcom,sda658-mtp"
compatible = "qcom,sda658-cdp"
compatible = "qcom,sda660-mtp"
compatible = "qcom,sda660-cdp"
compatible = "qcom,sdm636-cdp"
compatible = "qcom,sdm636-mtp"
compatible = "qcom,sdm636-qrd"
compatible = "qcom,sda636-qrd"
compatible = "qcom,sda636-mtp"
compatible = "qcom,sda636-cdp"
compatible = "qcom,sdm630-rumi"
compatible = "qcom,sdm630-mtp"
compatible = "qcom,sdm630-cdp"
+28 −1
Original line number Diff line number Diff line
@@ -229,7 +229,34 @@ dtb-$(CONFIG_ARCH_SDM660) += sdm660-sim.dtb \
	sda658-rcm.dtb \
	sda658-pm660a-mtp.dtb \
	sda658-pm660a-cdp.dtb \
	sda658-pm660a-rcm.dtb
	sda658-pm660a-rcm.dtb \
	sdm636-cdp.dtb \
	sdm636-mtp.dtb \
	sdm636-qrd.dtb \
	sdm636-rcm.dtb \
	sdm636-headset-jacktype-no-cdp.dtb \
	sdm636-headset-jacktype-no-rcm.dtb \
	sdm636-internal-codec-cdp.dtb \
	sdm636-internal-codec-mtp.dtb \
	sdm636-internal-codec-pm660a-cdp.dtb \
	sdm636-internal-codec-pm660a-mtp.dtb \
	sdm636-internal-codec-pm660a-rcm.dtb \
	sdm636-internal-codec-rcm.dtb \
	sdm636-pm660a-headset-jacktype-no-cdp.dtb \
	sdm636-pm660a-headset-jacktype-no-rcm.dtb \
	sdm636-pm660a-cdp.dtb \
	sdm636-pm660a-mtp.dtb \
	sdm636-pm660a-qrd.dtb \
	sdm636-pm660a-rcm.dtb \
	sdm636-usbc-audio-mtp.dtb \
	sdm636-usbc-audio-rcm.dtb \
	sda636-cdp.dtb \
	sda636-mtp.dtb \
	sda636-rcm.dtb \
	sda636-pm660a-cdp.dtb \
	sda636-pm660a-mtp.dtb \
	sda636-pm660a-qrd-hdk.dtb \
	sda636-pm660a-rcm.dtb

dtb-$(CONFIG_ARCH_SDM630) += sdm630-rumi.dtb \
	sdm630-pm660a-rumi.dtb \
+36 −0
Original line number Diff line number Diff line
/* Copyright (c) 2017, 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 "sda636.dtsi"
#include "sdm636-cdp.dtsi"
#include "sdm660-external-codec.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDA 636 PM660 + PM660L CDP";
	compatible = "qcom,sda636-cdp", "qcom,sda636", "qcom,cdp";
	qcom,board-id = <1 0>;
	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
			<0x0001001b 0x0201011a 0x0 0x0>;
};

&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>;
};
+30 −0
Original line number Diff line number Diff line
/* Copyright (c) 2017, 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 "sda636.dtsi"
#include "sdm636-mtp.dtsi"
#include "sdm660-external-codec.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDA 636 PM660 + PM660L MTP";
	compatible = "qcom,sda636-mtp", "qcom,sda636", "qcom,mtp";
	qcom,board-id = <8 0>;
	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
			<0x0001001b 0x0201011a 0x0 0x0>;
};

&tavil_snd {
	qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;
};
+36 −0
Original line number Diff line number Diff line
/* Copyright (c) 2017, 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 "sda636.dtsi"
#include "sdm636-cdp.dtsi"
#include "msm-pm660a.dtsi"
#include "sdm660-external-codec.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDA 636 PM660 + PM660A CDP";
	compatible = "qcom,sda636-cdp", "qcom,sda636", "qcom,cdp";
	qcom,board-id = <1 0>;
	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};

&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>;
};
Loading