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

Commit 74f592b1 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:
  defconfig: arm: qcs405: Enable MPROC drivers
  arm64: traps: Don't print stack or raw PC/LR values in backtraces
  msm: ipa3: Fix QMB configuration for IPA test pipes
  thermal: tsens: Update TSENS support for SDM640
  ARM: dts: msm: Add sdhc support for sm8150-auto
  mhi: core: prepare all the descriptors before ringing hardware doorbell
  clk: qcom: debugcc-sm8150: Remove measurement support for unused clocks
  Revert "defconfig: Enable full reference count validation"
  msm: sdm640: Replace sdm640 with sm6150
  ARM: RTIC 3.0:  Enabling MPGen
  arm: dma-mapping: use proper api to get prot attribute
  Android.bp: Initial header export bp for Android (qseecom only)
  usb: gadget: f_fs: Do not match when function do not bind
  power: qpnp-fg-gen4: Fix debug battery id reporting
  defconfig: arm64: Add misc_debug_defconfig for memory and fuzzing tests
  icnss: Avoid qmi exchange when fw is down
  sched/fair: Consider only idle CPUs for active migration
  ARM:dts:msm: add defconfig for SM8150 automotive
  msm: ipa4: enable adpl for all UL consumers.
  soc: qcom: spcom: add kernel-pil support for SPU
  wil6210: set ip_summed to CHECKSUM_UNNECESSARY if no error found
  ARM: dts: msm: Enable primary usb port in HS mode on sm8150-auto-adp-star
  qrtr: Only broadcast to initialized nodes
  qrtr: Align header and payload
  qrtr: Initialize the local nid to 1
  qrtr: Rename qrtr_all_nodes to qrtr_all_epts
  qrtr: Add support for multiple nodes on a single ept
  drivers: lpm-levels: return zero for parse_cluster_params function
  ARM: dts: msm: Add MPROC device nodes for QCS405
  msm: camera: Upgrade camera module drivers
  msm: kgsl: Prevent dual ownership of GMU counters
  ARM: dts: msm: Update GDSC device nodes for QCS405

Change-Id: Ic625f1383804af4aadb90dd513eeec5ea616f739
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents 9ded59e0 8354e26a

Android.bp

0 → 100644
+27 −0
Original line number Diff line number Diff line 
cc_binary_host {

    name: "unifdef",

    srcs: ["scripts/unifdef.c"],

    sanitize: {

        never: true,

    }

}



gensrcs {

    name: "qseecom-kernel-includes",



    // move to out/ as root for header generation because of scripts/unifdef

    // storage - at the expense of extra ../ references

    cmd: "pushd out && mkdir -p scripts && rm -f scripts/unifdef && ln -s ../../$(location unifdef) scripts/unifdef && ../$(location scripts/headers_install.sh) `dirname ../$(out)` ../ $(in) && popd",



    tools: ["unifdef"],

    tool_files: ["scripts/headers_install.sh"],

    export_include_dirs: ["include/uapi"],

    srcs: ["include/uapi/linux/qseecom.h"],

    output_extension: "h",

}



cc_library_headers {

    name: "qseecom-kernel-headers",

    generated_headers: ["qseecom-kernel-includes"],

    export_generated_headers: ["qseecom-kernel-includes"],

}

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

+6 −6
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ SoCs: 
- SDMSHRIKE

  compatible = "qcom,sdmshrike"



- SDM640

  compatible = "qcom,sdm640"

- SM6150

  compatible = "qcom,sm6150"



- QCS405

  compatible = "qcom,qcs405"
@@ -138,10 +138,10 @@ compatible = "qcom,sm8150p-qrd" 
compatible = "qcom,sdmshrike-rumi"

compatible = "qcom,sdmshrike-mtp"

compatible = "qcom,sdmshrike-cdp"

compatible = "qcom,sdm640-rumi"

compatible = "qcom,sdm640-mtp"

compatible = "qcom,sdm640-cdp"

compatible = "qcom,sdm640-qrd"

compatible = "qcom,sm6150-rumi"

compatible = "qcom,sm6150-mtp"

compatible = "qcom,sm6150-cdp"

compatible = "qcom,sm6150-qrd"

compatible = "qcom,qcs405-rumi"

compatible = "qcom,qcs405-mtp"

compatible = "qcom,qcs405-cdp"

Documentation/devicetree/bindings/arm/msm/qcom,llcc.txt

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ compatible devices: 
		qcom,sdm670-llcc,

		qcom,sm8150-llcc,

		qcom,sdmshrike-llcc,

		qcom,sdm640-llcc

		qcom,sm6150-llcc



Example:

Documentation/devicetree/bindings/interrupt-controller/qti,pdc-sdm640.txt→Documentation/devicetree/bindings/interrupt-controller/qti,pdc-sm6150.txt

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ Properties: 
Example:



pdcgic: interrupt-controller@0xb220000{

	compatible = "qcom,pdc-sdm640";

	compatible = "qcom,pdc-sm6150";

	reg = <0xb220000 0x30000>;

	#interrupt-cells = <3>;

	interrupt-parent = <&intc>;

Documentation/devicetree/bindings/pinctrl/qcom,sdm640-pinctrl→Documentation/devicetree/bindings/pinctrl/qcom,sm6150-pinctrl

+4 −4
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc. SDM640 TLMM block

Qualcomm Technologies, Inc. SM6150 TLMM block



This binding describes the Top Level Mode Multiplexer block found in the

SDM640 platform.

SM6150 platform.



- compatible:

	Usage: required

	Value type: <string>

	Definition: must be "qcom,sdm640-pinctrl"

	Definition: must be "qcom,sm6150-pinctrl"



- reg:

	Usage: required
@@ -176,7 +176,7 @@ to specify in a pin configuration subnode: 
Example:



	tlmm: pinctrl@03000000 {

		compatible = "qcom,sdm640-pinctrl";

		compatible = "qcom,sm6150-pinctrl";

		reg = <0x03000000 0xdc2000>;

		interrupts = <0 208 0>;

		gpio-controller;