spi: efm32: correct namespacing of location property
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 11 Jul 2014 08:17:57 +0000 (10:17 +0200)
committerMark Brown <broonie@linaro.org>
Fri, 11 Jul 2014 12:39:36 +0000 (13:39 +0100)
Olof Johansson pointed out that usually the company name is picked as
namespace prefix to specific properties. So expect "energymicro,location"
but fall back to the previously introduced name "efm32,location".

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Documentation/devicetree/bindings/spi/efm32-spi.txt
drivers/spi/spi-efm32.c

index 130cd17e3680d825777d52e464b8a28e3597b9b8..750e29aff9bc529ba721a3c842fd85ec37e1e132 100644 (file)
@@ -10,11 +10,12 @@ Required properties:
 - cs-gpios: see spi-bus.txt
 
 Recommended properties :
-- efm32,location: Value to write to the ROUTE register's LOCATION bitfield to
-                  configure the pinmux for the device, see datasheet for values.
-                  If "efm32,location" property is not provided, keeping what is
-                  already configured in the hardware, so its either the reset
-                  default 0 or whatever the bootloader did.
+- energymicro,location: Value to write to the ROUTE register's LOCATION
+                        bitfield to configure the pinmux for the device, see
+                        datasheet for values.
+                        If this property is not provided, keeping what is
+                        already configured in the hardware, so its either the
+                        reset default 0 or whatever the bootloader did.
 
 Example:
 
@@ -26,7 +27,7 @@ spi1: spi@0x4000c400 { /* USART1 */
        interrupts = <15 16>;
        clocks = <&cmu 20>;
        cs-gpios = <&gpio 51 1>; // D3
-       efm32,location = <1>;
+       energymicro,location = <1>;
        status = "ok";
 
        ks8851@0 {
index be44a3eeb5e8b2b244704a48a4c2fc4184b45aa0..6caeb1cac0f35c1d19657521508a36a8293ad5cc 100644 (file)
@@ -294,10 +294,16 @@ static void efm32_spi_probe_dt(struct platform_device *pdev,
        u32 location;
        int ret;
 
-       ret = of_property_read_u32(np, "efm32,location", &location);
+       ret = of_property_read_u32(np, "energymicro,location", &location);
+
+       if (ret)
+               /* fall back to wrongly namespaced property */
+               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) {
                dev_dbg(&pdev->dev, "using location %u\n", location);
        } else {