diff options
| author | Raphaël Poggi <poggi.raph@gmail.com> | 2014-09-24 14:57:04 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-09-25 08:10:56 +0200 |
| commit | a0ca2c13f60f53149e1996e1798f04112c0b986c (patch) | |
| tree | 48b614eec1573ab297d3d5bb104d84f86287191f /drivers/i2c | |
| parent | ccc282fb1b4f745f8fe14a01227393cdaa075e9e (diff) | |
| download | barebox-a0ca2c13f60f53149e1996e1798f04112c0b986c.tar.gz barebox-a0ca2c13f60f53149e1996e1798f04112c0b986c.tar.xz | |
i2c: at91: add support of device tree
Signed-off-by: Raphaël Poggi <poggi.raph@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-at91.c | 41 |
1 files changed, 34 insertions, 7 deletions
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c index 9490822d05..a2236edd3c 100644 --- a/drivers/i2c/busses/i2c-at91.c +++ b/drivers/i2c/busses/i2c-at91.c @@ -376,18 +376,44 @@ static struct platform_device_id at91_twi_devtypes[] = { } }; +static struct of_device_id at91_twi_dt_ids[] = { + { + .compatible = "atmel,at91rm9200-i2c", + .data = (unsigned long) &at91rm9200_config, + } , { + .compatible = "atmel,at91sam9260-i2c", + .data = (unsigned long) &at91sam9260_config, + } , { + .compatible = "atmel,at91sam9261-i2c", + .data = (unsigned long) &at91sam9261_config, + } , { + .compatible = "atmel,at91sam9g20-i2c", + .data = (unsigned long) &at91sam9g20_config, + } , { + .compatible = "atmel,at91sam9g10-i2c", + .data = (unsigned long) &at91sam9g10_config, + }, { + .compatible = "atmel,at91sam9x5-i2c", + .data = (unsigned long) &at91sam9x5_config, + }, { + /* sentinel */ + } +}; + static int at91_twi_probe(struct device_d *dev) { struct at91_twi_dev *i2c_at91; struct at91_twi_pdata *i2c_data; - int rc; + int rc = 0; u32 bus_clk_rate; i2c_at91 = xzalloc(sizeof(struct at91_twi_dev)); rc = dev_get_drvdata(dev, (unsigned long *)&i2c_data); - if (rc) + if (rc < 0) { + dev_err(dev, "failed to retrieve driver data\n"); goto out_free; + } i2c_at91->pdata = i2c_data; @@ -398,7 +424,7 @@ static int at91_twi_probe(struct device_d *dev) goto out_free; } - i2c_at91->clk = clk_get(dev, "twi_clk"); + i2c_at91->clk = clk_get(dev, NULL); if (IS_ERR(i2c_at91->clk)) { dev_err(dev, "no clock defined\n"); rc = -ENODEV; @@ -427,17 +453,18 @@ static int at91_twi_probe(struct device_d *dev) return 0; out_adap_fail: - clk_disable(i2c_at91->clk); - clk_put(i2c_at91->clk); + clk_disable(i2c_at91->clk); + clk_put(i2c_at91->clk); out_free: - kfree(i2c_at91); - return rc; + kfree(i2c_at91); + return rc; } static struct driver_d at91_twi_driver = { .name = "at91-twi", .probe = at91_twi_probe, .id_table = at91_twi_devtypes, + .of_compatible = DRV_OF_COMPAT(at91_twi_dt_ids), }; device_platform_driver(at91_twi_driver); |