Date:2010-02-24 15:23:10 (12 years 7 months ago)
Author:Colin Tuckley
Commit:b56ba8aa6f3aeab23d3d4b1190ed1098463b2a9c
Message:ARM: 5957/1: ARM: RealView SD/MMC Card detection and write-protect using GPIOLIB

The switch to using GPIOLIB broke the sd/mmc card detection on the
RealView development boards if GPIO_PL061 was not selected.
This patch selects GPIO_PL061 if GPIOLIB is selected.
The sense of the return value from mmc_status has also changed
and is corrected.

Signed-off-by: Colin Tuckley <colin.tuckley@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Files: arch/arm/Kconfig (1 diff)
arch/arm/mach-realview/core.c (1 diff)

Change Details

arch/arm/Kconfig
253253    select GENERIC_TIME
254254    select GENERIC_CLOCKEVENTS
255255    select ARCH_WANT_OPTIONAL_GPIOLIB
256    select GPIO_PL061 if GPIOLIB
256257    help
257258      This enables support for ARM Ltd RealView boards.
258259
arch/arm/mach-realview/core.c
254254    else
255255        mask = 2;
256256
257    return readl(REALVIEW_SYSMCI) & mask;
257    return !(readl(REALVIEW_SYSMCI) & mask);
258258}
259259
260260struct mmci_platform_data realview_mmc0_plat_data = {

Archive Download the corresponding diff file



interactive