Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c97cec9 authored by Rob Herring's avatar Rob Herring
Browse files

mips: octeon: convert to use unflatten_and_copy_device_tree 



The octeon FDT code can be simplified by using
unflatten_and_copy_device_tree function. This removes all accesses to
FDT header data by the arch code.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Tested-by: default avatarGrant Likely <grant.likely@linaro.org>
parent a798c10f

arch/mips/cavium-octeon/setup.c

+5 −15
Original line number Diff line number Diff line
@@ -1053,36 +1053,26 @@ void prom_free_prom_memory(void) 
int octeon_prune_device_tree(void);



extern const char __dtb_octeon_3xxx_begin;

extern const char __dtb_octeon_3xxx_end;

extern const char __dtb_octeon_68xx_begin;

extern const char __dtb_octeon_68xx_end;

void __init device_tree_init(void)

{

	int dt_size;

	struct boot_param_header *fdt;

	const void *fdt;

	bool do_prune;



	if (octeon_bootinfo->minor_version >= 3 && octeon_bootinfo->fdt_addr) {

		fdt = phys_to_virt(octeon_bootinfo->fdt_addr);

		if (fdt_check_header(fdt))

			panic("Corrupt Device Tree passed to kernel.");

		dt_size = be32_to_cpu(fdt->totalsize);

		do_prune = false;

	} else if (OCTEON_IS_MODEL(OCTEON_CN68XX)) {

		fdt = (struct boot_param_header *)&__dtb_octeon_68xx_begin;

		dt_size = &__dtb_octeon_68xx_end - &__dtb_octeon_68xx_begin;

		fdt = &__dtb_octeon_68xx_begin;

		do_prune = true;

	} else {

		fdt = (struct boot_param_header *)&__dtb_octeon_3xxx_begin;

		dt_size = &__dtb_octeon_3xxx_end - &__dtb_octeon_3xxx_begin;

		fdt = &__dtb_octeon_3xxx_begin;

		do_prune = true;

	}



	/* Copy the default tree from init memory. */

	initial_boot_params = early_init_dt_alloc_memory_arch(dt_size, 8);

	if (initial_boot_params == NULL)

		panic("Could not allocate initial_boot_params");

	memcpy(initial_boot_params, fdt, dt_size);

	initial_boot_params = (void *)fdt;



	if (do_prune) {

		octeon_prune_device_tree();
@@ -1090,7 +1080,7 @@ void __init device_tree_init(void) 
	} else {

		pr_info("Using passed Device Tree.\n");

	}

	unflatten_device_tree();

	unflatten_and_copy_device_tree();

}



static int __initdata disable_octeon_edac_p;