| From c8e6f24b09e33ed1ced8d89a589f8805f1c25cd0 Mon Sep 17 00:00:00 2001 |
| From: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Date: Fri, 2 May 2014 21:15:09 +0200 |
| Subject: i2c: sh_mobile: honor DT bus speed settings |
| |
| Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Signed-off-by: Wolfram Sang <wsa@the-dreams.de> |
| (cherry picked from commit 88c289ec28dfb0f383dcdbadd2c759f910585815) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/i2c/busses/i2c-sh_mobile.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c |
| index d2fa222df3d1..2e481abd50ce 100644 |
| --- a/drivers/i2c/busses/i2c-sh_mobile.c |
| +++ b/drivers/i2c/busses/i2c-sh_mobile.c |
| @@ -657,6 +657,7 @@ static int sh_mobile_i2c_probe(struct platform_device *dev) |
| struct resource *res; |
| int size; |
| int ret; |
| + u32 bus_speed; |
| |
| pd = kzalloc(sizeof(struct sh_mobile_i2c_data), GFP_KERNEL); |
| if (pd == NULL) { |
| @@ -697,7 +698,9 @@ static int sh_mobile_i2c_probe(struct platform_device *dev) |
| } |
| |
| /* Use platform data bus speed or STANDARD_MODE */ |
| - pd->bus_speed = STANDARD_MODE; |
| + ret = of_property_read_u32(dev->dev.of_node, "clock-frequency", &bus_speed); |
| + pd->bus_speed = ret ? STANDARD_MODE : bus_speed; |
| + |
| if (pdata && pdata->bus_speed) |
| pd->bus_speed = pdata->bus_speed; |
| pd->clks_per_count = 1; |
| -- |
| 2.1.2 |
| |
