Merge tag 'LA.UM.8.3.r1-07900-sdm845.0' into canting-4.9-q

"LA.UM.8.3.r1-07900-sdm845.0"

* tag 'LA.UM.8.3.r1-07900-sdm845.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.9: (228 commits)
  defconfig: Enabling ipc router transport over mhi
  soc: qcom: ipc_router: Add new ipc router transport interface
  cnss2: Sync code from kernel 4.14
  ARM: dts: msm: Remove duplicate avtimer node entry
  diag: dci: Synchronize dci mempool buffers alloc and free
  msm: camera: isp: validate in_port before accessing
  USB: gadget: u_ether: Change skb->len check for jumbo frames
  USB: configfs: Clear deactivation flag in configfs_composite_unbind()
  ARM: msm: dts: Enable sdp check timer for sdm429 spyro
  usb: dwc3: gadget: Block GSI DB update after END transfer on all EPs
  soc: qcom: bgcom: fix dangling pointer on device shutdown
  mhi: core: Read transfer length from an event properly
  mhi: core: Fix out of bound channel id handling
  ARM: dts: msm: add CPU dai for additional proxy ports
  dtsi: audio bring-up for msm8909go on kernel 4.9
  fbdev: msm: Avoid duplicate release fence fd creation
  cnss2: add null pointer check
  ARM: dts: msm: Remove TDM grouping changes
  ARM: dts: msm: Add skip-disable-before-sw-enable flag for SDM670
  clk: qcom: gdsc-regulator: Add support to skip GDSC disable
  ...

Change-Id: I97aeb3a2c23948889d3d0a8ac1d7af3488016159
Signed-off-by: Khusika Dhamar Gusti <mail@khusika.com>

Conflicts:
	.gitignore
	Makefile
	arch/arm64/kernel/smp.c
	arch/arm64/mm/mmu.c
	drivers/gpu/drm/msm/dsi-staging/dsi_panel.c
	drivers/gpu/drm/msm/dsi-staging/dsi_panel.h
	drivers/gpu/drm/msm/sde/sde_connector.c
	drivers/gpu/drm/msm/sde/sde_kms.c
	drivers/input/touchscreen/Kconfig
	drivers/platform/msm/ipa/ipa_clients/ipa_uc_offload.c
	drivers/scsi/sd.c
	drivers/soc/qcom/socinfo.c
	drivers/usb/gadget/composite.c
	drivers/usb/gadget/configfs.c
	drivers/usb/host/xhci-mem.c
	drivers/usb/pd/policy_engine.c
	drivers/usb/phy/phy-msm-qusb.c
	fs/ext4/page-io.c
	include/trace/events/sched.h
	kernel/time/hrtimer.c
	net/wireless/util.c

.gitignore

@@ -118,4 +118,9 @@ all.config
 
 # fetched Android config fragments
 kernel/configs/android-*.cfg
+
+#
+#Ignoring Android.bp link file
+#
+Android.bp
 net/wireguard/

Androidbp

@@ -0,0 +1,45 @@
+cc_binary_host {
+    name: "unifdef",
+    srcs: ["scripts/unifdef.c"],
+    sanitize: {
+        never: true,
+    },
+}
+
+genrule {
+    name: "gen-headers_install.sh",
+    srcs: ["scripts/headers_install.sh"],
+    tools: ["unifdef"],
+    out: ["headers_install.sh"],
+    cmd: "sed 's+scripts/unifdef+$(location unifdef)+g' $(in) > $(out)",
+}
+
+cc_prebuilt_binary {
+    name: "headers_install.sh",
+    device_supported: false,
+    host_supported: true,
+    srcs: [":gen-headers_install.sh"],
+}
+
+// Use the following for verbose output from kernel_headers.py.
+// kernel_headers_verbose = "--verbose "
+// Use the following for minimal output from kernel_headers.py.
+kernel_headers_verbose = ""
+
+build = ["gen_headers_arm.bp", "gen_headers_arm64.bp"]
+
+cc_library_headers {
+    name: "qti_kernel_headers",
+    arch: {
+        arm: {
+            generated_headers: ["qti_generate_kernel_headers_arm"],
+            export_generated_headers: ["qti_generate_kernel_headers_arm"],
+        },
+        arm64: {
+            generated_headers: ["qti_generate_kernel_headers_arm64"],
+            export_generated_headers: ["qti_generate_kernel_headers_arm64"],
+        },
+    },
+    vendor: true,
+    recovery_available: true,
+}

Documentation/devicetree/bindings/arm/msm/sdx-ext-ipc.txt

@@ -0,0 +1,31 @@
+Modem chipset attached to Application processor
+
+Modem chipset can be connected to an external apss processor. The control
+channel between the two chipsets consists of gpios that can relay the
+state of one subsytem to another. Modem can indicate different events
+(bootup/crash etc.) to AP and can get the same information from AP.
+
+Required Properties:
+- compatible:	"qcom,sdx-ext-ipc".
+
+Required named gpio properties:
+- qcom,mdm2ap-status-gpio: gpio for modem to indicate the boot status to APQ.
+
+- qcom,ap2mdm-status-gpio: gpio for APQ to indicate the boot status to modem.
+
+
+
+Optional named gpio properties:
+- qcom,mdm2ap-status2-gpio: gpio for modem to indicate to APQ that it is in
+		E911 call or doing firmware upgrade.
+
+- qcom,ap2mdm-status2-gpio: gpio for APQ to indicate graceful shutdown to modem.
+
+Example:
+	sdx_ext_ipc: qcom,sdx_ext_ipc {
+		compatible = "qcom,sdx-ext-ipc";
+		qcom,ap2mdm-status-gpio = <&tlmm 64 0x00>;
+		qcom,ap2mdm-status2-gpio = <&tlmm 65 0x00>;
+		qcom,mdm2ap-status-gpio = <&tlmm 63 0x00>;
+		qcom,mdm2ap-status2-gpio = <&tlmm 66 0x00>;
+	};

Documentation/devicetree/bindings/cnss/cnss-wlan.txt

@@ -14,6 +14,7 @@ Required properties:
   - compatible: "qcom,cnss" for QCA6174 device
                 "qcom,cnss-qca6290" for QCA6290 device
                 "qcom,cnss-qca6390" for QCA6390 device
+                "qcom,cnss-qca-converged" for converged QCA devices
   - wlan-en-gpio: WLAN_EN GPIO signal specified by the chip specifications
   - vdd-wlan-supply: phandle to the regulator device tree node
   - pinctrl-names: Names corresponding to the numbered pinctrl states
@@ -35,6 +36,10 @@ Optional properties:
   - vdd-wlan-xtal-aon-supply: phandle to the LDO-4 regulator. This is needed
                               on platforms where XTAL regulator depends on
                               always on regulator in VDDmin.
+  - vdd-wlan-ctrl1-supply: phandle to the DBU1 - 1.8V for QCA6595 or 3.3V for
+                           QCA6174 on auto platform.
+  - vdd-wlan-ctrl2-supply: phandle to the DBU4 - 2.2V for QCA6595 or 3.85V for
+                           QCA6696 on auto platform.
   - vdd-wlan-core-supply: phandle to the 1.3V CORE regulator for QCA6174
   - vdd-wlan-sp2t-supply: phandle to the 2.7V SP2T regulator for QCA6174
   - qcom,smmu-s1-enable: Boolean property to decide whether to enable SMMU
@@ -56,7 +61,32 @@ Optional properties:
                                WLAN_EN pin is a gpio or fixed regulator.
   - qcom,mhi: phandle to indicate the device which needs MHI support.
   - qcom,cap-tsf-gpio: WLAN_TSF_CAPTURED GPIO signal specified by the chip
-                       specifications, should be drived depending on products
+                       specifications, should be drived depending on products.
+  - cnss-daemon-support: Boolean property to decide whether cnss_daemon
+                         userspace QMI client is supported.
+  - qcom,converged-dt: Boolean property to decide whether it supports multiple
+                       chips.
+  - qcom,bus-type: U32 property to specify the bus type, is required when
+                   'qcom,converged-dt' being present.
+  - wlan_vregs: String array to decide which vregs are required, is required
+                when 'qcom,converged-dt' being present.
+  - <supply-name>-supply: phandle to the regulator device tree node.
+                          optional "supply-name" is "vdd-wlan-rfa".
+  - qcom,<supply-name>-info: Specifies configuration for supply. Should be
+                             specified in <min_uV max_uV load_uA delay_us>.
+  - pcie-disable-l1: Boolean property to decide whether to disable PCIe L1 PM.
+  - pcie-disable-l1ss: Boolean property to decide whether to disable PCIe L1ss.
+  - qcom,set-wlaon-pwr-ctrl: Boolean property to indicate if set
+                             WLAON_QFPROM_PWR_CTRL_REG register during power on
+                             and off sequences.
+
+List of chip specific sub nodes:
+  - chip_cfg@X: represent chip specific configurations
+    Each sub node has the following required properties:
+       - wlan_vregs: String array to decide which vregs are required, property
+                     being present but no values means no additional vregs.
+       - supported-ids: U32 array to decide which device ids are supported by
+                        sub node.
 
 Example:
 
@@ -76,3 +106,27 @@ Example:
         qcom,mhi = <&mhi_wlan>;
         qcom,cap-tsf-gpio = <&tlmm 126 1>;
     };
+
+    qcom,cnss-qca-converged {
+        compatible = "qcom,cnss-qca-converged";
+        qcom,converged-dt;
+        qcom,bus-type=<0>;
+
+        vdd-wlan-ctrl1-supply = <&vreg_conn_pa>;
+        vdd-wlan-ctrl2-supply = <&vreg_conn_1p8>;
+        vdd-wlan-supply = <&vreg_wlan>;
+        wlan_vregs = "vdd-wlan-ctrl1", "vdd-wlan-ctrl2";
+        qcom,vdd-wlan-ctrl1-info = <0 0 0 0>;
+        qcom,vdd-wlan-ctrl2-info = <0 0 0 0>;
+        wlan-en-gpio = <&tlmm 169 0>;
+        pinctrl-names = "wlan_en_active", "wlan_en_sleep";
+        pinctrl-0 = <&cnss_wlan_en_active>;
+        pinctrl-1 = <&cnss_wlan_en_sleep>;
+        qcom,wlan-rc-num = <0>;
+
+        chip_cfg@1 {
+                supported-ids = <0x003e>;
+                wlan_vregs = "vdd-wlan";
+                qcom,vdd-wlan-info = <0 0 0 10>;
+        };
+    };

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

@@ -67,6 +67,7 @@ DP Controller: Required properties:
 					within DP AUX, while the remaining entries indicate the
 					programmable values.
 - qcom,max-pclk-frequency-khz:	An integer specifying the max. pixel clock in KHz supported by Display Port.
+- qcom,yuv-support:		A boolean specifying if any YUV formats are supported by Display Port.
 - qcom,dp-usbpd-detection:	Phandle for the PMI regulator node for USB PHY PD detection.
 - qcom,<type>-supply-entries:		A node that lists the elements of the supply used by the a particular "type" of DSI module. The module "types"
 					can be "core", "ctrl", and "phy". Within the same type,

Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt

@@ -521,6 +521,7 @@ the fps window.
 					in floating state(not LP00 or LP11) to turn on this property. Software
 					turns off PHY pmic power supply, phy ldo and DSI Lane ldo during
 					idle screen (footswitch control off) when this property is enabled.
+- qcom,skip-panel-reset:		Boolean. when set, will skip panel reset during panel ON/OFF.
 [[Optional config sub-nodes]]		These subnodes provide different configurations for a given same panel.
 					Default configuration can be chosen by specifying phandle of the
 					selected subnode in the qcom,config-select.

Documentation/devicetree/bindings/input/touchscreen/raydium_ts.txt

@@ -0,0 +1,52 @@
+Raydium WT030 touch controller
+
+Please add this description here: The Raydium Touch controller is connected to the
+host processor via I2C. The controller generates interrupts when the user touches
+the panel. The host controller is expected to read the touch coordinates over I2C and
+pass the coordinates to the rest of the system.
+
+Required properties:
+
+ - compatible                     : should be "raydium,raydium-ts".
+ - reg                                : i2c slave address of the device.
+ - interrupt-parent               : parent of interrupt.
+ - raydium,irq-gpio               : irq gpio.
+ - raydium,reset-gpio         : reset gpio.
+ - vdd_ana-supply                         : analog voltage power supply needed to power device.
+ - vcc_i2c-supply                         : i2c voltage power supply needed to power device.
+
+Optional property:
+ - raydium,max-num-touches   : addr of ub-i2c.
+ - raydium,display-coords    : array of display coordinates.
+ - raydium,x_max                    : maximal x value of the panel.
+ - raydium,y_max                    : maximal y value of the panel.
+ - raydium,fw_id             : firmare id.
+ - raydium,soft-reset-delay-ms    : reset delay for controller (ms), default 100.
+ - raydium,hard-reset-delay-ms    : reset delay for controller (ms), default 100.
+
+Example:
+       i2c@78b7000 {
+               status = "ok";
+               raydium_ts@39 {
+                       compatible = "raydium,raydium-ts";
+                       reg = <0x39>;
+                       interrupt-parent = <&msm_gpio>;
+                       interrupts = <13 0x2008>;
+                       vdd_ana-supply = <&pm8916_l17>;
+                       vcc_i2c-supply = <&pm8916_l6>;
+                       pinctrl-names = "pmx_ts_active","pmx_ts_suspend","pmx_ts_release";
+                       pinctrl-0 = <&ts_int_active &ts_reset_active>;
+                       pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
+                       pinctrl-2 = <&ts_release>;
+                       raydium,reset-gpio = <&msm_gpio 12 0x00>;
+                       raydium,irq-gpio = <&msm_gpio 13 0x00>;
+                       raydium,num-max-touches = <2>;
+                       raydium,soft-reset-delay-ms = <50>;
+                       raydium,hard-reset-delay-ms = <100>;
+                       raydium,x_max = <390>;
+                       raydium,y_max = <390>;
+                       raydium,display-coords= <0  0 390 390>;
+                       raydium,fw_id = <0x2202>
+               };
+       };
+

Documentation/devicetree/bindings/media/video/msm-cci.txt

@@ -338,6 +338,7 @@ Example:
 		clocks = <&clock_mmss clk_mclk0_clk_src>,
 				<&clock_mmss clk_camss_mclk0_clk>;
 		clock-names = "cam_src_clk", "cam_clk";
+		qcom,clock-rates = <24000000 0>;
 	};
 
 &i2c_freq_100Khz {

Documentation/devicetree/bindings/regulator/gdsc-regulator.txt

@@ -72,7 +72,9 @@ Optional properties:
  - qcom,en-rest-wait-val: Input value for EN_REST_WAIT controls state transition
 			  delay after receiving ack signal (gds_enr_ack) from the
 			  longest en_rest power switch chain.
-
+ - qcom,skip-disable-before-sw-enable: Presence denotes a hardware requirement
+					to leave the GDSC on that has been
+					enabled by an entity external to HLOS.
 Example:
 	gdsc_oxili_gx: qcom,gdsc@fd8c4024 {
 		compatible = "qcom,gdsc";

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

@@ -674,6 +674,9 @@ Example:
 		msm_audio_apr_dummy {
 			compatible = "qcom,msm-audio-apr-dummy";
 		};
+                q6core {
+                        compatible = "qcom,q6core-audio";
+		};
 
 		qcom,subsys-name = "apr_adsp";
 	};
@@ -2149,8 +2152,11 @@ Optional properties:
 		should comply with the wsa nodes configurations.
 - qcom,wsa-aux-dev-prefix: This property contains list of wsa codec prefixes.
 - qcom,tdm-i2s-switch-enable: For chipsets where tdm mics are controlled by
-			      switch, drive corresponding gpio to output high
-			      to enable switch.
+			  switch, drive corresponding gpio to output high
+			  to enable switch.
+- qcom,pdm-i2s-switch-enable: For chipsets where pdm mics are controlled by
+			  switch, drive corresponding gpio to output high
+			  to enable switch.
 
 Example:
 	sound {
@@ -2590,6 +2596,7 @@ Example:
 				"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",
 				"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-dev.32774";
+		qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>;
 	};
 
 * SDX ASoC Auto Machine driver

Documentation/devicetree/bindings/sound/tfa9897.txt

@@ -0,0 +1,24 @@
+TFA9897 SmartpA
+
+Required properties:
+
+  - compatible : "nxp,tfa98xx"
+
+  - reg : I2C address of the device
+
+  - dvdd-supply : Power supply for PA's dvdd
+
+  - dvdd-voltage : Minimum and maximum voltage in uV to set for power supply
+
+  - dvdd-current : dvdd's max current in uA
+
+Examples:
+
+	i2c_smartpa@34 {
+		compatible = "nxp,tfa98xx";
+		reg = <0x34>;
+		reset-gpio = <&tlmm 68 0>;
+		dvdd-supply = <&pm660_l9>;
+		dvdd-voltage = <1800000 1800000>;
+		dvdd-current = <15000>;
+	};