提交 74be65a3 编写于 作者: U Uwe Kleine-König 提交者: Greg Kroah-Hartman

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: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 58dea357
...@@ -6,7 +6,7 @@ Required properties: ...@@ -6,7 +6,7 @@ Required properties:
- interrupts : Should contain uart interrupt - interrupts : Should contain uart interrupt
Optional properties: Optional properties:
- location : Decides the location of the USART I/O pins. - efm32,location : Decides the location of the USART I/O pins.
Allowed range : [0 .. 5] Allowed range : [0 .. 5]
Default: 0 Default: 0
...@@ -16,5 +16,5 @@ uart@0x4000c400 { ...@@ -16,5 +16,5 @@ uart@0x4000c400 {
compatible = "efm32,uart"; compatible = "efm32,uart";
reg = <0x4000c400 0x400>; reg = <0x4000c400 0x400>;
interrupts = <15>; interrupts = <15>;
location = <0>; efm32,location = <0>;
}; };
...@@ -671,6 +671,9 @@ static int efm32_uart_probe_dt(struct platform_device *pdev, ...@@ -671,6 +671,9 @@ static int efm32_uart_probe_dt(struct platform_device *pdev,
if (!np) if (!np)
return 1; return 1;
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); ret = of_property_read_u32(np, "location", &location);
if (!ret) { if (!ret) {
if (location > 5) { if (location > 5) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册