mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
Merge commit 'gcl/merge' into next
Manual merge of: drivers/net/fec_mpc52xx.c
This commit is contained in:
commit
b71a107c66
18 changed files with 91 additions and 149 deletions
|
|
@ -197,7 +197,7 @@ int mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock, int prescaler)
|
|||
return -EINVAL;
|
||||
|
||||
/* Determine divider value */
|
||||
divider = mpc52xx_find_ipb_freq(node) / clock;
|
||||
divider = mpc5xxx_get_bus_frequency(node) / clock;
|
||||
|
||||
/*
|
||||
* We want to choose an FDR/DFSR that generates an I2C bus speed that
|
||||
|
|
|
|||
Loading…
Reference in a new issue