diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2011-12-20 08:18:45 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:07:05 +0200 |
| commit | 2cf4e6c90e9eaa52e1e5d6160868e5232ff21fad (patch) | |
| tree | ef90030a64764ddbe19398757877481c8aa4fe78 | |
| parent | 221530527fe2428ba7c8171a9ddd0ed6582b7ee8 (diff) | |
drivers: stagning: nmf-cm: Always assume db v2.0 or later
Remove check for pre v2.0 db8500 since pre v2.0 hardware is no longer supported.
ST-Ericsson Linux next: -
ST-Ericsson ID: 370799
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I62ac40e8b8f34a3142465e5dde988704fb07095e
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/43187
Reviewed-by: QABUILD
Reviewed-by: Pierre PEIFFER <pierre.peiffer@stericsson.com>
| -rw-r--r-- | drivers/staging/nmf-cm/cmld.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/drivers/staging/nmf-cm/cmld.c b/drivers/staging/nmf-cm/cmld.c index 53e07cd3137..60c20cadaee 100644 --- a/drivers/staging/nmf-cm/cmld.c +++ b/drivers/staging/nmf-cm/cmld.c @@ -582,12 +582,10 @@ static long cmld_control_ioctl(struct file *file, unsigned int cmd, unsigned lon t_uint32 nmfversion = NMF_VERSION; return copy_to_user((void*)arg, &nmfversion, sizeof(nmfversion)); } - case CM_PRIV_GETBOARDVERSION: - if (cpu_is_u8500v20_or_later()) { - enum board_version v = U8500_V2; - return copy_to_user((void*)arg, &v, sizeof(v)); - } else - return -EINVAL; + case CM_PRIV_GETBOARDVERSION: { + enum board_version v = U8500_V2; + return copy_to_user((void*)arg, &v, sizeof(v)); + } case CM_PRIV_ISCOMPONENTCACHEEMPTY: if (CM_ENGINE_IsComponentCacheEmpty()) return 0; @@ -1207,14 +1205,10 @@ static int __init cmld_init_module(void) err = -EIO; prcmu_base = __io_address(U8500_PRCMU_BASE); - if (cpu_is_u8500v20_or_later()) { - /* power on a clock/timer 90KHz used on SVA */ - htim_base = ioremap_nocache(U8500_CR_BASE /*0xA03C8000*/, SZ_4K); - prcmu_tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE); - } else { - pr_err("CM: Unsupported chip version\n"); - goto out; - } + + /* power on a clock/timer 90KHz used on SVA */ + htim_base = ioremap_nocache(U8500_CR_BASE /*0xA03C8000*/, SZ_4K); + prcmu_tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE); /* Activate SVA 90 KHz timer */ if (htim_base == NULL) |