From: Hugo Villeneuve <hvilleneuve@xxxxxxxxxxxx>
Vendor prefix "nxp," will be added in an upcoming commit to DT binding
property "irda-mode-ports".
Prepare to recognize this new property "nxp,irda-mode-ports" and
retain backward compatibility with old DTBs by falling back to
"irda-mode-ports" when needed.
Signed-off-by: Hugo Villeneuve <hvilleneuve@xxxxxxxxxxxx>
---
drivers/tty/serial/sc16is7xx.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index db2bb1c0d36c..b0154e901358 100644
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
@@ -1415,13 +1415,19 @@ static void sc16is7xx_setup_irda_ports(struct sc16is7xx_port *s)
int count;
u32 irda_port[2];
struct device *dev = s->p[0].port.dev;
+ const char *prop_name = "nxp,irda-mode-ports";
+
+ count = device_property_count_u32(dev, prop_name);
+ if (count < 0) {
+ /* For backward compatibility with old DTBs. */
+ prop_name = "irda-mode-ports";
+ count = device_property_count_u32(dev, prop_name);
+ }
- count = device_property_count_u32(dev, "irda-mode-ports");
if (count < 0 || count > ARRAY_SIZE(irda_port))
return;
- ret = device_property_read_u32_array(dev, "irda-mode-ports",
- irda_port, count);
+ ret = device_property_read_u32_array(dev, prop_name, irda_port, count);
if (ret)
return;
--
2.30.2
