diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 13:34:21 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-24 11:29:52 +0000 |
| commit | 07be45f57ebe037977c8033a008e9012617b1915 (patch) | |
| tree | a3b7f11eb00c78e5817c68412cad0e412a5c55db /arch/arm/common | |
| parent | ARM: sa1111: change devid to be a bitmask (diff) | |
| download | linux-dev-07be45f57ebe037977c8033a008e9012617b1915.tar.xz linux-dev-07be45f57ebe037977c8033a008e9012617b1915.zip | |
ARM: sa1111: provide a generic way to prevent devices from registering
Some platforms don't want certain devices to be registered, because,
eg, the interface is not wired. Provide a way for platforms to
prevent various devices from being registered via a devid bitmask in
the platform data.
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/sa1111.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 4bdf1bb283dc..17694cf64aa6 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -833,11 +833,8 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) g_sa1111 = sachip; has_devs = ~0; - if (machine_is_assabet() || machine_is_jornada720() || - machine_is_badge4()) - has_devs &= ~SA1111_DEVID_PS2_MSE; - else - has_devs &= ~SA1111_DEVID_SAC; + if (pd) + has_devs &= ~pd->disable_devs; for (i = 0; i < ARRAY_SIZE(sa1111_devices); i++) if (sa1111_devices[i].devid & has_devs) |