diff options
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt | 6 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-mv64xxx.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt b/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt index f46d928aa73d..a1ee681942cc 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt +++ b/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt | |||
| @@ -6,7 +6,11 @@ Required properties : | |||
| 6 | - reg : Offset and length of the register set for the device | 6 | - reg : Offset and length of the register set for the device |
| 7 | - compatible : Should be "marvell,mv64xxx-i2c" | 7 | - compatible : Should be "marvell,mv64xxx-i2c" |
| 8 | - interrupts : The interrupt number | 8 | - interrupts : The interrupt number |
| 9 | - clock-frequency : Desired I2C bus clock frequency in Hz. | 9 | |
| 10 | Optional properties : | ||
| 11 | |||
| 12 | - clock-frequency : Desired I2C bus clock frequency in Hz. If not set the | ||
| 13 | default frequency is 100kHz | ||
| 10 | 14 | ||
| 11 | Examples: | 15 | Examples: |
| 12 | 16 | ||
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index ed854573b427..b1f42bf40963 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c | |||
| @@ -578,7 +578,11 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data, | |||
| 578 | goto out; | 578 | goto out; |
| 579 | } | 579 | } |
| 580 | tclk = clk_get_rate(drv_data->clk); | 580 | tclk = clk_get_rate(drv_data->clk); |
| 581 | of_property_read_u32(np, "clock-frequency", &bus_freq); | 581 | |
| 582 | rc = of_property_read_u32(np, "clock-frequency", &bus_freq); | ||
| 583 | if (rc) | ||
| 584 | bus_freq = 100000; /* 100kHz by default */ | ||
| 585 | |||
| 582 | if (!mv64xxx_find_baud_factors(bus_freq, tclk, | 586 | if (!mv64xxx_find_baud_factors(bus_freq, tclk, |
| 583 | &drv_data->freq_n, &drv_data->freq_m)) { | 587 | &drv_data->freq_n, &drv_data->freq_m)) { |
| 584 | rc = -EINVAL; | 588 | rc = -EINVAL; |
