diff options
| author | Jens Taprogge <jens.taprogge@taprogge.org> | 2012-09-27 12:37:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-19 11:45:09 -0700 |
| commit | a19ad7d08744bd3ea6efeccbcddcc4a992bc6ac9 (patch) | |
| tree | 1483b19e7d85680e937f31a70154918244bda2e3 /drivers/staging/ipack | |
| parent | 6114aeaa731a489420912faee758e6af363be595 (diff) | |
Staging: ipack: Provide physical memory regions to IPack devices.
This will allow us to use the regular ioremop functions.
Signed-off-by: Jens Taprogge <jens.taprogge@taprogge.org>
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ipack')
| -rw-r--r-- | drivers/staging/ipack/bridges/tpci200.c | 22 | ||||
| -rw-r--r-- | drivers/staging/ipack/ipack.h | 6 |
2 files changed, 26 insertions, 2 deletions
diff --git a/drivers/staging/ipack/bridges/tpci200.c b/drivers/staging/ipack/bridges/tpci200.c index 84e1c273fd61..8428e3bfd1a1 100644 --- a/drivers/staging/ipack/bridges/tpci200.c +++ b/drivers/staging/ipack/bridges/tpci200.c @@ -28,6 +28,20 @@ static const u16 tpci200_status_error[] = { TPCI200_D_ERROR, }; +static const size_t tpci200_space_size[IPACK_SPACE_COUNT] = { + [IPACK_IO_SPACE] = TPCI200_IO_SPACE_SIZE, + [IPACK_ID_SPACE] = TPCI200_ID_SPACE_SIZE, + [IPACK_INT_SPACE] = TPCI200_INT_SPACE_SIZE, + [IPACK_MEM_SPACE] = TPCI200_MEM8_SPACE_SIZE, +}; + +static const size_t tpci200_space_interval[IPACK_SPACE_COUNT] = { + [IPACK_IO_SPACE] = TPCI200_IO_SPACE_INTERVAL, + [IPACK_ID_SPACE] = TPCI200_ID_SPACE_INTERVAL, + [IPACK_INT_SPACE] = TPCI200_INT_SPACE_INTERVAL, + [IPACK_MEM_SPACE] = TPCI200_MEM8_SPACE_INTERVAL, +}; + static struct tpci200_board *check_slot(struct ipack_device *dev) { struct tpci200_board *tpci200; @@ -642,6 +656,7 @@ static void tpci200_release_device(struct ipack_device *dev) static int tpci200_create_device(struct tpci200_board *tpci200, int i) { + enum ipack_space space; struct ipack_device *dev = kzalloc(sizeof(struct ipack_device), GFP_KERNEL); if (!dev) @@ -649,6 +664,13 @@ static int tpci200_create_device(struct tpci200_board *tpci200, int i) dev->slot = i; dev->bus = tpci200->info->ipack_bus; dev->release = tpci200_release_device; + + for (space = 0; space < IPACK_SPACE_COUNT; space++) { + dev->region[space].start = + tpci200->mod_mem[space] + + tpci200_space_interval[space] * i; + dev->region[space].size = tpci200_space_size[space]; + } return ipack_device_register(dev); } diff --git a/drivers/staging/ipack/ipack.h b/drivers/staging/ipack/ipack.h index a842eeaf5348..43d152a6e0e9 100644 --- a/drivers/staging/ipack/ipack.h +++ b/drivers/staging/ipack/ipack.h @@ -82,6 +82,7 @@ struct ipack_device { struct ipack_addr_space mem_space; struct device dev; void (*release) (struct ipack_device *dev); + struct ipack_region region[IPACK_SPACE_COUNT]; u8 *id; size_t id_avail; u32 id_vendor; @@ -195,8 +196,9 @@ void ipack_driver_unregister(struct ipack_driver *edrv); * * Register a new IPack device ("module" in IndustryPack jargon). The call * is done by the carrier driver. The carrier should populate the fields - * bus and slot of @dev prior to calling this function. The rest of the - * fields will be allocated and populated during registration. + * bus and slot as well as the region array of @dev prior to calling this + * function. The rest of the fields will be allocated and populated + * during registration. * * Return zero on success or error code on failure. */ |