summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2018-05-09 14:17:06 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2018-05-09 14:17:06 +0200
commitcc234a70e5c237a9a81c30eb42455f466f095a73 (patch)
treed0557d8ae6d6d7420dd8d809eeaad59def97a807 /drivers/serial
parent531c25972ed2bfa7e2eb3cf7ac5f7cd068b8b01b (diff)
parent0f73d8fb36ec9b51cea9f78aa66a138b4a361cd0 (diff)
downloadbarebox-cc234a70e5c237a9a81c30eb42455f466f095a73.tar.gz
Merge branch 'for-next/serdev'
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/Kconfig6
-rw-r--r--drivers/serial/serial_auart.c11
-rw-r--r--drivers/serial/serial_cadence.c9
-rw-r--r--drivers/serial/serial_clps711x.c10
-rw-r--r--drivers/serial/serial_imx.c10
-rw-r--r--drivers/serial/serial_lpuart.c13
-rw-r--r--drivers/serial/serial_pxa.c9
-rw-r--r--drivers/serial/serial_s3c.c10
-rw-r--r--drivers/serial/stm-serial.c10
9 files changed, 6 insertions, 82 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index cfddc2e..8a56d39 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1,6 +1,12 @@
menu "serial drivers"
depends on !CONSOLE_NONE
+config SERIAL_DEV_BUS
+ bool "Serial device bus"
+ depends on CONSOLE_FULL
+ help
+ Core support for devices connected via a serial port.
+
config DRIVER_SERIAL_ARM_DCC
depends on ARM && !CPU_V8
bool "ARM Debug Communications Channel (DCC) serial driver"
diff --git a/drivers/serial/serial_auart.c b/drivers/serial/serial_auart.c
index c3b9a19..05cc757 100644
--- a/drivers/serial/serial_auart.c
+++ b/drivers/serial/serial_auart.c
@@ -220,16 +220,6 @@ static int auart_serial_probe(struct device_d *dev)
return 0;
}
-
-static void auart_serial_remove(struct device_d *dev)
-{
- struct auart_priv *priv = dev->priv;
-
- auart_serial_flush(&priv->cdev);
- console_unregister(&priv->cdev);
- free(priv);
-}
-
static const __maybe_unused struct of_device_id auart_serial_dt_ids[] = {
{
.compatible = "fsl,imx23-auart",
@@ -241,7 +231,6 @@ static const __maybe_unused struct of_device_id auart_serial_dt_ids[] = {
static struct driver_d auart_serial_driver = {
.name = "auart_serial",
.probe = auart_serial_probe,
- .remove = auart_serial_remove,
.of_compatible = DRV_OF_COMPAT(auart_serial_dt_ids),
};
console_platform_driver(auart_serial_driver);
diff --git a/drivers/serial/serial_cadence.c b/drivers/serial/serial_cadence.c
index 36dfa20..0501c40 100644
--- a/drivers/serial/serial_cadence.c
+++ b/drivers/serial/serial_cadence.c
@@ -267,14 +267,6 @@ err_free:
return ret;
}
-static void cadence_serial_remove(struct device_d *dev)
-{
- struct cadence_serial_priv *priv = dev->priv;
-
- console_unregister(&priv->cdev);
- free(priv);
-}
-
static __maybe_unused struct of_device_id cadence_serial_dt_ids[] = {
{
.compatible = "xlnx,xuartps",
@@ -296,7 +288,6 @@ static struct platform_device_id cadence_serial_ids[] = {
static struct driver_d cadence_serial_driver = {
.name = "cadence_serial",
.probe = cadence_serial_probe,
- .remove = cadence_serial_remove,
.of_compatible = DRV_OF_COMPAT(cadence_serial_dt_ids),
.id_table = cadence_serial_ids,
};
diff --git a/drivers/serial/serial_clps711x.c b/drivers/serial/serial_clps711x.c
index ad14373..fa63423 100644
--- a/drivers/serial/serial_clps711x.c
+++ b/drivers/serial/serial_clps711x.c
@@ -181,15 +181,6 @@ out_err:
return err;
}
-static void clps711x_remove(struct device_d *dev)
-{
- struct clps711x_uart *s = dev->priv;
-
- clps711x_flush(&s->cdev);
- console_unregister(&s->cdev);
- free(s);
-}
-
static struct of_device_id __maybe_unused clps711x_uart_dt_ids[] = {
{ .compatible = "cirrus,clps711x-uart", },
};
@@ -197,7 +188,6 @@ static struct of_device_id __maybe_unused clps711x_uart_dt_ids[] = {
static struct driver_d clps711x_driver = {
.name = "clps711x-uart",
.probe = clps711x_probe,
- .remove = clps711x_remove,
.of_compatible = DRV_OF_COMPAT(clps711x_uart_dt_ids),
};
console_platform_driver(clps711x_driver);
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c
index e8c3836..c8af995 100644
--- a/drivers/serial/serial_imx.c
+++ b/drivers/serial/serial_imx.c
@@ -271,15 +271,6 @@ err_free:
return ret;
}
-static void imx_serial_remove(struct device_d *dev)
-{
- struct imx_serial_priv *priv = dev->priv;
-
- imx_serial_flush(&priv->cdev);
- console_unregister(&priv->cdev);
- free(priv);
-}
-
static __maybe_unused struct of_device_id imx_serial_dt_ids[] = {
{
.compatible = "fsl,imx1-uart",
@@ -313,7 +304,6 @@ static struct platform_device_id imx_serial_ids[] = {
static struct driver_d imx_serial_driver = {
.name = "imx_serial",
.probe = imx_serial_probe,
- .remove = imx_serial_remove,
.of_compatible = DRV_OF_COMPAT(imx_serial_dt_ids),
.id_table = imx_serial_ids,
};
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index 8f87f7b..f28035a 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -189,18 +189,6 @@ err_free:
return ret;
}
-static void lpuart_serial_remove(struct device_d *dev)
-{
- struct lpuart *lpuart = dev->priv;
-
- lpuart_serial_flush(&lpuart->cdev);
- console_unregister(&lpuart->cdev);
- release_region(lpuart->io);
- clk_put(lpuart->clk);
-
- free(lpuart);
-}
-
static struct of_device_id lpuart_serial_dt_ids[] = {
{ .compatible = "fsl,vf610-lpuart" },
{}
@@ -209,7 +197,6 @@ static struct of_device_id lpuart_serial_dt_ids[] = {
static struct driver_d lpuart_serial_driver = {
.name = "lpuart-serial",
.probe = lpuart_serial_probe,
- .remove = lpuart_serial_remove,
.of_compatible = DRV_OF_COMPAT(lpuart_serial_dt_ids),
};
console_platform_driver(lpuart_serial_driver);
diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c
index 1a4d7b4..a427437 100644
--- a/drivers/serial/serial_pxa.c
+++ b/drivers/serial/serial_pxa.c
@@ -185,17 +185,8 @@ static int pxa_serial_probe(struct device_d *dev)
return 0;
}
-static void pxa_serial_remove(struct device_d *dev)
-{
- struct pxa_serial_priv *priv = dev->priv;
-
- console_unregister(&priv->cdev);
- free(priv);
-}
-
static struct driver_d pxa_serial_driver = {
.name = "pxa_serial",
.probe = pxa_serial_probe,
- .remove = pxa_serial_remove,
};
console_platform_driver(pxa_serial_driver);
diff --git a/drivers/serial/serial_s3c.c b/drivers/serial/serial_s3c.c
index 0a6e22d..1945560 100644
--- a/drivers/serial/serial_s3c.c
+++ b/drivers/serial/serial_s3c.c
@@ -202,18 +202,8 @@ static int s3c_serial_probe(struct device_d *dev)
return 0;
}
-static void s3c_serial_remove(struct device_d *dev)
-{
- struct s3c_uart *priv= dev->priv;
-
- s3c_serial_flush(&priv->cdev);
- console_unregister(&priv->cdev);
- free(priv);
-}
-
static struct driver_d s3c_serial_driver = {
.name = "s3c_serial",
.probe = s3c_serial_probe,
- .remove = s3c_serial_remove,
};
console_platform_driver(s3c_serial_driver);
diff --git a/drivers/serial/stm-serial.c b/drivers/serial/stm-serial.c
index 83328f4..ea48241 100644
--- a/drivers/serial/stm-serial.c
+++ b/drivers/serial/stm-serial.c
@@ -182,15 +182,6 @@ static int stm_serial_probe(struct device_d *dev)
return 0;
}
-static void stm_serial_remove(struct device_d *dev)
-{
- struct stm_priv *priv = dev->priv;
-
- stm_serial_flush(&priv->cdev);
- console_unregister(&priv->cdev);
- free(priv);
-}
-
static __maybe_unused struct of_device_id stm_serial_dt_ids[] = {
{
.compatible = "arm,pl011",
@@ -202,7 +193,6 @@ static __maybe_unused struct of_device_id stm_serial_dt_ids[] = {
static struct driver_d stm_serial_driver = {
.name = "stm_serial",
.probe = stm_serial_probe,
- .remove = stm_serial_remove,
.of_compatible = DRV_OF_COMPAT(stm_serial_dt_ids),
};
console_platform_driver(stm_serial_driver);