Commit b56ba8aa authored by Colin Tuckley's avatar Colin Tuckley Committed by Russell King

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: default avatarColin Tuckley <colin.tuckley@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0ad70740
...@@ -253,6 +253,7 @@ config ARCH_REALVIEW ...@@ -253,6 +253,7 @@ config ARCH_REALVIEW
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select ARCH_WANT_OPTIONAL_GPIOLIB select ARCH_WANT_OPTIONAL_GPIOLIB
select GPIO_PL061 if GPIOLIB
help help
This enables support for ARM Ltd RealView boards. This enables support for ARM Ltd RealView boards.
......
...@@ -254,7 +254,7 @@ static unsigned int realview_mmc_status(struct device *dev) ...@@ -254,7 +254,7 @@ static unsigned int realview_mmc_status(struct device *dev)
else else
mask = 2; mask = 2;
return readl(REALVIEW_SYSMCI) & mask; return !(readl(REALVIEW_SYSMCI) & mask);
} }
struct mmci_platform_data realview_mmc0_plat_data = { struct mmci_platform_data realview_mmc0_plat_data = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment