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

Commit f7e59f38 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'devicetree-fixes-for-4.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Rob writes:
  "Devicetree fixes for 4.19, part 3:

   - Fix DT unittest on Oldworld MAC systems"

* tag 'devicetree-fixes-for-4.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  of: unittest: Disable interrupt node tests for old world MAC systems
parents bb2d8f2f 88948914

drivers/of/unittest.c

+18 −8
Original line number Diff line number Diff line
@@ -771,6 +771,9 @@ static void __init of_unittest_parse_interrupts(void) 
	struct of_phandle_args args;

	int i, rc;



	if (of_irq_workarounds & OF_IMAP_OLDWORLD_MAC)

		return;



	np = of_find_node_by_path("/testcase-data/interrupts/interrupts0");

	if (!np) {

		pr_err("missing testcase data\n");
@@ -845,6 +848,9 @@ static void __init of_unittest_parse_interrupts_extended(void) 
	struct of_phandle_args args;

	int i, rc;



	if (of_irq_workarounds & OF_IMAP_OLDWORLD_MAC)

		return;



	np = of_find_node_by_path("/testcase-data/interrupts/interrupts-extended0");

	if (!np) {

		pr_err("missing testcase data\n");
@@ -1001,15 +1007,19 @@ static void __init of_unittest_platform_populate(void) 
	pdev = of_find_device_by_node(np);

	unittest(pdev, "device 1 creation failed\n");



	if (!(of_irq_workarounds & OF_IMAP_OLDWORLD_MAC)) {

		irq = platform_get_irq(pdev, 0);

	unittest(irq == -EPROBE_DEFER, "device deferred probe failed - %d\n", irq);

		unittest(irq == -EPROBE_DEFER,

			 "device deferred probe failed - %d\n", irq);



		/* Test that a parsing failure does not return -EPROBE_DEFER */

		np = of_find_node_by_path("/testcase-data/testcase-device2");

		pdev = of_find_device_by_node(np);

		unittest(pdev, "device 2 creation failed\n");

		irq = platform_get_irq(pdev, 0);

	unittest(irq < 0 && irq != -EPROBE_DEFER, "device parsing error failed - %d\n", irq);

		unittest(irq < 0 && irq != -EPROBE_DEFER,

			 "device parsing error failed - %d\n", irq);

	}



	np = of_find_node_by_path("/testcase-data/platform-tests");

	unittest(np, "No testcase data in device tree\n");