|
@@ -47,6 +47,7 @@
|
|
|
#include <linux/slab.h>
|
|
|
#include <linux/of.h>
|
|
|
#include <linux/of_device.h>
|
|
|
+#include <linux/pinctrl/consumer.h>
|
|
|
|
|
|
#include <asm/io.h>
|
|
|
#include <asm/irq.h>
|
|
@@ -1464,6 +1465,7 @@ static int serial_imx_probe(struct platform_device *pdev)
|
|
|
void __iomem *base;
|
|
|
int ret = 0;
|
|
|
struct resource *res;
|
|
|
+ struct pinctrl *pinctrl;
|
|
|
|
|
|
sport = kzalloc(sizeof(*sport), GFP_KERNEL);
|
|
|
if (!sport)
|
|
@@ -1503,6 +1505,12 @@ static int serial_imx_probe(struct platform_device *pdev)
|
|
|
sport->timer.function = imx_timeout;
|
|
|
sport->timer.data = (unsigned long)sport;
|
|
|
|
|
|
+ pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
|
|
|
+ if (IS_ERR(pinctrl)) {
|
|
|
+ ret = PTR_ERR(pinctrl);
|
|
|
+ goto unmap;
|
|
|
+ }
|
|
|
+
|
|
|
sport->clk = clk_get(&pdev->dev, "uart");
|
|
|
if (IS_ERR(sport->clk)) {
|
|
|
ret = PTR_ERR(sport->clk);
|