summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cc810de)
raw | patch | inline | side by side (parent: cc810de)
author | Vaibhav Bedia <vaibhav.bedia@ti.com> | |
Tue, 20 Dec 2011 11:18:39 +0000 (16:48 +0530) | ||
committer | Vaibhav Hiremath <hvaibhav@ti.com> | |
Mon, 23 Jan 2012 19:14:42 +0000 (00:44 +0530) |
Remove some of the platform devices which either do
not exist or are not being used right now.
Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com>
not exist or are not being used right now.
Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com>
arch/arm/mach-omap2/devices.c | patch | blob | history |
index 9dcb188d634323e4310a734aaca2079eca40897b..8d43913f10d25bb9bd3b525c92740a70eb9440c6 100644 (file)
* To avoid code running on other OMAPs in
* multi-omap builds
*/
- if (!(cpu_is_omap34xx()))
+ if (!(cpu_is_omap34xx()) || (cpu_is_am33xx()))
return -ENODEV;
l = snprintf(oh_name, L3_MODULES_MAX_LEN, "l3_main");
{
platform_device_register(&omap_mcbsp1);
platform_device_register(&omap_mcbsp2);
- if (cpu_is_omap243x() || cpu_is_omap34xx() || cpu_is_omap44xx()) {
+ if ((cpu_is_omap243x() || cpu_is_omap34xx() || cpu_is_omap44xx()) &&
+ !cpu_is_am33xx()) {
platform_device_register(&omap_mcbsp3);
platform_device_register(&omap_mcbsp4);
}
- if (cpu_is_omap243x() || cpu_is_omap34xx())
+ if ((cpu_is_omap243x() || cpu_is_omap34xx()) && !cpu_is_am33xx())
platform_device_register(&omap_mcbsp5);
platform_device_register(&omap_pcm);
{
if (cpu_is_omap24xx())
omap_pmu_device.resource = &omap2_pmu_resource;
- else if (cpu_is_omap34xx())
+ else if (cpu_is_omap34xx() && !cpu_is_am33xx())
omap_pmu_device.resource = &omap3_pmu_resource;
else
return;
if (cpu_is_omap24xx()) {
sham_device.resource = omap2_sham_resources;
sham_device.num_resources = omap2_sham_resources_sz;
- } else if (cpu_is_omap34xx()) {
+ } else if (cpu_is_omap34xx() && !cpu_is_am33xx()) {
sham_device.resource = omap3_sham_resources;
sham_device.num_resources = omap3_sham_resources_sz;
} else {
if (cpu_is_omap24xx()) {
aes_device.resource = omap2_aes_resources;
aes_device.num_resources = omap2_aes_resources_sz;
- } else if (cpu_is_omap34xx()) {
+ } else if (cpu_is_omap34xx() && !cpu_is_am33xx()) {
aes_device.resource = omap3_aes_resources;
aes_device.num_resources = omap3_aes_resources_sz;
} else {