powerpc/fsl_soc: Remove mpc83xx_wdt_init, again
commitb31a1d8b41
("gianfar: Convert gianfar to an of_platform_driver"), possibly due merge issues, reintroduced completely unneded mpc83xx_wdt_init call, which I removed some time ago in commit20d38e01d4
("powerpc/fsl_soc: remove mpc83xx_wdt code"). Remove it once again. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Родитель
0203d6ec4e
Коммит
cbec415991
|
@ -208,52 +208,6 @@ static int __init of_add_fixed_phys(void)
|
||||||
arch_initcall(of_add_fixed_phys);
|
arch_initcall(of_add_fixed_phys);
|
||||||
#endif /* CONFIG_FIXED_PHY */
|
#endif /* CONFIG_FIXED_PHY */
|
||||||
|
|
||||||
#ifdef CONFIG_PPC_83xx
|
|
||||||
static int __init mpc83xx_wdt_init(void)
|
|
||||||
{
|
|
||||||
struct resource r;
|
|
||||||
struct device_node *np;
|
|
||||||
struct platform_device *dev;
|
|
||||||
u32 freq = fsl_get_sys_freq();
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt");
|
|
||||||
|
|
||||||
if (!np) {
|
|
||||||
ret = -ENODEV;
|
|
||||||
goto nodev;
|
|
||||||
}
|
|
||||||
|
|
||||||
memset(&r, 0, sizeof(r));
|
|
||||||
|
|
||||||
ret = of_address_to_resource(np, 0, &r);
|
|
||||||
if (ret)
|
|
||||||
goto err;
|
|
||||||
|
|
||||||
dev = platform_device_register_simple("mpc83xx_wdt", 0, &r, 1);
|
|
||||||
if (IS_ERR(dev)) {
|
|
||||||
ret = PTR_ERR(dev);
|
|
||||||
goto err;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = platform_device_add_data(dev, &freq, sizeof(freq));
|
|
||||||
if (ret)
|
|
||||||
goto unreg;
|
|
||||||
|
|
||||||
of_node_put(np);
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
unreg:
|
|
||||||
platform_device_unregister(dev);
|
|
||||||
err:
|
|
||||||
of_node_put(np);
|
|
||||||
nodev:
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
arch_initcall(mpc83xx_wdt_init);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static enum fsl_usb2_phy_modes determine_usb_phy(const char *phy_type)
|
static enum fsl_usb2_phy_modes determine_usb_phy(const char *phy_type)
|
||||||
{
|
{
|
||||||
if (!phy_type)
|
if (!phy_type)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче