diff options
Diffstat (limited to 'arch/powerpc/sysdev/fsl_soc.c')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_soc.c | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index afe8dbc964aa..5c64ccd402e2 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c | |||
| @@ -208,52 +208,6 @@ static int __init of_add_fixed_phys(void) | |||
| 208 | arch_initcall(of_add_fixed_phys); | 208 | arch_initcall(of_add_fixed_phys); |
| 209 | #endif /* CONFIG_FIXED_PHY */ | 209 | #endif /* CONFIG_FIXED_PHY */ |
| 210 | 210 | ||
| 211 | #ifdef CONFIG_PPC_83xx | ||
| 212 | static int __init mpc83xx_wdt_init(void) | ||
| 213 | { | ||
| 214 | struct resource r; | ||
| 215 | struct device_node *np; | ||
| 216 | struct platform_device *dev; | ||
| 217 | u32 freq = fsl_get_sys_freq(); | ||
| 218 | int ret; | ||
| 219 | |||
| 220 | np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt"); | ||
| 221 | |||
| 222 | if (!np) { | ||
| 223 | ret = -ENODEV; | ||
| 224 | goto nodev; | ||
| 225 | } | ||
| 226 | |||
| 227 | memset(&r, 0, sizeof(r)); | ||
| 228 | |||
| 229 | ret = of_address_to_resource(np, 0, &r); | ||
| 230 | if (ret) | ||
| 231 | goto err; | ||
| 232 | |||
| 233 | dev = platform_device_register_simple("mpc83xx_wdt", 0, &r, 1); | ||
| 234 | if (IS_ERR(dev)) { | ||
| 235 | ret = PTR_ERR(dev); | ||
| 236 | goto err; | ||
| 237 | } | ||
| 238 | |||
| 239 | ret = platform_device_add_data(dev, &freq, sizeof(freq)); | ||
| 240 | if (ret) | ||
| 241 | goto unreg; | ||
| 242 | |||
| 243 | of_node_put(np); | ||
| 244 | return 0; | ||
| 245 | |||
| 246 | unreg: | ||
| 247 | platform_device_unregister(dev); | ||
| 248 | err: | ||
| 249 | of_node_put(np); | ||
| 250 | nodev: | ||
| 251 | return ret; | ||
| 252 | } | ||
| 253 | |||
| 254 | arch_initcall(mpc83xx_wdt_init); | ||
| 255 | #endif | ||
| 256 | |||
| 257 | static enum fsl_usb2_phy_modes determine_usb_phy(const char *phy_type) | 211 | static enum fsl_usb2_phy_modes determine_usb_phy(const char *phy_type) |
| 258 | { | 212 | { |
| 259 | if (!phy_type) | 213 | if (!phy_type) |
