提交 21dbfd29 编写于 作者: R Remi Machet 提交者: Paul Mackerras

[POWERPC] Use default values if necessary in mv64x60 I2C initialization

I2C parameters freq_m and freq_n are assigned defaults in the code,
but if properties for those parameters are not found in the open
firmware description the init routine returns an error and doesn't
create the platform device.

This changes the code so that it doesn't return an error if the
properties are not found but instead uses the default values.

Signed-off-by: Remi Machet (rmachet@slac.stanford.edu)
Acked-by: NDale Farnsworth <dale@farnsworth.org>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
上级 839ad62e
...@@ -338,15 +338,13 @@ static int __init mv64x60_i2c_device_setup(struct device_node *np, int id) ...@@ -338,15 +338,13 @@ static int __init mv64x60_i2c_device_setup(struct device_node *np, int id)
pdata.freq_m = 8; /* default */ pdata.freq_m = 8; /* default */
prop = of_get_property(np, "freq_m", NULL); prop = of_get_property(np, "freq_m", NULL);
if (!prop) if (prop)
return -ENODEV; pdata.freq_m = *prop;
pdata.freq_m = *prop;
pdata.freq_m = 3; /* default */ pdata.freq_m = 3; /* default */
prop = of_get_property(np, "freq_n", NULL); prop = of_get_property(np, "freq_n", NULL);
if (!prop) if (prop)
return -ENODEV; pdata.freq_n = *prop;
pdata.freq_n = *prop;
pdata.timeout = 1000; /* default: 1 second */ pdata.timeout = 1000; /* default: 1 second */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册