Merge branch 'android-msm-sunfish-4.14' into android-msm-pixel-4.14

 Conflicts:
	Documentation/devicetree/bindings/drm/msm/mdss-dsi-panel.txt
	Documentation/devicetree/bindings/pinctrl/qcom,sm8150-pinctrl
	arch/arm64/include/asm/processor.h
	arch/arm64/kernel/process.c
	drivers/block/zram/zram_dedup.c
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diag_memorydevice.c
	drivers/char/diag/diag_memorydevice.h
	drivers/char/diag/diag_mux.c
	drivers/char/diag/diag_mux.h
	drivers/char/diag/diagchar_core.c
	drivers/char/diag/diagfwd.c
	drivers/char/diag/diagfwd_bridge.c
	drivers/gpu/drm/msm/dsi-staging/dsi_backlight.c
	drivers/gpu/drm/msm/dsi-staging/dsi_display.c
	drivers/gpu/drm/msm/dsi-staging/dsi_drm.c
	drivers/gpu/drm/msm/dsi-staging/dsi_panel.c
	drivers/gpu/drm/msm/sde/sde_connector.c
	drivers/gpu/drm/msm/sde/sde_connector.h
	drivers/gpu/drm/msm/sde/sde_crtc.c
	drivers/gpu/drm/msm/sde/sde_encoder.c
	drivers/gpu/drm/msm/sde/sde_kms.c
	drivers/gpu/drm/msm/sde_power_handle.h
	drivers/gpu/msm/kgsl_events.c
	drivers/input/misc/lm36011/lm36011_module.c
	drivers/media/platform/msm/camera/cam_icp/cam_icp_context.c
	drivers/media/platform/msm/camera/cam_isp/cam_isp_context.c
	drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
	drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c
	drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.h
	drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/include/cam_ife_csid_hw_intf.h
	drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe175_130.h
	drivers/media/platform/msm/camera/cam_req_mgr/cam_req_mgr_core.c
	drivers/media/platform/msm/camera/cam_req_mgr/cam_req_mgr_core.h
	drivers/media/platform/msm/camera/cam_req_mgr/cam_req_mgr_interface.h
	drivers/media/platform/msm/camera/cam_sensor_module/Makefile
	drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/cam_cci_core.c
	drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/cam_cci_dev.c
	drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/cam_cci_dev.h
	drivers/media/platform/msm/camera/cam_sensor_module/cam_csiphy/cam_csiphy_core.c
	drivers/media/platform/msm/camera/cam_sensor_module/cam_csiphy/cam_csiphy_soc.c
	drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_dev.h
	drivers/media/platform/msm/camera/cam_sensor_module/cam_ois/cam_ois_core.c
	drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor/cam_sensor_core.c
	drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor/cam_sensor_dev.h
	drivers/media/platform/msm/sde/rotator/sde_rotator_core.c
	drivers/pci/host/pci-msm-msi.c
	drivers/pci/host/pci-msm.c
	drivers/platform/msm/gsi/gsi.c
	drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c
	drivers/platform/msm/ipa/ipa_v3/ipa_wdi3_i.c
	drivers/power/supply/google/Kconfig
	drivers/power/supply/google/Makefile
	drivers/power/supply/google/gbms_storage.c
	drivers/power/supply/google/google_battery.c
	drivers/power/supply/google/google_bms.h
	drivers/power/supply/google/gvotable.c
	drivers/power/supply/google/gvotable.h
	drivers/power/supply/power_supply_sysfs.c
	drivers/power/supply/qcom/Kconfig
	drivers/power/supply/qcom/Makefile
	drivers/power/supply/qcom/qpnp-smb5.c
	drivers/power/supply/qcom/smb5-lib.c
	drivers/power/supply/qcom/smb5-lib.h
	drivers/regulator/Kconfig
	drivers/regulator/Makefile
	drivers/regulator/qpnp-amoled-regulator.c
	drivers/scsi/ufs/ufshcd.h
	drivers/usb/dwc3/dwc3-msm.c
	drivers/usb/gadget/function/f_accessory.c
	fs/ext4/move_extent.c
	fs/overlayfs/namei.c
	include/linux/msm_gsi.h
	include/linux/power_supply.h
	include/uapi/media/cam_req_mgr.h
	include/uapi/media/cam_sensor.h
	kernel/sched/fair.c
	mm/memory.c

Bug: 149536833
Change-Id: I3544549951f29271154814dd78877b83ffb32179
Signed-off-by: Wilson Sung <wilsonsung@google.com>

Author: SENSEIIIII

AndroidKernel.mk

@@ -76,7 +76,11 @@ KERNEL_GCC_NOANDROID_CHK := $(shell (echo "int main() {return 0;}" | $(KERNEL_CR
 
 real_cc :=
 ifeq ($(KERNEL_LLVM_SUPPORT),true)
-real_cc := REAL_CC=$(KERNEL_LLVM_BIN) CLANG_TRIPLE=aarch64-linux-gnu-
+  ifeq ($(KERNEL_ARCH), arm64)
+    real_cc := REAL_CC=$(KERNEL_LLVM_BIN) CLANG_TRIPLE=aarch64-linux-gnu-
+  else
+    real_cc := REAL_CC=$(KERNEL_LLVM_BIN) CLANG_TRIPLE=arm-linux-gnueabihf
+  endif
 else
 ifeq ($(strip $(KERNEL_GCC_NOANDROID_CHK)),0)
 KERNEL_CFLAGS := KCFLAGS=-mno-android

Documentation/devicetree/bindings/arm/msm/msm.txt

@@ -237,5 +237,9 @@ compatible = "qcom,atollp"
 compatible = "qcom,atollp-idp"
 compatible = "qcom,atollp-atp"
 compatible = "qcom,atollp-qrd"
+compatible = "qcom,atoll-ab"
+compatible = "qcom,atoll-ab-idp"
+compatible = "qcom,atoll-ab-atp"
+compatible = "qcom,atoll-ab-qrd"
 compatible = "qcom,qcs610-iot"
 compatible = "qcom,qcs410-iot"

Documentation/devicetree/bindings/bus/mhi.txt

@@ -41,6 +41,12 @@ Main node properties:
 	Use "esoc" followed by numbers starting from 0 for external SOC's or
 	any other relevant names.
 
+- mhi,sfr-support
+  Usage: optional
+  Value type: <bool>
+  Definition: Set to true if MHI device supports sending subsystem failure
+	reason upon assert in case PCIe link is functional.
+
 ============================
 mhi channel node properties:
 ============================

Documentation/devicetree/bindings/display/msm/sde.txt

@@ -446,6 +446,17 @@ Optional properties:
 				1: priority have to be explicitly configured for a given pair of pipes.
 - qcom,sde-num-mnoc-ports:	A u32 property to indicate the number of mnoc ports
 - qcom,sde-axi-bus-width:	A u32 property to indicate the axi bus width value in bytes
+- qcom,sde-mixer-stage-base-layer: A boolean property to indicate if a layer can be staged on base
+				stage instead of border fill
+- qcom,sde-limits:		A node that lists the limits for different properties. This node
+				can have multiple child nodes. Each child node represents a
+				specific usecase limit. The usecase can be defined for properties like
+				sspp linewidth, bw limit etc.
+				e.g. qcom,sde-limits
+				-- qcom,sde-limit-name: name of the usecase
+				-- qcom,sde-limit-cases: different usecases to be considered
+				-- qcom,sde-limit-ids: respective ids for the above usecases
+				-- qcom,sde-limit-values: usecase and value for different combinations
 
 Bus Scaling Subnodes:
 - qcom,sde-reg-bus:		Property to provide Bus scaling for register access for
@@ -769,6 +780,34 @@ Example:
         qcom,sde-dspp-vlut = <0x0 0x00010000>;
     };
 
+   qcom,sde-limits {
+	qcom,sde-linewidth-limits{
+		qcom,sde-limit-cases = "vig", "dma", "scaling", "inline_rot";
+		qcom,sde-limit-ids= <0x1 0x2 0x4 0x8>;
+		/* the qcom,sde-limit-values property consist of two values:
+		one for the usecase and the other for the value. The usecase can be
+		any combination of the values mentioned in qcom,sde-limit-ids.
+		For eg: <0x5 2560> means usecase is 0x5 and value is 2560.
+		0x5 = (0x1 | 0x4) = vig + scaling. Thus the linewidth for usecase
+		vig + scaling  = 2560 */
+		qcom,sde-limit-values = <0x1 4096>,
+					<0x5 2560>,
+					<0xd 1088>,
+					<0x2 4096>;
+	};
+       qcom,sde-bw-limits{
+		qcom,sde-limit-cases = "per_pipe", "total_bw", "vfe_on", "cwb_on";
+		qcom,sde-limit-ids = <0x1 0x2 0x4 0x8>;
+		qcom,sde-limit-values = <0x1 2600000>,
+					<0x9 2600000>,
+					<0x5 2600000>,
+					<0xd 2600000>,
+					<0x2 5800000>,
+					<0xa 5500000>,
+					<0x6 4400000>,
+					<0xe 3900000>;
+	};
+    };
     qcom,sde-mixer-blocks {
         qcom,sde-mixer-gc = <0x3c0 0x00010000>;
     };

Documentation/devicetree/bindings/drm/msm/mdss-dsi-panel.txt

@@ -143,6 +143,8 @@ Optional properties:
 					0 = default value
 - qcom,mdss-dsi-v-bottom-border:	Vertical bottom border in pixel.
 					0 = default value
+- qcom,mdss-dsi-overlap-pixels:		Horizontal overlap pixels for certain panels.
+					0 = default value
 - qcom,mdss-dsi-underflow-color:	Specifies the controller settings for the
 					panel under flow color.
 					0xff = default value.
@@ -503,6 +505,7 @@ Optional properties:
 - qcom,panel-ack-disabled: A boolean property to indicate, whether we need to wait for any ACK from the panel
 			   for any commands that we send.
 - qcom,mdss-dsi-force-clock-lane-hs:	Boolean to force dsi clock lanes to HS mode always.
+- qcom,panel-cphy-mode:			Boolean to specify whether panel is using cphy.
 
 - qcom,compression-mode:		Select compression mode for panel.
 					"fbc" - frame buffer compression
@@ -548,7 +551,8 @@ Optional properties:
 					to identify the default topology for the
 					display. The first set is indexed by the
 					value 0.
-- qcom,mdss-dsi-ext-bridge-mode:	External bridge chip is connected instead of panel.
+- qcom,mdss-dsi-ext-bridge:		Array of u32 values which specifies the external bridge chip reg number, it
+					should match the port config.
 - google,mdss-dsi-panel-vendor		string: panel vendor name
 - google,mdss-dsi-panel-sn-location	Panel serial number is read by MIPI command. And it is defined by a
 					set of 3 values in the order:

Documentation/devicetree/bindings/drm/msm/sde-dsi.txt

@@ -8,7 +8,8 @@ Required properties:
 - compatible:           Should be "qcom,dsi-ctrl-hw-v<version>". Supported
 			versions include 1.4, 2.0 and 2.2.
 			eg: qcom,dsi-ctrl-hw-v1.4, qcom,dsi-ctrl-hw-v2.0,
-			qcom,dsi-ctrl-hw-v2.2, qcom,dsi-ctrl-hw-v2.3
+			qcom,dsi-ctrl-hw-v2.2, qcom,dsi-ctrl-hw-v2.3,
+			qcom,dsi-ctrl-hw-v2.4
 			And for dsi phy driver:
 			qcom,dsi-phy-v0.0-hpm, qcom,dsi-phy-v0.0-lpm,
 			qcom,dsi-phy-v1.0, qcom,dsi-phy-v2.0,

Documentation/devicetree/bindings/i2c/qcom,i2c-qcom-geni.txt

@@ -15,8 +15,19 @@ Required properties:
  - qcom,wrapper-core: Wrapper QUPv3 core containing this I2C controller.
 
 Optional property:
- - qcom,clk-freq-out : Desired I2C bus clock frequency in Hz.
+ - qcom,clk-freq-out: Desired I2C bus clock frequency in Hz.
    When missing default to 400000Hz.
+ - qcom,clk-cfg: Array of <u32>, clk cfg array should have 2nd to 5th parameter as
+   suggested by hardware expert. Standard frequency parameters taken cared by the
+   driver itself. This field is needed only if client freq is not from the i2c standard
+   supported frequencies or to fine tune the existing clock parameters.
+   1st parameter: clk-freq-out, desired I2C bus clock frequency in Hz.
+   2nd parameter: clk_div, desired I2C bus divider value.
+   3rd parameter: t_high, desired HIGH period of SCL clock.
+   4th parameter: t_low, desired LOW period of SCL clock.
+   5th parameter: t_cycle, desired clock cycle.
+
+   Note: Both qcom,clk-freq-out and qcom,clk-cfg should not be specified at the same time.
 
 Child nodes should conform to i2c bus binding.
 
@@ -37,4 +48,5 @@ i2c@a94000 {
 	#size-cells = <0>;
 	qcom,wrapper-core = <&qupv3_0>;
 	qcom,clk-freq-out = <400000>;
+	qcom,clk-cfg = <400000 2 5 12 24>; //optional to qcom,clk-freq-out
 };

Documentation/devicetree/bindings/pci/msm_ep_pcie.txt

@@ -69,6 +69,7 @@ Optional Properties:
 	- qcom,msm-bus,num-cases
 	- qcom,msm-bus,num-paths
 	- qcom,msm-bus,vectors-KBps
+  - qcom,pcie-m2-autonomous: Enable L1ss sleep/exit to support M2 autonomous mode.
 
 Example:
 

Documentation/devicetree/bindings/pinctrl/qcom,lpi-pinctrl.txt

@@ -37,6 +37,14 @@ Following properties are for LPI GPIO controller device main node.
 		    The first cell will be used to define gpio number and the
 		    second denotes the flags for this gpio.
 
+- goog,ignored-gpios:
+        Usage: optional
+        Value type: <prop-encoded-array>
+        Definition: List of gpio numbers should be ignored by the driver. It
+                    might be useful if this gpio mmio is unmapped from Linux
+                    kernel address space and that addresses should never be
+                    accessed.
+
 - clock-names:
 	Usage: optional
 	Value type: <string>

Documentation/devicetree/bindings/pinctrl/qcom,sdmmagpie-pinctrl.txt

@@ -47,6 +47,14 @@ SDMMAGPIE platform.
 	Definition: must be 2. Specifying the pin number and flags, as defined
 		    in <dt-bindings/gpio/gpio.h>
 
+- goog,ignored-gpios:
+	Usage: optional
+	Value type: <prop-encoded-array>
+	Definition: List of gpio numbers should be ignored by the driver. It
+	            might be useful if this gpio mmio is unmapped from Linux
+		    kernel address space and that addresses should never be
+		    accessed.
+
 Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for
 a general description of GPIO and interrupt bindings.
 

Documentation/devicetree/bindings/pinctrl/qcom,sm8150-pinctrl

@@ -47,19 +47,20 @@ SM8150 platform.
 	Definition: must be 2. Specifying the pin number and flags, as defined
 		    in <dt-bindings/gpio/gpio.h>
 
-- goog,ignored-gpios:
-	Usage: optional
-	Value type: <prop-encoded-array>
-	Definition: List of gpio numbers should be ignored by the driver. It might
-		be useful if this gpio mmio is unmapped from Linux kernel address space
-		and that addresses should never be accessed.
 - dirconn-list:
 	Usage: optional
 	Value type: <prop-encoded-array>
 	Definition: a 3-tuple list which contains mapping of GPIO pin to
 		    hardware IRQ, and a boolean for enabling the TLMM direct
 		    connect interrupt for the pin.
 
+- goog,ignored-gpios:
+	Usage: optional
+	Value type: <prop-encoded-array>
+	Definition: List of gpio numbers should be ignored by the driver. It might
+		be useful if this gpio mmio is unmapped from Linux kernel address space
+		and that addresses should never be accessed.
+
 Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for
 a general description of GPIO and interrupt bindings.
 

Documentation/devicetree/bindings/power/supply/qcom/qpnp-qg.txt

@@ -441,6 +441,14 @@ First Level Node - QGAUGE device
 		    value is 90%. This property is valid only if
 		    qcom,tcss-enable is defined.
 
+- qcom,bass-enable
+	Usage:      optional
+	Value type: bool
+	Definition: Enable Battery SOC based SOC scaling. This logic
+		    allows monotonic-SOC scaling at low-temperatures
+		    when there is variation in system-SOC due to
+		    changes in the load.
+
 ==========================================================
 Second Level Nodes - Peripherals managed by QGAUGE driver
 ==========================================================

Documentation/devicetree/bindings/power/supply/qcom/smb1398-charger.txt

@@ -0,0 +1,106 @@
+Qualcomm Technologies, Inc. SMB1398 Charger Specific Bindings
+
+SMB1398 combo charge chip can be working in different modes:
+(1) DIV2 charge pump mode to work as a companion charger that can be paired
+    with Qualcomm Technologies, Inc. family of standalone chargers;
+(2) DIV2 and 3-level buck combo mode to regulate output power from wireless
+    charger receiver and provide input power for downstream chargers.
+
+=======================
+Required Node Structure
+=======================
+
+SMB1398 Charger must be described in two levels of device nodes.
+
+==================================
+First Level Node - SMB1398 Charger
+==================================
+
+Charger specific properties:
+- compatible
+  Usage:      required
+  Value type: <string>
+  Definition: "qcom,smb1396-div2-cp-master" for SMB1396 working in DIV2
+	      mode as a companion master charger.
+	      "qcom,smb1396-div2-cp-slave" for SMB1396 working in DIV2
+	      mode as a companion slave charger.
+	      "qcom,smb1398-pre-regulator" for SMB1398 working in combo
+	      mode (auto transition between DIV2 CP and 3-level buck) as a
+	      pre-regulator stand between wireless receiver and downstream
+	      chargers.
+
+- interrupts
+  Usage:      optional
+  Value type: <prop-encoded-array>
+  Definition: Peripheral interrupt specifier. This is required when SMB1396
+	      working as a DIV2 CP master.
+
+- interrupt-names
+  Usage:      optional
+  Value type: <stringlist>
+  Definition: Interrupt names.  This list must match up 1-to-1 with the
+	      interrupts specified in the 'interrupts' property. This is
+	      required when SMB1396 working as a DIV2 CP master.
+
+- io-channels
+- io-channel-names
+  Usage:      optional
+  Value type: <phandle>
+  Definition: The IIO channel for measuring SMB1398 die temperature,
+	      io-channel-names should be "die-temp". For other details about
+	      IIO bindings see:
+	             Documentation/devicetree/bindings/iio/iio-bindings.txt
+	      These properties are required when SMB1396 working as a DIV2 CP
+	      master.
+
+- qcom,div2-cp-min-ilim-ua
+  Usage:      optional
+  Value type: <u32>
+  Definition: The minimum ILIM settings to enable SMB1398 working in DIV2 mode.
+	      The switcher is disabled when ILIM is below this value.
+	      If this values is not specified, the default minimum ILIM is 1A.
+	      This is only applicable when SMB1396 working as a DIV2 CP master.
+
+- qcom,max-cutoff-soc
+  Usage:      optional
+  Value type: <u32>
+  Definition: SOC beyond which SMB1398 is kept disabled.
+	      If this value is not specified then default value is 85%.
+	      This is only applicable when SMB1396 working as a DIV2 CP master.
+
+- qcom,ilim-ua-disable-slave
+  Usage:      optional
+  Value type: <u32>
+  Definition: The minimum ILIM setting to disable slave CP after hitting taper.
+	      If this value is not specified, the default value is 3 times of
+	      "qcom,div2-cp-min-ilim-ua". This is only applicable when both
+	      SMB1396 DIV2 CP master and slave are present.
+
+Peripheral specific properties:
+=======
+Example
+=======
+
+smb1398_charger: qcom,combo_charger {
+	compatible = "qcom,smb1396-div2-cp-master";
+	interrupt-parent = <&smb1398>;
+	status = "disabled";
+
+	io-channels = <&pm8150b_vadc ADC_AMUX_THM2>;
+	io-channel-names = "die_temp";
+
+	interrupts = <0x26 0x1 IRQ_TYPE_EDGE_RISING>,
+		     <0x26 0x3 IRQ_TYPE_EDGE_RISING>,
+		     <0x26 0x5 IRQ_TYPE_EDGE_RISING>,
+		     <0x26 0x7 IRQ_TYPE_EDGE_RISING>,
+		     <0x27 0x5 IRQ_TYPE_EDGE_RISING>,
+		     <0x27 0x6 IRQ_TYPE_EDGE_RISING>,
+		     <0x27 0x7 IRQ_TYPE_EDGE_RISING>;
+	interrupt-names = "temp-shdwn",
+			  "div2-irev",
+			  "usbin-uv",
+			  "usbin-ov",
+			  "div2-ilim",
+			  "div2-win-uv",
+			  "div2-win-ov";
+};

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

@@ -433,6 +433,11 @@ Required properties:
 Optional properties:
  - qcom,lpi-gpios : This boolean property is added if GPIOs are under
                     LPI TLMM.
+- qcom,chip-wakeup-reg : This lists registers related to control interrupt mask
+		for respective LPI TLMM GPIOs.
+- qcom,chip-wakeup-maskbit : This gives info on maskbit for given list of registers.
+- qcom,chip-wakeup-default-val : This gives info on default value to be updated
+		for given chip regs.
 
 * msm-dai-slim
 

Documentation/leds/leds-class.txt

@@ -51,6 +51,10 @@ overhead, I suggest these become part of the device name. The naming scheme
 above leaves scope for further attributes should they be needed. If sections
 of the name don't apply, just leave that section blank.
 
+Optionally, the driver may choose to register with the LED_BRIGHTNESS_FAST flag.
+This flag indicates that the driver implements the brightness_set() callback
+function using a fastpath so the LED core can use hrtimer if the driver requires
+high precision for the trigger timing.
 
 Brightness setting API
 ======================

arch/arm/Kconfig

@@ -1758,6 +1758,29 @@ config ARM_MODULE_PLTS
 
 source "mm/Kconfig"
 
+choice
+	prompt "Virtual Memory Reclaim"
+	default ENABLE_VMALLOC_SAVING
+	help
+	  Select the method of reclaiming virtual memory
+
+config ENABLE_VMALLOC_SAVING
+	bool "Reclaim memory for each subsystem"
+	help
+	  Enable this config to reclaim the virtual space belonging
+	  to any subsystem which is expected to have a lifetime of
+	  the entire system. This feature allows lowmem to be non-
+	  contiguous.
+
+config NO_VM_RECLAIM
+	bool "Do not reclaim memory"
+	help
+	  Do not reclaim any memory. This might result in less lowmem
+	  and wasting virtual memory space which could otherwise be
+	  reclaimed by using any of the other two config options.
+
+endchoice
+
 config FORCE_MAX_ZONEORDER
 	int "Maximum zone order"
 	default "12" if SOC_AM33XX