mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
ARM: OMAP2+: Disable code that currently does not work with multiplaform
We still need to fix up few places for multiplatform support, but that can proceed separately. Fix the issue by making the problem drivers depends !ARCH_MULTIPLATFORM for now. The remaining pieces that are not multiplatform compatible for omap2+ SoCs are: 1. Some drivers are using custom omap_dm_timer calls There are two drivers that are directly usign omap hardware timers for PWM and DSP clocking: drivers/media/rc/ir-rx51.c and drivers/staging/tidspbridge/core/dsp-clock.c. These can be fixed for multiplatform by allowing a minimal set of hardware timers to be accessed, and for some functionality by using the hrtimer framework. 2. Hardware OMAP4_ERRATA_I688 needs to be fixed up This can't be enabled for multiplatform configurations in it's current form. It may be possible to fix it up to do instruction replacement early on during init. Luckily it looks like this errata does not seem to get hit with mainline kernel code alone at least currently. 3. Legacy header needed for omap-sham.c Looks like it still needs mach/irqs.h for omap1 that does not exist for multiplatform systems. Just ifdef it for now. 4. Mailbox is waiting to get moved to drivers Disable it for now to avoid adding a dependency to the mailbox patches. Cc: Timo Kokkonen <timo.t.kokkonen@iki.fi> Cc: Sean Young <sean@mess.org> Cc: "Víctor Manuel Jáquez Leal" <vjaquez@igalia.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Mauro Carvalho Chehab <mchehab@redhat.com> Cc: Omar Ramirez Luna <omar.ramirez@ti.com> Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> [tony@atomide.com: updated to disable mailbox] Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
808b7e0746
commit
a62a6e98c3
5 changed files with 7 additions and 4 deletions
|
@ -397,7 +397,7 @@ config OMAP3_SDRC_AC_TIMING
|
||||||
|
|
||||||
config OMAP4_ERRATA_I688
|
config OMAP4_ERRATA_I688
|
||||||
bool "OMAP4 errata: Async Bridge Corruption"
|
bool "OMAP4 errata: Async Bridge Corruption"
|
||||||
depends on ARCH_OMAP4
|
depends on ARCH_OMAP4 && !ARCH_MULTIPLATFORM
|
||||||
select ARCH_HAS_BARRIERS
|
select ARCH_HAS_BARRIERS
|
||||||
help
|
help
|
||||||
If a data is stalled inside asynchronous bridge because of back
|
If a data is stalled inside asynchronous bridge because of back
|
||||||
|
|
|
@ -118,7 +118,7 @@ config OMAP_MUX_WARNINGS
|
||||||
|
|
||||||
config OMAP_MBOX_FWK
|
config OMAP_MBOX_FWK
|
||||||
tristate "Mailbox framework support"
|
tristate "Mailbox framework support"
|
||||||
depends on ARCH_OMAP
|
depends on ARCH_OMAP && !ARCH_MULTIPLATFORM
|
||||||
help
|
help
|
||||||
Say Y here if you want to use OMAP Mailbox framework support for
|
Say Y here if you want to use OMAP Mailbox framework support for
|
||||||
DSP, IVA1.0 and IVA2 in OMAP1/2/3.
|
DSP, IVA1.0 and IVA2 in OMAP1/2/3.
|
||||||
|
|
|
@ -38,7 +38,10 @@
|
||||||
#include <crypto/internal/hash.h>
|
#include <crypto/internal/hash.h>
|
||||||
|
|
||||||
#include <linux/omap-dma.h>
|
#include <linux/omap-dma.h>
|
||||||
|
|
||||||
|
#ifdef CONFIG_ARCH_OMAP1
|
||||||
#include <mach/irqs.h>
|
#include <mach/irqs.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#define SHA_REG_DIGEST(x) (0x00 + ((x) * 0x04))
|
#define SHA_REG_DIGEST(x) (0x00 + ((x) * 0x04))
|
||||||
#define SHA_REG_DIN(x) (0x1C + ((x) * 0x04))
|
#define SHA_REG_DIN(x) (0x1C + ((x) * 0x04))
|
||||||
|
|
|
@ -291,7 +291,7 @@ config IR_TTUSBIR
|
||||||
|
|
||||||
config IR_RX51
|
config IR_RX51
|
||||||
tristate "Nokia N900 IR transmitter diode"
|
tristate "Nokia N900 IR transmitter diode"
|
||||||
depends on OMAP_DM_TIMER && LIRC
|
depends on OMAP_DM_TIMER && LIRC && !ARCH_MULTIPLATFORM
|
||||||
---help---
|
---help---
|
||||||
Say Y or M here if you want to enable support for the IR
|
Say Y or M here if you want to enable support for the IR
|
||||||
transmitter diode built in the Nokia N900 (RX51) device.
|
transmitter diode built in the Nokia N900 (RX51) device.
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
menuconfig TIDSPBRIDGE
|
menuconfig TIDSPBRIDGE
|
||||||
tristate "DSP Bridge driver"
|
tristate "DSP Bridge driver"
|
||||||
depends on ARCH_OMAP3
|
depends on ARCH_OMAP3 && !ARCH_MULTIPLATFORM
|
||||||
select OMAP_MBOX_FWK
|
select OMAP_MBOX_FWK
|
||||||
help
|
help
|
||||||
DSP/BIOS Bridge is designed for platforms that contain a GPP and
|
DSP/BIOS Bridge is designed for platforms that contain a GPP and
|
||||||
|
|
Loading…
Reference in a new issue