diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-05-17 10:15:13 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-05-17 10:15:13 +0530 |
| commit | 82770a2f657ac4674db6db95b906218b526ef2a6 (patch) | |
| tree | c25a267deb022f968c7a007f966cd9b681f7e189 /Documentation | |
| parent | ba8b6cc07267fbf792cb7521cabc13879b227f4f (diff) | |
| parent | 42d236f8a4479fefb69b20da3962a462e05a112d (diff) | |
| download | linux-82770a2f657ac4674db6db95b906218b526ef2a6.tar.bz2 | |
Merge branch 'topic/qcom' into for-linus
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-platform-hidma | 9 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/dma/qcom_bam_dma.txt | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-platform-hidma b/Documentation/ABI/testing/sysfs-platform-hidma new file mode 100644 index 000000000000..d36441538660 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-platform-hidma @@ -0,0 +1,9 @@ +What: /sys/devices/platform/hidma-*/chid + /sys/devices/platform/QCOM8061:*/chid +Date: Dec 2015 +KernelVersion: 4.4 +Contact: "Sinan Kaya <okaya@cudeaurora.org>" +Description: + Contains the ID of the channel within the HIDMA instance. + It is used to associate a given HIDMA channel with the + priority and weight calls in the management interface. diff --git a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt index 1c9d48ea4914..9cbf5d9df8fd 100644 --- a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt +++ b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt @@ -13,6 +13,8 @@ Required properties: - clock-names: must contain "bam_clk" entry - qcom,ee : indicates the active Execution Environment identifier (0-7) used in the secure world. +- qcom,controlled-remotely : optional, indicates that the bam is controlled by + remote proccessor i.e. execution environment. Example: |