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

Commit 18f4458d authored by Namratha Siddappa's avatar Namratha Siddappa
Browse files

Merge remote-tracking branch 'quic/msm-4.14' into dev/msm-4.14-display 



* quic/msm-4.14:
  ARM: dts: msm: Enable sec usb port in host mode on sm8150-auto-adp-star
  defconfig: enable additional features to automotive
  ARM: dts: msm: Add MPM interrupt controller for qcs405
  defconfig: Enable MPM support for qcs405
  msm: vidc: Allocate dsp hfi queues from cdsp memory
  ARM: dts: msm: Add cdsp memory node to video subsystem
  msm: vidc: Add qcom,msm-vidc,mem-cdsp node
  sched/core_ctl: Pass sorted clusters based on capacity to cluster_init
  arch: arm: add support for sdxprairie target
  ARM: dts: msm: Add secondary USB configuration for sm8150
  ion: add support for secure dma allocations
  Revert "mm/memblock: fix a race between search and remove"
  Revert "mm/memblock: disable local irqs while late memblock changes"

Change-Id: I39908fb3d4dfb8fa7d9694dab079c214c8d67ac9
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents e60d32ea 9ee89464

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

+6 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ SoCs: 
- QCS405

  compatible = "qcom,qcs405"



- SDXPRAIRIE

  compatible = "qcom,sdxprairie"



Generic board variants:



- CDP device:
@@ -151,3 +154,6 @@ compatible = "qcom,qcs405-mtp" 
compatible = "qcom,qcs405-cdp"

compatible = "qcom,sm8150-auto-adp-star"

compatible = "qcom,auto-adp-star"

compatible = "qcom,sdxprairie-rumi"

compatible = "qcom,sdxprairie-mtp"

compatible = "qcom,sdxprairie-cdp"

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

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ Memory Heaps 
Required properties:

- compatible : one of:

	- "qcom,msm-vidc,mem-adsp"

	- "qcom,msm-vidc,mem-cdsp"

- memory-region : phandle to the memory heap/region.



Example:

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -562,6 +562,7 @@ config ARCH_QCOM 
       select CLKDEV_LOOKUP

       select GENERIC_CLOCKEVENTS

       select GENERIC_ALLOCATOR

       select ARM_GIC

       select ARM_PATCH_PHYS_VIRT

       select ARM_HAS_SG_CHAIN

       select ARCH_HAS_OPP

arch/arm/configs/qcs405-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ CONFIG_QCOM_GLINK_PKT=y 
CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_PWM_QTI_LPG=y

CONFIG_QTI_MPM=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_EXT2_FS=y

arch/arm/configs/qcs405_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -391,6 +391,7 @@ CONFIG_QCOM_GLINK_PKT=y 
CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_PWM_QTI_LPG=y

CONFIG_QTI_MPM=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_EXT2_FS=y