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

Commit c5a235bd 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 pinctrl for codec reset and interrupt for all targets"

parents 51a77e87 0d6e67e5

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

+6 −0
Original line number Diff line number Diff line
@@ -613,6 +613,8 @@ 
		interrupt-controller;

		#interrupt-cells = <1>;

		interrupt-names = "cdc-int";

		pinctrl-names = "default";

		pinctrl-0 = <&wcd_intr_default>;

	};



	clock_audio: audio_ext_clk {
@@ -644,6 +646,10 @@ 


		qcom,cdc-reset-gpio = <&tlmm 68 0>;



		pinctrl-names = "default", "sleep";

		pinctrl-0 = <&cdc_reset_active>;

		pinctrl-1 = <&cdc_reset_sleep>;



		clock-names = "wcd_clk";

		clocks = <&clock_audio clk_audio_pmi_clk>;

arch/arm/boot/dts/qcom/msm8937-pinctrl.dtsi

+44 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-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
@@ -854,6 +854,49 @@ 
			};

		};



		wcd9xxx_intr {

			wcd_intr_default: wcd_intr_default{

				mux {

					pins = "gpio73";

					function = "gpio";

				};



				config {

					pins = "gpio73";

					drive-strength = <2>; /* 2 mA */

					bias-pull-down; /* pull down */

					input-enable;

				};

			};

		};



		cdc_reset_ctrl {

			cdc_reset_sleep: cdc_reset_sleep {

				mux {

					pins = "gpio68";

					function = "gpio";

				};

				config {

					pins = "gpio68";

					drive-strength = <16>;

					bias-disable;

					output-low;

				};

			};

			cdc_reset_active:cdc_reset_active {

				mux {

					pins = "gpio68";

					function = "gpio";

				};

				config {

					pins = "gpio68";

					drive-strength = <16>;

					bias-pull-down;

					output-high;

				};

			};

		};



		cdc-pdm-2-lines {

			cdc_pdm_lines_2_act: pdm_lines_2_on {

				mux {

arch/arm/boot/dts/qcom/msmgold-pinctrl.dtsi

+43 −0
Original line number Diff line number Diff line
@@ -655,6 +655,49 @@ 
			 };

		};



		wcd9xxx_intr {

			wcd_intr_default: wcd_intr_default{

				mux {

					pins = "gpio73";

					function = "gpio";

				};



				config {

					pins = "gpio73";

					drive-strength = <2>; /* 2 mA */

					bias-pull-down; /* pull down */

					input-enable;

				};

			};

		};



		cdc_reset_ctrl {

			cdc_reset_sleep: cdc_reset_sleep {

				mux {

					pins = "gpio68";

					function = "gpio";

				};

				config {

					pins = "gpio68";

					drive-strength = <16>;

					bias-disable;

					output-low;

				};

			};

			cdc_reset_active:cdc_reset_active {

				mux {

					pins = "gpio68";

					function = "gpio";

				};

				config {

					pins = "gpio68";

					drive-strength = <16>;

					bias-pull-down;

					output-high;

				};

			};

		};



		cdc-pdm-2-lines {

			cdc_pdm_lines_2_act: pdm_lines_2_on {

				mux {

arch/arm/boot/dts/qcom/msmtitanium-pinctrl.dtsi

+43 −0
Original line number Diff line number Diff line
@@ -820,6 +820,49 @@ 
			};

		};



		wcd9xxx_intr {

			wcd_intr_default: wcd_intr_default{

				mux {

					pins = "gpio73";

					function = "gpio";

				};



				config {

					pins = "gpio73";

					drive-strength = <2>; /* 2 mA */

					bias-pull-down; /* pull down */

					input-enable;

				};

			};

		};



		cdc_reset_ctrl {

			cdc_reset_sleep: cdc_reset_sleep {

				mux {

					pins = "gpio67";

					function = "gpio";

				};

				config {

					pins = "gpio67";

					drive-strength = <16>;

					bias-disable;

					output-low;

				};

			};

			cdc_reset_active:cdc_reset_active {

				mux {

					pins = "gpio67";

					function = "gpio";

				};

				config {

					pins = "gpio67";

					drive-strength = <16>;

					bias-pull-down;

					output-high;

				};

			};

		};



		cdc-pdm-2-lines {

			cdc_pdm_lines_2_act: pdm_lines_2_on {

				mux {