leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spi: efm32: use $vendor,$device scheme for compatible string

Browse Source 
Wolfram 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>
Acked-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org
This commit is contained in:
Uwe Kleine-König 2014-03-25 15:51:50 +01:00 committed by Mark Brown
parent f2bb31057a
commit 12f6dd860c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/devicetree/bindings/spi/efm32-spi.txt
View File

@ -3,7 +3,7 @@
Required properties: Required properties:
- #address-cells: see spi-bus.txt - #address-cells: see spi-bus.txt
- #size-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 - reg: Offset and length of the register set for the controller
- interrupts: pair specifying rx and tx irq - interrupts: pair specifying rx and tx irq
- clocks: phandle to the spi clock - clocks: phandle to the spi clock
@ -15,7 +15,7 @@ Example:
spi1: spi@0x4000c400 { /* USART1 */ spi1: spi@0x4000c400 { /* USART1 */
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "efm32,spi"; compatible = "energymicro,efm32-spi";
reg = <0x4000c400 0x400>; reg = <0x4000c400 0x400>;
interrupts = <15 16>; interrupts = <15 16>;
clocks = <&cmu 20>; clocks = <&cmu 20>;

3
drivers/spi/spi-efm32.c
View File

@ -471,6 +471,9 @@ static int efm32_spi_remove(struct platform_device *pdev)
static const struct of_device_id efm32_spi_dt_ids[] = { 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", .compatible = "efm32,spi",
}, { }, {
/* sentinel */ /* sentinel */