From 4d11b7e5a81a2fd9e97986c3d1c2d76f25ce8f20 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Wed, 21 Jun 2017 11:36:29 +0200 Subject: [PATCH] sd_card: move defs from wand_quad to imx6 header --- repos/base/include/drivers/defs/imx6.h | 28 +++++++++++++++++++++ repos/base/include/drivers/defs/wand_quad.h | 11 ++++---- 2 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 repos/base/include/drivers/defs/imx6.h diff --git a/repos/base/include/drivers/defs/imx6.h b/repos/base/include/drivers/defs/imx6.h new file mode 100644 index 0000000000..c4934336d9 --- /dev/null +++ b/repos/base/include/drivers/defs/imx6.h @@ -0,0 +1,28 @@ +/* + * \brief MMIO and IRQ definitions common to i.MX6 SoC + * \author Nikolay Golikov + * \author Josef Soentgen + * \author Martin Stein + * \date 2017-06-20 + */ + +/* + * Copyright (C) 2017 Genode Labs GmbH + * + * This file is part of the Genode OS framework, which is distributed + * under the terms of the GNU Affero General Public License version 3. + */ + +#ifndef _INCLUDE__DRIVERS__DEFS__IMX6_H_ +#define _INCLUDE__DRIVERS__DEFS__IMX6_H_ + +namespace Imx6 { + enum { + /* SD host controller */ + SDHC_IRQ = 54, + SDHC_MMIO_BASE = 0x02190000, + SDHC_MMIO_SIZE = 0x00004000, + }; +}; + +#endif /* _INCLUDE__DRIVERS__DEFS__IMX6_H_ */ diff --git a/repos/base/include/drivers/defs/wand_quad.h b/repos/base/include/drivers/defs/wand_quad.h index 58eafdb132..714f6a69c7 100644 --- a/repos/base/include/drivers/defs/wand_quad.h +++ b/repos/base/include/drivers/defs/wand_quad.h @@ -17,7 +17,13 @@ #ifndef _INCLUDE__DRIVERS__DEFS__WAND_QUAD_H_ #define _INCLUDE__DRIVERS__DEFS__WAND_QUAD_H_ +/* Genode includes */ +#include + namespace Wand_quad { + + using namespace Imx6; + enum { /* normal RAM */ RAM0_BASE = 0x10000000, @@ -31,11 +37,6 @@ namespace Wand_quad { UART_1_MMIO_BASE = 0x02020000, UART_1_MMIO_SIZE = 0x00004000, - /* SD host controller */ - SDHC_IRQ = 54, - SDHC_MMIO_BASE = 0x02190000, - SDHC_MMIO_SIZE = 0x00004000, - /* timer */ EPIT_2_IRQ = 89, EPIT_2_MMIO_BASE = 0x020d4000,