| Message ID | 1405068614-14279-1-git-send-email-u.kleine-koenig@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
On Fri, Jul 11, 2014 at 10:50:14AM +0200, Uwe Kleine-König wrote: > 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". > > Cc: Olof Johansson <olof@lixom.net> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Applied to for-next, thanks! If you think this is better suited in for-current, let me know.
On Thu, Jul 17, 2014 at 03:40:00PM +0200, Wolfram Sang wrote: > On Fri, Jul 11, 2014 at 10:50:14AM +0200, Uwe Kleine-König wrote: > > 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". > > > > Cc: Olof Johansson <olof@lixom.net> > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > Applied to for-next, thanks! If you think this is better suited in > for-current, let me know. I'm not in a hurry. If you take it it's fine for me. (BTW, I'm not sure i fI understand your branch naming. for-next means "targeting the next merge window" and for-current means "targeting the next release"? So for-next currently means 3.17-rc1?) Thanks Uwe
diff --git a/Documentation/devicetree/bindings/i2c/i2c-efm32.txt b/Documentation/devicetree/bindings/i2c/i2c-efm32.txt index fc15ac519437..50b25c3da186 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-efm32.txt +++ b/Documentation/devicetree/bindings/i2c/i2c-efm32.txt @@ -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"; diff --git a/drivers/i2c/busses/i2c-efm32.c b/drivers/i2c/busses/i2c-efm32.c index f7eccd682de9..10b8323b08d4 100644 --- a/drivers/i2c/busses/i2c-efm32.c +++ b/drivers/i2c/busses/i2c-efm32.c @@ -370,7 +370,13 @@ static int efm32_i2c_probe(struct platform_device *pdev) return 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) { dev_dbg(&pdev->dev, "using location %u\n", location); } else {
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". Cc: Olof Johansson <olof@lixom.net> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- Changes since (implicit) v1: - fix a wrong if condtion Documentation/devicetree/bindings/i2c/i2c-efm32.txt | 4 ++-- drivers/i2c/busses/i2c-efm32.c | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-)