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

Commit ccc20a33 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux 

Pull devicetree fix from Grant Likely:
 "Simple bugfix for bad device tree data on the PA-Semi platform"

* tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux:
  drivers/of: Add empty ranges quirk for PA-Semi
parents b010a0f7 41d94893

drivers/of/address.c

+8 −3
Original line number Diff line number Diff line
@@ -450,12 +450,17 @@ static struct of_bus *of_match_bus(struct device_node *np) 
	return NULL;

}



static int of_empty_ranges_quirk(void)

static int of_empty_ranges_quirk(struct device_node *np)

{

	if (IS_ENABLED(CONFIG_PPC)) {

		/* To save cycles, we cache the result */

		/* To save cycles, we cache the result for global "Mac" setting */

		static int quirk_state = -1;



		/* PA-SEMI sdc DT bug */

		if (of_device_is_compatible(np, "1682m-sdc"))

			return true;



		/* Make quirk cached */

		if (quirk_state < 0)

			quirk_state =

				of_machine_is_compatible("Power Macintosh") ||
@@ -490,7 +495,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus, 
	 * This code is only enabled on powerpc. --gcl

	 */

	ranges = of_get_property(parent, rprop, &rlen);

	if (ranges == NULL && !of_empty_ranges_quirk()) {

	if (ranges == NULL && !of_empty_ranges_quirk(parent)) {

		pr_debug("OF: no ranges; cannot translate\n");

		return 1;

	}