Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

USB: ohci-nxp: Remove i2c_write(), use smbus

Browse source 
This patch removes the re-coded i2c_write function from the ohci-nxp driver
in favour of using just smbus functions.

Signed-off-by: Roland Stigge <stigge@antcom.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Roland Stigge 2012-03-12 22:54:52 +01:00 committed by Greg Kroah-Hartman
parent 53dc25ada6
commit a6a36008d7
1 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
drivers/usb/host/ohci-nxp.c
View file

@ -149,38 +149,36 @@ static struct i2c_driver isp1301_driver = {
.id_table = isp1301_id, .id_table = isp1301_id,
}; };
static void i2c_write(u8 buf, u8 subaddr)
{
char tmpbuf[2];
tmpbuf[0] = subaddr; /*register number */
tmpbuf[1] = buf; /*register data */
i2c_master_send(isp1301_i2c_client, &tmpbuf[0], 2);
}
static void isp1301_configure_pnx4008(void) static void isp1301_configure_pnx4008(void)
{ {
/* PNX4008 only supports DAT_SE0 USB mode */ /* PNX4008 only supports DAT_SE0 USB mode */
/* PNX4008 R2A requires setting the MAX603 to output 3.6V */ /* PNX4008 R2A requires setting the MAX603 to output 3.6V */
/* Power up externel charge-pump */ /* Power up externel charge-pump */
i2c_write(MC1_DAT_SE0 | MC1_SPEED_REG, ISP1301_I2C_MODE_CONTROL_1); i2c_smbus_write_byte_data(isp1301_i2c_client,
i2c_write(~(MC1_DAT_SE0 | MC1_SPEED_REG), ISP1301_I2C_MODE_CONTROL_1, MC1_DAT_SE0 | MC1_SPEED_REG);
ISP1301_I2C_MODE_CONTROL_1 | ISP1301_I2C_REG_CLEAR_ADDR); i2c_smbus_write_byte_data(isp1301_i2c_client,
i2c_write(MC2_BI_DI | MC2_PSW_EN | MC2_SPD_SUSP_CTRL, ISP1301_I2C_MODE_CONTROL_1 | ISP1301_I2C_REG_CLEAR_ADDR,
ISP1301_I2C_MODE_CONTROL_2); ~(MC1_DAT_SE0 | MC1_SPEED_REG));
i2c_write(~(MC2_BI_DI | MC2_PSW_EN | MC2_SPD_SUSP_CTRL), i2c_smbus_write_byte_data(isp1301_i2c_client,
ISP1301_I2C_MODE_CONTROL_2 | ISP1301_I2C_REG_CLEAR_ADDR); ISP1301_I2C_MODE_CONTROL_2,
i2c_write(OTG1_DM_PULLDOWN | OTG1_DP_PULLDOWN, MC2_BI_DI | MC2_PSW_EN | MC2_SPD_SUSP_CTRL);
ISP1301_I2C_OTG_CONTROL_1); i2c_smbus_write_byte_data(isp1301_i2c_client,
i2c_write(~(OTG1_DM_PULLDOWN | OTG1_DP_PULLDOWN), ISP1301_I2C_MODE_CONTROL_2 | ISP1301_I2C_REG_CLEAR_ADDR,
ISP1301_I2C_OTG_CONTROL_1 | ISP1301_I2C_REG_CLEAR_ADDR); ~(MC2_BI_DI | MC2_PSW_EN | MC2_SPD_SUSP_CTRL));
i2c_write(0xFF, i2c_smbus_write_byte_data(isp1301_i2c_client,
ISP1301_I2C_INTERRUPT_LATCH | ISP1301_I2C_REG_CLEAR_ADDR); ISP1301_I2C_OTG_CONTROL_1, OTG1_DM_PULLDOWN | OTG1_DP_PULLDOWN);
i2c_write(0xFF, i2c_smbus_write_byte_data(isp1301_i2c_client,
ISP1301_I2C_INTERRUPT_FALLING | ISP1301_I2C_REG_CLEAR_ADDR); ISP1301_I2C_OTG_CONTROL_1 | ISP1301_I2C_REG_CLEAR_ADDR,
i2c_write(0xFF, ~(OTG1_DM_PULLDOWN | OTG1_DP_PULLDOWN));
ISP1301_I2C_INTERRUPT_RISING | ISP1301_I2C_REG_CLEAR_ADDR); i2c_smbus_write_byte_data(isp1301_i2c_client,
ISP1301_I2C_INTERRUPT_LATCH | ISP1301_I2C_REG_CLEAR_ADDR, 0xFF);
i2c_smbus_write_byte_data(isp1301_i2c_client,
ISP1301_I2C_INTERRUPT_FALLING | ISP1301_I2C_REG_CLEAR_ADDR,
0xFF);
i2c_smbus_write_byte_data(isp1301_i2c_client,
ISP1301_I2C_INTERRUPT_RISING | ISP1301_I2C_REG_CLEAR_ADDR,
0xFF);
} }
static void isp1301_configure_lpc32xx(void) static void isp1301_configure_lpc32xx(void)
@ -242,13 +240,15 @@ static void isp1301_configure(void)
static inline void isp1301_vbus_on(void) static inline void isp1301_vbus_on(void)
{ {
i2c_write(OTG1_VBUS_DRV, ISP1301_I2C_OTG_CONTROL_1); i2c_smbus_write_byte_data(isp1301_i2c_client, ISP1301_I2C_OTG_CONTROL_1,
OTG1_VBUS_DRV);
} }
static inline void isp1301_vbus_off(void) static inline void isp1301_vbus_off(void)
{ {
i2c_write(OTG1_VBUS_DRV, i2c_smbus_write_byte_data(isp1301_i2c_client,
ISP1301_I2C_OTG_CONTROL_1 | ISP1301_I2C_REG_CLEAR_ADDR); ISP1301_I2C_OTG_CONTROL_1 | ISP1301_I2C_REG_CLEAR_ADDR,
OTG1_VBUS_DRV);
} }
static void nxp_start_hc(void) static void nxp_start_hc(void)