serial: efm32: properly namespace location property

While reviewing an i2c driver for efm32 that needs a similar property
Wolfram Sang pointed out that "location" is a too generic name for something
that is efm32 specific. So add an appropriate namespace and fall back to the
generic name in case of failure.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/tty/serial/efm32-uart.c b/drivers/tty/serial/efm32-uart.c
index 0eb5b5673ede..028582e924a5 100644
--- a/drivers/tty/serial/efm32-uart.c
+++ b/drivers/tty/serial/efm32-uart.c
@@ -671,7 +671,10 @@ static int efm32_uart_probe_dt(struct platform_device *pdev,
         if (!np)
                 return 1;
 
-        ret = of_property_read_u32(np, "location", &location);
+        ret = of_property_read_u32(np, "efm32,location", &location);
+        if (ret)
+                /* fall back to old and (wrongly) generic property "location" */
+                ret = of_property_read_u32(np, "location", &location);
         if (!ret) {
                 if (location > 5) {
                         dev_err(&pdev->dev, "invalid location\n");