diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-05-05 16:54:33 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-05-05 16:54:33 +0200 |
| commit | 59991da498122f779434c4e0beac8a69e0322938 (patch) | |
| tree | 23e46bc7f355c6d65f3246f756cd8ef84cfc3030 /Documentation/devicetree/bindings/serial/efm32-uart.txt | |
| parent | ALSA: fm801: introduce fm801_ac97_is_ready()/fm801_ac97_is_valid() helpers (diff) | |
| parent | ALSA: hda - hdmi: Set converter channel count even without sink (diff) | |
| download | linux-59991da498122f779434c4e0beac8a69e0322938.tar.xz linux-59991da498122f779434c4e0beac8a69e0322938.zip | |
Merge branch 'for-linus' into for-next
... for applying the further HDMI fixes.
Diffstat (limited to 'Documentation/devicetree/bindings/serial/efm32-uart.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/serial/efm32-uart.txt | 4 |
1 files changed, 2 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 @@ * Energymicro efm32 UART Required properties: -- compatible : Should be "efm32,uart" +- compatible : Should be "energymicro,efm32-uart" - reg : Address and length of the register set - interrupts : Should contain uart interrupt @@ -13,7 +13,7 @@ Optional properties: Example: uart@0x4000c400 { - compatible = "efm32,uart"; + compatible = "energymicro,efm32-uart"; reg = <0x4000c400 0x400>; interrupts = <15>; efm32,location = <0>; |