Merge "ARM: dts: msm: add device tree entry for sound drivers" (55bcbbeb) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm64/boot/dts/qcom/mdm9607-pinctrl.dtsi

+16 −0

Original line number	Diff line number	Diff line
		@@ -287,6 +287,21 @@
		};
		};

		wcd9xxx_intr {
		wcd_intr_default: wcd_intr_default{
		mux {
		pins = "gpio75";
		function = "gpio";
		};
		config {
		pins = "gpio75";
		drive-strength = <2>; /* 2 mA */
		bias-pull-down; /* pull down */
		input-enable;
		};
		};
		};

		codec_reset {
		codec_reset_active: codec_reset_active {
		mux {
		@@ -403,6 +418,7 @@
		pins = "gpio21";
		drive-strength = <8>; /* 8 MA */
		bias-disable; /* No PULL */
		input-enable;
		};
		};

arch/arm64/boot/dts/qcom/mdm9607.dtsi

+34 −15

Original line number	Diff line number	Diff line
		@@ -428,11 +428,7 @@
		compatible = "qcom,wcd9xxx-i2c";
		reg = <0x0d>;

		qcom,cdc-reset-gpio = <&tlmm_pinmux 26 0>;
		pinctrl-names = "default", "idle";
		pinctrl-0 = <&codec_reset_active>;
		pinctrl-1 = <&codec_reset_sleep>;

		qcom,wcd-rst-gpio-node = <&wcd_rst_gpio>;
		qcom,cdc-micbias1-ext-cap;

		interrupt-parent = <&wcd9xxx_intc>;
		@@ -908,12 +904,22 @@
		thermal_zones: thermal-zones {};

		wcd9xxx_intc: wcd9xxx-irq {
		status = "ok";
		compatible = "qcom,wcd9xxx-irq";
		interrupt-controller;
		#interrupt-cells = <1>;
		interrupt-parent = <&tlmm_pinmux>;
		qcom,gpio-connect = <&tlmm_pinmux 75 0>;
		interrupt-names = "cdc-int";
		pinctrl-names = "default";
		pinctrl-0 = <&wcd_intr_default>;
		};

		wcd_rst_gpio: msm_cdc_pinctrl@26 {
		compatible = "qcom,msm-cdc-pinctrl";
		qcom,cdc-rst-n-gpio = <&tlmm_pinmux 26 0>;
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&codec_reset_active>;
		pinctrl-1 = <&codec_reset_sleep>;
		};

		sound-9330 {
		@@ -938,6 +944,7 @@
		"DMIC3", "MIC BIAS3 External",
		"MIC BIAS3 External", "Digital Mic3";

		qcom,prim_mi2s_aux_master = <&prim_master>;
		qcom,codec-mclk-clk-freq = <12288000>;
		qcom,mi2s-interface-mode = "pri_mi2s_master", "sec_mi2s_master";
		qcom,auxpcm-interface-mode = "pri_pcm_master", "sec_pcm_master";
		@@ -1083,6 +1090,11 @@
		compatible = "qcom,msm-pcm-hostless";
		};

		audio_apr: qcom,msm-audio-apr {
		compatible = "qcom,msm-audio-apr";
		qcom,subsys-name = "apr_modem";
		};

		host_pcm: qcom,msm-voice-host-pcm {
		compatible = "qcom,msm-voice-host-pcm";
		};
		@@ -1199,7 +1211,17 @@
		qcom,msm-dai-q6-mi2s-dev-id = <0>;
		qcom,msm-mi2s-rx-lines = <2>;
		qcom,msm-mi2s-tx-lines = <1>;
		pinctrl-names = "default", "idle";
		};
		mi2s_sec: qcom,msm-dai-q6-mi2s-sec {
		compatible = "qcom,msm-dai-q6-mi2s";
		qcom,msm-dai-q6-mi2s-dev-id = <1>;
		qcom,msm-mi2s-rx-lines = <2>;
		qcom,msm-mi2s-tx-lines = <1>;
		};
		};
		prim_master: prim_master_pinctrl {
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&pri_mi2s_ws_active
		&pri_mi2s_sck_active
		&pri_mi2s_dout_active
		@@ -1209,13 +1231,6 @@
		&pri_mi2s_dout_sleep
		&pri_mi2s_din_sleep>;
		};
		mi2s_sec: qcom,msm-dai-q6-mi2s-sec {
		compatible = "qcom,msm-dai-q6-mi2s";
		qcom,msm-dai-q6-mi2s-dev-id = <1>;
		qcom,msm-mi2s-rx-lines = <2>;
		qcom,msm-mi2s-tx-lines = <1>;
		};
		};

		qcom,msm-thermal {
		compatible = "qcom,msm-thermal";
		@@ -1351,6 +1366,7 @@
		qcom,smd-edge = <0>;
		qcom,ipc = <&apcs 0 12>;
		qcom,remote-pid = <1>;
		mbox-names = "mpss_smem";
		interrupts = <GIC_SPI 25 IRQ_TYPE_EDGE_RISING>;
		label = "mpss";
		qcom,smd-channels = "IPCRTR";
		@@ -1359,6 +1375,9 @@
		qcom,net-id = <1>;
		qcom,low-latency;
		};
		qcom,apr_tal_rpmsg {
		qcom,glink-channels = "apr_audio_svc";
		};
		};

		rpm {