diff --git a/sys/arm/mv/mv_common.c b/sys/arm/mv/mv_common.c index 7adc06411e17..2c46ae44035f 100644 --- a/sys/arm/mv/mv_common.c +++ b/sys/arm/mv/mv_common.c @@ -484,7 +484,7 @@ pm_disable_device(int mask) } int -fdt_pm(phandle_t node) +mv_fdt_pm(phandle_t node) { uint32_t cpu_pm_ctrl; int i, ena, compat; diff --git a/sys/arm/mv/mv_localbus.c b/sys/arm/mv/mv_localbus.c index 600d9dc91632..0febb6305eda 100644 --- a/sys/arm/mv/mv_localbus.c +++ b/sys/arm/mv/mv_localbus.c @@ -275,7 +275,7 @@ localbus_attach(device_t dev) if (!(ofw_bus_node_status_okay(dt_child))) continue; - if (!(fdt_pm_is_enabled(dt_child))) + if (!(mv_fdt_pm(dt_child))) continue; di = malloc(sizeof(*di), M_LOCALBUS, M_WAITOK | M_ZERO); diff --git a/sys/arm/mv/mvvar.h b/sys/arm/mv/mvvar.h index 46029bfcc133..c9b107e46d49 100644 --- a/sys/arm/mv/mvvar.h +++ b/sys/arm/mv/mvvar.h @@ -141,6 +141,8 @@ int mv_pci_devmap(phandle_t, struct devmap_entry *, vm_offset_t, int fdt_localbus_devmap(phandle_t, struct devmap_entry *, int, int *); enum soc_family mv_check_soc_family(void); +int mv_fdt_pm(phandle_t); + uint32_t get_tclk_armadaxp(void); uint32_t get_tclk_armada38x(void); uint32_t get_cpu_freq_armadaxp(void); diff --git a/sys/dev/fdt/fdt_common.c b/sys/dev/fdt/fdt_common.c index 2475ba0c99dc..3aa89f4a9451 100644 --- a/sys/dev/fdt/fdt_common.c +++ b/sys/dev/fdt/fdt_common.c @@ -365,19 +365,6 @@ fdt_parent_addr_cells(phandle_t node) return ((int)fdt32_to_cpu(addr_cells)); } -int -fdt_pm_is_enabled(phandle_t node) -{ - int ret; - - ret = 1; - -#if defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY) - ret = fdt_pm(node); -#endif - return (ret); -} - u_long fdt_data_get(void *data, int cells) { diff --git a/sys/dev/fdt/fdt_common.h b/sys/dev/fdt/fdt_common.h index ca4ef7388db8..1e749c612509 100644 --- a/sys/dev/fdt/fdt_common.h +++ b/sys/dev/fdt/fdt_common.h @@ -91,10 +91,8 @@ int fdt_get_range(phandle_t, int, u_long *, u_long *); int fdt_immr_addr(vm_offset_t); int fdt_regsize(phandle_t, u_long *, u_long *); int fdt_is_compatible_strict(phandle_t, const char *); -int fdt_pm_is_enabled(phandle_t); int fdt_is_type(phandle_t, const char *); int fdt_parent_addr_cells(phandle_t); -int fdt_pm(phandle_t); int fdt_get_chosen_bootargs(char *bootargs, size_t max_size); #endif /* _FDT_COMMON_H_ */