Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

arm/dts: OMAP4: Add SPI controller nodes

Browse source 
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>
This commit is contained in:
Benoit Cousson 2012-01-20 14:15:58 +01:00
parent 385a64bbc2
commit efcf1e5020
2 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
arch/arm/boot/dts/omap4.dtsi
View file

@ -209,5 +209,37 @@
#size-cells = <0>; #size-cells = <0>;
ti,hwmods = "i2c4"; ti,hwmods = "i2c4";
}; };
mcspi1: spi@48098000 {
compatible = "ti,omap4-mcspi";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "mcspi1";
ti,spi-num-cs = <4>;
};
mcspi2: spi@4809a000 {
compatible = "ti,omap4-mcspi";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "mcspi2";
ti,spi-num-cs = <2>;
};
mcspi3: spi@480b8000 {
compatible = "ti,omap4-mcspi";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "mcspi3";
ti,spi-num-cs = <2>;
};
mcspi4: spi@480ba000 {
compatible = "ti,omap4-mcspi";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "mcspi4";
ti,spi-num-cs = <1>;
};
}; };
}; };

4
arch/arm/mach-omap2/devices.c
View file

@ -725,7 +725,9 @@ static int __init omap2_init_devices(void)
omap_init_dmic(); omap_init_dmic();
omap_init_camera(); omap_init_camera();
omap_init_mbox(); 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_init_pmu();
omap_hdq_init(); omap_hdq_init();
omap_init_sti(); omap_init_sti();