diff options
| author | Benoit Cousson <b-cousson@ti.com> | 2012-01-20 17:15:58 +0400 |
|---|---|---|
| committer | Benoit Cousson <b-cousson@ti.com> | 2012-03-12 17:58:25 +0400 |
| commit | efcf1e502012cc2cc9ee8165fa0a7679725c525c (patch) | |
| tree | aaa5d13b9884c1889e3f29ae2a8d0cc4bf067ed9 /arch/arm/mach-omap2/devices.c | |
| parent | 385a64bbc2d2c3ef864190b010c74afc5b850195 (diff) | |
| download | linux-efcf1e502012cc2cc9ee8165fa0a7679725c525c.tar.xz | |
arm/dts: OMAP4: Add SPI controller nodes
Add the 4 McSPI controller nodes present in an OMAP4 device.
Remove SPI static device initialisation if DT is populated.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 283d11eae693..8a489ba68714 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -725,7 +725,9 @@ static int __init omap2_init_devices(void) omap_init_dmic(); omap_init_camera(); omap_init_mbox(); - omap_init_mcspi(); + /* If dtb is there, the devices will be created dynamically */ + if (!of_have_populated_dt()) + omap_init_mcspi(); omap_init_pmu(); omap_hdq_init(); omap_init_sti(); |