Commit da36cadf authored by Jeremy Kerr's avatar Jeremy Kerr Committed by Greg Kroah-Hartman

drivers/fsi: expose direct-access slave API

Allow drivers to access the slave address ranges.
Signed-off-by: default avatarJeremy Kerr <jk@ozlabs.org>
Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
Signed-off-by: default avatarChristopher Bostic <cbostic@linux.vnet.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 125739cb
...@@ -78,10 +78,6 @@ static int fsi_master_read(struct fsi_master *master, int link, ...@@ -78,10 +78,6 @@ static int fsi_master_read(struct fsi_master *master, int link,
uint8_t slave_id, uint32_t addr, void *val, size_t size); uint8_t slave_id, uint32_t addr, void *val, size_t size);
static int fsi_master_write(struct fsi_master *master, int link, static int fsi_master_write(struct fsi_master *master, int link,
uint8_t slave_id, uint32_t addr, const void *val, size_t size); uint8_t slave_id, uint32_t addr, const void *val, size_t size);
static int fsi_slave_read(struct fsi_slave *slave, uint32_t addr,
void *val, size_t size);
static int fsi_slave_write(struct fsi_slave *slave, uint32_t addr,
const void *val, size_t size);
/* /*
* fsi_device_read() / fsi_device_write() / fsi_device_peek() * fsi_device_read() / fsi_device_write() / fsi_device_peek()
...@@ -174,7 +170,7 @@ static int fsi_slave_calc_addr(struct fsi_slave *slave, uint32_t *addrp, ...@@ -174,7 +170,7 @@ static int fsi_slave_calc_addr(struct fsi_slave *slave, uint32_t *addrp,
return 0; return 0;
} }
static int fsi_slave_read(struct fsi_slave *slave, uint32_t addr, int fsi_slave_read(struct fsi_slave *slave, uint32_t addr,
void *val, size_t size) void *val, size_t size)
{ {
uint8_t id = slave->id; uint8_t id = slave->id;
...@@ -187,8 +183,9 @@ static int fsi_slave_read(struct fsi_slave *slave, uint32_t addr, ...@@ -187,8 +183,9 @@ static int fsi_slave_read(struct fsi_slave *slave, uint32_t addr,
return fsi_master_read(slave->master, slave->link, id, return fsi_master_read(slave->master, slave->link, id,
addr, val, size); addr, val, size);
} }
EXPORT_SYMBOL_GPL(fsi_slave_read);
static int fsi_slave_write(struct fsi_slave *slave, uint32_t addr, int fsi_slave_write(struct fsi_slave *slave, uint32_t addr,
const void *val, size_t size) const void *val, size_t size)
{ {
uint8_t id = slave->id; uint8_t id = slave->id;
...@@ -201,6 +198,27 @@ static int fsi_slave_write(struct fsi_slave *slave, uint32_t addr, ...@@ -201,6 +198,27 @@ static int fsi_slave_write(struct fsi_slave *slave, uint32_t addr,
return fsi_master_write(slave->master, slave->link, id, return fsi_master_write(slave->master, slave->link, id,
addr, val, size); addr, val, size);
} }
EXPORT_SYMBOL_GPL(fsi_slave_write);
extern int fsi_slave_claim_range(struct fsi_slave *slave,
uint32_t addr, uint32_t size)
{
if (addr + size < addr)
return -EINVAL;
if (addr + size > slave->size)
return -EINVAL;
/* todo: check for overlapping claims */
return 0;
}
EXPORT_SYMBOL_GPL(fsi_slave_claim_range);
extern void fsi_slave_release_range(struct fsi_slave *slave,
uint32_t addr, uint32_t size)
{
}
EXPORT_SYMBOL_GPL(fsi_slave_release_range);
static int fsi_slave_scan(struct fsi_slave *slave) static int fsi_slave_scan(struct fsi_slave *slave)
{ {
......
...@@ -66,6 +66,18 @@ extern void fsi_driver_unregister(struct fsi_driver *fsi_drv); ...@@ -66,6 +66,18 @@ extern void fsi_driver_unregister(struct fsi_driver *fsi_drv);
module_driver(__fsi_driver, fsi_driver_register, \ module_driver(__fsi_driver, fsi_driver_register, \
fsi_driver_unregister) fsi_driver_unregister)
/* direct slave API */
extern int fsi_slave_claim_range(struct fsi_slave *slave,
uint32_t addr, uint32_t size);
extern void fsi_slave_release_range(struct fsi_slave *slave,
uint32_t addr, uint32_t size);
extern int fsi_slave_read(struct fsi_slave *slave, uint32_t addr,
void *val, size_t size);
extern int fsi_slave_write(struct fsi_slave *slave, uint32_t addr,
const void *val, size_t size);
extern struct bus_type fsi_bus_type; extern struct bus_type fsi_bus_type;
#endif /* LINUX_FSI_H */ #endif /* LINUX_FSI_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment