|
@@ -884,14 +884,19 @@ static int sccnxp_probe(struct platform_device *pdev)
|
|
|
|
|
|
clk = devm_clk_get(&pdev->dev, NULL);
|
|
|
if (IS_ERR(clk)) {
|
|
|
- if (PTR_ERR(clk) == -EPROBE_DEFER) {
|
|
|
- ret = -EPROBE_DEFER;
|
|
|
+ ret = PTR_ERR(clk);
|
|
|
+ if (ret == -EPROBE_DEFER)
|
|
|
goto err_out;
|
|
|
- }
|
|
|
+ uartclk = 0;
|
|
|
+ } else {
|
|
|
+ clk_prepare_enable(clk);
|
|
|
+ uartclk = clk_get_rate(clk);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!uartclk) {
|
|
|
dev_notice(&pdev->dev, "Using default clock frequency\n");
|
|
|
uartclk = s->chip->freq_std;
|
|
|
- } else
|
|
|
- uartclk = clk_get_rate(clk);
|
|
|
+ }
|
|
|
|
|
|
/* Check input frequency */
|
|
|
if ((uartclk < s->chip->freq_min) || (uartclk > s->chip->freq_max)) {
|