ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-01 15:10:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sd_card: enable wand_quad/imx6 again

Browse Source
This commit is contained in:
Christian Helmuth 2017-06-21 12:15:54 +02:00 committed by Norman Feske
parent ad824cea11
commit 82af06a42a
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
repos/os/src/drivers/sd_card/spec/imx/driver.cc
View File

@ -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, int Driver::_prepare_dma_mb(Block::Packet_descriptor packet,
bool reading, bool reading,
size_t blk_cnt, size_t blk_cnt,

3
repos/os/src/drivers/sd_card/spec/imx/driver.h
View File

@ -15,7 +15,6 @@
#define _DRIVER_H_ #define _DRIVER_H_
/* Genode includes */ /* Genode includes */
#include <drivers/defs/imx53.h>
#include <timer_session/connection.h> #include <timer_session/connection.h>
#include <irq_session/connection.h> #include <irq_session/connection.h>
#include <os/attached_mmio.h> #include <os/attached_mmio.h>
@ -216,7 +215,7 @@ class Sd_card::Driver : public Driver_base,
Timer_delayer _delayer; Timer_delayer _delayer;
Signal_handler<Driver> _irq_handler { _env.ep(), *this, Signal_handler<Driver> _irq_handler { _env.ep(), *this,
&Driver::_handle_irq }; &Driver::_handle_irq };
Irq_connection _irq { Imx53::SDHC_IRQ }; Irq_connection _irq;
Card_info _card_info { _init() }; Card_info _card_info { _init() };
Adma2::Table _adma2_table { _env.ram() }; Adma2::Table _adma2_table { _env.ram() };

12
repos/os/src/drivers/sd_card/spec/imx53/driver.cc
View File

@ -13,6 +13,7 @@
/* local includes */ /* local includes */
#include <driver.h> #include <driver.h>
#include <drivers/defs/imx53.h>
using namespace Sd_card; using namespace Sd_card;
using namespace Genode; using namespace Genode;
@ -117,3 +118,14 @@ void Driver::_clock_finish(Clock clock)
void Driver::_disable_clock_preparation() { } void Driver::_disable_clock_preparation() { }
void Driver::_enable_clock_finish() { } 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");
}

12
repos/os/src/drivers/sd_card/spec/imx6/driver.cc
View File

@ -13,6 +13,7 @@
/* local includes */ /* local includes */
#include <driver.h> #include <driver.h>
#include <drivers/defs/imx6.h>
using namespace Sd_card; using namespace Sd_card;
using namespace Genode; using namespace Genode;
@ -115,3 +116,14 @@ void Driver::_disable_clock_preparation() {
Mmio::write<Vendspec::Frc_sdclk_on>(0); } Mmio::write<Vendspec::Frc_sdclk_on>(0); }
void Driver::_enable_clock_finish() { 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");
}