if (MMU_MAJ_VER(data->version) < 5)
                writel(pgd, data->sfrbase + REG_PT_BASE_ADDR);
        else
-               writel(pgd / SZ_4K, data->sfrbase + REG_V5_PT_BASE_PFN);
+               writel(pgd >> SPAGE_ORDER, data->sfrbase + REG_V5_PT_BASE_PFN);
 
        __sysmmu_tlb_invalidate(data);
 }
                 * 64KB page can be one of 16 consecutive sets.
                 */
                if (MMU_MAJ_VER(data->version) == 2)
-                       num_inv = min_t(unsigned int, size / SZ_4K, 64);
+                       num_inv = min_t(unsigned int, size / SPAGE_SIZE, 64);
 
                if (sysmmu_block(data)) {
                        __sysmmu_tlb_invalidate_entry(data, iova, num_inv);