From 82af06a42af15aabbfc3c0ce6e262e1d4eca3472 Mon Sep 17 00:00:00 2001
From: Christian Helmuth <christian.helmuth@genode-labs.com>
Date: Wed, 21 Jun 2017 12:15:54 +0200
Subject: [PATCH] sd_card: enable wand_quad/imx6 again

---
 repos/os/src/drivers/sd_card/spec/imx/driver.cc   | 11 -----------
 repos/os/src/drivers/sd_card/spec/imx/driver.h    |  3 +--
 repos/os/src/drivers/sd_card/spec/imx53/driver.cc | 12 ++++++++++++
 repos/os/src/drivers/sd_card/spec/imx6/driver.cc  | 12 ++++++++++++
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/repos/os/src/drivers/sd_card/spec/imx/driver.cc b/repos/os/src/drivers/sd_card/spec/imx/driver.cc
index 4dadb12cc6..17db392675 100644
--- a/repos/os/src/drivers/sd_card/spec/imx/driver.cc
+++ b/repos/os/src/drivers/sd_card/spec/imx/driver.cc
@@ -234,17 +234,6 @@ void Driver::write_dma(Block::sector_t           blk_nr,
 }
 
 
-Driver::Driver(Env &env)
-:
-	Driver_base(env.ram()),
-	Attached_mmio(env, Imx53::SDHC_MMIO_BASE, Imx53::SDHC_MMIO_SIZE),
-	_env(env)
-{
-	log("SD card detected");
-	log("capacity: ", card_info().capacity_mb(), " MiB");
-}
-
-
 int Driver::_prepare_dma_mb(Block::Packet_descriptor packet,
                           bool                     reading,
                           size_t                   blk_cnt,
diff --git a/repos/os/src/drivers/sd_card/spec/imx/driver.h b/repos/os/src/drivers/sd_card/spec/imx/driver.h
index 7d9502b49a..81dc3296a1 100644
--- a/repos/os/src/drivers/sd_card/spec/imx/driver.h
+++ b/repos/os/src/drivers/sd_card/spec/imx/driver.h
@@ -15,7 +15,6 @@
 #define _DRIVER_H_
 
 /* Genode includes */
-#include <drivers/defs/imx53.h>
 #include <timer_session/connection.h>
 #include <irq_session/connection.h>
 #include <os/attached_mmio.h>
@@ -216,7 +215,7 @@ class Sd_card::Driver : public  Driver_base,
 		Timer_delayer           _delayer;
 		Signal_handler<Driver>  _irq_handler { _env.ep(), *this,
 		                                       &Driver::_handle_irq };
-		Irq_connection          _irq         { Imx53::SDHC_IRQ };
+		Irq_connection          _irq;
 		Card_info               _card_info   { _init() };
 		Adma2::Table            _adma2_table { _env.ram() };
 
diff --git a/repos/os/src/drivers/sd_card/spec/imx53/driver.cc b/repos/os/src/drivers/sd_card/spec/imx53/driver.cc
index 3efef6a9b2..4e7dd70a19 100644
--- a/repos/os/src/drivers/sd_card/spec/imx53/driver.cc
+++ b/repos/os/src/drivers/sd_card/spec/imx53/driver.cc
@@ -13,6 +13,7 @@
 
 /* local includes */
 #include <driver.h>
+#include <drivers/defs/imx53.h>
 
 using namespace Sd_card;
 using namespace Genode;
@@ -117,3 +118,14 @@ void Driver::_clock_finish(Clock clock)
 
 void Driver::_disable_clock_preparation() { }
 void Driver::_enable_clock_finish() { }
+
+
+Driver::Driver(Env &env)
+:
+	Driver_base(env.ram()),
+	Attached_mmio(env, Imx53::SDHC_MMIO_BASE, Imx53::SDHC_MMIO_SIZE),
+	_env(env), _irq(Imx53::SDHC_IRQ)
+{
+	log("SD card detected");
+	log("capacity: ", card_info().capacity_mb(), " MiB");
+}
diff --git a/repos/os/src/drivers/sd_card/spec/imx6/driver.cc b/repos/os/src/drivers/sd_card/spec/imx6/driver.cc
index 18c0a8fbd6..ee79301130 100644
--- a/repos/os/src/drivers/sd_card/spec/imx6/driver.cc
+++ b/repos/os/src/drivers/sd_card/spec/imx6/driver.cc
@@ -13,6 +13,7 @@
 
 /* local includes */
 #include <driver.h>
+#include <drivers/defs/imx6.h>
 
 using namespace Sd_card;
 using namespace Genode;
@@ -115,3 +116,14 @@ void Driver::_disable_clock_preparation() {
 	Mmio::write<Vendspec::Frc_sdclk_on>(0); }
 
 void Driver::_enable_clock_finish() { Mmio::write<Vendspec::Frc_sdclk_on>(0); }
+
+
+Driver::Driver(Env &env)
+:
+	Driver_base(env.ram()),
+	Attached_mmio(env, Imx6::SDHC_MMIO_BASE, Imx6::SDHC_MMIO_SIZE),
+	_env(env), _irq(Imx6::SDHC_IRQ)
+{
+	log("SD card detected");
+	log("capacity: ", card_info().capacity_mb(), " MiB");
+}