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

Commit 5dc18ac7 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 the hardware jack setting for all boards"

parents baf64b5d cfd12292

arch/arm/boot/dts/qcom/msm8226-1080p-cdp.dtsi

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 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
@@ -129,6 +129,7 @@ 
		qcom,cdc-mclk-gpios = <&pm8226_gpios 1 0>;

		qcom,cdc-vdd-spkr-gpios = <&pm8226_gpios 2 0>;

		qcom,headset-jack-type-NC;

		qcom,mbhc-audio-jack-type = "6-pole-jack";

	};



	sound-9302 {

arch/arm/boot/dts/qcom/msm8226-720p-cdp.dtsi

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 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
@@ -120,6 +120,7 @@ 
		qcom,cdc-mclk-gpios = <&pm8226_gpios 1 0>;

		qcom,cdc-vdd-spkr-gpios = <&pm8226_gpios 2 0>;

		qcom,headset-jack-type-NC;

		qcom,mbhc-audio-jack-type = "6-pole-jack";

	};



	sound-9302 {

arch/arm/boot/dts/qcom/msm8974-cdp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ 
		qcom,hdmi-audio-rx;

		qcom,us-euro-gpios = <&pm8941_gpios 20 0>;

		qcom,cdc-micbias2-headset-only;

		qcom,mbhc-audio-jack-type = "6-pole-jack";

	};



	usb2_otg_sw: regulator-tpd4s214 {

arch/arm/boot/dts/qcom/msm8974-fluid.dtsi

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, 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
@@ -271,6 +271,7 @@ 
		qcom,hdmi-audio-rx;

		qcom,ext-ult-lo-amp-gpio = <&pm8941_gpios 6 0>;

		qcom,cdc-micbias2-headset-only;

		qcom,mbhc-audio-jack-type = "6-pole-jack";

	};

};

arch/arm/boot/dts/qcom/msm8974-mtp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ 
	sound {

		qcom,model = "msm8974-taiko-mtp-snd-card";

		qcom,cdc-micbias2-headset-only;

		qcom,mbhc-audio-jack-type = "6-pole-jack";

	};

};