diff options
author | Dong Aisheng <b29396@freescale.com> | 2012-12-09 21:32:56 -0500 |
---|---|---|
committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-16 09:11:57 -0400 |
commit | bc56a5ba2decffc7b8a5c9f4ec218302aea5068f (patch) | |
tree | cab620b7e12a01af53f25b8673e72b8293af6b1b | |
parent | 040feb19fb8e250d4d3fac527d190301063b10b7 (diff) |
ENGR00286724-1 net: flexcan: using per clock for clock rate calculation
The per clock is used for the output clock.
Signed-off-by: Dong Aisheng <b29396@freescale.com>
-rw-r--r-- | drivers/net/can/flexcan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index f63169d6af26..152558de92f7 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c | |||
@@ -1019,7 +1019,6 @@ static int flexcan_probe(struct platform_device *pdev) | |||
1019 | err = PTR_ERR(clk_ipg); | 1019 | err = PTR_ERR(clk_ipg); |
1020 | goto failed_clock; | 1020 | goto failed_clock; |
1021 | } | 1021 | } |
1022 | clock_freq = clk_get_rate(clk_ipg); | ||
1023 | 1022 | ||
1024 | clk_per = devm_clk_get(&pdev->dev, "per"); | 1023 | clk_per = devm_clk_get(&pdev->dev, "per"); |
1025 | if (IS_ERR(clk_per)) { | 1024 | if (IS_ERR(clk_per)) { |
@@ -1027,6 +1026,8 @@ static int flexcan_probe(struct platform_device *pdev) | |||
1027 | err = PTR_ERR(clk_per); | 1026 | err = PTR_ERR(clk_per); |
1028 | goto failed_clock; | 1027 | goto failed_clock; |
1029 | } | 1028 | } |
1029 | |||
1030 | clock_freq = clk_get_rate(clk_per); | ||
1030 | } | 1031 | } |
1031 | 1032 | ||
1032 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 1033 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); |