Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc60c7d5 authored by yungwenpeng's avatar yungwenpeng
Browse files

Merge branch vanilla into gms 

* ssh://ch-git3.arimacomm.com.tw:29418/kernel/msm-4.9: (177 commits)
  msm: adsprpc: Check fastrpc file pointer before accessing it
  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
  ARM: dts: qcom: SDA429 memory map changes
  input: qti-haptics: Add support for cmd based haptics-twm
  ...
Change-Id: I41b98fe860fb926ec14c139d03aa3f28b37fbccf
parents 5d989ab0 387c73a5

Documentation/devicetree/bindings/powerpc/fsl/fman.txt

+7 −0
Original line number Diff line number Diff line
@@ -110,6 +110,13 @@ PROPERTIES 
		Usage: required

		Definition: See soc/fsl/qman.txt and soc/fsl/bman.txt



- fsl,erratum-a050385

		Usage: optional

		Value type: boolean

		Definition: A boolean property. Indicates the presence of the

		erratum A050385 which indicates that DMA transactions that are

		split can result in a FMan lock.



=============================================================================

FMan MURAM Node

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

+3 −1
Original line number Diff line number Diff line
@@ -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

+5 −2
Original line number Diff line number Diff line
@@ -2154,6 +2154,9 @@ Optional properties: 
- qcom,tdm-i2s-switch-enable: For chipsets where tdm mics are controlled by

			  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 {

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 217

SUBLEVEL = 218

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/dra7.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ 
		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0x0 0x0 0x0 0xc0000000>;

		dma-ranges = <0x80000000 0x0 0x80000000 0x80000000>;

		ti,hwmods = "l3_main_1", "l3_main_2";

		reg = <0x0 0x44000000 0x0 0x1000000>,

		      <0x0 0x45000000 0x0 0x1000>;
@@ -282,6 +283,7 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x20013000 0x13000 0 0xffed000>;

				dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;
@@ -319,6 +321,7 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x30013000 0x13000 0 0xffed000>;

				dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;