aboutsummaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorGravatar Guanbing Huang <albanhuang@tencent.com> 2024-04-16 11:16:37 +0800
committerGravatar Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2024-04-17 13:14:30 +0200
commit18ba7f2d99f698251294fe9521da3f00d03f96aa (patch)
tree0031ebbeebe2e2df40a89b0ec35c774ef8fb3ec2 /drivers/tty
parentPNP: Add dev_is_pnp() macro (diff)
downloadlinux-18ba7f2d99f698251294fe9521da3f00d03f96aa.tar.gz
linux-18ba7f2d99f698251294fe9521da3f00d03f96aa.tar.bz2
linux-18ba7f2d99f698251294fe9521da3f00d03f96aa.zip
serial: port: Add support of PNP IRQ to __uart_read_properties()
The function __uart_read_properties doesn't cover PNP devices, so add IRQ processing for PNP devices in the branch. Signed-off-by: Guanbing Huang <albanhuang@tencent.com> Suggested-by: Andy Shevchenko <andriy.shevchenko@intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Bing Fan <tombinfan@tencent.com> Tested-by: Linheng Du <dylanlhdu@tencent.com> Link: https://lore.kernel.org/r/7f4ca31ef1cab4c6ecad22fafd82117686b696be.1713234515.git.albanhuang@tencent.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/serial_port.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/tty/serial/serial_port.c b/drivers/tty/serial/serial_port.c
index 3408c8827561..47dd8c3fd06d 100644
--- a/drivers/tty/serial/serial_port.c
+++ b/drivers/tty/serial/serial_port.c
@@ -11,6 +11,7 @@
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+#include <linux/pnp.h>
#include <linux/property.h>
#include <linux/serial_core.h>
#include <linux/spinlock.h>
@@ -221,7 +222,11 @@ static int __uart_read_properties(struct uart_port *port, bool use_defaults)
if (dev_is_platform(dev))
ret = platform_get_irq(to_platform_device(dev), 0);
- else
+ else if (dev_is_pnp(dev)) {
+ ret = pnp_irq(to_pnp_dev(dev), 0);
+ if (ret < 0)
+ ret = -ENXIO;
+ } else
ret = fwnode_irq_get(dev_fwnode(dev), 0);
if (ret == -EPROBE_DEFER)
return ret;