serial: imx: Remove unused platform data support
Since 5.10-rc1 i.MX is a devicetree-only platform and the existing platform data support in this driver was only useful for old non-devicetree platforms. Get rid of the platform data support since it is no longer used. Reviewed-by: Fugang Duan <fugang.duan@nxp.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Fabio Estevam <festevam@gmail.com> Link: https://lore.kernel.org/r/20201110214840.16768-1-festevam@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
cb215da836
Коммит
1f78ae9979
|
@ -30,7 +30,6 @@
|
||||||
#include <linux/dma-mapping.h>
|
#include <linux/dma-mapping.h>
|
||||||
|
|
||||||
#include <asm/irq.h>
|
#include <asm/irq.h>
|
||||||
#include <linux/platform_data/serial-imx.h>
|
|
||||||
#include <linux/platform_data/dma-imx.h>
|
#include <linux/platform_data/dma-imx.h>
|
||||||
|
|
||||||
#include "serial_mctrl_gpio.h"
|
#include "serial_mctrl_gpio.h"
|
||||||
|
@ -2191,10 +2190,9 @@ static struct uart_driver imx_uart_uart_driver = {
|
||||||
.cons = IMX_CONSOLE,
|
.cons = IMX_CONSOLE,
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef CONFIG_OF
|
|
||||||
/*
|
/*
|
||||||
* This function returns 1 iff pdev isn't a device instatiated by dt, 0 iff it
|
* This function returns 0 iff it could successfully get all information
|
||||||
* could successfully get all information from dt or a negative errno.
|
* from dt or a negative errno.
|
||||||
*/
|
*/
|
||||||
static int imx_uart_probe_dt(struct imx_port *sport,
|
static int imx_uart_probe_dt(struct imx_port *sport,
|
||||||
struct platform_device *pdev)
|
struct platform_device *pdev)
|
||||||
|
@ -2232,28 +2230,6 @@ static int imx_uart_probe_dt(struct imx_port *sport,
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
static inline int imx_uart_probe_dt(struct imx_port *sport,
|
|
||||||
struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static void imx_uart_probe_pdata(struct imx_port *sport,
|
|
||||||
struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
struct imxuart_platform_data *pdata = dev_get_platdata(&pdev->dev);
|
|
||||||
|
|
||||||
sport->port.line = pdev->id;
|
|
||||||
sport->devdata = (struct imx_uart_data *) pdev->id_entry->driver_data;
|
|
||||||
|
|
||||||
if (!pdata)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (pdata->flags & IMXUART_HAVE_RTSCTS)
|
|
||||||
sport->have_rtscts = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static enum hrtimer_restart imx_trigger_start_tx(struct hrtimer *t)
|
static enum hrtimer_restart imx_trigger_start_tx(struct hrtimer *t)
|
||||||
{
|
{
|
||||||
|
@ -2295,9 +2271,7 @@ static int imx_uart_probe(struct platform_device *pdev)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
ret = imx_uart_probe_dt(sport, pdev);
|
ret = imx_uart_probe_dt(sport, pdev);
|
||||||
if (ret > 0)
|
if (ret < 0)
|
||||||
imx_uart_probe_pdata(sport, pdev);
|
|
||||||
else if (ret < 0)
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
if (sport->port.line >= ARRAY_SIZE(imx_uart_ports)) {
|
if (sport->port.line >= ARRAY_SIZE(imx_uart_ports)) {
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
||||||
/*
|
|
||||||
* Copyright (C) 2008 by Sascha Hauer <kernel@pengutronix.de>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef ASMARM_ARCH_UART_H
|
|
||||||
#define ASMARM_ARCH_UART_H
|
|
||||||
|
|
||||||
#define IMXUART_HAVE_RTSCTS (1<<0)
|
|
||||||
|
|
||||||
struct imxuart_platform_data {
|
|
||||||
unsigned int flags;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
Загрузка…
Ссылка в новой задаче