.. | .. |
---|
232 | 232 | * In standard mode: |
---|
233 | 233 | * t_scl_high = t_scl_low = CCR * I2C parent clk period |
---|
234 | 234 | * So to reach 100 kHz, we have: |
---|
235 | | - * CCR = I2C parent rate / 100 kHz >> 1 |
---|
| 235 | + * CCR = I2C parent rate / (100 kHz * 2) |
---|
236 | 236 | * |
---|
237 | 237 | * For example with parent rate = 2 MHz: |
---|
238 | | - * CCR = 2000000 / (100000 << 1) = 10 |
---|
| 238 | + * CCR = 2000000 / (100000 * 2) = 10 |
---|
239 | 239 | * t_scl_high = t_scl_low = 10 * (1 / 2000000) = 5000 ns |
---|
240 | 240 | * t_scl_high + t_scl_low = 10000 ns so 100 kHz is reached |
---|
241 | 241 | * |
---|
.. | .. |
---|
243 | 243 | * parent rate is not higher than 46 MHz . As a result val |
---|
244 | 244 | * is at most 8 bits wide and so fits into the CCR bits [11:0]. |
---|
245 | 245 | */ |
---|
246 | | - val = i2c_dev->parent_rate / (100000 << 1); |
---|
| 246 | + val = i2c_dev->parent_rate / (I2C_MAX_STANDARD_MODE_FREQ * 2); |
---|
247 | 247 | } else { |
---|
248 | 248 | /* |
---|
249 | 249 | * In fast mode, we compute CCR with duty = 0 as with low |
---|
.. | .. |
---|
263 | 263 | * parent rate is not higher than 46 MHz . As a result val |
---|
264 | 264 | * is at most 6 bits wide and so fits into the CCR bits [11:0]. |
---|
265 | 265 | */ |
---|
266 | | - val = DIV_ROUND_UP(i2c_dev->parent_rate, 400000 * 3); |
---|
| 266 | + val = DIV_ROUND_UP(i2c_dev->parent_rate, I2C_MAX_FAST_MODE_FREQ * 3); |
---|
267 | 267 | |
---|
268 | 268 | /* Select Fast mode */ |
---|
269 | 269 | ccr |= STM32F4_I2C_CCR_FS; |
---|
.. | .. |
---|
797 | 797 | |
---|
798 | 798 | rst = devm_reset_control_get_exclusive(&pdev->dev, NULL); |
---|
799 | 799 | if (IS_ERR(rst)) { |
---|
800 | | - dev_err(&pdev->dev, "Error: Missing controller reset\n"); |
---|
801 | | - ret = PTR_ERR(rst); |
---|
| 800 | + ret = dev_err_probe(&pdev->dev, PTR_ERR(rst), |
---|
| 801 | + "Error: Missing reset ctrl\n"); |
---|
802 | 802 | goto clk_free; |
---|
803 | 803 | } |
---|
804 | 804 | reset_control_assert(rst); |
---|
.. | .. |
---|
807 | 807 | |
---|
808 | 808 | i2c_dev->speed = STM32_I2C_SPEED_STANDARD; |
---|
809 | 809 | ret = of_property_read_u32(np, "clock-frequency", &clk_rate); |
---|
810 | | - if (!ret && clk_rate >= 400000) |
---|
| 810 | + if (!ret && clk_rate >= I2C_MAX_FAST_MODE_FREQ) |
---|
811 | 811 | i2c_dev->speed = STM32_I2C_SPEED_FAST; |
---|
812 | 812 | |
---|
813 | 813 | i2c_dev->dev = &pdev->dev; |
---|