diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2014-03-14 16:34:22 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-14 16:36:48 -0400 |
commit | f2bb31057a42cb439161066db615ca73e4438e30 (patch) | |
tree | afd2f5399cbcb4d64b933ff72d8ba90099d838c3 /drivers/spi/spi-efm32.c | |
parent | f9f4cbde587335515acaaef9e23028fc0a616292 (diff) |
spi: 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: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi-efm32.c')
-rw-r--r-- | drivers/spi/spi-efm32.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/spi/spi-efm32.c b/drivers/spi/spi-efm32.c index 0512fedf1f13..fdb6fce0530b 100644 --- a/drivers/spi/spi-efm32.c +++ b/drivers/spi/spi-efm32.c | |||
@@ -294,7 +294,10 @@ static void efm32_spi_probe_dt(struct platform_device *pdev, | |||
294 | u32 location; | 294 | u32 location; |
295 | int ret; | 295 | int ret; |
296 | 296 | ||
297 | ret = of_property_read_u32(np, "location", &location); | 297 | ret = of_property_read_u32(np, "efm32,location", &location); |
298 | if (ret) | ||
299 | /* fall back to old and (wrongly) generic property "location" */ | ||
300 | ret = of_property_read_u32(np, "location", &location); | ||
298 | if (!ret) { | 301 | if (!ret) { |
299 | dev_dbg(&pdev->dev, "using location %u\n", location); | 302 | dev_dbg(&pdev->dev, "using location %u\n", location); |
300 | } else { | 303 | } else { |