git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 98d7e1aee6dd534f468993f8c6a1bc730d4cfa81 Mon Sep 17 00:00:00 2001
   2 From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
   3 Date: Mon, 21 Apr 2014 15:06:23 +0200
   4 Subject: ARM: OMAP3: clock: Back-propagate rate change from cam_mclk to dpll4_m5 on all OMAP3 platforms
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
  10
  11 commit 98d7e1aee6dd534f468993f8c6a1bc730d4cfa81 upstream.
  12
  13 Commit 7b2e1277598e4187c9be3e61fd9b0f0423f97986 ("ARM: OMAP3: clock:
  14 Back-propagate rate change from cam_mclk to dpll4_m5") enabled clock
  15 rate back-propagation from cam_mclk do dpll4_m5 on OMAP3630 only.
  16 Perform back-propagation on other OMAP3 platforms as well.
  17
  18 Reported-by: Jean-Philippe François <jp.francois@cynove.com>
  19 Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  20 Signed-off-by: Paul Walmsley <paul@pwsan.com>
  21 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  22
  23 ---
  24  arch/arm/mach-omap2/cclock3xxx_data.c |    3 ++-
  25  1 file changed, 2 insertions(+), 1 deletion(-)
  26
  27 --- a/arch/arm/mach-omap2/cclock3xxx_data.c
  28 +++ b/arch/arm/mach-omap2/cclock3xxx_data.c
  29 @@ -418,7 +418,8 @@ static struct clk_hw_omap dpll4_m5x2_ck_
  30         .clkdm_name     = "dpll4_clkdm",
  31  };
  32
  33 -DEFINE_STRUCT_CLK(dpll4_m5x2_ck, dpll4_m5x2_ck_parent_names, dpll4_m5x2_ck_ops);
  34 +DEFINE_STRUCT_CLK_FLAGS(dpll4_m5x2_ck, dpll4_m5x2_ck_parent_names,
  35 +                       dpll4_m5x2_ck_ops, CLK_SET_RATE_PARENT);
  36
  37  static struct clk dpll4_m5x2_ck_3630 = {
  38         .name           = "dpll4_m5x2_ck",