Commit f88aafe5 authored by Sonic Zhang's avatar Sonic Zhang Committed by Wolfram Sang

i2c: i2c-bfin-twi: Move TWI peripheral pin request array to platform data.

Depend on commit cf93feb3Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent c9d87edb
...@@ -78,11 +78,6 @@ DEFINE_TWI_REG(XMT_DATA16, 0x84) ...@@ -78,11 +78,6 @@ DEFINE_TWI_REG(XMT_DATA16, 0x84)
DEFINE_TWI_REG(RCV_DATA8, 0x88) DEFINE_TWI_REG(RCV_DATA8, 0x88)
DEFINE_TWI_REG(RCV_DATA16, 0x8C) DEFINE_TWI_REG(RCV_DATA16, 0x8C)
static const u16 pin_req[2][3] = {
{P_TWI0_SCL, P_TWI0_SDA, 0},
{P_TWI1_SCL, P_TWI1_SDA, 0},
};
static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface, static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface,
unsigned short twi_int_status) unsigned short twi_int_status)
{ {
...@@ -712,7 +707,8 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev) ...@@ -712,7 +707,8 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
p_adap->timeout = 5 * HZ; p_adap->timeout = 5 * HZ;
p_adap->retries = 3; p_adap->retries = 3;
rc = peripheral_request_list(pin_req[pdev->id], "i2c-bfin-twi"); rc = peripheral_request_list((unsigned short *)pdev->dev.platform_data,
"i2c-bfin-twi");
if (rc) { if (rc) {
dev_err(&pdev->dev, "Can't setup pin mux!\n"); dev_err(&pdev->dev, "Can't setup pin mux!\n");
goto out_error_pin_mux; goto out_error_pin_mux;
...@@ -759,7 +755,7 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev) ...@@ -759,7 +755,7 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
free_irq(iface->irq, iface); free_irq(iface->irq, iface);
out_error_req_irq: out_error_req_irq:
out_error_no_irq: out_error_no_irq:
peripheral_free_list(pin_req[pdev->id]); peripheral_free_list((unsigned short *)pdev->dev.platform_data);
out_error_pin_mux: out_error_pin_mux:
iounmap(iface->regs_base); iounmap(iface->regs_base);
out_error_ioremap: out_error_ioremap:
...@@ -777,7 +773,7 @@ static int i2c_bfin_twi_remove(struct platform_device *pdev) ...@@ -777,7 +773,7 @@ static int i2c_bfin_twi_remove(struct platform_device *pdev)
i2c_del_adapter(&(iface->adap)); i2c_del_adapter(&(iface->adap));
free_irq(iface->irq, iface); free_irq(iface->irq, iface);
peripheral_free_list(pin_req[pdev->id]); peripheral_free_list((unsigned short *)pdev->dev.platform_data);
iounmap(iface->regs_base); iounmap(iface->regs_base);
kfree(iface); kfree(iface);
......
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