2 files changed, 6 insertions, 7 deletions

diff --git a/arch/mips/alchemy/common/clock.c b/arch/mips/alchemy/common/clock.c
index d7557cde271a..203e4403c366 100644
--- a/arch/mips/alchemy/common/clock.c
+++ b/arch/mips/alchemy/common/clock.c
@@ -37,7 +37,6 @@
 #include <linux/io.h>
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
-#include <linux/clk-private.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
@@ -397,10 +396,10 @@ static long alchemy_clk_fgcs_detr(struct clk_hw *hw, unsigned long rate,
                         break;
 
                 /* if this parent is currently unused, remember it.
-                 * XXX: I know it's a layering violation, but it works
-                 * so well.. (if (!clk_has_active_children(pc)) )
+                 * XXX: we would actually want clk_has_active_children()
+                 * but this is a good-enough approximation for now.
                  */
-                if (pc->prepare_count == 0) {
+                if (!__clk_is_prepared(pc)) {
                         if (!free)
                                 free = pc;
                 }
diff --git a/arch/mips/alchemy/common/setup.c b/arch/mips/alchemy/common/setup.c
index ea8f41869e56..4e72daf12c32 100644
--- a/arch/mips/alchemy/common/setup.c
+++ b/arch/mips/alchemy/common/setup.c
@@ -70,9 +70,9 @@ void __init plat_mem_setup(void)
         iomem_resource.end = IOMEM_RESOURCE_END;
 }
 
-#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_PCI)
+#if defined(CONFIG_PHYS_ADDR_T_64BIT) && defined(CONFIG_PCI)
 /* This routine should be valid for all Au1x based boards */
-phys_t __fixup_bigphys_addr(phys_t phys_addr, phys_t size)
+phys_addr_t __fixup_bigphys_addr(phys_addr_t phys_addr, phys_addr_t size)
 {
         unsigned long start = ALCHEMY_PCI_MEMWIN_START;
         unsigned long end = ALCHEMY_PCI_MEMWIN_END;
@@ -83,7 +83,7 @@ phys_t __fixup_bigphys_addr(phys_t phys_addr, phys_t size)
 
         /* Check for PCI memory window */
         if (phys_addr >= start && (phys_addr + size - 1) <= end)
-                return (phys_t)(AU1500_PCI_MEM_PHYS_ADDR + phys_addr);
+                return (phys_addr_t)(AU1500_PCI_MEM_PHYS_ADDR + phys_addr);
 
         /* default nop */
         return phys_addr;