Merge "ARM: dts: msm: update speaker left and right GPIOs for APQ8998" (69a20f9e) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm/boot/dts/qcom/apq8998-v2.1-mediabox.dts

+18 −0

Original line number	Diff line number	Diff line
		@@ -28,3 +28,21 @@
		&mdss_mdp {
		qcom,mdss-pref-prim-intf = "hdmi";
		};

		&slim_aud {
		tasha_codec {
		wsa_spkr_sd1: msm_cdc_pinctrll {
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&spkr_1_sd_active_mediabox>;
		pinctrl-1 = <&spkr_1_sd_sleep_mediabox>;
		};

		wsa_spkr_sd2: msm_cdc_pinctrlr {
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&spkr_2_sd_active_mediabox>;
		pinctrl-1 = <&spkr_2_sd_sleep_mediabox>;
		};
		};
		};

+54 −0

Original line number	Diff line number	Diff line
		@@ -2957,5 +2957,59 @@
		};
		};
		};

		spkr_1_sd_mediabox {
		spkr_1_sd_sleep_mediabox: spkr_1_sd_sleep_mediabox {
		mux {
		pins = "gpio85";
		function = "gpio";
		};
		config {
		pins = "gpio85";
		drive-strength = <2>; /* 2 mA */
		bias-pull-down;
		input-enable;
		};
		};
		spkr_1_sd_active_mediabox: spkr_1_sd_active_mediabox {
		mux {
		pins = "gpio85";
		function = "gpio";
		};
		config {
		pins = "gpio85";
		drive-strength = <8>; /* 8 mA */
		bias-disable;
		output-high;
		};
		};
		};

		spkr_2_sd_mediabox_mediabox {
		spkr_2_sd_sleep_mediabox: spkr_2_sd_sleep_mediabox {
		mux {
		pins = "gpio112";
		function = "gpio";
		};
		config {
		pins = "gpio112";
		drive-strength = <2>; /* 2 mA */
		bias-pull-down;
		input-enable;
		};
		};
		spkr_2_sd_active_mediabox: spkr_2_sd_active_mediabox {
		mux {
		pins = "gpio112";
		function = "gpio";
		};
		config {
		pins = "gpio112";
		drive-strength = <8>; /* 8 mA */
		bias-disable;
		output-high;
		};
		};
		};
		};
		};