From 43417e99d59c7b13cb92691c3ba500996210cfcd Mon Sep 17 00:00:00 2001
From: Lucas Russo <lerwys@gmail.com>
Date: Wed, 20 Apr 2016 09:13:45 -0300
Subject: [PATCH] fmc250m_4ch: fix wrong SMIO base address
---
src/sm_io/modules/fmc250m_4ch/sm_io_fmc250m_4ch_core.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/sm_io/modules/fmc250m_4ch/sm_io_fmc250m_4ch_core.c b/src/sm_io/modules/fmc250m_4ch/sm_io_fmc250m_4ch_core.c
index 43a7c742..5272d66d 100644
--- a/src/sm_io/modules/fmc250m_4ch/sm_io_fmc250m_4ch_core.c
+++ b/src/sm_io/modules/fmc250m_4ch/sm_io_fmc250m_4ch_core.c
@@ -44,6 +44,7 @@ smio_fmc250m_4ch_t * smio_fmc250m_4ch_new (smio_t *parent)
smio_fmc250m_4ch_t *self = (smio_fmc250m_4ch_t *) zmalloc (sizeof *self);
ASSERT_ALLOC(self, err_self_alloc);
uint32_t inst_id = smio_get_inst_id (parent);
+ uint64_t base = smio_get_base (parent);
/* Check if Instance ID is within our expected limits */
ASSERT_TEST(inst_id < NUM_FMC250M_4CH_SMIOS, "Number of FMC250M_4CH SMIOs instances exceeded",
@@ -139,13 +140,13 @@ smio_fmc250m_4ch_t * smio_fmc250m_4ch_new (smio_t *parent)
_smio_fmc250m_4ch_set_type (self, 0x0);
DBE_DEBUG (DBG_SM_IO | DBG_LVL_TRACE, "[sm_io:fmc250m_4ch_core] Registering FMC_ADC_COMMON SMIO\n");
- smio_register_sm (parent, 0x2403f569, FMC_250M_FMC_ADC_COMMON_OFFS, inst_id);
+ smio_register_sm (parent, 0x2403f569, base | FMC_250M_FMC_ADC_COMMON_OFFS, inst_id);
/* Now, initialize the FMC250M_4CH with the appropriate structures*/
if (self->type == TYPE_FMC250M_4CH_ACTIVE) {
DBE_DEBUG (DBG_SM_IO | DBG_LVL_TRACE, "[sm_io:fmc250m_4ch_core] Active Board detected. "
"Registering FMC_ADC_ACTIVE SMIO\n");
- smio_register_sm (parent, 0x88c67d9c, FMC_250M_FMC_ACTIVE_CLK_OFFS, inst_id);
+ smio_register_sm (parent, 0x88c67d9c, base | FMC_250M_FMC_ACTIVE_CLK_OFFS, inst_id);
}
else { /* PASSIVE or Unsupported*/
if (self->type != TYPE_FMC250M_4CH_PASSIVE) {
--
GitLab