diff options
author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2014-05-02 15:15:09 -0400 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2014-05-22 04:09:23 -0400 |
commit | 88c289ec28dfb0f383dcdbadd2c759f910585815 (patch) | |
tree | d910169ef4d69793660c9d56477f9c1b1ccad7ad | |
parent | 5a72b25e7896e6358b62b590ce5b3a457516ae40 (diff) |
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>
-rw-r--r-- | drivers/i2c/busses/i2c-sh_mobile.c | 5 |
1 files changed, 4 insertions, 1 deletions
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) | |||
657 | struct resource *res; | 657 | struct resource *res; |
658 | int size; | 658 | int size; |
659 | int ret; | 659 | int ret; |
660 | u32 bus_speed; | ||
660 | 661 | ||
661 | pd = kzalloc(sizeof(struct sh_mobile_i2c_data), GFP_KERNEL); | 662 | pd = kzalloc(sizeof(struct sh_mobile_i2c_data), GFP_KERNEL); |
662 | if (pd == NULL) { | 663 | if (pd == NULL) { |
@@ -697,7 +698,9 @@ static int sh_mobile_i2c_probe(struct platform_device *dev) | |||
697 | } | 698 | } |
698 | 699 | ||
699 | /* Use platform data bus speed or STANDARD_MODE */ | 700 | /* Use platform data bus speed or STANDARD_MODE */ |
700 | pd->bus_speed = STANDARD_MODE; | 701 | ret = of_property_read_u32(dev->dev.of_node, "clock-frequency", &bus_speed); |
702 | pd->bus_speed = ret ? STANDARD_MODE : bus_speed; | ||
703 | |||
701 | if (pdata && pdata->bus_speed) | 704 | if (pdata && pdata->bus_speed) |
702 | pd->bus_speed = pdata->bus_speed; | 705 | pd->bus_speed = pdata->bus_speed; |
703 | pd->clks_per_count = 1; | 706 | pd->clks_per_count = 1; |