kernel: bump 4.14 to 4.14.48 for 18.06

[openwrt/openwrt.git] / target / linux / ipq806x / patches-4.14 / 0001-dtbindings-qcom_adm-Fix-channel-specifiers.patch

diff --git a/target/linux/ipq806x/patches-4.14/0001-dtbindings-qcom_adm-Fix-channel-specifiers.patch b/target/linux/ipq806x/patches-4.14/0001-dtbindings-qcom_adm-Fix-channel-specifiers.patch
index da962c7130277a332644db0cf51d1a5de60213b3..83d7bbc6f40618ef0644334e6d5f454c2c2a0075 100644 (file)
--- a/target/linux/ipq806x/patches-4.14/0001-dtbindings-qcom_adm-Fix-channel-specifiers.patch
+++ b/target/linux/ipq806x/patches-4.14/0001-dtbindings-qcom_adm-Fix-channel-specifiers.patch
@@ -33,22 +33,22 @@ Signed-off-by: Thomas Pedersen <twp@codeaurora.org>
  - clock-names: Must contain "core" for the core clock and "iface" for the
    interface clock.
 @@ -22,7 +21,7 @@ Example:
-                       compatible = "qcom,adm";
-                       reg = <0x18300000 0x100000>;
-                       interrupts = <0 170 0>;
+                       compatible = "qcom,adm";
+                       reg = <0x18300000 0x100000>;
+                       interrupts = <0 170 0>;
 -                      #dma-cells = <2>;
 +                      #dma-cells = <1>;
-
-                       clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>;
-                       clock-names = "core", "iface";
+ 
+                       clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>;
+                       clock-names = "core", "iface";
 @@ -35,15 +34,12 @@ Example:
-                       qcom,ee = <0>;
-               };
-
+                       qcom,ee = <0>;
+               };
+ 
 -DMA clients must use the format descripted in the dma.txt file, using a three
 +DMA clients must use the format descripted in the dma.txt file, using a two
  cell specifier for each channel.
-
+ 
 -Each dmas request consists of 3 cells:
 +Each dmas request consists of two cells:
   1. phandle pointing to the DMA controller
@@ -56,16 +56,16 @@ Signed-off-by: Thomas Pedersen <twp@codeaurora.org>
 - 3. CRCI assignment, if applicable.  If no CRCI flow control is required, use 0.
 -    The CRCI is used for flow control.  It identifies the peripheral device that
 -    is the source/destination for the transferred data.
-
+ 
  Example:
-
+ 
 @@ -55,7 +51,7 @@ Example:
-
-               cs-gpios = <&qcom_pinmux 20 0>;
-
+ 
+               cs-gpios = <&qcom_pinmux 20 0>;
+ 
 -              dmas = <&adm_dma 6 9>,
 -                      <&adm_dma 5 10>;
 +              dmas = <&adm_dma 6>,
 +                      <&adm_dma 5>;
-               dma-names = "rx", "tx";
-       };
+               dma-names = "rx", "tx";
+       };