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

Commit b79d39d3 authored by yungwenpeng's avatar yungwenpeng
Browse files

Merge branch r2.0_00018.0 into vanilla 

* ssh://ch-git3.arimacomm.com.tw:29418/kernel/msm-4.9: (1537 commits)
  ARM: dts: msm: enable 6dof in Sheldon
  ARM: dts: msm: create separate dt for bg soc entries
  crypto: msm: restrict value of num_fds to QCEDEV_MAX_BUFFERS
  headers_lib: rename Android.bp
  msm: mdss: Enable SPI in pan display path
  drm/msm: scrambling not mandatory for DP interface
  drm/msm/dp: configure VSC SDP packet during HDR playback
  drm/msm/dp: configure quantization ranges as per video format
  ARM: dts: msm: Add avb flags for system and vendor
  drm/msm/dp: set pixel_encoding and colorimetry info
  drm/msm/sde: append VIC ID to mode info string
  drm/msm/dp: check for VSC SDP support
  drm/msm/dp: add display-type support in dp
  drm/msm/dp: parse yuv-support dt property
  ARM: dts: msm: Update A2B select pin detail for SA415M  CCARD
  kbuild: skip install/check of headers right under uapi directories
  uapi: export all arch specifics directories
  kernel_headers: Fix headers not detected in incremental builds
  kernel headers: Update comparison logic
  Kbuild : Use no-export-headers to avoid exporting headers
  ...

Change-Id: I27e36261ceaac4577d0283145498d97466856311
parents 05c07c29 9dfd5b86

.gitignore

+5 −0
Original line number Diff line number Diff line
@@ -118,3 +118,8 @@ all.config 


# fetched Android config fragments

kernel/configs/android-*.cfg



#

#Ignoring Android.bp link file

#

Android.bp

Android.bp

deleted100644 → 0
+0 −27
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"],

}

Androidbp

0 → 100644
+45 −0
Original line number Diff line number Diff line 
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/ABI/testing/sysfs-bus-mei

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ KernelVersion: 3.10 
Contact:	Samuel Ortiz <sameo@linux.intel.com>

		linux-mei@linux.intel.com

Description:	Stores the same MODALIAS value emitted by uevent

		Format: mei:<mei device name>:<device uuid>:

		Format: mei:<mei device name>:<device uuid>:<protocol version>



What:		/sys/bus/mei/devices/.../name

Date:		May 2015

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

0 → 100644
+31 −0
Original line number Diff line number Diff line 
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>;

	};