forked from luck/tmp_suning_uos_patched
drivers/fsi/scom: Remove reset before every putscom
Reset causes problems for operations requiring multiple scoms (e.g. i2c over scom). Instead, reset scom engine during probe. Signed-off-by: Edward A. James <eajames@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
061c0958de
commit
47a6623b2d
|
@ -57,12 +57,6 @@ static int put_scom(struct scom_device *scom_dev, uint64_t value,
|
|||
int rc;
|
||||
uint32_t data;
|
||||
|
||||
data = cpu_to_be32(SCOM_RESET_CMD);
|
||||
rc = fsi_device_write(scom_dev->fsi_dev, SCOM_RESET_REG, &data,
|
||||
sizeof(uint32_t));
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
data = cpu_to_be32((value >> 32) & 0xffffffff);
|
||||
rc = fsi_device_write(scom_dev->fsi_dev, SCOM_DATA0_REG, &data,
|
||||
sizeof(uint32_t));
|
||||
|
@ -186,6 +180,7 @@ static const struct file_operations scom_fops = {
|
|||
|
||||
static int scom_probe(struct device *dev)
|
||||
{
|
||||
uint32_t data;
|
||||
struct fsi_device *fsi_dev = to_fsi_dev(dev);
|
||||
struct scom_device *scom;
|
||||
|
||||
|
@ -202,6 +197,9 @@ static int scom_probe(struct device *dev)
|
|||
scom->mdev.parent = dev;
|
||||
list_add(&scom->link, &scom_devices);
|
||||
|
||||
data = cpu_to_be32(SCOM_RESET_CMD);
|
||||
fsi_device_write(fsi_dev, SCOM_RESET_REG, &data, sizeof(uint32_t));
|
||||
|
||||
return misc_register(&scom->mdev);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user