Merge "ARM: dts: msm: add specific sound card for MSM8939 SKUL" (9773d78e) · Commits · e / devices / android_kernel_sony_msm8994

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

+17 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-2015, 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
		@@ -30,6 +30,22 @@
		};
		};

		cdc-ext-spk-pa {
		qcom,pins = <&gp 0>;
		qcom,num-grp-pins = <1>;
		qcom,pin-func = <0>;
		label = "cdc-ext-spk-pa";
		cdc_ext_spk_pa_act: ext_spk_pa_on {
		drive-strength = <8>;
		output-low;
		bias-pull-none;
		};
		cdc_ext_spk_pa_sus: ext_spk_pa_off {
		drive-strength = <2>;
		bias-disable;
		};
		};

		pmx-uartconsole {
		qcom,pins = <&gp 4>, <&gp 5>;
		qcom,num-grp-pins = <2>;

+9 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,15 @@
		qcom,key-codes = <139 172 158>;
		qcom,y-offset = <0>;
		};

		sound {
		qcom,model = "msm8939-snd-card-skul";
		qcom,msm-spk-ext-pa = <&msm_gpio 0 0>;
		pinctrl-names = "cdc_lines_act",
		"cdc_lines_sus";
		pinctrl-0 = <&cdc_pdm_lines_act &cdc_ext_spk_pa_act>;
		pinctrl-1 = <&cdc_pdm_lines_sus &cdc_ext_spk_pa_sus>;
		};
		};

		&sdhc_2 {