| Message ID | 1395759110-10747-1-git-send-email-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 12f6dd860cf8bf036c0bec38c00a53da71bcd43a |
| Headers | show |
On Tue, Mar 25, 2014 at 03:51:50PM +0100, Uwe Kleine-König wrote: > Wolfgang Sang pointed out that "efm32,$device" is non-standard. So use the > common scheme and prefix device with "efm32-". The old compatible string > is left in place until arch/arm/boot/dts/efm32* is fixed. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> "Wolfram" please, next time. No need to resend, though. Acked-by: Wolfram Sang <wsa@the-dreams.de>
On Tue, Mar 25, 2014 at 03:51:50PM +0100, Uwe Kleine-König wrote: > Wolfgang Sang pointed out that "efm32,$device" is non-standard. So use the > common scheme and prefix device with "efm32-". The old compatible string > is left in place until arch/arm/boot/dts/efm32* is fixed. Applied, thanks.
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 @@ Required properties: - #address-cells: see spi-bus.txt - #size-cells: see spi-bus.txt -- compatible: should be "efm32,spi" +- compatible: should be "energymicro,efm32-spi" - reg: Offset and length of the register set for the controller - interrupts: pair specifying rx and tx irq - clocks: phandle to the spi clock @@ -15,7 +15,7 @@ Example: spi1: spi@0x4000c400 { /* USART1 */ #address-cells = <1>; #size-cells = <0>; - compatible = "efm32,spi"; + compatible = "energymicro,efm32-spi"; reg = <0x4000c400 0x400>; interrupts = <15 16>; clocks = <&cmu 20>; diff --git a/drivers/spi/spi-efm32.c b/drivers/spi/spi-efm32.c index daa73358f92d..d02f28b56041 100644 --- a/drivers/spi/spi-efm32.c +++ b/drivers/spi/spi-efm32.c @@ -490,6 +490,9 @@ static int efm32_spi_remove(struct platform_device *pdev) static const struct of_device_id efm32_spi_dt_ids[] = { { + .compatible = "energymicro,efm32-spi", + }, { + /* doesn't follow the "vendor,device" scheme, don't use */ .compatible = "efm32,spi", }, { /* sentinel */
Wolfgang Sang pointed out that "efm32,$device" is non-standard. So use the common scheme and prefix device with "efm32-". The old compatible string is left in place until arch/arm/boot/dts/efm32* is fixed. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- Changes since (implicit) v1, sent with Message-id: 1395756019-23989-1-git-send-email-u.kleine-koenig@pengutronix.de: - fix binding doc accordingly Documentation/devicetree/bindings/spi/efm32-spi.txt | 4 ++-- drivers/spi/spi-efm32.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-)