forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-02-19 1c055e55a242a33e574e48be530e06770a210dcd
kernel/drivers/tty/serial/owl-uart.c
....@@ -427,7 +427,7 @@
427427 return -EBUSY;
428428
429429 if (port->flags & UPF_IOREMAP) {
430
- port->membase = devm_ioremap_nocache(port->dev, port->mapbase,
430
+ port->membase = devm_ioremap(port->dev, port->mapbase,
431431 resource_size(res));
432432 if (!port->membase)
433433 return -EBUSY;
....@@ -662,10 +662,8 @@
662662 }
663663
664664 irq = platform_get_irq(pdev, 0);
665
- if (irq < 0) {
666
- dev_err(&pdev->dev, "could not get irq\n");
665
+ if (irq < 0)
667666 return irq;
668
- }
669667
670668 if (owl_uart_ports[pdev->id]) {
671669 dev_err(&pdev->dev, "port %d already allocated\n", pdev->id);
....@@ -682,6 +680,12 @@
682680 return PTR_ERR(owl_port->clk);
683681 }
684682
683
+ ret = clk_prepare_enable(owl_port->clk);
684
+ if (ret) {
685
+ dev_err(&pdev->dev, "could not enable clk\n");
686
+ return ret;
687
+ }
688
+
685689 owl_port->port.dev = &pdev->dev;
686690 owl_port->port.line = pdev->id;
687691 owl_port->port.type = PORT_OWL;
....@@ -691,6 +695,7 @@
691695 owl_port->port.uartclk = clk_get_rate(owl_port->clk);
692696 if (owl_port->port.uartclk == 0) {
693697 dev_err(&pdev->dev, "clock rate is zero\n");
698
+ clk_disable_unprepare(owl_port->clk);
694699 return -EINVAL;
695700 }
696701 owl_port->port.flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP | UPF_LOW_LATENCY;
....@@ -714,6 +719,7 @@
714719
715720 uart_remove_one_port(&owl_uart_driver, &owl_port->port);
716721 owl_uart_ports[pdev->id] = NULL;
722
+ clk_disable_unprepare(owl_port->clk);
717723
718724 return 0;
719725 }