diff options
-rw-r--r-- | Documentation/devicetree/bindings/serial/efm32-uart.txt | 4 | ||||
-rw-r--r-- | drivers/tty/serial/efm32-uart.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/serial/efm32-uart.txt b/Documentation/devicetree/bindings/serial/efm32-uart.txt index 1984bdfbd545..3ca01336b837 100644 --- a/Documentation/devicetree/bindings/serial/efm32-uart.txt +++ b/Documentation/devicetree/bindings/serial/efm32-uart.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | * Energymicro efm32 UART | 1 | * Energymicro efm32 UART |
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | - compatible : Should be "efm32,uart" | 4 | - compatible : Should be "energymicro,efm32-uart" |
5 | - reg : Address and length of the register set | 5 | - reg : Address and length of the register set |
6 | - interrupts : Should contain uart interrupt | 6 | - interrupts : Should contain uart interrupt |
7 | 7 | ||
@@ -13,7 +13,7 @@ Optional properties: | |||
13 | Example: | 13 | Example: |
14 | 14 | ||
15 | uart@0x4000c400 { | 15 | uart@0x4000c400 { |
16 | compatible = "efm32,uart"; | 16 | compatible = "energymicro,efm32-uart"; |
17 | reg = <0x4000c400 0x400>; | 17 | reg = <0x4000c400 0x400>; |
18 | interrupts = <15>; | 18 | interrupts = <15>; |
19 | efm32,location = <0>; | 19 | efm32,location = <0>; |
diff --git a/drivers/tty/serial/efm32-uart.c b/drivers/tty/serial/efm32-uart.c index 028582e924a5..c167a710dc39 100644 --- a/drivers/tty/serial/efm32-uart.c +++ b/drivers/tty/serial/efm32-uart.c | |||
@@ -798,6 +798,9 @@ static int efm32_uart_remove(struct platform_device *pdev) | |||
798 | 798 | ||
799 | static const struct of_device_id efm32_uart_dt_ids[] = { | 799 | static const struct of_device_id efm32_uart_dt_ids[] = { |
800 | { | 800 | { |
801 | .compatible = "energymicro,efm32-uart", | ||
802 | }, { | ||
803 | /* doesn't follow the "vendor,device" scheme, don't use */ | ||
801 | .compatible = "efm32,uart", | 804 | .compatible = "efm32,uart", |
802 | }, { | 805 | }, { |
803 | /* sentinel */ | 806 | /* sentinel */ |