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

Commit 1a0d9146 authored by ckosuru's avatar ckosuru
Browse files

Merge commit '6f516dcd' into dev/msm-4.14-display 



* commit '6f516dcd':
  ARM: dts: msm: Bring all board specific changes to common file for QCS610
  msm: camera: Allow applying request if congestion comes
  ARM: dts: msm: Add initial dts support for QCM6125
  soc: qcom: socinfo: Add support for QCM6125/QCS6125 soc-id
  ARM: dts: qcom: Add support for POMS on sim-video-panel
  arm64: dts: msm: Add dt entry for manual fw loading
  ARM: dts: msm: Add restart driver to sdm429
  usb: pd: Use break instead of return after soft reset is done
  ARM: dts: msm: remove default SA6155 DP pinctrl
  ARM: dts: msm: Enable USB type-C analog audio on SDM660
  net-ipv6-ndisc: add support for 'PREF64' dns64 prefix identifier
  fbdev: msm: call pxl clk unprepare during suspend
  msm: vidc: Fix in deciding power mode
  dma-buf: fill dmabuf->name in dma_buf_export
  ARM: dts: msm: Include camera sensor DTSi file for QCS410
  USB: gadget: Add a print for Boot marker KPI
  msm: camera: isp: Add trace event in case of irq delay detected
  msm: camera: csiphy: Clear secure phy flags on release
  msm: ais: fix csid fatal error issue
  ANDROID: net: bpf: permit redirect from ingress L3 to egress L2 devices at near max mtu
  ARM: dts: msm: Correct the spi pinctrl active node name
  ARM: dts: msm: Enable sdx_ext_ipc and set policy to NOP in sa515m
  sched: Fix out of bounds issue in for_each_cluster macro
  drivers: soc: sdx_ext_ipc: Add option to change default policy
  msm: adsprpc: Fix array index underflow problem
  power: smb1398: Fix array index out of bounds error
  bootkpi: Add KPI Marker for System Resume
  Revert "Kconfig: Add menu choice option to reclaim virtual memory"
  msm: ipa3: Add max PDN  num based on hardware version
  ARM: dts: qcom: Add device nodes for second AFE rx and proxy tx devices
  msm: ipa: update MHI event id logic
  defconfig: qcs610-minimal-perf: enable I2C support config
  defconfig: qcs610-minimal-perf: enable security config
  defconfig: qcs610-minimal-perf: enable I2C config
  cnss: Migrate to upstream adc_tm interface for wlan vbat feature
  wcnss: Migrate from SMD to upstream rpmsg
  msm: ipa: eth: Provide exception stats in lan_rx_skb trace
  msm: ipa: eth: Fix double free of dropped exception skbs
  spi: spi-geni-qcom : Don't configure SPI WORD LEN for SPI Slave
  coresight: Add ports and port child node check in get_ports function
  ARM: dts: msm: Add support for sdxprairie-v2-dsda-cdp
  msm:ipa:mhi: fix the number of max channel for mhi
  Revert "ARM: dts: msm: remove 2nd DP and eDP from sa8195p"
  msm: ipa3: Fix to enable the HOLB during enable wdi pipe
  usb: dwc3: gadget: Avoid spuriously printing NO_PULLUP in log
  ARM: dts: msm: Fix extcon property issue for SDM429
  ARM: dts: disable LDO 1,2,7 and 10 not required
  defconfig: sa2150p: remove support for HID devices
  ARM: dts: msm: Disable RSCC on sa8155
  ARM: dts: msm: Disable RSCC on sa6155
  ARM: dts: msm: include correct dtsi for sa8195p-v2-adp-air-overlay.dts
  msm: camera: Correct GPIO values for IRCUT On/Off function
  ARM64: DTS: qcs610: put VA macro node on top of other macros
  Revert "ARM: dts: msm: fix NFC device probe issue for sdm660"
  defconfig: sa2150: remove atheros 802.11ac wireless cards support
  defconfig: sa2150p: remove user space SPI device driver support
  ARM: dts: sa2150p: disable nodes for graphics support not needed
  defconfig: sa2150p: remove usb mass storage support
  defconfig: sa2150p: remove NFC driver
  defconfig: sa2150p: remove 3D Graphics driver
  clk: qcom: gcc: Add support for 80KHz and 100KHz for gp clocks
  defconfig: sa2150p: remove unused regulator for APC
  defconfig: sa2150p: remove cnss driver from build
  net: stmmac: get set wol & duplicate message fix
  ARM: dts: msm: add support of DP PHY bond mode for SA8195p
  ARM: dts: msm: added 2nd DP and eDP for SA8195p
  ARM: dts: msm: Add SPS node for sdmshrike
  soc: qcom: hab: fix memory leak
  USB: phy: msm: Register extcon callbacks in usb_add_phy()
  Revert "ARM: dts: msm: Add support for SDX55 V2 TTP CPE platform"
  mm: release the spinlock on zap_pte_range
  ARM: dts: qcom: resolve undefined node for SDM429 WTP
  msm: ais: fix csid error event callback propagation
  ARM: msm: dts: enable touch node for SDM429W+BG targets
  rpm-smd: Remove redundant spinlocks which are not required
  ARM: dts: qcom: Modify sleep state config for SPI
  defconfig: Enable the SPM driver for sdm429
  drivers: irqchip: qcom: Add mpm pin data for sdm429
  ARM: dts: msm: Add LPM device nodes for sdm429
  ARM: dts: msm: Add MPM interrupt controller for sdm429
  ARM: dts: msm: Enable adsp vdd restriction cooling device for sa2150p
  defconfig: Enable CONFIG_PSI
  ARM: dts: msm: config primary tdm as pcm on auto platforms
  usb: gadget: f_mbim: Set bnotification type in mbim_write
  drivers: usb: gadget: add minor fixes
  Add S2R and S2D support in KMD
  drm/bridge: add anx7625 to drm device pm link
  msm: v4l2loopback: to create V4L2 loopback devices
  ARM: dts: msm: add hgsl to sa8195 vm for GPU doorbell

Change-Id: I0f41559725a5a112681fa66a9e08c962d8bb1f5e
Signed-off-by: default avatarckosuru <kosuru@codeaurora.org>
parents ebc6039d 6f516dcd

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

+8 −0
Original line number Diff line number Diff line
@@ -106,6 +106,12 @@ SoCs: 
- SDA429W

  compatible = "qcom,sda429w"



- QCM6125

  compatible = "qcom,qcm6125"



- QCS6125

  compatible = "qcom,qcs6125"



Generic board variants:



- CDP device:
@@ -299,3 +305,5 @@ compatible = "qcom,sda429w-wdp" 
compatible = "qcom,sda429-wdp"

compatible = "qcom,sdm429w-wdp"

compatible = "qcom,sdm429-wdp"

compatible = "qcom,qcm6125"

compatible = "qcom,qcs6125"

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

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ Optional named gpio properties: 


- qcom,ap2mdm-status2-gpio: gpio for APQ to indicate graceful shutdown to modem.



- qcom,default-policy-nop: Set default policy from PANIC to NOP.



Example:

	sdx_ext_ipc: qcom,sdx_ext_ipc {

		compatible = "qcom,sdx-ext-ipc";

Documentation/devicetree/bindings/interrupt-controller/qti,mpm.txt

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ Properties: 
		"qcom,mpm-gic-trinket"

		"qcom,mpm-gic-mdm9607"

		"qcom,mpm-gic-sdm660"

		"qcom,mpm-gic-sdm429"



- interrupts:

	Usage: required
@@ -85,6 +86,7 @@ properties: 
		"qcom,mpm-gpio-trinket",

		"qcom,mpm-gpio-mdm9607"

		"qcom,mpm-gpio-sdm660"

		"qcom,mpm-gpio-sdm429"



- interrupt-parent:

	Usage: required

Documentation/devicetree/bindings/platform/msm/ipa.txt

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ memory allocation over a PCIe bridge 
				1 (override scm call as though it returned true), and

				2 (override scm call as though it returned false)

- qcom,use-xbl-boot: Boolean to indicate XBL boot loading for IPA FW

- qcom,manual-fw-load: Manually load ipa fws by writing 1 to ipa dev node



IPA pipe sub nodes (A2 static pipes configurations):

arch/arm/Kconfig

+0 −23
Original line number Diff line number Diff line
@@ -1778,29 +1778,6 @@ 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