imx6: update patches

[openwrt.git] / target / linux / imx6 / patches-3.12 / 0002-ARM-imx6q-Add-pll4_audio_div-to-clock-tree.patch

diff --git a/target/linux/imx6/patches-3.12/0002-ARM-imx6q-Add-pll4_audio_div-to-clock-tree.patch b/target/linux/imx6/patches-3.12/0002-ARM-imx6q-Add-pll4_audio_div-to-clock-tree.patch
index 85212ca..658b0c9 100644 (file)
--- a/target/linux/imx6/patches-3.12/0002-ARM-imx6q-Add-pll4_audio_div-to-clock-tree.patch
+++ b/target/linux/imx6/patches-3.12/0002-ARM-imx6q-Add-pll4_audio_div-to-clock-tree.patch
@@ -14,7 +14,7 @@ Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
 
 --- a/arch/arm/mach-imx/clk-imx6q.c
 +++ b/arch/arm/mach-imx/clk-imx6q.c
-@@ -182,7 +182,7 @@ static const char *periph2_clk2_sels[]     = { "pll3_usb_otg", "pll2_bus", };
+@@ -182,7 +182,7 @@ static const char *periph2_clk2_sels[]     =
  static const char *periph_sels[]      = { "periph_pre", "periph_clk2", };
  static const char *periph2_sels[]     = { "periph2_pre", "periph2_clk2", };
  static const char *axi_sels[]         = { "periph", "pll2_pfd2_396m", "periph", "pll3_pfd1_540m", };
@@ -23,7 +23,7 @@ Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
  static const char *gpu_axi_sels[]     = { "axi", "ahb", };
  static const char *gpu2d_core_sels[]  = { "axi", "pll3_usb_otg", "pll2_pfd0_352m", "pll2_pfd2_396m", };
  static const char *gpu3d_core_sels[]  = { "mmdc_ch0_axi", "pll3_usb_otg", "pll2_pfd1_594m", "pll2_pfd2_396m", };
-@@ -196,7 +196,7 @@ static const char *ipu2_di0_sels[] = { "ipu2_di0_pre", "dummy", "dummy", "ldb_di
+@@ -196,7 +196,7 @@ static const char *ipu2_di0_sels[] = { "
  static const char *ipu2_di1_sels[]    = { "ipu2_di1_pre", "dummy", "dummy", "ldb_di0", "ldb_di1", };
  static const char *hsi_tx_sels[]      = { "pll3_120m", "pll2_pfd2_396m", };
  static const char *pcie_axi_sels[]    = { "axi", "ahb", };
@@ -32,7 +32,7 @@ Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
  static const char *usdhc_sels[]       = { "pll2_pfd2_396m", "pll2_pfd0_352m", };
  static const char *enfc_sels[]        = { "pll2_pfd0_352m", "pll2_bus", "pll3_usb_otg", "pll2_pfd2_396m", };
  static const char *emi_sels[]         = { "pll2_pfd2_396m", "pll3_usb_otg", "axi", "pll2_pfd0_352m", };
-@@ -205,7 +205,7 @@ static const char *vdo_axi_sels[]  = { "axi", "ahb", };
+@@ -205,7 +205,7 @@ static const char *vdo_axi_sels[]  = { "a
  static const char *vpu_axi_sels[]     = { "axi", "pll2_pfd2_396m", "pll2_pfd0_352m", };
  static const char *cko1_sels[]        = { "pll3_usb_otg", "pll2_bus", "pll1_sys", "pll5_video_div",
                                    "dummy", "axi", "enfc", "ipu1_di0", "ipu1_di1", "ipu2_di0",
@@ -50,7 +50,7 @@ Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
  };
  
  static struct clk *clk[clk_max];
-@@ -359,6 +359,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
+@@ -359,6 +359,7 @@ static void __init imx6q_clocks_init(str
        clk[twd]       = imx_clk_fixed_factor("twd",       "arm",            1, 2);
  
        clk[pll4_post_div] = clk_register_divider_table(NULL, "pll4_post_div", "pll4_audio", CLK_SET_RATE_PARENT, base + 0x70, 19, 2, 0, post_div_table, &imx_ccm_lock);