Browse Source

clk: imx: return correct frequency for Ethernet PLL

The i.MX 7 designs Ethernet PLL provides a 1000MHz reference clock.
Store the reference clock in the clk_pllv3 structure according to
the PLL type.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Stefan Agner 9 years ago
parent
commit
585a60f24b
1 changed files with 8 additions and 1 deletions
  1. 8 1
      drivers/clk/imx/clk-pllv3.c

+ 8 - 1
drivers/clk/imx/clk-pllv3.c

@@ -44,6 +44,7 @@ struct clk_pllv3 {
 	u32		powerdown;
 	u32		powerdown;
 	u32		div_mask;
 	u32		div_mask;
 	u32		div_shift;
 	u32		div_shift;
+	unsigned long	ref_clock;
 };
 };
 
 
 #define to_clk_pllv3(_hw) container_of(_hw, struct clk_pllv3, hw)
 #define to_clk_pllv3(_hw) container_of(_hw, struct clk_pllv3, hw)
@@ -286,7 +287,9 @@ static const struct clk_ops clk_pllv3_av_ops = {
 static unsigned long clk_pllv3_enet_recalc_rate(struct clk_hw *hw,
 static unsigned long clk_pllv3_enet_recalc_rate(struct clk_hw *hw,
 						unsigned long parent_rate)
 						unsigned long parent_rate)
 {
 {
-	return 500000000;
+	struct clk_pllv3 *pll = to_clk_pllv3(hw);
+
+	return pll->ref_clock;
 }
 }
 
 
 static const struct clk_ops clk_pllv3_enet_ops = {
 static const struct clk_ops clk_pllv3_enet_ops = {
@@ -326,7 +329,11 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name,
 		break;
 		break;
 	case IMX_PLLV3_ENET_IMX7:
 	case IMX_PLLV3_ENET_IMX7:
 		pll->powerdown = IMX7_ENET_PLL_POWER;
 		pll->powerdown = IMX7_ENET_PLL_POWER;
+		pll->ref_clock = 1000000000;
+		ops = &clk_pllv3_enet_ops;
+		break;
 	case IMX_PLLV3_ENET:
 	case IMX_PLLV3_ENET:
+		pll->ref_clock = 500000000;
 		ops = &clk_pllv3_enet_ops;
 		ops = &clk_pllv3_enet_ops;
 		break;
 		break;
 	default:
 	default: