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

Commit c00a37de 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: Specify the configuration for audio on msmfalcon interposer"

parents 81271b3c ccfb8702

arch/arm/boot/dts/qcom/msm-audio.dtsi

0 → 100644
+838 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon-audio.dtsi

0 → 100644
+73 −0
Original line number Original line Diff line number Diff line 
/* 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.

 */



&clock_audio {

	qcom,audio-ref-clk-gpio = <&pmfalcon_gpios 3 0>;

};



&slim_aud {

	tasha_codec {

		cdc-vdd-buck-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-buck-voltage = <1800000 1800000>;

		qcom,cdc-vdd-buck-current = <650000>;



		cdc-buck-sido-supply = <&pmfalcon_s4>;

		qcom,cdc-buck-sido-voltage = <1800000 1800000>;

		qcom,cdc-buck-sido-current = <250000>;



		cdc-vdd-tx-h-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-tx-h-voltage = <1800000 1800000>;

		qcom,cdc-vdd-tx-h-current = <25000>;



		cdc-vdd-rx-h-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-rx-h-voltage = <1800000 1800000>;

		qcom,cdc-vdd-rx-h-current = <25000>;



		cdc-vddpx-1-supply = <&pmfalcon_s4>;

		qcom,cdc-vddpx-1-voltage = <1800000 1800000>;

		qcom,cdc-vddpx-1-current = <10000>;

	};



	tavil_codec {

		cdc-vdd-buck-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-buck-voltage = <1800000 1800000>;

		qcom,cdc-vdd-buck-current = <650000>;



		cdc-buck-sido-supply = <&pmfalcon_s4>;

		qcom,cdc-buck-sido-voltage = <1800000 1800000>;

		qcom,cdc-buck-sido-current = <250000>;



		cdc-vdd-tx-h-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-tx-h-voltage = <1800000 1800000>;

		qcom,cdc-vdd-tx-h-current = <25000>;



		cdc-vdd-rx-h-supply = <&pmfalcon_s4>;

		qcom,cdc-vdd-rx-h-voltage = <1800000 1800000>;

		qcom,cdc-vdd-rx-h-current = <25000>;



		cdc-vddpx-1-supply = <&pmfalcon_s4>;

		qcom,cdc-vddpx-1-voltage = <1800000 1800000>;

		qcom,cdc-vddpx-1-current = <10000>;

	};

};



&pmfalcon_gpios {

	gpio@c200 {

		status = "ok";

		qcom,mode = <1>;

		qcom,pull = <5>;

		qcom,vin-sel = <0>;

		qcom,src-sel = <2>;

		qcom,master-en = <1>;

		qcom,out-strength = <2>;

	};

};

arch/arm/boot/dts/qcom/msm8998-interposer-msmfalcon.dtsi

+2 −3
Original line number Original line Diff line number Diff line
@@ -3083,12 +3083,11 @@ 
#include "msm8998-bus.dtsi"

#include "msm8998-bus.dtsi"

#include "msm8998-gpu.dtsi"

#include "msm8998-gpu.dtsi"

#include "msm8998-pinctrl.dtsi"

#include "msm8998-pinctrl.dtsi"

#include "msm-audio-lpass.dtsi"

#include "msm8998-mdss.dtsi"

#include "msm8998-mdss.dtsi"

#include "msm8998-mdss-pll.dtsi"

#include "msm8998-mdss-pll.dtsi"

#include "msm8998-blsp.dtsi"

#include "msm8998-blsp.dtsi"

#include "msm8998-audio.dtsi"

#include "msm-audio.dtsi"



#include "msmfalcon-audio.dtsi"





/* GPU overrides */

/* GPU overrides */

&msm_gpu {

&msm_gpu {

arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-cdp.dts

+1 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "msm8998-v2.1-interposer-msmfalcon.dtsi"

#include "msm8998-v2.1-interposer-msmfalcon.dtsi"

#include "msm8998-interposer-msmfalcon-cdp.dtsi"

#include "msm8998-interposer-msmfalcon-cdp.dtsi"

#include "msm8998-interposer-pmfalcon.dtsi"

#include "msm8998-interposer-pmfalcon.dtsi"

#include "msm8998-interposer-msmfalcon-audio.dtsi"





/ {

/ {

	model = "Qualcomm Technologies, Inc. MSM 8998 v2.1 MSM FALCON Interposer CDP";

	model = "Qualcomm Technologies, Inc. MSM 8998 v2.1 MSM FALCON Interposer CDP";

arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-msmfalcon-mtp.dts

+1 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "msm8998-v2.1-interposer-msmfalcon.dtsi"

#include "msm8998-v2.1-interposer-msmfalcon.dtsi"

#include "msm8998-interposer-msmfalcon-mtp.dtsi"

#include "msm8998-interposer-msmfalcon-mtp.dtsi"

#include "msm8998-interposer-pmfalcon.dtsi"

#include "msm8998-interposer-pmfalcon.dtsi"

#include "msm8998-interposer-msmfalcon-audio.dtsi"





/ {

/ {

	model = "Qualcomm Technologies, Inc. MSM 8998 v2.1 MSM FALCON Interposer MTP";

	model = "Qualcomm Technologies, Inc. MSM 8998 v2.1 MSM FALCON Interposer MTP";