diff options
| -rw-r--r-- | Documentation/devicetree/bindings/spi/efm32-spi.txt | 4 | ||||
| -rw-r--r-- | drivers/spi/spi-efm32.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/spi/efm32-spi.txt b/Documentation/devicetree/bindings/spi/efm32-spi.txt index 25c02ba530da..8f081c96a4fa 100644 --- a/Documentation/devicetree/bindings/spi/efm32-spi.txt +++ b/Documentation/devicetree/bindings/spi/efm32-spi.txt | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | Required properties: | 3 | Required properties: |
| 4 | - #address-cells: see spi-bus.txt | 4 | - #address-cells: see spi-bus.txt |
| 5 | - #size-cells: see spi-bus.txt | 5 | - #size-cells: see spi-bus.txt |
| 6 | - compatible: should be "efm32,spi" | 6 | - compatible: should be "energymicro,efm32-spi" |
| 7 | - reg: Offset and length of the register set for the controller | 7 | - reg: Offset and length of the register set for the controller |
| 8 | - interrupts: pair specifying rx and tx irq | 8 | - interrupts: pair specifying rx and tx irq |
| 9 | - clocks: phandle to the spi clock | 9 | - clocks: phandle to the spi clock |
| @@ -15,7 +15,7 @@ Example: | |||
| 15 | spi1: spi@0x4000c400 { /* USART1 */ | 15 | spi1: spi@0x4000c400 { /* USART1 */ |
| 16 | #address-cells = <1>; | 16 | #address-cells = <1>; |
| 17 | #size-cells = <0>; | 17 | #size-cells = <0>; |
| 18 | compatible = "efm32,spi"; | 18 | compatible = "energymicro,efm32-spi"; |
| 19 | reg = <0x4000c400 0x400>; | 19 | reg = <0x4000c400 0x400>; |
| 20 | interrupts = <15 16>; | 20 | interrupts = <15 16>; |
| 21 | clocks = <&cmu 20>; | 21 | clocks = <&cmu 20>; |
diff --git a/drivers/spi/spi-efm32.c b/drivers/spi/spi-efm32.c index fdb6fce0530b..4a5a359dafca 100644 --- a/drivers/spi/spi-efm32.c +++ b/drivers/spi/spi-efm32.c | |||
| @@ -471,6 +471,9 @@ static int efm32_spi_remove(struct platform_device *pdev) | |||
| 471 | 471 | ||
| 472 | static const struct of_device_id efm32_spi_dt_ids[] = { | 472 | static const struct of_device_id efm32_spi_dt_ids[] = { |
| 473 | { | 473 | { |
| 474 | .compatible = "energymicro,efm32-spi", | ||
| 475 | }, { | ||
| 476 | /* doesn't follow the "vendor,device" scheme, don't use */ | ||
| 474 | .compatible = "efm32,spi", | 477 | .compatible = "efm32,spi", |
| 475 | }, { | 478 | }, { |
| 476 | /* sentinel */ | 479 | /* sentinel */ |
