kernel: update 3.14 to 3.14.18

[openwrt/openwrt.git] / target / linux / sunxi / patches-3.14 / 188-clk-sunxi-implement-mmc-phasectrl.patch

diff --git a/target/linux/sunxi/patches-3.14/188-clk-sunxi-implement-mmc-phasectrl.patch b/target/linux/sunxi/patches-3.14/188-clk-sunxi-implement-mmc-phasectrl.patch
index 1288f8fed9607b70145c9f9c23f9a4681de3f040..c191b350f8423e91c6778098b97acd3ecd04c4f8 100644 (file)
--- a/target/linux/sunxi/patches-3.14/188-clk-sunxi-implement-mmc-phasectrl.patch
+++ b/target/linux/sunxi/patches-3.14/188-clk-sunxi-implement-mmc-phasectrl.patch
@@ -16,11 +16,9 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  2 files changed, 57 insertions(+)
  create mode 100644 include/linux/clk/sunxi.h
 
-diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
-index 23baad9..9afd8dd 100644
 --- a/drivers/clk/sunxi/clk-sunxi.c
 +++ b/drivers/clk/sunxi/clk-sunxi.c
-@@ -507,6 +507,41 @@ CLK_OF_DECLARE(sun7i_a20_gmac, "allwinner,sun7i-a20-gmac-clk",
+@@ -507,6 +507,41 @@ CLK_OF_DECLARE(sun7i_a20_gmac, "allwinne
  
  
  /**
@@ -62,9 +60,6 @@ index 23baad9..9afd8dd 100644
   * sunxi_factors_clk_setup() - Setup function for factor clocks
   */
  
-diff --git a/include/linux/clk/sunxi.h b/include/linux/clk/sunxi.h
-new file mode 100644
-index 0000000..1ef5c89
 --- /dev/null
 +++ b/include/linux/clk/sunxi.h
 @@ -0,0 +1,22 @@
@@ -90,6 +85,3 @@ index 0000000..1ef5c89
 +void clk_sunxi_mmc_phase_control(struct clk_hw *hw, u8 sample, u8 output);
 +
 +#endif
--- 
-2.0.3
-