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

Commit d36f47fa authored Jul 11, 2014 by Uwe Kleine-König Committed by Greg Kroah-Hartman Jul 11, 2014

serial: 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".

Cc: Olof Johansson <olof@lixom.net>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 68252424

Documentation/devicetree/bindings/serial/efm32-uart.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@ Required properties:
	- interrupts : Should contain uart interrupt		- interrupts : Should contain uart interrupt

	Optional properties:		Optional properties:
	- 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 .. 5]		Allowed range : [0 .. 5]
	Default: 0		Default: 0

	@@ -16,5 +16,5 @@ uart@0x4000c400 {
	compatible = "energymicro,efm32-uart";		compatible = "energymicro,efm32-uart";
	reg = <0x4000c400 0x400>;		reg = <0x4000c400 0x400>;
	interrupts = <15>;		interrupts = <15>;
	efm32,location = <0>;		energymicro,location = <0>;
	};		};

drivers/tty/serial/efm32-uart.c

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -665,10 +665,16 @@ static int efm32_uart_probe_dt(struct platform_device *pdev,
	if (!np)		if (!np)
	return 1;		return 1;

			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);		ret = of_property_read_u32(np, "efm32,location", &location);

	if (ret)		if (ret)
	/* fall back to old and (wrongly) generic property "location" */		/* 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) {
	dev_err(&pdev->dev, "invalid location\n");		dev_err(&pdev->dev, "invalid location\n");