0001-dtbindings-qcom_adm-Fix-channel-specifiers.patch 2.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071
  1. From 28d0ed88f536dd639adf1b0c7c08e04be3c8f294 Mon Sep 17 00:00:00 2001
  2. From: Thomas Pedersen <[email protected]>
  3. Date: Mon, 16 May 2016 17:58:50 -0700
  4. Subject: [PATCH 01/69] dtbindings: qcom_adm: Fix channel specifiers
  5. Original patch from Andy Gross.
  6. This patch removes the crci information from the dma
  7. channel property. At least one client device requires
  8. using more than one CRCI value for a channel. This does
  9. not match the current binding and the crci information
  10. needs to be removed.
  11. Instead, the client device will provide this information
  12. via other means.
  13. Signed-off-by: Andy Gross <[email protected]>
  14. Signed-off-by: Thomas Pedersen <[email protected]>
  15. ---
  16. Documentation/devicetree/bindings/dma/qcom_adm.txt | 16 ++++++----------
  17. 1 file changed, 6 insertions(+), 10 deletions(-)
  18. --- a/Documentation/devicetree/bindings/dma/qcom_adm.txt
  19. +++ b/Documentation/devicetree/bindings/dma/qcom_adm.txt
  20. @@ -4,8 +4,7 @@ Required properties:
  21. - compatible: must contain "qcom,adm" for IPQ/APQ8064 and MSM8960
  22. - reg: Address range for DMA registers
  23. - interrupts: Should contain one interrupt shared by all channels
  24. -- #dma-cells: must be <2>. First cell denotes the channel number. Second cell
  25. - denotes CRCI (client rate control interface) flow control assignment.
  26. +- #dma-cells: must be <1>. First cell denotes the channel number.
  27. - clocks: Should contain the core clock and interface clock.
  28. - clock-names: Must contain "core" for the core clock and "iface" for the
  29. interface clock.
  30. @@ -22,7 +21,7 @@ Example:
  31. compatible = "qcom,adm";
  32. reg = <0x18300000 0x100000>;
  33. interrupts = <0 170 0>;
  34. - #dma-cells = <2>;
  35. + #dma-cells = <1>;
  36. clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>;
  37. clock-names = "core", "iface";
  38. @@ -35,15 +34,12 @@ Example:
  39. qcom,ee = <0>;
  40. };
  41. -DMA clients must use the format descripted in the dma.txt file, using a three
  42. +DMA clients must use the format descripted in the dma.txt file, using a two
  43. cell specifier for each channel.
  44. -Each dmas request consists of 3 cells:
  45. +Each dmas request consists of two cells:
  46. 1. phandle pointing to the DMA controller
  47. 2. channel number
  48. - 3. CRCI assignment, if applicable. If no CRCI flow control is required, use 0.
  49. - The CRCI is used for flow control. It identifies the peripheral device that
  50. - is the source/destination for the transferred data.
  51. Example:
  52. @@ -55,7 +51,7 @@ Example:
  53. cs-gpios = <&qcom_pinmux 20 0>;
  54. - dmas = <&adm_dma 6 9>,
  55. - <&adm_dma 5 10>;
  56. + dmas = <&adm_dma 6>,
  57. + <&adm_dma 5>;
  58. dma-names = "rx", "tx";
  59. };