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

Commit 084dd0e5 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add support of CSRA66X0 for QCS405 platform"

parents 6388b2b5 4690ea5f

Documentation/devicetree/bindings/sound/qcom,csra66x0.txt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
CSRA66X0 audio codec



Required properties:

 - compatible = "qcom,csra66x0"

 - reg: represents the slave base address provided to the peripheral.

 - qcom,csra-vreg-en-gpio: CSRA66X0 codec enable signal.



Optional Properties:

 - qcom,csra-cluster: Indication that CSRA66X0 device is member

			of a multi-device cluster.

 - qcom,csra-cluster-master: Indication that CSRA66X0 device is

			master of multi-device cluster.

 - interrupt-parent: The parent interrupt controller.

 - interrupts: Specifies the interrupt to Apps processor.

 - irq-active-low: Active interrupt level indication.



Example:



	csra66x0_ampl_68: csra66x0@68 {

		compatible = "qcom,csra66x0";

		reg = <0x68>;

		qcom,csra-vreg-en-gpio = <&tlmm 96 0>;



		qcom,csra-cluster = <1>;

		qcom,csra-cluster-master = <1>;



		interrupt-parent = <&tlmm>;

		interrupts = <80 IRQ_TYPE_LEVEL_HIGH>;

		irq-active-low = <0>;

	};

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+4 −0
Original line number Diff line number Diff line
@@ -1299,6 +1299,10 @@ Optional properties: 
- qcom,va_bolero_codec : Property to specify if VA macro in Bolero codec is used for this target

- qcom,tasha_codec : Property to specify if Tasha codec is used for this target

- qcom,cdc-dmic-gpios : phandle for Digital mic clk and data gpios.

- qcom,csra-codec : Property to specify if CSRA66x0 is used for this target

- qcom,csra-max-devs : Maximum number of CSRA66x0 devices present in the target

- qcom,csra-devs : List of phandles of all possible CSRA66x0 devices supported for the target

- qcom,csra-aux-dev-prefix : Name prefix in multi-channel configuration for CSRA66x0 device

Example:



	qcs405_snd {

arch/arm64/boot/dts/qcom/qcs405-csra1-audio-overlay.dtsi

+7 −1
Original line number Diff line number Diff line
@@ -13,13 +13,18 @@ 


#include "qcs405-tasha.dtsi"

#include "qcs405-va-bolero.dtsi"

#include "qcs405-csra1.dtsi"



&qcs405_snd {

	qcom,model = "qcs405-csra1-snd-card";

	qcom,va-bolero-codec = <1>;

	qcom,tasha-codec = <1>;

	qcom,csra-codec = <1>;

	asoc-codec = <&stub_codec>, <&bolero>;

	asoc-codec-names = "msm-stub-codec.1", "bolero_codec";

	qcom,csra-max-devs = <1>;

	qcom,csra-devs = <&csra66x0_ampl_68>;

	qcom,csra-aux-dev-prefix = "CSRA_12";

	qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;

	qcom,cdc-dmic23-gpios = <&cdc_dmic23_gpios>;

	qcom,cdc-dmic45-gpios = <&cdc_dmic45_gpios>;
@@ -44,7 +49,8 @@ 
		"VA DMIC6", "VA MIC BIAS1",

		"VA MIC BIAS1", "Digital Mic6",

		"VA DMIC7", "VA MIC BIAS1",

		"VA MIC BIAS1", "Digital Mic7";

		"VA MIC BIAS1", "Digital Mic7",

		"CSRA_12 IN", "PRI_MI2S_RX";

};



&bolero {

arch/arm64/boot/dts/qcom/qcs405-csra1.dtsi

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * 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.

 */



&i2c_5 {

	/* CSRA66X0 cluster GRP_0 */

	csra66x0_ampl_68: csra66x0@68 {

		compatible = "qcom,csra66x0";

		reg = <0x68>;

		qcom,csra-vreg-en-gpio = <&tlmm 96 0>;



		qcom,csra-cluster = <1>;

		qcom,csra-cluster-master = <1>;



		interrupt-parent = <&tlmm>;

		interrupts = <80 IRQ_TYPE_LEVEL_HIGH>;

		irq-active-low = <0>;

	};

};



&csra66x0_ampl_68 {

	status = "okay";

};

arch/arm64/boot/dts/qcom/qcs405-csra6-audio-overlay.dtsi

+15 −1
Original line number Diff line number Diff line
@@ -13,13 +13,21 @@ 


#include "qcs405-tasha.dtsi"

#include "qcs405-va-bolero.dtsi"

#include "qcs405-csra6.dtsi"



&qcs405_snd {

	qcom,model = "qcs405-csra6-snd-card";

	qcom,va-bolero-codec = <1>;

	qcom,tasha-codec = <1>;

	qcom,csra-codec = <1>;

	asoc-codec = <&stub_codec>, <&bolero>;

	asoc-codec-names = "msm-stub-codec.1", "bolero_codec";

	qcom,csra-max-devs = <6>;

	qcom,csra-devs = <&csra66x0_ampl_68>, <&csra66x0_ampl_69>,

		<&csra66x0_ampl_6A>, <&csra66x0_ampl_6B>,

		<&csra66x0_ampl_68_1>, <&csra66x0_ampl_69_1>;

	qcom,csra-aux-dev-prefix = "CSRA_12", "CSRA_34", "CSRA_56",

					"CSRA_78", "CSRA_9A", "CSRA_BC";

	qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;

	qcom,cdc-dmic23-gpios = <&cdc_dmic23_gpios>;

	qcom,cdc-dmic45-gpios = <&cdc_dmic45_gpios>;
@@ -44,7 +52,13 @@ 
		"VA DMIC6", "VA MIC BIAS1",

		"VA MIC BIAS1", "Digital Mic6",

		"VA DMIC7", "VA MIC BIAS1",

		"VA MIC BIAS1", "Digital Mic7";

		"VA MIC BIAS1", "Digital Mic7",

		"CSRA_12 IN", "PRI_MI2S_RX",

		"CSRA_34 IN", "PRI_MI2S_RX",

		"CSRA_56 IN", "PRI_MI2S_RX",

		"CSRA_78 IN", "PRI_MI2S_RX",

		"CSRA_9A IN", "PRI_MI2S_RX",

		"CSRA_BC IN", "PRI_MI2S_RX";

};



&bolero {