powerpc: Fix sound driver use of i2c
PATCH 1/1 powerpc: Fix sound driver use of i2c
The PowerMac sound drivers used to rely on a "bug" of the i2c-keywest driver that implemented I2C_SMBUS_BLOCK_DATA incorrectly, that is it did what I2C_SMBUS_I2C_BLOCK_DATA should have done. The new i2c-powermac driver that replaces keywest has this bug fixed, thus the sound drivers must be fixed too.
Signed-off-by Benjamin Herrenschmidt <[email protected]>
sound/ppc/tumbler.c +10 -9
@@ -239,8 +239,8 @@ block[4 ] = (right_vol >>8 ) &0xff ; block[5 ] = (right_vol >>0 ) &0xff ; -if (i2c_smbus_write_block_data (mix->i2c.client,TAS_REG_VOL , -6 , block) <0 ) { +if (i2c_smbus_write_i2c_block_data (mix->i2c.client,TAS_REG_VOL ,6 , + block) <0 ) {snd_printk ("failed to set volume \n" );return -EINVAL ; }
@@ -345,8 +345,8 @@ val[1 ] =0 ; } -if (i2c_smbus_write_block_data (mix->i2c.client,TAS_REG_DRC , -2 , val) <0 ) { +if (i2c_smbus_write_i2c_block_data (mix->i2c.client,TAS_REG_DRC , +2 , val) <0 ) {snd_printk ("failed to set DRC\n" );return -EINVAL ; }
@@ -381,8 +381,8 @@ val[4 ] =0x60 ; val[5 ] =0xa0 ; -if (i2c_smbus_write_block_data (mix->i2c.client,TAS_REG_DRC , -6 , val) <0 ) { +if (i2c_smbus_write_i2c_block_data (mix->i2c.client,TAS_REG_DRC , +6 , val) <0 ) {snd_printk ("failed to set DRC\n" );return -EINVAL ; }
@@ -492,8 +492,8 @@ vol = info->table[vol];for (i =0 ; i < info->bytes; i++) block[i] = (vol >> ((info->bytes - i -1 ) *8 )) &0xff ; -if (i2c_smbus_write_block_data (mix->i2c.client, info->reg, - info->bytes, block) <0 ) { +if (i2c_smbus_write_i2c_block_data (mix->i2c.client, info->reg, + info->bytes, block) <0 ) {snd_printk ("failed to set mono volume %d\n" , info->index);return -EINVAL ; }
@@ -625,7 +625,8 @@for (j =0 ; j <3 ; j++) block[i *3 + j] = (vol >> ((2 - j) *8 )) &0xff ; } -if (i2c_smbus_write_block_data (mix->i2c.client, reg,9 , block) <0 ) { +if (i2c_smbus_write_i2c_block_data (mix->i2c.client, reg, +9 , block) <0 ) {snd_printk ("failed to set mono volume %d\n" , reg);return -EINVAL ; }
sound/ppc/pmac.c +2 -1
@@ -66,7 +66,7 @@static void snd_pmac_dbdma_free (struct snd_pmac *chip,struct pmac_dbdma *rec) { -if (rec) { +if (rec->space) {unsigned int rsize =sizeof (struct dbdma_cmd ) * (rec->size +1 );dma_free_coherent (&chip->pdev->dev, rsize, rec->space, rec->dma_base);
@@ -881,6 +881,7 @@ chip->can_capture =1 ; chip->num_freqs =ARRAY_SIZE (awacs_freqs); chip->freq_table = awacs_freqs; + chip->pdev =NULL ; chip->control_mask =MASK_IEPC |MASK_IEE |0x11 ;/* default */
sound/oss/dmasound/tas_common.h +8 -8
@@ -178,10 +178,10 @@if (write_mode &WRITE_SHADOW )memcpy (self->shadow[reg_num],data,reg_width);if (write_mode &WRITE_HW ) { - rc=i2c_smbus_write_block_data (self->client, - reg_num, - reg_width, - data); + rc=i2c_smbus_write_i2c_block_data (self->client, + reg_num, + reg_width, + data);if (rc <0 ) {printk ("tas: I2C block write failed \n" );return rc;
@@ -199,10 +199,10 @@if (reg_width==0 || self==NULL )return -EINVAL ; - rc=i2c_smbus_write_block_data (self->client, - reg_num, - reg_width, - self->shadow[reg_num]); + rc=i2c_smbus_write_i2c_block_data (self->client, + reg_num, + reg_width, + self->shadow[reg_num]);if (rc <0 ) {printk ("tas: I2C block write failed \n" );return rc;