Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 281ec367 authored Jul 11, 2014 by Uwe Kleine-König Committed by Wolfram Sang Jul 17, 2014

i2c: efm32: correct namespacing of location property

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: Wolfram Sang <wsa@the-dreams.de>

parent 290025d9

Documentation/devicetree/bindings/i2c/i2c-efm32.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ Required properties :
		Recommended properties :

		- clock-frequency : maximal I2C bus clock frequency in Hz.
		- efm32,location : Decides the location of the USART I/O pins.
		- energymicro,location : Decides the location of the USART I/O pins.
		Allowed range : [0 .. 6]

		Example:
		@@ -23,7 +23,7 @@ Example:
		clocks = <&cmu clk_HFPERCLKI2C0>;
		clock-frequency = <100000>;
		status = "ok";
		efm32,location = <3>;
		energymicro,location = <3>;

		eeprom@50 {
		compatible = "microchip,24c02";

drivers/i2c/busses/i2c-efm32.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -370,7 +370,13 @@ static int efm32_i2c_probe(struct platform_device *pdev)
		return ret;
		}


		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) {
		dev_dbg(&pdev->dev, "using location %u\n", location);
		} else {