diff options
author | Tony Lindgren <tony@atomide.com> | 2018-11-08 18:32:24 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2018-11-08 18:32:24 +0100 |
commit | 91e43395820baad80248987608216c35da9df65b (patch) | |
tree | 29d41d1a036eb1abd6a60f16ad37aa578acd8159 /arch/arm/boot/dts/imx28-apf28dev.dts | |
parent | ARM: OMAP2+: prm44xx: Fix section annotation on omap44xx_prm_enable_io_wakeup (diff) | |
parent | ARM: OMAP1: ams-delta: Fix possible use of uninitialized field (diff) | |
download | linux-91e43395820baad80248987608216c35da9df65b.tar.xz linux-91e43395820baad80248987608216c35da9df65b.zip |
Merge branch 'fixes-dts' into omap-for-v4.20/fixes
Diffstat (limited to 'arch/arm/boot/dts/imx28-apf28dev.dts')
-rw-r--r-- | arch/arm/boot/dts/imx28-apf28dev.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx28-apf28dev.dts b/arch/arm/boot/dts/imx28-apf28dev.dts index c4fadbc1b400..8df5ec470376 100644 --- a/arch/arm/boot/dts/imx28-apf28dev.dts +++ b/arch/arm/boot/dts/imx28-apf28dev.dts @@ -18,7 +18,7 @@ apb@80000000 { apbh@80000000 { - ssp0: ssp@80010000 { + ssp0: spi@80010000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_4bit_pins_a @@ -27,7 +27,7 @@ status = "okay"; }; - ssp2: ssp@80014000 { + ssp2: spi@80014000 { compatible = "fsl,imx28-spi"; pinctrl-names = "default"; pinctrl-0 = <&spi2_pins_a>; |