|
@@ -37,6 +37,7 @@
|
|
|
#include <linux/of.h>
|
|
|
#include <linux/of_device.h>
|
|
|
#include <linux/of_gpio.h>
|
|
|
+#include <linux/pinctrl/consumer.h>
|
|
|
|
|
|
#include <mach/spi.h>
|
|
|
|
|
@@ -758,6 +759,7 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)
|
|
|
struct spi_master *master;
|
|
|
struct spi_imx_data *spi_imx;
|
|
|
struct resource *res;
|
|
|
+ struct pinctrl *pinctrl;
|
|
|
int i, ret, num_cs;
|
|
|
|
|
|
if (!np && !mxc_platform_info) {
|
|
@@ -845,6 +847,12 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)
|
|
|
goto out_iounmap;
|
|
|
}
|
|
|
|
|
|
+ pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
|
|
|
+ if (IS_ERR(pinctrl)) {
|
|
|
+ ret = PTR_ERR(pinctrl);
|
|
|
+ goto out_free_irq;
|
|
|
+ }
|
|
|
+
|
|
|
spi_imx->clk = clk_get(&pdev->dev, NULL);
|
|
|
if (IS_ERR(spi_imx->clk)) {
|
|
|
dev_err(&pdev->dev, "unable to get clock\n");
|