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

Commit 6385cefa authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of kernel.lnx.4.4-160725.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1045203   Icc884b53c85941f59f84bed108b536cc18b8be60   arm: dma-mapping: Export arch_setup_dma_ops symbol
1009124   Ic0dedbadc324b979583d7a3998195bf15ac537f6   msm: kgsl: Preemption cleanups
1044777   I9be1ee26419c082cda6351ef6d5aeedc6e17de55   msm: camera: isp: Vote bandwidth with clock enabled
1009194   Ic0dedbad998767a1ffdfe265e52fae7baa18d203   msm: kgsl: Program the secvid registers in the soft rese
1043961   I639e8bfb1275a1b8c8fa5bff3a46f9b34fe49ffe   ARM: dts: msm: add ion heaps for msmfalcon
1040026   Ibb660397f8e7e3e0cd0a5e672924925e605b2eb7   msm: vidc: check for venus_hfi_device state in resume
1043478   Ib35104adf7b3618f94c6adf7fab531abffea3f76   msm: kgsl: Stop fault_timer before reading fault registe
1041122   I21e62361f40eb654c369048d01e158d4b96dd551   clk: msm: Fix MDSS compilation issue
1009149   Ic0dedbad641bfa3fd6cbc1c91a37fb0e37f72bae   msm: kgsl: Relax timestamp comparisons for processing ev
1043798   I7a8c2b2fcc9b43e2e858114f7312fccf96dc3f78   of_batterydata: Pass battery id directly to find battery
1041459   I6122ceb014f70b8e0ac005bc3789fbd13a3e867a   ARM: dts: msm: Remove SMD device for Modem edge for MSMC
1043377   Ic36a67c724d7f8a0e64affba92856160cce914bb   ARM: dts: msm: Add SMEM entry for MSMFALCON
1041199   I32ad5c5c8c9dd30a79818c873cfe1d121fd62d49   ASoC: wcd: add wcd934x gpio controller device
1043961   I2b0d35bf90b92f7fbd4256f339c1567d539e17b2   ARM: dts: msm: Add initial memory map for msmfalcon
1035203   Ib5a2d7879f1b493bc445ab4a2d32a89f98d872b4   NFC: Fix crash due to invalid use of ese gpio
1009187   Ic0dedbadb8f6122e32a0a34a65c54a7bca2a523c   msm: kgsl: Remove idle wait in kgsl_iommu_set_pf_policy(
1044736   I08fcb174fd0e0c49f8069e106b48597bcdfe847d   clk: qcom: clk-dummy: Add a dummy clock provider
1041199   I889922a0c36ec80ee6ede95b2f19f80791323332   ASoC: wcd9335: add all child devices of codec
1009124   Ic0dedbadb277a6498d0840b45c90e1265e2f354a   msm: kgsl: Force all command level context switches to t
1043369   I20253a0f0762982fe7d7cb0bde9f64f58a8068fb   msm: vidc: add support for maximum bitrate rate control
1043465   Ic7652e43781f39d3137fb55f2fec2423e457fac4   qcom-charger: smb138x-charger: change power supply type
1009190   Ic0dedbad8476c308a13572d999540b243d97eabc   msm: kgsl: Allow a draw context to skip snapshot
1009124   Ic0dedbadc48095eada9c5fce6004475a2cb0f0a9   msm: kgsl: Leave the MMU clocks on with the rest of the
1009124   Ic0dedbadff8df192096292b221130c8ef5b31e12   msm: kgsl: Keep the active draw context until it is swit
1037857   Id53a790cf67b201a4207f85604cb3472275d418a   msm: mdss: mdp: fix handling of GDSC off notifier
1043373   Ic28f6f36781154ff0c28f4636ade8523d753ab6a   msm: mdss: fix mdss errors on 32-bit compilation
1040761   I4ec609b45f5313d7c19ff6201742b0c5daf54174   ARM: dts: msm: update min voltage for pmcobalt s5 and s7
1042302   Ied8a0048d8af17fa593c1970cabb572aac338786   input: touchscreen: remove dead code in it7258 driver
1042813   I947b8d08f61624b914bd82caf4276364b9833cef   soc: qcom: glink: Included sched.h to avoid build error
1025447   Ie302e79ff838837f214ac50ebfaa6e11f0055915   soc: qcom: code cleanup for service-locator
1009124   Ic0dedbad01a31a5da2954b097cb6fa937d45ef5c   msm: kgsl: Implement fast preemption for 5XX
1041461   I299d31569291e90431802059f727a57ea0f76200   ARM: dts: msm: Remove SMD device for ADSP edge for MSMCO
1043377   I6df0575cf54003374a5ebdbfa54e169d3545ffe7   soc: qcom: smem: Add CDSP processor ID
1041199   I0489f9149cfd6ec7af056d074cb1869a705f9eff   qcom: wcd934x: add pinctrl driver for wcd934x
1037272   I1cc965696c06bd3901d86668aaf597abb3ef2d6d   msm: camera isp: Control camif interrupts on camif enabl
1043377   I097e5464ec6ab80c12bcdb5f38d0599fa40da9ee   ARM: dts: msm: Add ipc-spinlock entry for MSMFALCON
986311   Ie7720001edbbaed8b202655445707b2b49a69cb1   msm: vidc: Increase output port buffer size for VP9 deco
1036037   I77ecff3a2ac395ff3799c1b0618fbc7f5eeb03da   dwc3: gadget: Add debug event for pull up operation
1032174   Id70c3230f761385489e5e94c613f4519239dfb1f   wcnss: Avoid user buffer overloading for write cal data
1041199   I0f04c08587f080eb2df7341d41344ce2079de21b   ARM: dts: msm: add gpio controller node for msmcobalt
1041462   I9f62cc0e8229b86500fa72908be5c503847aed8f   ARM: dts: msm: Remove SMD device for DSPS edge for MSMCO
553571   If56742a9c6b6c4ef774da6e83d57aee56bf28842   Bluetooth: HID: Add support for building hid drivers
507581   I4287e9103769535f43e0934bac08435a524ee6a4   WLAN subsystem: Sysctl support for key TCP/IP parameters
1043369   I3765506f1d703f47e481719296ab890b1f3dc106   msm: vidc: Add support for setting packed QP range
987082   Ic44759d1a5c6e48b2f0f566ea8c153f01cf68279   msm: kgsl: Use the GPU to write the RPTR
1009134   Ic0dedbad6d99130e31cd8a06dfe025610e9157a8   msm: kgsl: Record the ringbuffer start of pipeline times
1009183   Ic0dedbad1015883788e12815806e3249a1e09b21   msm: kgsl: Do INIT_WORK() just before queueing a deferre
1042660   I2b94e78f2470dbc2fd469b5cab287d643e8f3227   sched/core: Fix uninitialized variable used for tracepoi
1043729   If8e08112d065e1327fd54d7b0daf511632aa059f   ARM: dts: msm: Add GDSC data for mnoc fab for msmcobalt
1043377   Iba226aa328906427593ecae35fab3396f34c19ae   soc: qcom: smem_xprt: Add CDSP entry in smem xprt driver
1022201   I9472f3162a87b8a4255d9c684573093642d488a2   msm: camera: ispif: RDI Pack mode support
1042656   I6e6a57e24b41e4b3d049bfcf694b9ad7e2144dd5   sched/core: Fix null-pointer dereference
1042302   Ic1eab3ba79b8e8e5c259bb92f2692fd0db5fc8d3   input: touchscreen: Add Touch screen driver for IC it725
1041199   If6066a42b8aa5a820263a88627e2405df5e227b7   ARM: dts: msm: add sound node for msmcobalt
1043377   Ibd8ceb8149b3041ce1f58ac4c3642d7391b89385   ARM: dts: msm: Add G-Link SSR entries for MSMFALCON
1009158   Ic0dedbad7416abb23c769a4d3be9ebd0ca04810c   msm: kgsl: Remove unneeded error message in kgsl_iommu.c

Change-Id: I1db3a206e714668dd1dcf714f3b236a07c92a862
CRs-Fixed: 1042660, 1036037, 1043478, 1041122, 1044736, 1041459, 507581, 1045203, 1009183, 1037857, 1009187, 1009124, 1043961, 553571, 1009149, 1037272, 1025447, 1040026, 1043798, 1043465, 1043373, 1042656, 1043377, 1009190, 1022201, 987082, 1009194, 1042302, 1041461, 1032174, 1035203, 1009134, 1040761, 1042813, 1043729, 1041199, 1041462, 986311, 1044777, 1009158, 1043369
parents a9c1a507 cc915a39
Loading
Loading
Loading
Loading
+138 −0
Original line number Diff line number Diff line
Qualcomm Technologies, Inc. WCD GPIO block

This binding describes the GPIO block found in the WCD934X series of
audio codec's from QTI.

- compatible:
	Usage: required
	Value type: <string>
	Definition: must be "qcom,wcd-pinctrl"

- qcom,num-gpios:
	Usage: required
	Value type: <u32>
	Definition: Number of GPIO's supported by the controller

- gpio-controller:
	Usage: required
	Value type: <none>
	Definition: Mark the device node as a GPIO controller

- #gpio-cells:
	Usage: required
	Value type: <u32>
	Definition: Must be 2;
		    the first cell will be used to define gpio number and the
		    second denotes the flags for this gpio

Please refer to ../gpio/gpio.txt for a general description of GPIO bindings.

Please refer to pinctrl-bindings.txt in this directory for details of the
common pinctrl bindings used by client devices, including the meaning of the
phrase "pin configuration node".

The pin configuration nodes act as a container for an arbitrary number of
subnodes. Each of these subnodes represents some desired configuration for a
pin or a list of pins. This configuration can include the
mux function to select on those pin(s), and various pin configuration
parameters, as listed below.


SUBNODES:

The name of each subnode is not important; all subnodes should be enumerated
and processed purely based on their content.

Each subnode only affects those parameters that are explicitly listed. In
other words, a subnode that lists a mux function but no pin configuration
parameters implies no information about any pin configuration parameters.
Similarly, a pin subnode that describes a pullup parameter implies no
information about e.g. the mux function.

The following generic properties as defined in pinctrl-bindings.txt are valid
to specify in a pin configuration subnode:

- pins:
	Usage: required
	Value type: <string-array>
	Definition: List of gpio pins affected by the properties specified in
		    this subnode.  Valid pins are:
		    gpio1-gpio5 for wcd9340

- bias-disable:
	Usage: optional
	Value type: <none>
	Definition: The specified pins should be configured as no pull.

- bias-pull-down:
	Usage: optional
	Value type: <none>
	Definition: The specified pins should be configured as pull down.

- bias-pull-up:
	Usage: optional
	Value type: <empty>
	Definition: The specified pins should be configured as pull up.

- qcom,pull-up-strength:
	Usage: optional
	Value type: <u32>
	Definition: Specifies the strength to use for pull up, if selected.

- bias-high-impedance:
	Usage: optional
	Value type: <none>
	Definition: The specified pins will put in high-Z mode and disabled.

- input-enable:
	Usage: optional
	Value type: <none>
	Definition: The specified pins are put in input mode.

- output-high:
	Usage: optional
	Value type: <none>
	Definition: The specified pins are configured in output mode, driven
		    high.

- output-low:
	Usage: optional
	Value type: <none>
	Definition: The specified pins are configured in output mode, driven
		    low.

- qcom,drive-strength:
	Usage: optional
	Value type: <u32>
	Definition: Selects the drive strength for the specified pins.

Example:

	wcd: wcd_pinctrl@5 {
		compatible = "qcom,wcd-pinctl";
		qcom,num-gpios = <5>
		gpio-controller;
		#gpio-cells = <2>;

		spkr_1_wcd_en_active: spkr_1_wcd_en_active {
			mux {
				pins = "gpio2";
			};

			config {
				pins = "gpio2";
				output-high;
			};
		};

		spkr_1_wcd_en_sleep: spkr_1_wcd_en_sleep {
			mux {
				pins = "gpio2";
			};

			config {
				pins = "gpio2";
				input-enable;
			};
		};
	};
+133 −0
Original line number Diff line number Diff line
@@ -109,6 +109,78 @@
					  "SpkrLeft", "SpkrRight";
	};

	sound-tavil {
		compatible = "qcom,msmcobalt-asoc-snd-tavil";
		qcom,model = "msmcobalt-tavil-snd-card";

		qcom,audio-routing =
			"RX_BIAS", "MCLK",
			"AMIC2", "MIC BIAS2",
			"MIC BIAS2", "Headset Mic",
			"AMIC3", "MIC BIAS2",
			"MIC BIAS2", "ANCRight Headset Mic",
			"AMIC4", "MIC BIAS2",
			"MIC BIAS2", "ANCLeft Headset Mic",
			"AMIC5", "MIC BIAS3",
			"MIC BIAS3", "Handset Mic",
			"DMIC0", "MIC BIAS1",
			"MIC BIAS1", "Digital Mic0",
			"DMIC1", "MIC BIAS1",
			"MIC BIAS1", "Digital Mic1",
			"DMIC2", "MIC BIAS3",
			"MIC BIAS3", "Digital Mic2",
			"DMIC3", "MIC BIAS3",
			"MIC BIAS3", "Digital Mic3",
			"DMIC4", "MIC BIAS4",
			"MIC BIAS4", "Digital Mic4",
			"DMIC5", "MIC BIAS4",
			"MIC BIAS4", "Digital Mic5",
			"SpkrLeft IN", "SPK1 OUT",
			"SpkrRight IN", "SPK2 OUT";

		qcom,msm-mbhc-hphl-swh = <0>;
		qcom,msm-mbhc-gnd-swh = <0>;
		qcom,tavil-mclk-clk-freq = <9600000>;
		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
				<&loopback>, <&compress>, <&hostless>,
				<&afe>, <&lsm>, <&routing>, <&cpe>, <&compr>;
		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",
				"msm-pcm-dsp.2", "msm-voip-dsp",
				"msm-pcm-voice", "msm-pcm-loopback",
				"msm-compress-dsp", "msm-pcm-hostless",
				"msm-pcm-afe", "msm-lsm-client",
				"msm-pcm-routing", "msm-cpe-lsm",
				"msm-compr-dsp";
		asoc-cpu = <&dai_hdmi>,
				<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,
				<&sb_2_rx>, <&sb_2_tx>, <&sb_3_rx>, <&sb_3_tx>,
				<&sb_4_rx>, <&sb_4_tx>, <&sb_5_tx>,
				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
				<&afe_proxy_tx>, <&incall_record_rx>,
				<&incall_record_tx>, <&incall_music_rx>,
				<&incall_music_2_rx>, <&sb_5_rx>,
				<&usb_audio_rx>, <&usb_audio_tx>;
		asoc-cpu-names = "msm-dai-q6-hdmi.8",
				"msm-dai-q6-dev.16384", "msm-dai-q6-dev.16385",
				"msm-dai-q6-dev.16386", "msm-dai-q6-dev.16387",
				"msm-dai-q6-dev.16388", "msm-dai-q6-dev.16389",
				"msm-dai-q6-dev.16390", "msm-dai-q6-dev.16391",
				"msm-dai-q6-dev.16392", "msm-dai-q6-dev.16393",
				"msm-dai-q6-dev.16395", "msm-dai-q6-dev.224",
				"msm-dai-q6-dev.225", "msm-dai-q6-dev.241",
				"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",
				"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",
				"msm-dai-q6-dev.32770", "msm-dai-q6-dev.16394",
				"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673";
		asoc-codec = <&stub_codec>;
		asoc-codec-names = "msm-stub-codec.1";
		qcom,wsa-max-devs = <2>;
		qcom,wsa-devs = <&wsa881x_0211>, <&wsa881x_0212>,
				<&wsa881x_0213>, <&wsa881x_0214>;
		qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",
					  "SpkrLeft", "SpkrRight";
	};

	cpe: qcom,msm-cpe-lsm {
		compatible = "qcom,msm-cpe-lsm";
	};
@@ -141,6 +213,15 @@
		#clock-cells = <1>;
	};

	clock_audio_lnbb: audio_ext_clk_lnbb {
		status = "ok";
		compatible = "qcom,audio-ref-clk";
		clock-names = "osr_clk";
		clocks = <&clock_gcc clk_ln_bb_clk2>;
		qcom,node_has_rpm_clock;
		#clock-cells = <1>;
	};

	wcd_rst_gpio: msm_cdc_pinctrl@64 {
		compatible = "qcom,msm-cdc-pinctrl";
		qcom,cdc-rst-n-gpio = <&tlmm 64 0>;
@@ -208,4 +289,56 @@
		qcom,cdc-dmic-sample-rate = <4800000>;
		qcom,cdc-mad-dmic-rate = <600000>;
	};

	tavil_codec {
		compatible = "qcom,tavil-slim-pgd";
		elemental-addr = [00 01 50 02 17 02];

		interrupt-parent = <&wcd9xxx_intc>;
		interrupts = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
			      17 18 19 20 21 22 23 24 25 26 27 28 29
			      30 31>;

		qcom,wcd-rst-gpio-node = <&wcd_rst_gpio>;

		clock-names = "wcd_clk";
		clocks = <&clock_audio_lnbb clk_audio_pmi_lnbb_clk>;

		cdc-vdd-buck-supply = <&pmcobalt_s4>;
		qcom,cdc-vdd-buck-voltage = <1800000 1800000>;
		qcom,cdc-vdd-buck-current = <650000>;

		cdc-buck-sido-supply = <&pmcobalt_s4>;
		qcom,cdc-buck-sido-voltage = <1800000 1800000>;
		qcom,cdc-buck-sido-current = <250000>;

		cdc-vdd-tx-h-supply = <&pmcobalt_s4>;
		qcom,cdc-vdd-tx-h-voltage = <1800000 1800000>;
		qcom,cdc-vdd-tx-h-current = <25000>;

		cdc-vdd-rx-h-supply = <&pmcobalt_s4>;
		qcom,cdc-vdd-rx-h-voltage = <1800000 1800000>;
		qcom,cdc-vdd-rx-h-current = <25000>;

		cdc-vddpx-1-supply = <&pmcobalt_s4>;
		qcom,cdc-vddpx-1-voltage = <1800000 1800000>;
		qcom,cdc-vddpx-1-current = <10000>;

		qcom,cdc-static-supplies = "cdc-vdd-buck",
					   "cdc-buck-sido",
					   "cdc-vdd-tx-h",
					   "cdc-vdd-rx-h",
					   "cdc-vddpx-1";

		qcom,cdc-micbias1-mv = <1800>;
		qcom,cdc-micbias2-mv = <1800>;
		qcom,cdc-micbias3-mv = <1800>;
		qcom,cdc-micbias4-mv = <1800>;

		qcom,cdc-mclk-clk-rate = <9600000>;
		qcom,cdc-slim-ifd = "tavil-slim-ifd";
		qcom,cdc-slim-ifd-elemental-addr = [00 00 50 02 17 02];
		qcom,cdc-dmic-sample-rate = <4800000>;
		qcom,cdc-mad-dmic-rate = <600000>;
	};
};
+11 −0
Original line number Diff line number Diff line
@@ -131,6 +131,16 @@
			clock-names = "bus_clk", "bus_a_clk";
			clocks = <&clock_gcc clk_mmssnoc_axi_clk>,
				<&clock_gcc clk_mmssnoc_axi_a_clk>;
			clk-mdss-axi-no-rate-supply =
					<&gdsc_mdss>;
			clk-mdss-ahb-no-rate-supply =
					<&gdsc_mdss>;
			clk-camss-ahb-no-rate-supply =
					<&gdsc_camss_top>;
			clk-video-ahb-no-rate-supply =
					<&gdsc_venus>;
			clk-video-axi-no-rate-supply =
					<&gdsc_venus>;
			qcom,node-qos-clks {
				clock-names =
				"clk-noc-cfg-ahb-no-rate",
@@ -141,6 +151,7 @@
				"clk-video-ahb-no-rate",
				"clk-video-axi-no-rate";
				clocks =
				<&clock_gcc clk_mmssnoc_axi_clk>,
				<&clock_gcc clk_gcc_mmss_noc_cfg_ahb_clk>,
				<&clock_mmss clk_mmss_mnoc_ahb_clk>,
				<&clock_mmss clk_mmss_mdss_ahb_clk>,
+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@
	rpm-regulator-smpa5 {
		status = "okay";
		pmcobalt_s5: regulator-s5 {
			regulator-min-microvolt = <2040000>;
			regulator-min-microvolt = <1904000>;
			regulator-max-microvolt = <2040000>;
			status = "okay";
		};
@@ -91,7 +91,7 @@
	rpm-regulator-smpa7 {
		status = "okay";
		pmcobalt_s7: regulator-s7 {
			regulator-min-microvolt = <1028000>;
			regulator-min-microvolt = <900000>;
			regulator-max-microvolt = <1028000>;
			status = "okay";
		};
+96 −0
Original line number Diff line number Diff line
/* Copyright (c) 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
 * 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.
 */

&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_n_active>;
		      pinctrl-1 = <&spkr_1_sd_n_sleep>;
		};

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

	tavil_codec {
		wcd: wcd_pinctrl@5 {
			compatible = "qcom,wcd-pinctrl";
			qcom,num-gpios = <5>;
			gpio-controller;
			#gpio-cells = <2>;

			spkr_1_wcd_en_active: spkr_1_wcd_en_active {
				mux {
					pins = "gpio2";
				};

				config {
					pins = "gpio2";
					output-high;
				};
			};

			spkr_1_wcd_en_sleep: spkr_1_wcd_en_sleep {
				mux {
					pins = "gpio2";
				};

				config {
					pins = "gpio2";
					input-enable;
				};
			};

			spkr_2_wcd_en_active: spkr_2_sd_n_active {
				mux {
					pins = "gpio3";
				};

				config {
					pins = "gpio3";
					output-high;
				};
			};

			spkr_2_wcd_en_sleep: spkr_2_sd_n_sleep {
				mux {
					pins = "gpio3";
				};

				config {
					pins = "gpio3";
					input-enable;
				};
			};
		};

		wsa_spkr_wcd_sd1: msm_cdc_pinctrll {
		      compatible = "qcom,msm-cdc-pinctrl";
		      pinctrl-names = "aud_active", "aud_sleep";
		      pinctrl-0 = <&spkr_1_wcd_en_active>;
		      pinctrl-1 = <&spkr_1_wcd_en_sleep>;
		};

		wsa_spkr_wcd_sd2: msm_cdc_pinctrlr {
		      compatible = "qcom,msm-cdc-pinctrl";
		      pinctrl-names = "aud_active", "aud_sleep";
		      pinctrl-0 = <&spkr_2_wcd_en_active>;
		      pinctrl-1 = <&spkr_2_wcd_en_sleep>;
		};
	};
};
Loading