summaryrefslogtreecommitdiff
path: root/arch/arm/mach-nomadik/board-nhk8815.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-01-05 00:29:31 +0100
committerLinus Walleij <linus.walleij@linaro.org>2013-01-28 23:23:44 +0100
commitf8635abd38776a413d1e84c79353693b8ecf45c9 (patch)
tree335410b72facf10dac9bbd53aeafd570eb4dd538 /arch/arm/mach-nomadik/board-nhk8815.c
parenta352d85adbe8ed0c5c8c69e3ea0ee1833b3ee27e (diff)
ARM: nomadik: initial devicetree support
Support basic device tree boot on the Nomadik. Implement the support in the cpu file with the intent of deleting the board files later. At this stage IRQ controllers, system timer, l2x0 cache, UARTs and thus console boot is fully functional. Patch out the code adding devices by initcalls for now so as not to disturb the boot. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-nomadik/board-nhk8815.c')
-rw-r--r--arch/arm/mach-nomadik/board-nhk8815.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c
index 72ec3fad2ba6..d152d7bdf411 100644
--- a/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@ -204,6 +204,10 @@ static int __init nhk8815_mmcsd_init(void)
{
int ret;
+ /* For e.g. devicetree boot */
+ if (!machine_is_nomadik())
+ return 0;
+
ret = gpio_request(112, "card detect bias");
if (ret)
return ret;