Merge pull request #17 from bitrvmpd/LA.UM.6.6.r1-05300-89xx.0

Merge CAF LA.UM.6.6.r1-05300-89xx.0

.gitignore

@@ -99,3 +99,6 @@ all.config
 
 # Binares
 ipa_common
+
+# Old config file
+santoni_defconfig.old

Documentation/devicetree/bindings/iommu/arm,smmu.txt

@@ -115,6 +115,12 @@ conditions.
 		  supported as we are directly comparing client SID with ID bits
 		  of SMR registers.
 
+- qcom,deferred-regulator-disable-delay : The time delay for deferred regulator
+                  disable in ms. In case of unmap call, regulator is
+                  enabled/disabled. This may introduce additional delay. For
+                  clients who do not detach, it's not possible to keep regulator
+                  vote while smmu is attached. Type is <u32>.
+
 - clocks        : List of clocks to be used during SMMU register access. See
                   Documentation/devicetree/bindings/clock/clock-bindings.txt
                   for information about the format. For each clock specified

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

@@ -756,7 +756,12 @@ normally open.
 
 Optional Properties:
 - qcom,us-euro-gpios : GPIO on which gnd/mic swap signal is coming.
-
+- qcom,subsys-name: This value provides the subsystem name where codec
+		is present. This property enables the codec driver to
+		register and receive subsytem restart notification from subsystem
+		and follow appropriate steps to ensure codec is in proper state
+		after subsytem restart. By default codec driver register
+		with ADSP subsystem.
 Example:
 
 	sound {
@@ -1622,6 +1627,12 @@ capacitor mode.
 - qcom,msm-micbias2-ext-cap : Boolean. Enable micbias2 external
 capacitor mode.
 - qcom,msm-spk-ext-pa : GPIO which enables external speaker pa.
+- qcom,subsys-name: This value provides the subsystem name where codec
+		is present. This property enables the codec driver to
+		register and receive subsytem restart notification from subsystem
+		and follow appropriate steps to ensure codec is in proper state
+		after subsytem restart. By default codec driver register
+		with ADSP subsystem.
 
 To Configure External Audio Switch
 - qcom,msm-ext-audio-switch : GPIO which controls external switch that switches

arch/Kconfig

@@ -561,6 +561,13 @@ config ARCH_MMAP_RND_COMPAT_BITS
 	  This value can be changed after boot using the
 	  /proc/sys/vm/mmap_rnd_compat_bits tunable
 
+config ARCH_HAS_ELF_RANDOMIZE
+	bool
+	help
+	  An architecture supports choosing randomized locations for
+	  stack, mmap, brk, and ET_DYN. Defined functions:
+	  - arch_mmap_rnd()
+
 #
 # ABI hall of shame
 #

arch/arm/boot/dts/qcom/Makefile

@@ -218,6 +218,7 @@
 	msm8917-pmi8940-cdp.dtb \
 	msm8917-pmi8940-mtp.dtb \
 	msm8917-pmi8950-cdp.dtb \
+	msm8917-pmi8950-cdp-mirror-lake-touch.dtb \
 	msm8917-pmi8950-ext-codec-cdp.dtb \
 	msm8917-pmi8950-mtp.dtb \
 	msm8917-pmi8937-rcm.dtb \
@@ -305,8 +306,10 @@ dtb-$(CONFIG_ARCH_MSM8940) += msm8940-pmi8950-qrd-sku7.dtb
        msm8952-mtp.dtb
 
 #dtb-$(CONFIG_ARCH_MSM8909) += msm8909-pm8916-mtp.dtb \
+	msm8909-cdp.dtb \
         msm8909-1gb-qrd-skuc.dtb \
         msm8909-1gb-qrd-skue.dtb \
+        msm8909-qrd-skue.dtb \
 	msm8909w-wtp.dtb \
 	apq8009w-wtp.dtb \
 	apq8009w-cdp.dtb \
@@ -350,8 +353,10 @@ dtb-$(CONFIG_ARCH_MSM8940) += msm8940-pmi8950-qrd-sku7.dtb
 	apq8009-robot-rome.dtb \
 	apq8009-mtp-drone.dtb \
 	msm8909-mtp.dtb \
-	msm8909-1gb-mtp.dtb
-
+	msm8909-1gb-mtp.dtb \
+	msm8909-1gb-rcm.dtb \
+	msm8909-pm8916-1gb-rcm.dtb \
+        msm8909-1gb-cdp.dtb
 
 ifeq ($(CONFIG_ARM64),y)
 always          := $(dtb-y)

arch/arm/boot/dts/qcom/apq8009-robot-rome.dts

@@ -243,7 +243,8 @@
 	pinctrl-names = "active", "sleep";
 	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on
 			&sdc2_wlan_gpio_on>;
-	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
+	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off
+			&sdc2_wlan_gpio_off>;
 	qcom,nonremovable;
 	status = "ok";
 };

arch/arm/boot/dts/qcom/mdm9650-v1.1-nand-ccard-v2.dts

@@ -25,12 +25,6 @@
 	status = "ok";
 };
 
-&soc {
-	ethernet {
-		ntn-supply-enable-gpio = <&pmd9650_gpios 3 0>;
-	};
-};
-
 &usb3 {
 	/* Enable USB detection on v2 */
 	interrupt-map = <0x0 0 &intc 0 202 0

arch/arm/boot/dts/qcom/msm-pm8916.dtsi

@@ -1,4 +1,5 @@
-/* Copyright (c) 2013-2014, 2016 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, 2016-2017, 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
@@ -600,6 +601,7 @@
 						   "cdc-vdda-cp";
 
 			qcom,cdc-on-demand-supplies = "cdc-vdd-mic-bias";
+			qcom,subsys-name = "modem";
 		};
 
 		pm8916_tombak_analog: msm8x16_wcd_codec@f100{

arch/arm/boot/dts/qcom/msm8909-cdp.dtsi

@@ -214,6 +214,91 @@
 		};
 	};
 
+	audio_codec: sound {
+		compatible = "qcom,msm8952-audio-codec";
+		qcom,model = "msm8909-snd-card";
+		reg = <0x7702000 0x4>,
+		      <0x7702004 0x4>,
+		      <0x7702008 0x4>;
+		reg-names = "csr_gp_io_mux_mic_ctl",
+			    "csr_gp_io_mux_spkr_ctl",
+			    "csr_gp_io_lpaif_pri_pcm_pri_mode_muxsel";
+
+		qcom,msm-snd-card-id = <0>;
+		qcom,msm-codec-type = "internal";
+		qcom,msm-ext-pa = "primary";
+		qcom,msm-mclk-freq = <9600000>;
+		qcom,msm-mbhc-hphl-swh = <0>;
+		qcom,msm-mbhc-gnd-swh = <0>;
+		qcom,msm-hs-micbias-type = "internal";
+		qcom,msm-micbias1-ext-cap;
+		qcom,audio-routing =
+			"RX_BIAS", "MCLK",
+			"SPK_RX_BIAS", "MCLK",
+			"INT_LDO_H", "MCLK",
+			"MIC BIAS Internal1", "Handset Mic",
+			"MIC BIAS Internal2", "Headset Mic",
+			"MIC BIAS Internal1", "Secondary Mic",
+			"AMIC1", "MIC BIAS Internal1",
+			"AMIC2", "MIC BIAS Internal2",
+			"AMIC3", "MIC BIAS Internal1";
+		qcom,msm-gpios =
+			"pri_i2s",
+			"us_eu_gpio";
+		qcom,pinctrl-names =
+			"all_off",
+			"pri_i2s_act",
+			"us_eu_gpio_act",
+			"pri_i2s_us_eu_gpio_act";
+		pinctrl-names =
+			"all_off",
+			"pri_i2s_act",
+			"us_eu_gpio_act",
+			"pri_i2s_us_eu_gpio_act";
+		pinctrl-0 = <&cdc_pdm_lines_sus &cross_conn_det_sus
+							&vdd_spkdrv_sus>;
+		pinctrl-1 = <&cdc_pdm_lines_act &cross_conn_det_sus
+							&vdd_spkdrv_act>;
+		pinctrl-2 = <&cdc_pdm_lines_sus &cross_conn_det_act
+							&vdd_spkdrv_sus>;
+		pinctrl-3 = <&cdc_pdm_lines_act &cross_conn_det_act
+							&vdd_spkdrv_act>;
+		qcom,cdc-us-euro-gpios = <&msm_gpio 97 0>;
+		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
+				<&loopback>, <&compress>, <&hostless>,
+				<&afe>, <&lsm>, <&routing>, <&lpa>,
+				<&voice_svc>;
+		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-pcm-lpa",
+				"msm-voice-svc";
+		asoc-cpu = <&dai_pri_auxpcm>,
+				<&dai_mi2s0>, <&dai_mi2s1>,
+				<&dai_mi2s2>, <&dai_mi2s3>,
+				<&dai_mi2s5>, <&dai_mi2s6>,
+				<&bt_sco_rx>, <&bt_sco_tx>, <&bt_a2dp_rx>,
+				<&int_fm_rx>, <&int_fm_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>;
+		asoc-cpu-names = "msm-dai-q6-auxpcm.1",
+				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
+				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
+				"msm-dai-q6-mi2s.5", "msm-dai-q6-mi2s.6",
+				"msm-dai-q6-dev.12288", "msm-dai-q6-dev.12289",
+				"msm-dai-q6-dev.12290", "msm-dai-q6-dev.12292",
+				"msm-dai-q6-dev.12293",	"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";
+		asoc-codec = <&stub_codec>, <&pm8909_conga_dig>;
+		asoc-codec-names = "msm-stub-codec.1", "cajon_codec";
+	};
 };
 
 &blsp1_uart1 {

arch/arm/boot/dts/qcom/msm8909-gpu.dtsi

@@ -51,8 +51,6 @@
 		interrupt-names = "kgsl_3d0_irq";
 		qcom,id = <0>;
 
-		qcom,gpu-speed-config = <0>;
-
 		qcom,chipid = <0x03000400>;
 
 		qcom,initial-pwrlevel = <1>;
@@ -95,26 +93,6 @@
 		qcom,pm-qos-active-latency = <701>;
 		qcom,pm-qos-wakeup-latency = <701>;
 
-		/* GPU Mempools */
-		qcom,gpu-mempools {
-			#address-cells= <1>;
-			#size-cells = <0>;
-			compatible = "qcom,gpu-mempools";
-
-			qcom,mempool-max-pages = <32768>;
-
-			/* 4K Page Pool configuration */
-			qcom,gpu-mempool@0 {
-				reg = <0>;
-				qcom,mempool-page-size = <4096>;
-			};
-			/* 64K Page Pool configuration */
-			qcom,gpu-mempool@1 {
-				reg = <1>;
-				qcom,mempool-page-size  = <65536>;
-			};
-		};
-
 		/* Power levels */
 		qcom,gpu-pwrlevels {
 			#address-cells = <1>;
@@ -124,7 +102,7 @@
 
 			qcom,gpu-pwrlevel@0 {
 				reg = <0>;
-				qcom,gpu-freq = <409600000>;
+				qcom,gpu-freq = <456000000>;
 				qcom,bus-freq = <3>;
 			};
 
@@ -147,41 +125,7 @@
 			};
 		};
 
-		qcom,gpu-speed-config@0 {
-			compatible = "gpu-speed-config@0";
-			/* Power levels */
-			qcom,gpu-pwrlevels {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				compatible = "qcom,gpu-pwrlevels";
-
-				qcom,gpu-pwrlevel@0 {
-					reg = <0>;
-					qcom,gpu-freq = <456000000>;
-					qcom,bus-freq = <3>;
-				};
-
-				qcom,gpu-pwrlevel@1 {
-					reg = <1>;
-					qcom,gpu-freq = <307200000>;
-					qcom,bus-freq = <2>;
-				};
-
-				qcom,gpu-pwrlevel@2 {
-					reg = <2>;
-					qcom,gpu-freq = <200000000>;
-					qcom,bus-freq = <1>;
-				};
-
-				qcom,gpu-pwrlevel@3 {
-					reg = <3>;
-					qcom,gpu-freq = <19200000>;
-					qcom,bus-freq = <0>;
-				};
-			};
-		};
-	 };
+	};
 	kgsl_msm_iommu: qcom,kgsl-iommu@1f00000 {
 	compatible = "qcom,kgsl-smmu-v2";
 	reg = <0x1f00000 0x10000>;

arch/arm/boot/dts/qcom/msm8909-pm8909-mtp.dtsi

@@ -116,6 +116,7 @@
 	qcom,cdc-vdd-spkdrv-current = <20000>;
 	qcom,cdc-on-demand-supplies = "cdc-vdd-mic-bias",
 				      "cdc-vdd-spkdrv";
+	qcom,subsys-name = "modem";
 };
 
 &wcnss {

arch/arm/boot/dts/qcom/msm8909-pm8916-cdp.dtsi

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2016, 2017, 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
@@ -29,6 +29,13 @@
 
 };
 
+&audio_codec {
+	status = "ok";
+	qcom,model = "msm8909-pm8916-snd-card";
+	asoc-codec = <&stub_codec>, <&pm8916_tombak_dig>;
+	asoc-codec-names = "msm-stub-codec.1", "tombak_codec";
+};
+
 &dsi_auo_qvga_cmd {
 	qcom,mdss-dsi-pwm-gpio = <&pm8916_mpps 4 0>;
 };