Commit f89e635b authored Jun 14, 2016 by Linux Build Service Account

Promotion of kernel.lnx.4.4-160613.

CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1027269 I15edfdf0442e3ac678c70df29482b3304cf1215a mmc: sdhci: add a quirk to define non standard tuning
1013280 I5af41bef6db6af14d53018caef1f7fd9b00fc136 ASoC: wcd9335: Avoid TX mute during voice call on headse
1027456 Id281b6b8ac3c9312848c39e11019284f970caced arm: cpu: read all address cells in dt for cpuid
1019254 Ie57950e0fb979807ef95cf21046c97617e286ed0 ASoC: msmcobalt: Create pinctrl entries for ground/mic s
1027647 I7a4ad3188f7a19427c096a596a502debdc2aac55 msm: mdss: add validation for dest scaler count
1027269 I32b8c1bbbd67b4daadaa85c3c01beab8ff1b7cb2 mmc: mmc: Add clk_hold/release pair before caching host-
1027269 If6261c0e42178d331184ac605c192d48a76e1e29 mmc: mmc: fix issue with clock scaling in HS200 mode
1027269 Ie0c11743fb781e765c926e3408b87eaf94dc2eb6 Revert "mmc: sdhci: Panic after dumping SDHC registers"
1027269 I5182b48523e7f9511265fa557433b88224318a23 mmc: sdhci: update sdhci_cmdq_set_transfer_params()
1000387 1027269 Iec6ecef1bf940e720c871be58b265394904f0cf1 drivers: mmc: fix issue raised by source code analyzer t
1027269 I9657b16954b54c491fa19f9d82d9141edf45e0ef mmc: cmdq_hci: set block size as part of CQ unhalt proce
955531 I6bfcfd54525fa6472bd848d4c112fff0c9462355 usb: hcd: Fix double free with bandwidth_mutex on cable
1027269 Ie3917ac9b573dfef514f82e5073d1c480cd9a71d mmc: cmdq_hci: disable CDR in CQ mode
1027461 I10f3c6d1e2d3c6e71be04e3206273aad7971a6b5 diag: dci: Fix possible race condition during SSR
1022917 I6e1bd314af1311af73704bdfd9cdc5d2cb849557 ASoC: msm: Add 48KHz sample rate support for CPE CPU DAI
1025296 Id0e48b5c2f9deea93c5875c10d5ec72bd360df5f mm: fix cma accounting in zone_watermark_ok
1027269 I1d683c4202ce34edeb6cb36d9713e226bb6f43d7 mmc: core: Add NULL check for host->card
1017287 I40e12b9ce8d6751c0a6dc0bd3c780b92c499b7dc drivers: mfd: Set ANC gain register as volatile
1019254 Ibccddc82b18614ddbe6ef9c9720b3de1ce00163e ASoC: msmcobalt: Switch ground/mic swap GPIO control to
1027269 I8dbec823938525af90fb990db1bb4b325ee23cba mmc: sdhci-msm: use PIO for tuning commands
1027269 Id6f6230520db1ad018c883cb639fe66b4b86c70c mmc: sdhci-msm: enable quirk to define non standard tuni
1027269 Id9625167d7e235fb3a20a6193889c1654b5c0cd8 mmc: sdhci: Add new quirk to use PIO for eMMC tuning com
1018329 I716401adda144ac0c03520f747694eaa50ea8e51 soundwire: Fix NULL pointer dereference
1027269 If502f28e19924264dfb99d76f6881d3167f56a05 mmc: core: modify scaling up/down sequence
1027269 I1e5cbb6a2dfff129acdb27e27ea090d58197f41c mmc: core: Fix the timing related checks in partial_init
1013573 I113657c91dd5eb00791535dc78b7cdad1db5c4aa ASoC: wcd9330: Fix MCLK enable/disable issue in wcd9330
1027269 Ic90fe26a676ae7dd2063e17bc3771db83605f4dc mmc: core: fix reading the bkops status from card
1027269 Idaa2cb0c7712846f6827272caefc112b127ef818 mmc: sdhci: Implement set_transfer_params() cmdq host op
1027269 I3a9856e0d60ce6a9cc1727cd8ccd10ef33bb707c mmc: cmdq_hci: add set_transfer_params() to CQ unhalt
1027269 I69f9dacaa042e9f9a0bc4ed886f97c5c4a3b9791 mmc: sdhci-msm: Don't enable MMC_CAP2_FULL_PWR_CYCLE

Change-Id: I0a671106a0593c7889c9ee403bc8a87e4c9a490e
CRs-Fixed: 1025296, 1013280, 1013573, 955531, 1000387, 1017287, 1019254, 1022917, 1027647, 1027456, 1027461, 1018329, 1027269

parents 5ec37333 07ab290b

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -336,6 +336,12 @@ Required properties:

		- compatible : "qcom,msm-cpe-lsm"

		* wcd_us_euro_gpio

		Required properties:

		- compatible : "qcom,msm-cdc-pinctrl"

		* msm-dai-slim

		Required properties:

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@

		qcom,msm-mbhc-hphl-swh = <0>;
		qcom,msm-mbhc-gnd-swh = <0>;
		qcom,us-euro-gpios = <&wcd_us_euro_gpio>;
		qcom,tasha-mclk-clk-freq = <9600000>;
		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
		<&loopback>, <&compress>, <&hostless>,
		@@ -110,6 +111,13 @@
		compatible = "qcom,msm-cpe-lsm";
		};

		wcd_us_euro_gpio: msm_cdc_pinctrl@75 {
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&wcd_gnd_mic_swap_active>;
		pinctrl-1 = <&wcd_gnd_mic_swap_idle>;
		};

		wcd9xxx_intc: wcd9xxx-irq {
		status = "ok";
		compatible = "qcom,wcd9xxx-irq";

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

+28 −0

Original line number	Diff line number	Diff line
		@@ -587,6 +587,34 @@
		};
		};

		wcd_gnd_mic_swap {
		wcd_gnd_mic_swap_idle: wcd_gnd_mic_swap_idle {
		mux {
		pins = "gpio75";
		function = "gpio";
		};
		config {
		pins = "gpio75";
		drive-strength = <2>;
		bias-pull-down;
		output-low;
		};
		};
		wcd_gnd_mic_swap_active: wcd_gnd_mic_swap_active {
		mux {
		pins = "gpio75";
		function = "gpio";
		};
		config {
		pins = "gpio75";
		drive-strength = <2>;
		bias-disable;
		output-high;
		};
		};
		};


		cdc_reset_ctrl {
		cdc_reset_sleep: cdc_reset_sleep {
		mux {

arch/arm/kernel/devtree.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ void __init arm_dt_init_cpu_maps(void)

		for_each_child_of_node(cpus, cpu) {
		u32 hwid;
		const __be32 *cell;

		if (of_node_cmp(cpu->type, "cpu"))
		continue;
		@@ -98,13 +99,13 @@ void __init arm_dt_init_cpu_maps(void)
		* properties is considered invalid to build the
		* cpu_logical_map.
		*/
		if (of_property_read_u32(cpu, "reg", &hwid)) {
		pr_debug(" * %s missing reg property\n",
		cpu->full_name);
		cell = of_get_property(cpu, "reg", NULL);
		if (!cell) {
		pr_err("%s: missing reg property\n", cpu->full_name);
		of_node_put(cpu);
		return;
		}

		hwid = of_read_number(cell, of_n_addr_cells(cpu));
		/*
		* 8 MSBs must be set to 0 in the DT since the reg property
		* defines the MPIDR[23:0].

drivers/char/diag/diag_dci.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -2964,7 +2964,6 @@ int diag_dci_deinit_client(struct diag_dci_client_tbl *entry)
		diag_update_userspace_clients(DCI_LOG_MASKS_TYPE);
		ret = dci_ops_tbl[token].send_log_mask(token);
		if (ret != DIAG_DCI_NO_ERROR) {
		mutex_unlock(&driver->dci_mutex);
		return ret;
		}
		kfree(entry->dci_event_mask);
		@@ -2973,7 +2972,6 @@ int diag_dci_deinit_client(struct diag_dci_client_tbl *entry)
		diag_update_userspace_clients(DCI_EVENT_MASKS_TYPE);
		ret = dci_ops_tbl[token].send_event_mask(token);
		if (ret != DIAG_DCI_NO_ERROR) {
		mutex_unlock(&driver->dci_mutex);
		return ret;
		}