diff options
Diffstat (limited to 'drivers/spi/dspi_spi.c')
| -rw-r--r-- | drivers/spi/dspi_spi.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/drivers/spi/dspi_spi.c b/drivers/spi/dspi_spi.c index 07b2f2c567..75addfd12c 100644 --- a/drivers/spi/dspi_spi.c +++ b/drivers/spi/dspi_spi.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Zodiac Inflight Innovation * Author: Andrey Smirnov <andrew.smirnov@gmail.com> @@ -5,12 +6,6 @@ * Based on drivers/spi/spi-fsl-dspi.c from Linux kernel * * Copyright 2013 Freescale Semiconductor, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * */ #include <common.h> @@ -26,8 +21,8 @@ #include <gpio.h> #include <of_gpio.h> #include <of_device.h> -#include <mach/spi.h> -#include <mach/generic.h> +#include <mach/imx/spi.h> +#include <mach/imx/generic.h> #include <linux/clk.h> #include <linux/err.h> #include <clock.h> @@ -98,7 +93,7 @@ static struct fsl_dspi *to_dspi(struct spi_master *master) return container_of(master, struct fsl_dspi, master); } -static void hz_to_spi_baud(struct device_d *dev, +static void hz_to_spi_baud(struct device *dev, char *pbr, char *br, int speed_hz, unsigned long clkrate) { @@ -137,7 +132,7 @@ static void hz_to_spi_baud(struct device_d *dev, } } -static void ns_delay_scale(struct device_d *dev, +static void ns_delay_scale(struct device *dev, char *psc, char *sc, int delay_ns, unsigned long clkrate) { @@ -319,12 +314,12 @@ static int dspi_setup(struct spi_device *spi) return 0; } -static int dspi_probe(struct device_d *dev) +static int dspi_probe(struct device *dev) { struct resource *io; struct fsl_dspi *dspi; struct spi_master *master; - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; int ret = 0; uint32_t bus_num = 0; @@ -356,9 +351,9 @@ static int dspi_probe(struct device_d *dev) else master->bus_num = dev->id; - of_property_read_u32(dev->device_node, "fsl,spi-cs-sck-delay", + of_property_read_u32(dev->of_node, "fsl,spi-cs-sck-delay", &dspi->cs_sck_delay); - of_property_read_u32(dev->device_node, "fsl,spi-sck-cs-delay", + of_property_read_u32(dev->of_node, "fsl,spi-sck-cs-delay", &dspi->sck_cs_delay); io = dev_request_mem_resource(dev, 0); @@ -405,8 +400,9 @@ static const struct of_device_id dspi_dt_ids[] = { { .compatible = "fsl,vf610-dspi", .data = (void *)&vf610_data, }, { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, dspi_dt_ids); -static struct driver_d dspi_spi_driver = { +static struct driver dspi_spi_driver = { .name = "fsl-dspi", .probe = dspi_probe, .of_compatible = DRV_OF_COMPAT(dspi_dt_ids), |