Merge tag 'LA.UM.6.6.r1-09800-89xx.0' into kernel.lnx.3.18.r33-rel

"LA.UM.6.6.r1-09800-89xx.0"

* tag 'LA.UM.6.6.r1-09800-89xx.0':
  ASoC: msm: qdsp6v2: use correct stream id of next session
  msm: mdss: Fix Gamma LUT bounds condition
  msm: kgsl: Add a property to find if secure context is supported
  msm: kgsl: Add a property to find alignment of secure buffers
  ARM: dts: msm: Enable reset via PM_RESIN_N for mdm9650 CV2X
  ARM: dts: msm: Enable use-default-batt-values for apq8009-dragon
  msm: ipa: Validate routing rule id
  net: core: null pointer derefernce in sockev_client_cb
  ASoC: msm: qdsp6v2: Fix rtac memory unmap issue in ASM driver
  netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsets
  ARM: dts: msm: Invert interrupt polarity for K61 on mdm9650 CV2X
  msm:ipa: Prevent NAT table deletion only if public ip is not assigned
  msm: ipa3: Add mutex to prevent race condition
  diag: Prevent out of bound access while initializing msg mask
  Revert "rtc: alarm: Add power-on alarm feature"
  msm: ais: Fix out-of-bounds read in string class name
  mdss: mdp: Fix fudge factor overflow check
  defconfig: msm: enable MSM_SYSMON_COMM for 8909
  ASoC: msm: qdsp6v2: update backend name
  power: qpnp-charger: Fix null pointer dereference error

Signed-off-by: Nathan Chancellor <[email protected]>

arch/arm/boot/dts/qcom/apq8009-dragon.dtsi

@@ -245,3 +245,10 @@
 	status = "ok";
 	qcom,disable-bms;
 };
+
+&pm8916_chg {
+	status = "ok";
+	qcom,charging-disabled;
+	qcom,use-default-batt-values;
+};
+

arch/arm/boot/dts/qcom/mdm9650-cv2x.dtsi

@@ -106,7 +106,7 @@
 		spi-max-frequency = <4800000>;
 		reg = <0>;
 		interrupt-parent = <&tlmm_pinmux>;
-		interrupts = <68 0>;
+		interrupts = <68 IRQ_TYPE_EDGE_RISING>;
 		reset-gpio = <&tlmm_pinmux 89 GPIO_ACTIVE_LOW>;
 		pinctrl-names = "active", "sleep";
 		pinctrl-0 = <&can_rst_on>;
@@ -330,3 +330,18 @@
 		qcom,vadc-thermal-node;
 	};
 };
+
+&pmd9650_pon {
+	interrupts = <0x0 0x8 0x0>, <0x0 0x8 0x1>;
+	interrupt-names = "kpdpwr", "resin";
+	qcom,s3-src = "resin";
+
+	qcom,pon_2 {
+		qcom,pon-type = <1>;
+		qcom,support-reset = <1>;
+		qcom,s1-timer = <0>;
+		qcom,s2-timer = <2000>;
+		qcom,s2-type = <7>;
+		qcom,pull-up = <1>;
+	};
+};

arch/arm/configs/msm8909-perf_defconfig

@@ -485,6 +485,7 @@ CONFIG_MSM_QMI_INTERFACE=y
 CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y
 CONFIG_MSM_EVENT_TIMER=y
 CONFIG_MSM_SUBSYSTEM_RESTART=y
+CONFIG_MSM_SYSMON_COMM=y
 CONFIG_MSM_PIL=y
 CONFIG_MSM_PIL_SSR_GENERIC=y
 CONFIG_MSM_PIL_MSS_QDSP6V5=y

arch/arm/configs/msm8909_defconfig

@@ -495,6 +495,7 @@ CONFIG_MSM_QMI_INTERFACE=y
 CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y
 CONFIG_MSM_EVENT_TIMER=y
 CONFIG_MSM_SUBSYSTEM_RESTART=y
+CONFIG_MSM_SYSMON_COMM=y
 CONFIG_MSM_PIL=y
 CONFIG_MSM_PIL_SSR_GENERIC=y
 CONFIG_MSM_PIL_MSS_QDSP6V5=y