49 files changed, 538 insertions, 524 deletions
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method.txt
index 8240c023e202..8240c023e202 100644
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method.txt
diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm11351.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.txt
index 0ff6560e6094..0ff6560e6094 100644
--- a/Documentation/devicetree/bindings/arm/bcm/bcm11351.txt
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.txt
diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm21664.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.txt
index e0774255e1a6..e0774255e1a6 100644
--- a/Documentation/devicetree/bindings/arm/bcm/bcm21664.txt
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.txt
diff --git a/Documentation/devicetree/bindings/arm/bcm2835.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt
index ac683480c486..ac683480c486 100644
--- a/Documentation/devicetree/bindings/arm/bcm2835.txt
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt
diff --git a/Documentation/devicetree/bindings/arm/bcm4708.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.txt
index 6b0f49f6f499..6b0f49f6f499 100644
--- a/Documentation/devicetree/bindings/arm/bcm4708.txt
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.txt
diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm63138.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm63138.txt
index bd49987a8812..bd49987a8812 100644
--- a/Documentation/devicetree/bindings/arm/bcm/bcm63138.txt
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm63138.txt
diff --git a/Documentation/devicetree/bindings/arm/brcm-brcmstb.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt
index 430608ec09f0..430608ec09f0 100644
--- a/Documentation/devicetree/bindings/arm/brcm-brcmstb.txt
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt
diff --git a/Documentation/devicetree/bindings/arm/bcm/cygnus.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,cygnus.txt
index 4c77169bb534..4c77169bb534 100644
--- a/Documentation/devicetree/bindings/arm/bcm/cygnus.txt
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,cygnus.txt
diff --git a/Documentation/devicetree/bindings/bus/bcma.txt b/Documentation/devicetree/bindings/bus/brcm,bus-axi.txt
index edd44d802139..edd44d802139 100644
--- a/Documentation/devicetree/bindings/bus/bcma.txt
+++ b/Documentation/devicetree/bindings/bus/brcm,bus-axi.txt
diff --git a/Documentation/devicetree/bindings/clock/bcm-kona-clock.txt b/Documentation/devicetree/bindings/clock/brcm,kona-ccu.txt
index 5286e260fcae..5286e260fcae 100644
--- a/Documentation/devicetree/bindings/clock/bcm-kona-clock.txt
+++ b/Documentation/devicetree/bindings/clock/brcm,kona-ccu.txt
diff --git a/Documentation/devicetree/bindings/dma/bcm2835-dma.txt b/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt
index 1396078d15ac..1396078d15ac 100644
--- a/Documentation/devicetree/bindings/dma/bcm2835-dma.txt
+++ b/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt
diff --git a/Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt b/Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
index 4a63bc96b687..4a63bc96b687 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt
+++ b/Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
diff --git a/Documentation/devicetree/bindings/i2c/i2c-bcm-kona.txt b/Documentation/devicetree/bindings/i2c/brcm,kona-i2c.txt
index 1b87b741fa8e..1b87b741fa8e 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-bcm-kona.txt
+++ b/Documentation/devicetree/bindings/i2c/brcm,kona-i2c.txt
diff --git a/Documentation/devicetree/bindings/mfd/bcm590xx.txt b/Documentation/devicetree/bindings/mfd/brcm,bcm59056.txt
index be51a15e05f9..be51a15e05f9 100644
--- a/Documentation/devicetree/bindings/mfd/bcm590xx.txt
+++ b/Documentation/devicetree/bindings/mfd/brcm,bcm59056.txt
diff --git a/Documentation/devicetree/bindings/mips/brcm/bcm3384-intc.txt b/Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt
index d4e0141d3620..d4e0141d3620 100644
--- a/Documentation/devicetree/bindings/mips/brcm/bcm3384-intc.txt
+++ b/Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt
diff --git a/Documentation/devicetree/bindings/mips/brcm/bmips.txt b/Documentation/devicetree/bindings/mips/brcm/brcm,bmips.txt
index 8ef71b4085ca..8ef71b4085ca 100644
--- a/Documentation/devicetree/bindings/mips/brcm/bmips.txt
+++ b/Documentation/devicetree/bindings/mips/brcm/brcm,bmips.txt
diff --git a/Documentation/devicetree/bindings/mips/brcm/cm-dsl.txt b/Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt
index 8a139cb3c0b5..8a139cb3c0b5 100644
--- a/Documentation/devicetree/bindings/mips/brcm/cm-dsl.txt
+++ b/Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt
diff --git a/Documentation/devicetree/bindings/misc/smc.txt b/Documentation/devicetree/bindings/misc/brcm,kona-smc.txt
index 6c9f176f3571..6c9f176f3571 100644
--- a/Documentation/devicetree/bindings/misc/smc.txt
+++ b/Documentation/devicetree/bindings/misc/brcm,kona-smc.txt
diff --git a/Documentation/devicetree/bindings/mmc/kona-sdhci.txt b/Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.txt
index aaba2483b4ff..aaba2483b4ff 100644
--- a/Documentation/devicetree/bindings/mmc/kona-sdhci.txt
+++ b/Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.txt
diff --git a/Documentation/devicetree/bindings/net/broadcom-sf2.txt b/Documentation/devicetree/bindings/net/brcm,bcm7445-switch-v4.0.txt
index 30d487597ecb..30d487597ecb 100644
--- a/Documentation/devicetree/bindings/net/broadcom-sf2.txt
+++ b/Documentation/devicetree/bindings/net/brcm,bcm7445-switch-v4.0.txt
diff --git a/Documentation/devicetree/bindings/net/broadcom-bcmgenet.txt b/Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
index 451fef26b4df..451fef26b4df 100644
--- a/Documentation/devicetree/bindings/net/broadcom-bcmgenet.txt
+++ b/Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
diff --git a/Documentation/devicetree/bindings/net/broadcom-systemport.txt b/Documentation/devicetree/bindings/net/brcm,systemport.txt
index 877da34145b0..877da34145b0 100644
--- a/Documentation/devicetree/bindings/net/broadcom-systemport.txt
+++ b/Documentation/devicetree/bindings/net/brcm,systemport.txt
diff --git a/Documentation/devicetree/bindings/net/broadcom-mdio-unimac.txt b/Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
index ab0bb4247d14..ab0bb4247d14 100644
--- a/Documentation/devicetree/bindings/net/broadcom-mdio-unimac.txt
+++ b/Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
diff --git a/Documentation/devicetree/bindings/phy/bcm-phy.txt b/Documentation/devicetree/bindings/phy/brcm,kona-usb2-phy.txt
index 3dc8b3d2ffbb..3dc8b3d2ffbb 100644
--- a/Documentation/devicetree/bindings/phy/bcm-phy.txt
+++ b/Documentation/devicetree/bindings/phy/brcm,kona-usb2-phy.txt
diff --git a/Documentation/devicetree/bindings/pwm/bcm-kona-pwm.txt b/Documentation/devicetree/bindings/pwm/brcm,kona-pwm.txt
index 8eae9fe7841c..8eae9fe7841c 100644
--- a/Documentation/devicetree/bindings/pwm/bcm-kona-pwm.txt
+++ b/Documentation/devicetree/bindings/pwm/brcm,kona-pwm.txt
diff --git a/Documentation/devicetree/bindings/arm/bcm/kona-resetmgr.txt b/Documentation/devicetree/bindings/reset/brcm,bcm21664-resetmgr.txt
index 93f31ca1ef4b..93f31ca1ef4b 100644
--- a/Documentation/devicetree/bindings/arm/bcm/kona-resetmgr.txt
+++ b/Documentation/devicetree/bindings/reset/brcm,bcm21664-resetmgr.txt
diff --git a/Documentation/devicetree/bindings/serial/bcm63xx-uart.txt b/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt
index 5c52e5eef16d..5c52e5eef16d 100644
--- a/Documentation/devicetree/bindings/serial/bcm63xx-uart.txt
+++ b/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt
diff --git a/Documentation/devicetree/bindings/sound/bcm2835-i2s.txt b/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt
index 65783de0aedf..65783de0aedf 100644
--- a/Documentation/devicetree/bindings/sound/bcm2835-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt
diff --git a/Documentation/devicetree/bindings/arm/bcm/kona-timer.txt b/Documentation/devicetree/bindings/timer/brcm,kona-timer.txt
index 39adf54b4388..39adf54b4388 100644
--- a/Documentation/devicetree/bindings/arm/bcm/kona-timer.txt
+++ b/Documentation/devicetree/bindings/timer/brcm,kona-timer.txt
diff --git a/Documentation/devicetree/bindings/unittest.txt b/Documentation/devicetree/bindings/unittest.txt
index 8933211f32f9..3bf58c20fe94 100644
--- a/Documentation/devicetree/bindings/unittest.txt
+++ b/Documentation/devicetree/bindings/unittest.txt
@@ -1,60 +1,60 @@
-1) OF selftest platform device
+1) OF unittest platform device
-** selftest
+** unittest
 Required properties:
- compatible: must be "selftest"
+- compatible: must be "unittest"
 All other properties are optional.
 Example:
-        selftest {
+        unittest {
-                compatible = "selftest";
+                compatible = "unittest";
                status = "okay";
        };
-2) OF selftest i2c adapter platform device
+2) OF unittest i2c adapter platform device
 ** platform device unittest adapter
 Required properties:
- compatible: must be selftest-i2c-bus
+- compatible: must be unittest-i2c-bus
-Children nodes contain selftest i2c devices.
+Children nodes contain unittest i2c devices.
 Example:
-        selftest-i2c-bus {
+        unittest-i2c-bus {
-                compatible = "selftest-i2c-bus";
+                compatible = "unittest-i2c-bus";
                status = "okay";
        };
-3) OF selftest i2c device
+3) OF unittest i2c device
-** I2C selftest device
+** I2C unittest device
 Required properties:
- compatible: must be selftest-i2c-dev
+- compatible: must be unittest-i2c-dev
 All other properties are optional
 Example:
-        selftest-i2c-dev {
+        unittest-i2c-dev {
-                compatible = "selftest-i2c-dev";
+                compatible = "unittest-i2c-dev";
                status = "okay";
        };
-4) OF selftest i2c mux device
+4) OF unittest i2c mux device
-** I2C selftest mux
+** I2C unittest mux
 Required properties:
- compatible: must be selftest-i2c-mux
+- compatible: must be unittest-i2c-mux
-Children nodes contain selftest i2c bus nodes per channel.
+Children nodes contain unittest i2c bus nodes per channel.
 Example:
-        selftest-i2c-mux {
+        unittest-i2c-mux {
-                compatible = "selftest-i2c-mux";
+                compatible = "unittest-i2c-mux";
                status = "okay";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -64,7 +64,7 @@ Example:
                        #size-cells = <0>;
                        i2c-dev {
                                reg = <8>;
-                                compatible = "selftest-i2c-dev";
+                                compatible = "unittest-i2c-dev";
                                status = "okay";
                        };
                };
diff --git a/Documentation/devicetree/bindings/mips/brcm/usb.txt b/Documentation/devicetree/bindings/usb/brcm,bcm3384-usb.txt
index 452c45c7bf29..452c45c7bf29 100644
--- a/Documentation/devicetree/bindings/mips/brcm/usb.txt
+++ b/Documentation/devicetree/bindings/usb/brcm,bcm3384-usb.txt
diff --git a/Documentation/devicetree/bindings/arm/bcm/kona-wdt.txt b/Documentation/devicetree/bindings/watchdog/brcm,kona-wdt.txt
index 2b86a00e351d..2b86a00e351d 100644
--- a/Documentation/devicetree/bindings/arm/bcm/kona-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/brcm,kona-wdt.txt
diff --git a/Documentation/devicetree/of_selftest.txt b/Documentation/devicetree/of_unittest.txt
index 57a808b588bf..3e4e7d48ae93 100644
--- a/Documentation/devicetree/of_selftest.txt
+++ b/Documentation/devicetree/of_unittest.txt
@@ -1,11 +1,11 @@
-Open Firmware Device Tree Selftest
+Open Firmware Device Tree Unittest
 ----------------------------------
 Author: Gaurav Minocha <gaurav.minocha.os@gmail.com>
 1. Introduction
-This document explains how the test data required for executing OF selftest
+This document explains how the test data required for executing OF unittest
 is attached to the live tree dynamically, independent of the machine's
 architecture.
@@ -22,31 +22,31 @@ most of the device drivers in various use cases.
 2. Test-data
-The Device Tree Source file (drivers/of/testcase-data/testcases.dts) contains
+The Device Tree Source file (drivers/of/unittest-data/testcases.dts) contains
 the test data required for executing the unit tests automated in
-drivers/of/selftests.c. Currently, following Device Tree Source Include files
+drivers/of/unittest.c. Currently, following Device Tree Source Include files
-(.dtsi) are included in testcase.dts:
+(.dtsi) are included in testcases.dts:
-drivers/of/testcase-data/tests-interrupts.dtsi
+drivers/of/unittest-data/tests-interrupts.dtsi
-drivers/of/testcase-data/tests-platform.dtsi
+drivers/of/unittest-data/tests-platform.dtsi
-drivers/of/testcase-data/tests-phandle.dtsi
+drivers/of/unittest-data/tests-phandle.dtsi
-drivers/of/testcase-data/tests-match.dtsi
+drivers/of/unittest-data/tests-match.dtsi
 When the kernel is build with OF_SELFTEST enabled, then the following make rule
 $(obj)/%.dtb: $(src)/%.dts FORCE
        $(call if_changed_dep, dtc)
-is used to compile the DT source file (testcase.dts) into a binary blob
+is used to compile the DT source file (testcases.dts) into a binary blob
-(testcase.dtb), also referred as flattened DT.
+(testcases.dtb), also referred as flattened DT.
 After that, using the following rule the binary blob above is wrapped as an
-assembly file (testcase.dtb.S).
+assembly file (testcases.dtb.S).
 $(obj)/%.dtb.S: $(obj)/%.dtb
        $(call cmd, dt_S_dtb)
-The assembly file is compiled into an object file (testcase.dtb.o), and is
+The assembly file is compiled into an object file (testcases.dtb.o), and is
 linked into the kernel image.
@@ -98,7 +98,7 @@ child11 -> sibling12 -> sibling13 -> sibling14 -> null
 Figure 1: Generic structure of un-flattened device tree
-Before executing OF selftest, it is required to attach the test data to
+Before executing OF unittest, it is required to attach the test data to
 machine's device tree (if present). So, when selftest_data_add() is called,
 at first it reads the flattened device tree data linked into the kernel image
 via the following kernel symbols:
diff --git a/MAINTAINERS b/MAINTAINERS
index 2c060fd2a98b..652004223ead 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7192,6 +7192,15 @@ F:	Documentation/devicetree/
 F:      arch/*/boot/dts/
 F:      include/dt-bindings/
+OPEN FIRMWARE AND DEVICE TREE OVERLAYS
+M:      Pantelis Antoniou <pantelis.antoniou@konsulko.com>
+L:      devicetree@vger.kernel.org
+S:      Maintained
+F:      Documentation/devicetree/dynamic-resolution-notes.txt
+F:      Documentation/devicetree/overlay-notes.txt
+F:      drivers/of/overlay.c
+F:      drivers/of/resolver.c
 OPENRISC ARCHITECTURE
 M:      Jonas Bonn <jonas@southpole.se>
 W:      http://openrisc.net
diff --git a/drivers/coresight/of_coresight.c b/drivers/coresight/of_coresight.c
index c3efa418a86d..6f75e9d5b6fb 100644
--- a/drivers/coresight/of_coresight.c
+++ b/drivers/coresight/of_coresight.c
@@ -52,15 +52,6 @@ of_coresight_get_endpoint_device(struct device_node *endpoint)
                               endpoint, of_dev_node_match);
 }
-static struct device_node *of_get_coresight_endpoint(
-                const struct device_node *parent, struct device_node *prev)
-{
-        struct device_node *node = of_graph_get_next_endpoint(parent, prev);
-        of_node_put(prev);
-        return node;
-}
 static void of_coresight_get_ports(struct device_node *node,
                                   int *nr_inport, int *nr_outport)
 {
@@ -68,7 +59,7 @@ static void of_coresight_get_ports(struct device_node *node,
        int in = 0, out = 0;
        do {
-                ep = of_get_coresight_endpoint(node, ep);
+                ep = of_graph_get_next_endpoint(node, ep);
                if (!ep)
                        break;
@@ -140,7 +131,7 @@ struct coresight_platform_data *of_get_coresight_platform_data(
                /* Iterate through each port to discover topology */
                do {
                        /* Get a handle on a port */
-                        ep = of_get_coresight_endpoint(node, ep);
+                        ep = of_graph_get_next_endpoint(node, ep);
                        if (!ep)
                                break;
diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c
index 16150a00c237..aaa130736bf8 100644
--- a/drivers/gpu/drm/drm_of.c
+++ b/drivers/gpu/drm/drm_of.c
@@ -43,14 +43,10 @@ static uint32_t drm_crtc_port_mask(struct drm_device *dev,
 uint32_t drm_of_find_possible_crtcs(struct drm_device *dev,
                                    struct device_node *port)
 {
-        struct device_node *remote_port, *ep = NULL;
+        struct device_node *remote_port, *ep;
        uint32_t possible_crtcs = 0;
-        do {
+        for_each_endpoint_of_node(port, ep) {
-                ep = of_graph_get_next_endpoint(port, ep);
-                if (!ep)
-                        break;
                remote_port = of_graph_get_remote_port(ep);
                if (!remote_port) {
                        of_node_put(ep);
@@ -60,7 +56,7 @@ uint32_t drm_of_find_possible_crtcs(struct drm_device *dev,
                possible_crtcs |= drm_crtc_port_mask(dev, remote_port);
                of_node_put(remote_port);
-        } while (1);
+        }
        return possible_crtcs;
 }
diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
index a002f53aab0e..db2f5a739e05 100644
--- a/drivers/gpu/drm/imx/imx-drm-core.c
+++ b/drivers/gpu/drm/imx/imx-drm-core.c
@@ -431,15 +431,6 @@ int imx_drm_encoder_parse_of(struct drm_device *drm,
 }
 EXPORT_SYMBOL_GPL(imx_drm_encoder_parse_of);
-static struct device_node *imx_drm_of_get_next_endpoint(
-                const struct device_node *parent, struct device_node *prev)
-{
-        struct device_node *node = of_graph_get_next_endpoint(parent, prev);
-        of_node_put(prev);
-        return node;
-}
 /*
 * @node: device tree node containing encoder input ports
 * @encoder: drm_encoder
@@ -448,7 +439,7 @@ int imx_drm_encoder_get_mux_id(struct device_node *node,
                               struct drm_encoder *encoder)
 {
        struct imx_drm_crtc *imx_crtc = imx_drm_find_crtc(encoder->crtc);
-        struct device_node *ep = NULL;
+        struct device_node *ep;
        struct of_endpoint endpoint;
        struct device_node *port;
        int ret;
@@ -456,18 +447,15 @@ int imx_drm_encoder_get_mux_id(struct device_node *node,
        if (!node || !imx_crtc)
                return -EINVAL;
-        do {
+        for_each_endpoint_of_node(node, ep) {
-                ep = imx_drm_of_get_next_endpoint(node, ep);
-                if (!ep)
-                        break;
                port = of_graph_get_remote_port(ep);
                of_node_put(port);
                if (port == imx_crtc->crtc->port) {
                        ret = of_graph_parse_endpoint(ep, &endpoint);
+                        of_node_put(ep);
                        return ret ? ret : endpoint.port;
                }
-        } while (ep);
+        }
        return -EINVAL;
 }
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index fb052bca574f..93117f159a3b 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
@@ -509,7 +509,7 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu,
        enum rcar_du_encoder_type enc_type = RCAR_DU_ENCODER_NONE;
        struct device_node *connector = NULL;
        struct device_node *encoder = NULL;
-        struct device_node *prev = NULL;
+        struct device_node *ep_node = NULL;
        struct device_node *entity_ep_node;
        struct device_node *entity;
        int ret;
@@ -527,16 +527,7 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu,
        entity_ep_node = of_parse_phandle(ep->local_node, "remote-endpoint", 0);
-        while (1) {
+        for_each_endpoint_of_node(entity, ep_node) {
-                struct device_node *ep_node;
-                ep_node = of_graph_get_next_endpoint(entity, prev);
-                of_node_put(prev);
-                prev = ep_node;
-                if (!ep_node)
-                        break;
                if (ep_node == entity_ep_node)
                        continue;
@@ -603,27 +594,19 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu,
 static int rcar_du_encoders_init(struct rcar_du_device *rcdu)
 {
        struct device_node *np = rcdu->dev->of_node;
-        struct device_node *prev = NULL;
+        struct device_node *ep_node;
        unsigned int num_encoders = 0;
        /*
         * Iterate over the endpoints and create one encoder for each output
         * pipeline.
         */
-        while (1) {
+        for_each_endpoint_of_node(np, ep_node) {
-                struct device_node *ep_node;
                enum rcar_du_output output;
                struct of_endpoint ep;
                unsigned int i;
                int ret;
-                ep_node = of_graph_get_next_endpoint(np, prev);
-                of_node_put(prev);
-                prev = ep_node;
-                if (ep_node == NULL)
-                        break;
                ret = of_graph_parse_endpoint(ep_node, &ep);
                if (ret < 0) {
                        of_node_put(ep_node);
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index 30da7813d53e..3962176ee713 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -385,7 +385,7 @@ static const struct dev_pm_ops rockchip_drm_pm_ops = {
 int rockchip_drm_encoder_get_mux_id(struct device_node *node,
                                    struct drm_encoder *encoder)
 {
-        struct device_node *ep = NULL;
+        struct device_node *ep;
        struct drm_crtc *crtc = encoder->crtc;
        struct of_endpoint endpoint;
        struct device_node *port;
@@ -394,18 +394,15 @@ int rockchip_drm_encoder_get_mux_id(struct device_node *node,
        if (!node || !crtc)
                return -EINVAL;
-        do {
+        for_each_endpoint_of_node(node, ep) {
-                ep = of_graph_get_next_endpoint(node, ep);
-                if (!ep)
-                        break;
                port = of_graph_get_remote_port(ep);
                of_node_put(port);
                if (port == crtc->port) {
                        ret = of_graph_parse_endpoint(ep, &endpoint);
+                        of_node_put(ep);
                        return ret ?: endpoint.id;
                }
-        } while (ep);
+        }
        return -EINVAL;
 }
diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c
index 56a5cb0d2152..0d07fca756fe 100644
--- a/drivers/media/platform/am437x/am437x-vpfe.c
+++ b/drivers/media/platform/am437x/am437x-vpfe.c
@@ -2504,7 +2504,6 @@ vpfe_get_pdata(struct platform_device *pdev)
                                             GFP_KERNEL);
                pdata->asd[i]->match_type = V4L2_ASYNC_MATCH_OF;
                pdata->asd[i]->match.of.node = rem;
-                of_node_put(endpoint);
                of_node_put(rem);
        }
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index cee7b56f8404..f2a3d960b1a6 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -1694,7 +1694,6 @@ static void scan_of_host(struct soc_camera_host *ici)
                if (!i)
                        soc_of_bind(ici, epn, ren->parent);
-                of_node_put(epn);
                of_node_put(ren);
                if (i) {
@@ -1702,6 +1701,8 @@ static void scan_of_host(struct soc_camera_host *ici)
                        break;
                }
        }
+        of_node_put(epn);
 }
 #else
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index 7563f36c71db..fcacb186a67b 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -6,8 +6,7 @@ obj-$(CONFIG_OF_PROMTREE) += pdt.o
 obj-$(CONFIG_OF_ADDRESS)  += address.o
 obj-$(CONFIG_OF_IRQ)    += irq.o
 obj-$(CONFIG_OF_NET)    += of_net.o
-obj-$(CONFIG_OF_UNITTEST) += of_unittest.o
+obj-$(CONFIG_OF_UNITTEST) += unittest.o
-of_unittest-objs := unittest.o unittest-data/testcases.dtb.o
 obj-$(CONFIG_OF_MDIO)   += of_mdio.o
 obj-$(CONFIG_OF_PCI)    += of_pci.o
 obj-$(CONFIG_OF_PCI_IRQ)  += of_pci_irq.o
@@ -16,5 +15,7 @@ obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
 obj-$(CONFIG_OF_RESOLVE)  += resolver.o
 obj-$(CONFIG_OF_OVERLAY) += overlay.o
+obj-$(CONFIG_OF_UNITTEST) += unittest-data/
 CFLAGS_fdt.o = -I$(src)/../../scripts/dtc/libfdt
 CFLAGS_fdt_address.o = -I$(src)/../../scripts/dtc/libfdt
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 8f165b112e03..69566b6a876d 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2083,13 +2083,44 @@ int of_graph_parse_endpoint(const struct device_node *node,
 EXPORT_SYMBOL(of_graph_parse_endpoint);
 /**
+ * of_graph_get_port_by_id() - get the port matching a given id
+ * @parent: pointer to the parent device node
+ * @id: id of the port
+ *
+ * Return: A 'port' node pointer with refcount incremented. The caller
+ * has to use of_node_put() on it when done.
+ */
+struct device_node *of_graph_get_port_by_id(struct device_node *parent, u32 id)
+{
+        struct device_node *node, *port;
+        node = of_get_child_by_name(parent, "ports");
+        if (node)
+                parent = node;
+        for_each_child_of_node(parent, port) {
+                u32 port_id = 0;
+                if (of_node_cmp(port->name, "port") != 0)
+                        continue;
+                of_property_read_u32(port, "reg", &port_id);
+                if (id == port_id)
+                        break;
+        }
+        of_node_put(node);
+        return port;
+}
+EXPORT_SYMBOL(of_graph_get_port_by_id);
+/**
 * of_graph_get_next_endpoint() - get next endpoint node
 * @parent: pointer to the parent device node
 * @prev: previous endpoint node, or NULL to get first
 *
 * Return: An 'endpoint' node pointer with refcount incremented. Refcount
- * of the passed @prev node is not decremented, the caller have to use
+ * of the passed @prev node is decremented.
- * of_node_put() on it when done.
 */
 struct device_node *of_graph_get_next_endpoint(const struct device_node *parent,
                                        struct device_node *prev)
@@ -2125,12 +2156,6 @@ struct device_node *of_graph_get_next_endpoint(const struct device_node *parent,
                if (WARN_ONCE(!port, "%s(): endpoint %s has no parent node\n",
                              __func__, prev->full_name))
                        return NULL;
-                /*
-                 * Avoid dropping prev node refcount to 0 when getting the next
-                 * child below.
-                 */
-                of_node_get(prev);
        }
        while (1) {
diff --git a/drivers/of/unittest-data/.gitignore b/drivers/of/unittest-data/.gitignore
new file mode 100644
index 000000000000..4b3cf8b16de2
--- /dev/null
+++ b/drivers/of/unittest-data/.gitignore
@@ -0,0 +1,2 @@
+testcases.dtb
+testcases.dtb.S
diff --git a/drivers/of/unittest-data/Makefile b/drivers/of/unittest-data/Makefile
new file mode 100644
index 000000000000..1ac5cc01d627
--- /dev/null
+++ b/drivers/of/unittest-data/Makefile
@@ -0,0 +1,7 @@
+obj-y += testcases.dtb.o
+targets += testcases.dtb testcases.dtb.S
+.SECONDARY: \
+        $(obj)/testcases.dtb.S \
+        $(obj)/testcases.dtb
diff --git a/drivers/of/unittest-data/tests-overlay.dtsi b/drivers/of/unittest-data/tests-overlay.dtsi
index 244226cbb5a3..02ba56c20fe1 100644
--- a/drivers/of/unittest-data/tests-overlay.dtsi
+++ b/drivers/of/unittest-data/tests-overlay.dtsi
@@ -4,94 +4,94 @@
                overlay-node {
                        /* test bus */
-                        selftestbus: test-bus {
+                        unittestbus: test-bus {
                                compatible = "simple-bus";
                                #address-cells = <1>;
                                #size-cells = <0>;
-                                selftest100: test-selftest100 {
+                                unittest100: test-unittest100 {
-                                        compatible = "selftest";
+                                        compatible = "unittest";
                                        status = "okay";
                                        reg = <100>;
                                };
-                                selftest101: test-selftest101 {
+                                unittest101: test-unittest101 {
-                                        compatible = "selftest";
+                                        compatible = "unittest";
                                        status = "disabled";
                                        reg = <101>;
                                };
-                                selftest0: test-selftest0 {
+                                unittest0: test-unittest0 {
-                                        compatible = "selftest";
+                                        compatible = "unittest";
                                        status = "disabled";
                                        reg = <0>;
                                };
-                                selftest1: test-selftest1 {
+                                unittest1: test-unittest1 {
-                                        compatible = "selftest";
+                                        compatible = "unittest";
                                        status = "okay";
                                        reg = <1>;
                                };
-                                selftest2: test-selftest2 {
+                                unittest2: test-unittest2 {
-                                        compatible = "selftest";
+                                        compatible = "unittest";
                                        status = "disabled";
                                        reg = <2>;
                                };
-                                selftest3: test-selftest3 {
+                                unittest3: test-unittest3 {
-                                        compatible = "selftest";
+                                        compatible = "unittest";
                                        status = "okay";
                                        reg = <3>;
                                };
-                                selftest5: test-selftest5 {
+                                unittest5: test-unittest5 {
-                                        compatible = "selftest";
+                                        compatible = "unittest";
                                        status = "disabled";
                                        reg = <5>;
                                };
-                                selftest6: test-selftest6 {
+                                unittest6: test-unittest6 {
-                                        compatible = "selftest";
+                                        compatible = "unittest";
                                        status = "disabled";
                                        reg = <6>;
                                };
-                                selftest7: test-selftest7 {
+                                unittest7: test-unittest7 {
-                                        compatible = "selftest";
+                                        compatible = "unittest";
                                        status = "disabled";
                                        reg = <7>;
                                };
-                                selftest8: test-selftest8 {
+                                unittest8: test-unittest8 {
-                                        compatible = "selftest";
+                                        compatible = "unittest";
                                        status = "disabled";
                                        reg = <8>;
                                };
                                i2c-test-bus {
-                                        compatible = "selftest-i2c-bus";
+                                        compatible = "unittest-i2c-bus";
                                        status = "okay";
                                        reg = <50>;
                                        #address-cells = <1>;
                                        #size-cells = <0>;
-                                        test-selftest12 {
+                                        test-unittest12 {
                                                reg = <8>;
-                                                compatible = "selftest-i2c-dev";
+                                                compatible = "unittest-i2c-dev";
                                                status = "disabled";
                                        };
-                                        test-selftest13 {
+                                        test-unittest13 {
                                                reg = <9>;
-                                                compatible = "selftest-i2c-dev";
+                                                compatible = "unittest-i2c-dev";
                                                status = "okay";
                                        };
-                                        test-selftest14 {
+                                        test-unittest14 {
                                                reg = <10>;
-                                                compatible = "selftest-i2c-mux";
+                                                compatible = "unittest-i2c-mux";
                                                status = "okay";
                                                #address-cells = <1>;
@@ -104,7 +104,7 @@
                                                        test-mux-dev {
                                                                reg = <32>;
-                                                                compatible = "selftest-i2c-dev";
+                                                                compatible = "unittest-i2c-dev";
                                                                status = "okay";
                                                        };
                                                };
@@ -116,7 +116,7 @@
                /* test enable using absolute target path */
                overlay0 {
                        fragment@0 {
-                                target-path = "/testcase-data/overlay-node/test-bus/test-selftest0";
+                                target-path = "/testcase-data/overlay-node/test-bus/test-unittest0";
                                __overlay__ {
                                        status = "okay";
                                };
@@ -126,7 +126,7 @@
                /* test disable using absolute target path */
                overlay1 {
                        fragment@0 {
-                                target-path = "/testcase-data/overlay-node/test-bus/test-selftest1";
+                                target-path = "/testcase-data/overlay-node/test-bus/test-unittest1";
                                __overlay__ {
                                        status = "disabled";
                                };
@@ -136,7 +136,7 @@
                /* test enable using label */
                overlay2 {
                        fragment@0 {
-                                target = <&selftest2>;
+                                target = <&unittest2>;
                                __overlay__ {
                                        status = "okay";
                                };
@@ -146,7 +146,7 @@
                /* test disable using label */
                overlay3 {
                        fragment@0 {
-                                target = <&selftest3>;
+                                target = <&unittest3>;
                                __overlay__ {
                                        status = "disabled";
                                };
@@ -156,15 +156,15 @@
                /* test insertion of a full node */
                overlay4 {
                        fragment@0 {
-                                target = <&selftestbus>;
+                                target = <&unittestbus>;
                                __overlay__ {
                                        /* suppress DTC warning */
                                        #address-cells = <1>;
                                        #size-cells = <0>;
-                                        test-selftest4 {
+                                        test-unittest4 {
-                                                compatible = "selftest";
+                                                compatible = "unittest";
                                                status = "okay";
                                                reg = <4>;
                                        };
@@ -175,7 +175,7 @@
                /* test overlay apply revert */
                overlay5 {
                        fragment@0 {
-                                target-path = "/testcase-data/overlay-node/test-bus/test-selftest5";
+                                target-path = "/testcase-data/overlay-node/test-bus/test-unittest5";
                                __overlay__ {
                                        status = "okay";
                                };
@@ -185,7 +185,7 @@
                /* test overlays application and removal in sequence */
                overlay6 {
                        fragment@0 {
-                                target-path = "/testcase-data/overlay-node/test-bus/test-selftest6";
+                                target-path = "/testcase-data/overlay-node/test-bus/test-unittest6";
                                __overlay__ {
                                        status = "okay";
                                };
@@ -193,7 +193,7 @@
                };
                overlay7 {
                        fragment@0 {
-                                target-path = "/testcase-data/overlay-node/test-bus/test-selftest7";
+                                target-path = "/testcase-data/overlay-node/test-bus/test-unittest7";
                                __overlay__ {
                                        status = "okay";
                                };
@@ -203,7 +203,7 @@
                /* test overlays application and removal in bad sequence */
                overlay8 {
                        fragment@0 {
-                                target-path = "/testcase-data/overlay-node/test-bus/test-selftest8";
+                                target-path = "/testcase-data/overlay-node/test-bus/test-unittest8";
                                __overlay__ {
                                        status = "okay";
                                };
@@ -211,7 +211,7 @@
                };
                overlay9 {
                        fragment@0 {
-                                target-path = "/testcase-data/overlay-node/test-bus/test-selftest8";
+                                target-path = "/testcase-data/overlay-node/test-bus/test-unittest8";
                                __overlay__ {
                                        property-foo = "bar";
                                };
@@ -227,16 +227,16 @@
                                        #address-cells = <1>;
                                        #size-cells = <0>;
-                                        test-selftest10 {
+                                        test-unittest10 {
-                                                compatible = "selftest";
+                                                compatible = "unittest";
                                                status = "okay";
                                                reg = <10>;
                                                #address-cells = <1>;
                                                #size-cells = <0>;
-                                                test-selftest101 {
+                                                test-unittest101 {
-                                                        compatible = "selftest";
+                                                        compatible = "unittest";
                                                        status = "okay";
                                                        reg = <1>;
                                                };
@@ -255,16 +255,16 @@
                                        #address-cells = <1>;
                                        #size-cells = <0>;
-                                        test-selftest11 {
+                                        test-unittest11 {
-                                                compatible = "selftest";
+                                                compatible = "unittest";
                                                status = "okay";
                                                reg = <11>;
                                                #address-cells = <1>;
                                                #size-cells = <0>;
-                                                test-selftest111 {
+                                                test-unittest111 {
-                                                        compatible = "selftest";
+                                                        compatible = "unittest";
                                                        status = "okay";
                                                        reg = <1>;
                                                };
@@ -277,7 +277,7 @@
                /* test enable using absolute target path (i2c) */
                overlay12 {
                        fragment@0 {
-                                target-path = "/testcase-data/overlay-node/test-bus/i2c-test-bus/test-selftest12";
+                                target-path = "/testcase-data/overlay-node/test-bus/i2c-test-bus/test-unittest12";
                                __overlay__ {
                                        status = "okay";
                                };
@@ -287,7 +287,7 @@
                /* test disable using absolute target path (i2c) */
                overlay13 {
                        fragment@0 {
-                                target-path = "/testcase-data/overlay-node/test-bus/i2c-test-bus/test-selftest13";
+                                target-path = "/testcase-data/overlay-node/test-bus/i2c-test-bus/test-unittest13";
                                __overlay__ {
                                        status = "disabled";
                                };
@@ -301,9 +301,9 @@
                                __overlay__ {
                                        #address-cells = <1>;
                                        #size-cells = <0>;
-                                        test-selftest15 {
+                                        test-unittest15 {
                                                reg = <11>;
-                                                compatible = "selftest-i2c-mux";
+                                                compatible = "unittest-i2c-mux";
                                                status = "okay";
                                                #address-cells = <1>;
@@ -316,7 +316,7 @@
                                                        test-mux-dev {
                                                                reg = <32>;
-                                                                compatible = "selftest-i2c-dev";
+                                                                compatible = "unittest-i2c-dev";
                                                                status = "okay";
                                                        };
                                                };
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 52c45c7df07f..fdb597766be9 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -25,115 +25,115 @@
 #include "of_private.h"
-static struct selftest_results {
+static struct unittest_results {
        int passed;
        int failed;
-} selftest_results;
+} unittest_results;
-#define selftest(result, fmt, ...) ({ \
+#define unittest(result, fmt, ...) ({ \
        bool failed = !(result); \
        if (failed) { \
-                selftest_results.failed++; \
+                unittest_results.failed++; \
                pr_err("FAIL %s():%i " fmt, __func__, __LINE__, ##__VA_ARGS__); \
        } else { \
-                selftest_results.passed++; \
+                unittest_results.passed++; \
                pr_debug("pass %s():%i\n", __func__, __LINE__); \
        } \
        failed; \
 })
-static void __init of_selftest_find_node_by_name(void)
+static void __init of_unittest_find_node_by_name(void)
 {
        struct device_node *np;
        const char *options;
        np = of_find_node_by_path("/testcase-data");
-        selftest(np && !strcmp("/testcase-data", np->full_name),
+        unittest(np && !strcmp("/testcase-data", np->full_name),
                "find /testcase-data failed\n");
        of_node_put(np);
        /* Test if trailing '/' works */
        np = of_find_node_by_path("/testcase-data/");
-        selftest(!np, "trailing '/' on /testcase-data/ should fail\n");
+        unittest(!np, "trailing '/' on /testcase-data/ should fail\n");
        np = of_find_node_by_path("/testcase-data/phandle-tests/consumer-a");
-        selftest(np && !strcmp("/testcase-data/phandle-tests/consumer-a", np->full_name),
+        unittest(np && !strcmp("/testcase-data/phandle-tests/consumer-a", np->full_name),
                "find /testcase-data/phandle-tests/consumer-a failed\n");
        of_node_put(np);
        np = of_find_node_by_path("testcase-alias");
-        selftest(np && !strcmp("/testcase-data", np->full_name),
+        unittest(np && !strcmp("/testcase-data", np->full_name),
                "find testcase-alias failed\n");
        of_node_put(np);
        /* Test if trailing '/' works on aliases */
        np = of_find_node_by_path("testcase-alias/");
-        selftest(!np, "trailing '/' on testcase-alias/ should fail\n");
+        unittest(!np, "trailing '/' on testcase-alias/ should fail\n");
        np = of_find_node_by_path("testcase-alias/phandle-tests/consumer-a");
-        selftest(np && !strcmp("/testcase-data/phandle-tests/consumer-a", np->full_name),
+        unittest(np && !strcmp("/testcase-data/phandle-tests/consumer-a", np->full_name),
                "find testcase-alias/phandle-tests/consumer-a failed\n");
        of_node_put(np);
        np = of_find_node_by_path("/testcase-data/missing-path");
-        selftest(!np, "non-existent path returned node %s\n", np->full_name);
+        unittest(!np, "non-existent path returned node %s\n", np->full_name);
        of_node_put(np);
        np = of_find_node_by_path("missing-alias");
-        selftest(!np, "non-existent alias returned node %s\n", np->full_name);
+        unittest(!np, "non-existent alias returned node %s\n", np->full_name);
        of_node_put(np);
        np = of_find_node_by_path("testcase-alias/missing-path");
-        selftest(!np, "non-existent alias with relative path returned node %s\n", np->full_name);
+        unittest(!np, "non-existent alias with relative path returned node %s\n", np->full_name);
        of_node_put(np);
        np = of_find_node_opts_by_path("/testcase-data:testoption", &options);
-        selftest(np && !strcmp("testoption", options),
+        unittest(np && !strcmp("testoption", options),
                 "option path test failed\n");
        of_node_put(np);
        np = of_find_node_opts_by_path("/testcase-data:test/option", &options);
-        selftest(np && !strcmp("test/option", options),
+        unittest(np && !strcmp("test/option", options),
                 "option path test, subcase #1 failed\n");
        of_node_put(np);
        np = of_find_node_opts_by_path("/testcase-data/testcase-device1:test/option", &options);
-        selftest(np && !strcmp("test/option", options),
+        unittest(np && !strcmp("test/option", options),
                 "option path test, subcase #2 failed\n");
        of_node_put(np);
        np = of_find_node_opts_by_path("/testcase-data:testoption", NULL);
-        selftest(np, "NULL option path test failed\n");
+        unittest(np, "NULL option path test failed\n");
        of_node_put(np);
        np = of_find_node_opts_by_path("testcase-alias:testaliasoption",
                                       &options);
-        selftest(np && !strcmp("testaliasoption", options),
+        unittest(np && !strcmp("testaliasoption", options),
                 "option alias path test failed\n");
        of_node_put(np);
        np = of_find_node_opts_by_path("testcase-alias:test/alias/option",
                                       &options);
-        selftest(np && !strcmp("test/alias/option", options),
+        unittest(np && !strcmp("test/alias/option", options),
                 "option alias path test, subcase #1 failed\n");
        of_node_put(np);
        np = of_find_node_opts_by_path("testcase-alias:testaliasoption", NULL);
-        selftest(np, "NULL option alias path test failed\n");
+        unittest(np, "NULL option alias path test failed\n");
        of_node_put(np);
        options = "testoption";
        np = of_find_node_opts_by_path("testcase-alias", &options);
-        selftest(np && !options, "option clearing test failed\n");
+        unittest(np && !options, "option clearing test failed\n");
        of_node_put(np);
        options = "testoption";
        np = of_find_node_opts_by_path("/", &options);
-        selftest(np && !options, "option clearing root node test failed\n");
+        unittest(np && !options, "option clearing root node test failed\n");
        of_node_put(np);
 }
-static void __init of_selftest_dynamic(void)
+static void __init of_unittest_dynamic(void)
 {
        struct device_node *np;
        struct property *prop;
@@ -147,7 +147,7 @@ static void __init of_selftest_dynamic(void)
        /* Array of 4 properties for the purpose of testing */
        prop = kzalloc(sizeof(*prop) * 4, GFP_KERNEL);
        if (!prop) {
-                selftest(0, "kzalloc() failed\n");
+                unittest(0, "kzalloc() failed\n");
                return;
        }
@@ -155,20 +155,20 @@ static void __init of_selftest_dynamic(void)
        prop->name = "new-property";
        prop->value = "new-property-data";
        prop->length = strlen(prop->value);
-        selftest(of_add_property(np, prop) == 0, "Adding a new property failed\n");
+        unittest(of_add_property(np, prop) == 0, "Adding a new property failed\n");
        /* Try to add an existing property - should fail */
        prop++;
        prop->name = "new-property";
        prop->value = "new-property-data-should-fail";
        prop->length = strlen(prop->value);
-        selftest(of_add_property(np, prop) != 0,
+        unittest(of_add_property(np, prop) != 0,
                 "Adding an existing property should have failed\n");
        /* Try to modify an existing property - should pass */
        prop->value = "modify-property-data-should-pass";
        prop->length = strlen(prop->value);
-        selftest(of_update_property(np, prop) == 0,
+        unittest(of_update_property(np, prop) == 0,
                 "Updating an existing property should have passed\n");
        /* Try to modify non-existent property - should pass*/
@@ -176,11 +176,11 @@ static void __init of_selftest_dynamic(void)
        prop->name = "modify-property";
        prop->value = "modify-missing-property-data-should-pass";
        prop->length = strlen(prop->value);
-        selftest(of_update_property(np, prop) == 0,
+        unittest(of_update_property(np, prop) == 0,
                 "Updating a missing property should have passed\n");
        /* Remove property - should pass */
-        selftest(of_remove_property(np, prop) == 0,
+        unittest(of_remove_property(np, prop) == 0,
                 "Removing a property should have passed\n");
        /* Adding very large property - should pass */
@@ -188,13 +188,13 @@ static void __init of_selftest_dynamic(void)
        prop->name = "large-property-PAGE_SIZEx8";
        prop->length = PAGE_SIZE * 8;
        prop->value = kzalloc(prop->length, GFP_KERNEL);
-        selftest(prop->value != NULL, "Unable to allocate large buffer\n");
+        unittest(prop->value != NULL, "Unable to allocate large buffer\n");
        if (prop->value)
-                selftest(of_add_property(np, prop) == 0,
+                unittest(of_add_property(np, prop) == 0,
                         "Adding a large property should have passed\n");
 }
-static int __init of_selftest_check_node_linkage(struct device_node *np)
+static int __init of_unittest_check_node_linkage(struct device_node *np)
 {
        struct device_node *child;
        int count = 0, rc;
@@ -206,7 +206,7 @@ static int __init of_selftest_check_node_linkage(struct device_node *np)
                        return -EINVAL;
                }
-                rc = of_selftest_check_node_linkage(child);
+                rc = of_unittest_check_node_linkage(child);
                if (rc < 0)
                        return rc;
                count += rc;
@@ -215,7 +215,7 @@ static int __init of_selftest_check_node_linkage(struct device_node *np)
        return count + 1;
 }
-static void __init of_selftest_check_tree_linkage(void)
+static void __init of_unittest_check_tree_linkage(void)
 {
        struct device_node *np;
        int allnode_count = 0, child_count;
@@ -225,10 +225,10 @@ static void __init of_selftest_check_tree_linkage(void)
        for_each_of_allnodes(np)
                allnode_count++;
-        child_count = of_selftest_check_node_linkage(of_root);
+        child_count = of_unittest_check_node_linkage(of_root);
-        selftest(child_count > 0, "Device node data structure is corrupted\n");
+        unittest(child_count > 0, "Device node data structure is corrupted\n");
-        selftest(child_count == allnode_count, "allnodes list size (%i) doesn't match"
+        unittest(child_count == allnode_count, "allnodes list size (%i) doesn't match"
                 "sibling lists size (%i)\n", allnode_count, child_count);
        pr_debug("allnodes list size (%i); sibling lists size (%i)\n", allnode_count, child_count);
 }
@@ -239,7 +239,7 @@ struct node_hash {
 };
 static DEFINE_HASHTABLE(phandle_ht, 8);
-static void __init of_selftest_check_phandles(void)
+static void __init of_unittest_check_phandles(void)
 {
        struct device_node *np;
        struct node_hash *nh;
@@ -267,7 +267,7 @@ static void __init of_selftest_check_phandles(void)
                hash_add(phandle_ht, &nh->node, np->phandle);
                phandle_count++;
        }
-        selftest(dup_count == 0, "Found %i duplicates in %i phandles\n",
+        unittest(dup_count == 0, "Found %i duplicates in %i phandles\n",
                 dup_count, phandle_count);
        /* Clean up */
@@ -277,7 +277,7 @@ static void __init of_selftest_check_phandles(void)
        }
 }
-static void __init of_selftest_parse_phandle_with_args(void)
+static void __init of_unittest_parse_phandle_with_args(void)
 {
        struct device_node *np;
        struct of_phandle_args args;
@@ -290,7 +290,7 @@ static void __init of_selftest_parse_phandle_with_args(void)
        }
        rc = of_count_phandle_with_args(np, "phandle-list", "#phandle-cells");
-        selftest(rc == 7, "of_count_phandle_with_args() returned %i, expected 7\n", rc);
+        unittest(rc == 7, "of_count_phandle_with_args() returned %i, expected 7\n", rc);
        for (i = 0; i < 8; i++) {
                bool passed = true;
@@ -342,44 +342,44 @@ static void __init of_selftest_parse_phandle_with_args(void)
                        passed = false;
                }
-                selftest(passed, "index %i - data error on node %s rc=%i\n",
+                unittest(passed, "index %i - data error on node %s rc=%i\n",
                         i, args.np->full_name, rc);
        }
        /* Check for missing list property */
        rc = of_parse_phandle_with_args(np, "phandle-list-missing",
                                        "#phandle-cells", 0, &args);
-        selftest(rc == -ENOENT, "expected:%i got:%i\n", -ENOENT, rc);
+        unittest(rc == -ENOENT, "expected:%i got:%i\n", -ENOENT, rc);
        rc = of_count_phandle_with_args(np, "phandle-list-missing",
                                        "#phandle-cells");
-        selftest(rc == -ENOENT, "expected:%i got:%i\n", -ENOENT, rc);
+        unittest(rc == -ENOENT, "expected:%i got:%i\n", -ENOENT, rc);
        /* Check for missing cells property */
        rc = of_parse_phandle_with_args(np, "phandle-list",
                                        "#phandle-cells-missing", 0, &args);
-        selftest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc);
+        unittest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc);
        rc = of_count_phandle_with_args(np, "phandle-list",
                                        "#phandle-cells-missing");
-        selftest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc);
+        unittest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc);
        /* Check for bad phandle in list */
        rc = of_parse_phandle_with_args(np, "phandle-list-bad-phandle",
                                        "#phandle-cells", 0, &args);
-        selftest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc);
+        unittest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc);
        rc = of_count_phandle_with_args(np, "phandle-list-bad-phandle",
                                        "#phandle-cells");
-        selftest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc);
+        unittest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc);
        /* Check for incorrectly formed argument list */
        rc = of_parse_phandle_with_args(np, "phandle-list-bad-args",
                                        "#phandle-cells", 1, &args);
-        selftest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc);
+        unittest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc);
        rc = of_count_phandle_with_args(np, "phandle-list-bad-args",
                                        "#phandle-cells");
-        selftest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc);
+        unittest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc);
 }
-static void __init of_selftest_property_string(void)
+static void __init of_unittest_property_string(void)
 {
        const char *strings[4];
        struct device_node *np;
@@ -392,79 +392,79 @@ static void __init of_selftest_property_string(void)
        }
        rc = of_property_match_string(np, "phandle-list-names", "first");
-        selftest(rc == 0, "first expected:0 got:%i\n", rc);
+        unittest(rc == 0, "first expected:0 got:%i\n", rc);
        rc = of_property_match_string(np, "phandle-list-names", "second");
-        selftest(rc == 1, "second expected:1 got:%i\n", rc);
+        unittest(rc == 1, "second expected:1 got:%i\n", rc);
        rc = of_property_match_string(np, "phandle-list-names", "third");
-        selftest(rc == 2, "third expected:2 got:%i\n", rc);
+        unittest(rc == 2, "third expected:2 got:%i\n", rc);
        rc = of_property_match_string(np, "phandle-list-names", "fourth");
-        selftest(rc == -ENODATA, "unmatched string; rc=%i\n", rc);
+        unittest(rc == -ENODATA, "unmatched string; rc=%i\n", rc);
        rc = of_property_match_string(np, "missing-property", "blah");
-        selftest(rc == -EINVAL, "missing property; rc=%i\n", rc);
+        unittest(rc == -EINVAL, "missing property; rc=%i\n", rc);
        rc = of_property_match_string(np, "empty-property", "blah");
-        selftest(rc == -ENODATA, "empty property; rc=%i\n", rc);
+        unittest(rc == -ENODATA, "empty property; rc=%i\n", rc);
        rc = of_property_match_string(np, "unterminated-string", "blah");
-        selftest(rc == -EILSEQ, "unterminated string; rc=%i\n", rc);
+        unittest(rc == -EILSEQ, "unterminated string; rc=%i\n", rc);
        /* of_property_count_strings() tests */
        rc = of_property_count_strings(np, "string-property");
-        selftest(rc == 1, "Incorrect string count; rc=%i\n", rc);
+        unittest(rc == 1, "Incorrect string count; rc=%i\n", rc);
        rc = of_property_count_strings(np, "phandle-list-names");
-        selftest(rc == 3, "Incorrect string count; rc=%i\n", rc);
+        unittest(rc == 3, "Incorrect string count; rc=%i\n", rc);
        rc = of_property_count_strings(np, "unterminated-string");
-        selftest(rc == -EILSEQ, "unterminated string; rc=%i\n", rc);
+        unittest(rc == -EILSEQ, "unterminated string; rc=%i\n", rc);
        rc = of_property_count_strings(np, "unterminated-string-list");
-        selftest(rc == -EILSEQ, "unterminated string array; rc=%i\n", rc);
+        unittest(rc == -EILSEQ, "unterminated string array; rc=%i\n", rc);
        /* of_property_read_string_index() tests */
        rc = of_property_read_string_index(np, "string-property", 0, strings);
-        selftest(rc == 0 && !strcmp(strings[0], "foobar"), "of_property_read_string_index() failure; rc=%i\n", rc);
+        unittest(rc == 0 && !strcmp(strings[0], "foobar"), "of_property_read_string_index() failure; rc=%i\n", rc);
        strings[0] = NULL;
        rc = of_property_read_string_index(np, "string-property", 1, strings);
-        selftest(rc == -ENODATA && strings[0] == NULL, "of_property_read_string_index() failure; rc=%i\n", rc);
+        unittest(rc == -ENODATA && strings[0] == NULL, "of_property_read_string_index() failure; rc=%i\n", rc);
        rc = of_property_read_string_index(np, "phandle-list-names", 0, strings);
-        selftest(rc == 0 && !strcmp(strings[0], "first"), "of_property_read_string_index() failure; rc=%i\n", rc);
+        unittest(rc == 0 && !strcmp(strings[0], "first"), "of_property_read_string_index() failure; rc=%i\n", rc);
        rc = of_property_read_string_index(np, "phandle-list-names", 1, strings);
-        selftest(rc == 0 && !strcmp(strings[0], "second"), "of_property_read_string_index() failure; rc=%i\n", rc);
+        unittest(rc == 0 && !strcmp(strings[0], "second"), "of_property_read_string_index() failure; rc=%i\n", rc);
        rc = of_property_read_string_index(np, "phandle-list-names", 2, strings);
-        selftest(rc == 0 && !strcmp(strings[0], "third"), "of_property_read_string_index() failure; rc=%i\n", rc);
+        unittest(rc == 0 && !strcmp(strings[0], "third"), "of_property_read_string_index() failure; rc=%i\n", rc);
        strings[0] = NULL;
        rc = of_property_read_string_index(np, "phandle-list-names", 3, strings);
-        selftest(rc == -ENODATA && strings[0] == NULL, "of_property_read_string_index() failure; rc=%i\n", rc);
+        unittest(rc == -ENODATA && strings[0] == NULL, "of_property_read_string_index() failure; rc=%i\n", rc);
        strings[0] = NULL;
        rc = of_property_read_string_index(np, "unterminated-string", 0, strings);
-        selftest(rc == -EILSEQ && strings[0] == NULL, "of_property_read_string_index() failure; rc=%i\n", rc);
+        unittest(rc == -EILSEQ && strings[0] == NULL, "of_property_read_string_index() failure; rc=%i\n", rc);
        rc = of_property_read_string_index(np, "unterminated-string-list", 0, strings);
-        selftest(rc == 0 && !strcmp(strings[0], "first"), "of_property_read_string_index() failure; rc=%i\n", rc);
+        unittest(rc == 0 && !strcmp(strings[0], "first"), "of_property_read_string_index() failure; rc=%i\n", rc);
        strings[0] = NULL;
        rc = of_property_read_string_index(np, "unterminated-string-list", 2, strings); /* should fail */
-        selftest(rc == -EILSEQ && strings[0] == NULL, "of_property_read_string_index() failure; rc=%i\n", rc);
+        unittest(rc == -EILSEQ && strings[0] == NULL, "of_property_read_string_index() failure; rc=%i\n", rc);
        strings[1] = NULL;
        /* of_property_read_string_array() tests */
        rc = of_property_read_string_array(np, "string-property", strings, 4);
-        selftest(rc == 1, "Incorrect string count; rc=%i\n", rc);
+        unittest(rc == 1, "Incorrect string count; rc=%i\n", rc);
        rc = of_property_read_string_array(np, "phandle-list-names", strings, 4);
-        selftest(rc == 3, "Incorrect string count; rc=%i\n", rc);
+        unittest(rc == 3, "Incorrect string count; rc=%i\n", rc);
        rc = of_property_read_string_array(np, "unterminated-string", strings, 4);
-        selftest(rc == -EILSEQ, "unterminated string; rc=%i\n", rc);
+        unittest(rc == -EILSEQ, "unterminated string; rc=%i\n", rc);
        /* -- An incorrectly formed string should cause a failure */
        rc = of_property_read_string_array(np, "unterminated-string-list", strings, 4);
-        selftest(rc == -EILSEQ, "unterminated string array; rc=%i\n", rc);
+        unittest(rc == -EILSEQ, "unterminated string array; rc=%i\n", rc);
        /* -- parsing the correctly formed strings should still work: */
        strings[2] = NULL;
        rc = of_property_read_string_array(np, "unterminated-string-list", strings, 2);
-        selftest(rc == 2 && strings[2] == NULL, "of_property_read_string_array() failure; rc=%i\n", rc);
+        unittest(rc == 2 && strings[2] == NULL, "of_property_read_string_array() failure; rc=%i\n", rc);
        strings[1] = NULL;
        rc = of_property_read_string_array(np, "phandle-list-names", strings, 1);
-        selftest(rc == 1 && strings[1] == NULL, "Overwrote end of string array; rc=%i, str='%s'\n", rc, strings[1]);
+        unittest(rc == 1 && strings[1] == NULL, "Overwrote end of string array; rc=%i, str='%s'\n", rc, strings[1]);
 }
 #define propcmp(p1, p2) (((p1)->length == (p2)->length) && \
                        (p1)->value && (p2)->value && \
                        !memcmp((p1)->value, (p2)->value, (p1)->length) && \
                        !strcmp((p1)->name, (p2)->name))
-static void __init of_selftest_property_copy(void)
+static void __init of_unittest_property_copy(void)
 {
 #ifdef CONFIG_OF_DYNAMIC
        struct property p1 = { .name = "p1", .length = 0, .value = "" };
@@ -472,20 +472,20 @@ static void __init of_selftest_property_copy(void)
        struct property *new;
        new = __of_prop_dup(&p1, GFP_KERNEL);
-        selftest(new && propcmp(&p1, new), "empty property didn't copy correctly\n");
+        unittest(new && propcmp(&p1, new), "empty property didn't copy correctly\n");
        kfree(new->value);
        kfree(new->name);
        kfree(new);
        new = __of_prop_dup(&p2, GFP_KERNEL);
-        selftest(new && propcmp(&p2, new), "non-empty property didn't copy correctly\n");
+        unittest(new && propcmp(&p2, new), "non-empty property didn't copy correctly\n");
        kfree(new->value);
        kfree(new->name);
        kfree(new);
 #endif
 }
-static void __init of_selftest_changeset(void)
+static void __init of_unittest_changeset(void)
 {
 #ifdef CONFIG_OF_DYNAMIC
        struct property *ppadd, padd = { .name = "prop-add", .length = 0, .value = "" };
@@ -495,51 +495,51 @@ static void __init of_selftest_changeset(void)
        struct of_changeset chgset;
        n1 = __of_node_dup(NULL, "/testcase-data/changeset/n1");
-        selftest(n1, "testcase setup failure\n");
+        unittest(n1, "testcase setup failure\n");
        n2 = __of_node_dup(NULL, "/testcase-data/changeset/n2");
-        selftest(n2, "testcase setup failure\n");
+        unittest(n2, "testcase setup failure\n");
        n21 = __of_node_dup(NULL, "%s/%s", "/testcase-data/changeset/n2", "n21");
-        selftest(n21, "testcase setup failure %p\n", n21);
+        unittest(n21, "testcase setup failure %p\n", n21);
        nremove = of_find_node_by_path("/testcase-data/changeset/node-remove");
-        selftest(nremove, "testcase setup failure\n");
+        unittest(nremove, "testcase setup failure\n");
        ppadd = __of_prop_dup(&padd, GFP_KERNEL);
-        selftest(ppadd, "testcase setup failure\n");
+        unittest(ppadd, "testcase setup failure\n");
        ppupdate = __of_prop_dup(&pupdate, GFP_KERNEL);
-        selftest(ppupdate, "testcase setup failure\n");
+        unittest(ppupdate, "testcase setup failure\n");
        parent = nremove->parent;
        n1->parent = parent;
        n2->parent = parent;
        n21->parent = n2;
        n2->child = n21;
        ppremove = of_find_property(parent, "prop-remove", NULL);
-        selftest(ppremove, "failed to find removal prop");
+        unittest(ppremove, "failed to find removal prop");
        of_changeset_init(&chgset);
-        selftest(!of_changeset_attach_node(&chgset, n1), "fail attach n1\n");
+        unittest(!of_changeset_attach_node(&chgset, n1), "fail attach n1\n");
-        selftest(!of_changeset_attach_node(&chgset, n2), "fail attach n2\n");
+        unittest(!of_changeset_attach_node(&chgset, n2), "fail attach n2\n");
-        selftest(!of_changeset_detach_node(&chgset, nremove), "fail remove node\n");
+        unittest(!of_changeset_detach_node(&chgset, nremove), "fail remove node\n");
-        selftest(!of_changeset_attach_node(&chgset, n21), "fail attach n21\n");
+        unittest(!of_changeset_attach_node(&chgset, n21), "fail attach n21\n");
-        selftest(!of_changeset_add_property(&chgset, parent, ppadd), "fail add prop\n");
+        unittest(!of_changeset_add_property(&chgset, parent, ppadd), "fail add prop\n");
-        selftest(!of_changeset_update_property(&chgset, parent, ppupdate), "fail update prop\n");
+        unittest(!of_changeset_update_property(&chgset, parent, ppupdate), "fail update prop\n");
-        selftest(!of_changeset_remove_property(&chgset, parent, ppremove), "fail remove prop\n");
+        unittest(!of_changeset_remove_property(&chgset, parent, ppremove), "fail remove prop\n");
        mutex_lock(&of_mutex);
-        selftest(!of_changeset_apply(&chgset), "apply failed\n");
+        unittest(!of_changeset_apply(&chgset), "apply failed\n");
        mutex_unlock(&of_mutex);
        /* Make sure node names are constructed correctly */
-        selftest((np = of_find_node_by_path("/testcase-data/changeset/n2/n21")),
+        unittest((np = of_find_node_by_path("/testcase-data/changeset/n2/n21")),
                 "'%s' not added\n", n21->full_name);
        of_node_put(np);
        mutex_lock(&of_mutex);
-        selftest(!of_changeset_revert(&chgset), "revert failed\n");
+        unittest(!of_changeset_revert(&chgset), "revert failed\n");
        mutex_unlock(&of_mutex);
        of_changeset_destroy(&chgset);
 #endif
 }
-static void __init of_selftest_parse_interrupts(void)
+static void __init of_unittest_parse_interrupts(void)
 {
        struct device_node *np;
        struct of_phandle_args args;
@@ -560,7 +560,7 @@ static void __init of_selftest_parse_interrupts(void)
                passed &= (args.args_count == 1);
                passed &= (args.args[0] == (i + 1));
-                selftest(passed, "index %i - data error on node %s rc=%i\n",
+                unittest(passed, "index %i - data error on node %s rc=%i\n",
                         i, args.np->full_name, rc);
        }
        of_node_put(np);
@@ -605,13 +605,13 @@ static void __init of_selftest_parse_interrupts(void)
                default:
                        passed = false;
                }
-                selftest(passed, "index %i - data error on node %s rc=%i\n",
+                unittest(passed, "index %i - data error on node %s rc=%i\n",
                         i, args.np->full_name, rc);
        }
        of_node_put(np);
 }
-static void __init of_selftest_parse_interrupts_extended(void)
+static void __init of_unittest_parse_interrupts_extended(void)
 {
        struct device_node *np;
        struct of_phandle_args args;
@@ -674,7 +674,7 @@ static void __init of_selftest_parse_interrupts_extended(void)
                        passed = false;
                }
-                selftest(passed, "index %i - data error on node %s rc=%i\n",
+                unittest(passed, "index %i - data error on node %s rc=%i\n",
                         i, args.np->full_name, rc);
        }
        of_node_put(np);
@@ -715,7 +715,7 @@ static struct {
        { .path = "/testcase-data/match-node/name9", .data = "K", },
 };
-static void __init of_selftest_match_node(void)
+static void __init of_unittest_match_node(void)
 {
        struct device_node *np;
        const struct of_device_id *match;
@@ -724,32 +724,32 @@ static void __init of_selftest_match_node(void)
        for (i = 0; i < ARRAY_SIZE(match_node_tests); i++) {
                np = of_find_node_by_path(match_node_tests[i].path);
                if (!np) {
-                        selftest(0, "missing testcase node %s\n",
+                        unittest(0, "missing testcase node %s\n",
                                match_node_tests[i].path);
                        continue;
                }
                match = of_match_node(match_node_table, np);
                if (!match) {
-                        selftest(0, "%s didn't match anything\n",
+                        unittest(0, "%s didn't match anything\n",
                                match_node_tests[i].path);
                        continue;
                }
                if (strcmp(match->data, match_node_tests[i].data) != 0) {
-                        selftest(0, "%s got wrong match. expected %s, got %s\n",
+                        unittest(0, "%s got wrong match. expected %s, got %s\n",
                                match_node_tests[i].path, match_node_tests[i].data,
                                (const char *)match->data);
                        continue;
                }
-                selftest(1, "passed");
+                unittest(1, "passed");
        }
 }
 struct device test_bus = {
        .init_name = "unittest-bus",
 };
-static void __init of_selftest_platform_populate(void)
+static void __init of_unittest_platform_populate(void)
 {
        int irq, rc;
        struct device_node *np, *child, *grandchild;
@@ -765,30 +765,30 @@ static void __init of_selftest_platform_populate(void)
        /* Test that a missing irq domain returns -EPROBE_DEFER */
        np = of_find_node_by_path("/testcase-data/testcase-device1");
        pdev = of_find_device_by_node(np);
-        selftest(pdev, "device 1 creation failed\n");
+        unittest(pdev, "device 1 creation failed\n");
        irq = platform_get_irq(pdev, 0);
-        selftest(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);
-        selftest(pdev, "device 2 creation failed\n");
+        unittest(pdev, "device 2 creation failed\n");
        irq = platform_get_irq(pdev, 0);
-        selftest(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);
-        if (selftest(np = of_find_node_by_path("/testcase-data/platform-tests"),
+        if (unittest(np = of_find_node_by_path("/testcase-data/platform-tests"),
                     "No testcase data in device tree\n"));
                return;
-        if (selftest(!(rc = device_register(&test_bus)),
+        if (unittest(!(rc = device_register(&test_bus)),
                     "testbus registration failed; rc=%i\n", rc));
                return;
        for_each_child_of_node(np, child) {
                of_platform_populate(child, match, NULL, &test_bus);
                for_each_child_of_node(child, grandchild)
-                        selftest(of_find_device_by_node(grandchild),
+                        unittest(of_find_device_by_node(grandchild),
                                 "Could not create device for node '%s'\n",
                                 grandchild->name);
        }
@@ -796,7 +796,7 @@ static void __init of_selftest_platform_populate(void)
        of_platform_depopulate(&test_bus);
        for_each_child_of_node(np, child) {
                for_each_child_of_node(child, grandchild)
-                        selftest(!of_find_device_by_node(grandchild),
+                        unittest(!of_find_device_by_node(grandchild),
                                 "device didn't get destroyed '%s'\n",
                                 grandchild->name);
        }
@@ -866,13 +866,13 @@ static int attach_node_and_children(struct device_node *np)
 }
 /**
- *      selftest_data_add - Reads, copies data from
+ *      unittest_data_add - Reads, copies data from
 *      linked tree and attaches it to the live tree
 */
-static int __init selftest_data_add(void)
+static int __init unittest_data_add(void)
 {
-        void *selftest_data;
+        void *unittest_data;
-        struct device_node *selftest_data_node, *np;
+        struct device_node *unittest_data_node, *np;
        extern uint8_t __dtb_testcases_begin[];
        extern uint8_t __dtb_testcases_end[];
        const int size = __dtb_testcases_end - __dtb_testcases_begin;
@@ -885,27 +885,27 @@ static int __init selftest_data_add(void)
        }
        /* creating copy */
-        selftest_data = kmemdup(__dtb_testcases_begin, size, GFP_KERNEL);
+        unittest_data = kmemdup(__dtb_testcases_begin, size, GFP_KERNEL);
-        if (!selftest_data) {
+        if (!unittest_data) {
-                pr_warn("%s: Failed to allocate memory for selftest_data; "
+                pr_warn("%s: Failed to allocate memory for unittest_data; "
                        "not running tests\n", __func__);
                return -ENOMEM;
        }
-        of_fdt_unflatten_tree(selftest_data, &selftest_data_node);
+        of_fdt_unflatten_tree(unittest_data, &unittest_data_node);
-        if (!selftest_data_node) {
+        if (!unittest_data_node) {
                pr_warn("%s: No tree to attach; not running tests\n", __func__);
                return -ENODATA;
        }
-        of_node_set_flag(selftest_data_node, OF_DETACHED);
+        of_node_set_flag(unittest_data_node, OF_DETACHED);
-        rc = of_resolve_phandles(selftest_data_node);
+        rc = of_resolve_phandles(unittest_data_node);
        if (rc) {
                pr_err("%s: Failed to resolve phandles (rc=%i)\n", __func__, rc);
                return -EINVAL;
        }
        if (!of_root) {
-                of_root = selftest_data_node;
+                of_root = unittest_data_node;
                for_each_of_allnodes(np)
                        __of_attach_node_sysfs(np);
                of_aliases = of_find_node_by_path("/aliases");
@@ -914,7 +914,7 @@ static int __init selftest_data_add(void)
        }
        /* attach the sub-tree to live tree */
-        np = selftest_data_node->child;
+        np = unittest_data_node->child;
        while (np) {
                struct device_node *next = np->sibling;
                np->parent = of_root;
@@ -926,7 +926,7 @@ static int __init selftest_data_add(void)
 #ifdef CONFIG_OF_OVERLAY
-static int selftest_probe(struct platform_device *pdev)
+static int unittest_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct device_node *np = dev->of_node;
@@ -944,7 +944,7 @@ static int selftest_probe(struct platform_device *pdev)
        return 0;
 }
-static int selftest_remove(struct platform_device *pdev)
+static int unittest_remove(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct device_node *np = dev->of_node;
@@ -953,18 +953,18 @@ static int selftest_remove(struct platform_device *pdev)
        return 0;
 }
-static struct of_device_id selftest_match[] = {
+static struct of_device_id unittest_match[] = {
-        { .compatible = "selftest", },
+        { .compatible = "unittest", },
        {},
 };
-static struct platform_driver selftest_driver = {
+static struct platform_driver unittest_driver = {
-        .probe                  = selftest_probe,
+        .probe                  = unittest_probe,
-        .remove                 = selftest_remove,
+        .remove                 = unittest_remove,
        .driver = {
-                .name           = "selftest",
+                .name           = "unittest",
                .owner          = THIS_MODULE,
-                .of_match_table = of_match_ptr(selftest_match),
+                .of_match_table = of_match_ptr(unittest_match),
        },
 };
@@ -1046,7 +1046,7 @@ static int of_path_device_type_exists(const char *path,
        return 0;
 }
-static const char *selftest_path(int nr, enum overlay_type ovtype)
+static const char *unittest_path(int nr, enum overlay_type ovtype)
 {
        const char *base;
        static char buf[256];
@@ -1062,16 +1062,16 @@ static const char *selftest_path(int nr, enum overlay_type ovtype)
                buf[0] = '\0';
                return buf;
        }
-        snprintf(buf, sizeof(buf) - 1, "%s/test-selftest%d", base, nr);
+        snprintf(buf, sizeof(buf) - 1, "%s/test-unittest%d", base, nr);
        buf[sizeof(buf) - 1] = '\0';
        return buf;
 }
-static int of_selftest_device_exists(int selftest_nr, enum overlay_type ovtype)
+static int of_unittest_device_exists(int unittest_nr, enum overlay_type ovtype)
 {
        const char *path;
-        path = selftest_path(selftest_nr, ovtype);
+        path = unittest_path(unittest_nr, ovtype);
        switch (ovtype) {
        case PDEV_OVERLAY:
@@ -1095,7 +1095,7 @@ static const char *overlay_path(int nr)
 static const char *bus_path = "/testcase-data/overlay-node/test-bus";
-static int of_selftest_apply_overlay(int selftest_nr, int overlay_nr,
+static int of_unittest_apply_overlay(int unittest_nr, int overlay_nr,
                int *overlay_id)
 {
        struct device_node *np = NULL;
@@ -1103,7 +1103,7 @@ static int of_selftest_apply_overlay(int selftest_nr, int overlay_nr,
        np = of_find_node_by_path(overlay_path(overlay_nr));
        if (np == NULL) {
-                selftest(0, "could not find overlay node @\"%s\"\n",
+                unittest(0, "could not find overlay node @\"%s\"\n",
                                overlay_path(overlay_nr));
                ret = -EINVAL;
                goto out;
@@ -1111,7 +1111,7 @@ static int of_selftest_apply_overlay(int selftest_nr, int overlay_nr,
        ret = of_overlay_create(np);
        if (ret < 0) {
-                selftest(0, "could not create overlay from \"%s\"\n",
+                unittest(0, "could not create overlay from \"%s\"\n",
                                overlay_path(overlay_nr));
                goto out;
        }
@@ -1129,31 +1129,31 @@ out:
 }
 /* apply an overlay while checking before and after states */
-static int of_selftest_apply_overlay_check(int overlay_nr, int selftest_nr,
+static int of_unittest_apply_overlay_check(int overlay_nr, int unittest_nr,
                int before, int after, enum overlay_type ovtype)
 {
        int ret;
-        /* selftest device must not be in before state */
+        /* unittest device must not be in before state */
-        if (of_selftest_device_exists(selftest_nr, ovtype) != before) {
+        if (of_unittest_device_exists(unittest_nr, ovtype) != before) {
-                selftest(0, "overlay @\"%s\" with device @\"%s\" %s\n",
+                unittest(0, "overlay @\"%s\" with device @\"%s\" %s\n",
                                overlay_path(overlay_nr),
-                                selftest_path(selftest_nr, ovtype),
+                                unittest_path(unittest_nr, ovtype),
                                !before ? "enabled" : "disabled");
                return -EINVAL;
        }
-        ret = of_selftest_apply_overlay(overlay_nr, selftest_nr, NULL);
+        ret = of_unittest_apply_overlay(overlay_nr, unittest_nr, NULL);
        if (ret != 0) {
-                /* of_selftest_apply_overlay already called selftest() */
+                /* of_unittest_apply_overlay already called unittest() */
                return ret;
        }
-        /* selftest device must be to set to after state */
+        /* unittest device must be to set to after state */
-        if (of_selftest_device_exists(selftest_nr, ovtype) != after) {
+        if (of_unittest_device_exists(unittest_nr, ovtype) != after) {
-                selftest(0, "overlay @\"%s\" failed to create @\"%s\" %s\n",
+                unittest(0, "overlay @\"%s\" failed to create @\"%s\" %s\n",
                                overlay_path(overlay_nr),
-                                selftest_path(selftest_nr, ovtype),
+                                unittest_path(unittest_nr, ovtype),
                                !after ? "enabled" : "disabled");
                return -EINVAL;
        }
@@ -1162,50 +1162,50 @@ static int of_selftest_apply_overlay_check(int overlay_nr, int selftest_nr,
 }
 /* apply an overlay and then revert it while checking before, after states */
-static int of_selftest_apply_revert_overlay_check(int overlay_nr,
+static int of_unittest_apply_revert_overlay_check(int overlay_nr,
-                int selftest_nr, int before, int after,
+                int unittest_nr, int before, int after,
                enum overlay_type ovtype)
 {
        int ret, ov_id;
-        /* selftest device must be in before state */
+        /* unittest device must be in before state */
-        if (of_selftest_device_exists(selftest_nr, ovtype) != before) {
+        if (of_unittest_device_exists(unittest_nr, ovtype) != before) {
-                selftest(0, "overlay @\"%s\" with device @\"%s\" %s\n",
+                unittest(0, "overlay @\"%s\" with device @\"%s\" %s\n",
                                overlay_path(overlay_nr),
-                                selftest_path(selftest_nr, ovtype),
+                                unittest_path(unittest_nr, ovtype),
                                !before ? "enabled" : "disabled");
                return -EINVAL;
        }
        /* apply the overlay */
-        ret = of_selftest_apply_overlay(overlay_nr, selftest_nr, &ov_id);
+        ret = of_unittest_apply_overlay(overlay_nr, unittest_nr, &ov_id);
        if (ret != 0) {
-                /* of_selftest_apply_overlay already called selftest() */
+                /* of_unittest_apply_overlay already called unittest() */
                return ret;
        }
-        /* selftest device must be in after state */
+        /* unittest device must be in after state */
-        if (of_selftest_device_exists(selftest_nr, ovtype) != after) {
+        if (of_unittest_device_exists(unittest_nr, ovtype) != after) {
-                selftest(0, "overlay @\"%s\" failed to create @\"%s\" %s\n",
+                unittest(0, "overlay @\"%s\" failed to create @\"%s\" %s\n",
                                overlay_path(overlay_nr),
-                                selftest_path(selftest_nr, ovtype),
+                                unittest_path(unittest_nr, ovtype),
                                !after ? "enabled" : "disabled");
                return -EINVAL;
        }
        ret = of_overlay_destroy(ov_id);
        if (ret != 0) {
-                selftest(0, "overlay @\"%s\" failed to be destroyed @\"%s\"\n",
+                unittest(0, "overlay @\"%s\" failed to be destroyed @\"%s\"\n",
                                overlay_path(overlay_nr),
-                                selftest_path(selftest_nr, ovtype));
+                                unittest_path(unittest_nr, ovtype));
                return ret;
        }
-        /* selftest device must be again in before state */
+        /* unittest device must be again in before state */
-        if (of_selftest_device_exists(selftest_nr, PDEV_OVERLAY) != before) {
+        if (of_unittest_device_exists(unittest_nr, PDEV_OVERLAY) != before) {
-                selftest(0, "overlay @\"%s\" with device @\"%s\" %s\n",
+                unittest(0, "overlay @\"%s\" with device @\"%s\" %s\n",
                                overlay_path(overlay_nr),
-                                selftest_path(selftest_nr, ovtype),
+                                unittest_path(unittest_nr, ovtype),
                                !before ? "enabled" : "disabled");
                return -EINVAL;
        }
@@ -1214,98 +1214,98 @@ static int of_selftest_apply_revert_overlay_check(int overlay_nr,
 }
 /* test activation of device */
-static void of_selftest_overlay_0(void)
+static void of_unittest_overlay_0(void)
 {
        int ret;
        /* device should enable */
-        ret = of_selftest_apply_overlay_check(0, 0, 0, 1, PDEV_OVERLAY);
+        ret = of_unittest_apply_overlay_check(0, 0, 0, 1, PDEV_OVERLAY);
        if (ret != 0)
                return;
-        selftest(1, "overlay test %d passed\n", 0);
+        unittest(1, "overlay test %d passed\n", 0);
 }
 /* test deactivation of device */
-static void of_selftest_overlay_1(void)
+static void of_unittest_overlay_1(void)
 {
        int ret;
        /* device should disable */
-        ret = of_selftest_apply_overlay_check(1, 1, 1, 0, PDEV_OVERLAY);
+        ret = of_unittest_apply_overlay_check(1, 1, 1, 0, PDEV_OVERLAY);
        if (ret != 0)
                return;
-        selftest(1, "overlay test %d passed\n", 1);
+        unittest(1, "overlay test %d passed\n", 1);
 }
 /* test activation of device */
-static void of_selftest_overlay_2(void)
+static void of_unittest_overlay_2(void)
 {
        int ret;
        /* device should enable */
-        ret = of_selftest_apply_overlay_check(2, 2, 0, 1, PDEV_OVERLAY);
+        ret = of_unittest_apply_overlay_check(2, 2, 0, 1, PDEV_OVERLAY);
        if (ret != 0)
                return;
-        selftest(1, "overlay test %d passed\n", 2);
+        unittest(1, "overlay test %d passed\n", 2);
 }
 /* test deactivation of device */
-static void of_selftest_overlay_3(void)
+static void of_unittest_overlay_3(void)
 {
        int ret;
        /* device should disable */
-        ret = of_selftest_apply_overlay_check(3, 3, 1, 0, PDEV_OVERLAY);
+        ret = of_unittest_apply_overlay_check(3, 3, 1, 0, PDEV_OVERLAY);
        if (ret != 0)
                return;
-        selftest(1, "overlay test %d passed\n", 3);
+        unittest(1, "overlay test %d passed\n", 3);
 }
 /* test activation of a full device node */
-static void of_selftest_overlay_4(void)
+static void of_unittest_overlay_4(void)
 {
        int ret;
        /* device should disable */
-        ret = of_selftest_apply_overlay_check(4, 4, 0, 1, PDEV_OVERLAY);
+        ret = of_unittest_apply_overlay_check(4, 4, 0, 1, PDEV_OVERLAY);
        if (ret != 0)
                return;
-        selftest(1, "overlay test %d passed\n", 4);
+        unittest(1, "overlay test %d passed\n", 4);
 }
 /* test overlay apply/revert sequence */
-static void of_selftest_overlay_5(void)
+static void of_unittest_overlay_5(void)
 {
        int ret;
        /* device should disable */
-        ret = of_selftest_apply_revert_overlay_check(5, 5, 0, 1, PDEV_OVERLAY);
+        ret = of_unittest_apply_revert_overlay_check(5, 5, 0, 1, PDEV_OVERLAY);
        if (ret != 0)
                return;
-        selftest(1, "overlay test %d passed\n", 5);
+        unittest(1, "overlay test %d passed\n", 5);
 }
 /* test overlay application in sequence */
-static void of_selftest_overlay_6(void)
+static void of_unittest_overlay_6(void)
 {
        struct device_node *np;
        int ret, i, ov_id[2];
-        int overlay_nr = 6, selftest_nr = 6;
+        int overlay_nr = 6, unittest_nr = 6;
        int before = 0, after = 1;
-        /* selftest device must be in before state */
+        /* unittest device must be in before state */
        for (i = 0; i < 2; i++) {
-                if (of_selftest_device_exists(selftest_nr + i, PDEV_OVERLAY)
+                if (of_unittest_device_exists(unittest_nr + i, PDEV_OVERLAY)
                                != before) {
-                        selftest(0, "overlay @\"%s\" with device @\"%s\" %s\n",
+                        unittest(0, "overlay @\"%s\" with device @\"%s\" %s\n",
                                        overlay_path(overlay_nr + i),
-                                        selftest_path(selftest_nr + i,
+                                        unittest_path(unittest_nr + i,
                                                PDEV_OVERLAY),
                                        !before ? "enabled" : "disabled");
                        return;
@@ -1317,14 +1317,14 @@ static void of_selftest_overlay_6(void)
                np = of_find_node_by_path(overlay_path(overlay_nr + i));
                if (np == NULL) {
-                        selftest(0, "could not find overlay node @\"%s\"\n",
+                        unittest(0, "could not find overlay node @\"%s\"\n",
                                        overlay_path(overlay_nr + i));
                        return;
                }
                ret = of_overlay_create(np);
                if (ret < 0)  {
-                        selftest(0, "could not create overlay from \"%s\"\n",
+                        unittest(0, "could not create overlay from \"%s\"\n",
                                        overlay_path(overlay_nr + i));
                        return;
                }
@@ -1332,12 +1332,12 @@ static void of_selftest_overlay_6(void)
        }
        for (i = 0; i < 2; i++) {
-                /* selftest device must be in after state */
+                /* unittest device must be in after state */
-                if (of_selftest_device_exists(selftest_nr + i, PDEV_OVERLAY)
+                if (of_unittest_device_exists(unittest_nr + i, PDEV_OVERLAY)
                                != after) {
-                        selftest(0, "overlay @\"%s\" failed @\"%s\" %s\n",
+                        unittest(0, "overlay @\"%s\" failed @\"%s\" %s\n",
                                        overlay_path(overlay_nr + i),
-                                        selftest_path(selftest_nr + i,
+                                        unittest_path(unittest_nr + i,
                                                PDEV_OVERLAY),
                                        !after ? "enabled" : "disabled");
                        return;
@@ -1347,36 +1347,36 @@ static void of_selftest_overlay_6(void)
        for (i = 1; i >= 0; i--) {
                ret = of_overlay_destroy(ov_id[i]);
                if (ret != 0) {
-                        selftest(0, "overlay @\"%s\" failed destroy @\"%s\"\n",
+                        unittest(0, "overlay @\"%s\" failed destroy @\"%s\"\n",
                                        overlay_path(overlay_nr + i),
-                                        selftest_path(selftest_nr + i,
+                                        unittest_path(unittest_nr + i,
                                                PDEV_OVERLAY));
                        return;
                }
        }
        for (i = 0; i < 2; i++) {
-                /* selftest device must be again in before state */
+                /* unittest device must be again in before state */
-                if (of_selftest_device_exists(selftest_nr + i, PDEV_OVERLAY)
+                if (of_unittest_device_exists(unittest_nr + i, PDEV_OVERLAY)
                                != before) {
-                        selftest(0, "overlay @\"%s\" with device @\"%s\" %s\n",
+                        unittest(0, "overlay @\"%s\" with device @\"%s\" %s\n",
                                        overlay_path(overlay_nr + i),
-                                        selftest_path(selftest_nr + i,
+                                        unittest_path(unittest_nr + i,
                                                PDEV_OVERLAY),
                                        !before ? "enabled" : "disabled");
                        return;
                }
        }
-        selftest(1, "overlay test %d passed\n", 6);
+        unittest(1, "overlay test %d passed\n", 6);
 }
 /* test overlay application in sequence */
-static void of_selftest_overlay_8(void)
+static void of_unittest_overlay_8(void)
 {
        struct device_node *np;
        int ret, i, ov_id[2];
-        int overlay_nr = 8, selftest_nr = 8;
+        int overlay_nr = 8, unittest_nr = 8;
        /* we don't care about device state in this test */
@@ -1385,14 +1385,14 @@ static void of_selftest_overlay_8(void)
                np = of_find_node_by_path(overlay_path(overlay_nr + i));
                if (np == NULL) {
-                        selftest(0, "could not find overlay node @\"%s\"\n",
+                        unittest(0, "could not find overlay node @\"%s\"\n",
                                        overlay_path(overlay_nr + i));
                        return;
                }
                ret = of_overlay_create(np);
                if (ret < 0)  {
-                        selftest(0, "could not create overlay from \"%s\"\n",
+                        unittest(0, "could not create overlay from \"%s\"\n",
                                        overlay_path(overlay_nr + i));
                        return;
                }
@@ -1402,9 +1402,9 @@ static void of_selftest_overlay_8(void)
        /* now try to remove first overlay (it should fail) */
        ret = of_overlay_destroy(ov_id[0]);
        if (ret == 0) {
-                selftest(0, "overlay @\"%s\" was destroyed @\"%s\"\n",
+                unittest(0, "overlay @\"%s\" was destroyed @\"%s\"\n",
                                overlay_path(overlay_nr + 0),
-                                selftest_path(selftest_nr,
+                                unittest_path(unittest_nr,
                                        PDEV_OVERLAY));
                return;
        }
@@ -1413,85 +1413,85 @@ static void of_selftest_overlay_8(void)
        for (i = 1; i >= 0; i--) {
                ret = of_overlay_destroy(ov_id[i]);
                if (ret != 0) {
-                        selftest(0, "overlay @\"%s\" not destroyed @\"%s\"\n",
+                        unittest(0, "overlay @\"%s\" not destroyed @\"%s\"\n",
                                        overlay_path(overlay_nr + i),
-                                        selftest_path(selftest_nr,
+                                        unittest_path(unittest_nr,
                                                PDEV_OVERLAY));
                        return;
                }
        }
-        selftest(1, "overlay test %d passed\n", 8);
+        unittest(1, "overlay test %d passed\n", 8);
 }
 /* test insertion of a bus with parent devices */
-static void of_selftest_overlay_10(void)
+static void of_unittest_overlay_10(void)
 {
        int ret;
        char *child_path;
        /* device should disable */
-        ret = of_selftest_apply_overlay_check(10, 10, 0, 1, PDEV_OVERLAY);
+        ret = of_unittest_apply_overlay_check(10, 10, 0, 1, PDEV_OVERLAY);
-        if (selftest(ret == 0,
+        if (unittest(ret == 0,
                        "overlay test %d failed; overlay application\n", 10))
                return;
-        child_path = kasprintf(GFP_KERNEL, "%s/test-selftest101",
+        child_path = kasprintf(GFP_KERNEL, "%s/test-unittest101",
-                        selftest_path(10, PDEV_OVERLAY));
+                        unittest_path(10, PDEV_OVERLAY));
-        if (selftest(child_path, "overlay test %d failed; kasprintf\n", 10))
+        if (unittest(child_path, "overlay test %d failed; kasprintf\n", 10))
                return;
        ret = of_path_device_type_exists(child_path, PDEV_OVERLAY);
        kfree(child_path);
-        if (selftest(ret, "overlay test %d failed; no child device\n", 10))
+        if (unittest(ret, "overlay test %d failed; no child device\n", 10))
                return;
 }
 /* test insertion of a bus with parent devices (and revert) */
-static void of_selftest_overlay_11(void)
+static void of_unittest_overlay_11(void)
 {
        int ret;
        /* device should disable */
-        ret = of_selftest_apply_revert_overlay_check(11, 11, 0, 1,
+        ret = of_unittest_apply_revert_overlay_check(11, 11, 0, 1,
                        PDEV_OVERLAY);
-        if (selftest(ret == 0,
+        if (unittest(ret == 0,
                        "overlay test %d failed; overlay application\n", 11))
                return;
 }
 #if IS_BUILTIN(CONFIG_I2C) && IS_ENABLED(CONFIG_OF_OVERLAY)
-struct selftest_i2c_bus_data {
+struct unittest_i2c_bus_data {
        struct platform_device  *pdev;
        struct i2c_adapter      adap;
 };
-static int selftest_i2c_master_xfer(struct i2c_adapter *adap,
+static int unittest_i2c_master_xfer(struct i2c_adapter *adap,
                struct i2c_msg *msgs, int num)
 {
-        struct selftest_i2c_bus_data *std = i2c_get_adapdata(adap);
+        struct unittest_i2c_bus_data *std = i2c_get_adapdata(adap);
        (void)std;
        return num;
 }
-static u32 selftest_i2c_functionality(struct i2c_adapter *adap)
+static u32 unittest_i2c_functionality(struct i2c_adapter *adap)
 {
        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
 }
-static const struct i2c_algorithm selftest_i2c_algo = {
+static const struct i2c_algorithm unittest_i2c_algo = {
-        .master_xfer    = selftest_i2c_master_xfer,
+        .master_xfer    = unittest_i2c_master_xfer,
-        .functionality  = selftest_i2c_functionality,
+        .functionality  = unittest_i2c_functionality,
 };
-static int selftest_i2c_bus_probe(struct platform_device *pdev)
+static int unittest_i2c_bus_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct device_node *np = dev->of_node;
-        struct selftest_i2c_bus_data *std;
+        struct unittest_i2c_bus_data *std;
        struct i2c_adapter *adap;
        int ret;
@@ -1505,7 +1505,7 @@ static int selftest_i2c_bus_probe(struct platform_device *pdev)
        std = devm_kzalloc(dev, sizeof(*std), GFP_KERNEL);
        if (!std) {
-                dev_err(dev, "Failed to allocate selftest i2c data\n");
+                dev_err(dev, "Failed to allocate unittest i2c data\n");
                return -ENOMEM;
        }
@@ -1518,7 +1518,7 @@ static int selftest_i2c_bus_probe(struct platform_device *pdev)
        adap->nr = -1;
        strlcpy(adap->name, pdev->name, sizeof(adap->name));
        adap->class = I2C_CLASS_DEPRECATED;
-        adap->algo = &selftest_i2c_algo;
+        adap->algo = &unittest_i2c_algo;
        adap->dev.parent = dev;
        adap->dev.of_node = dev->of_node;
        adap->timeout = 5 * HZ;
@@ -1533,11 +1533,11 @@ static int selftest_i2c_bus_probe(struct platform_device *pdev)
        return 0;
 }
-static int selftest_i2c_bus_remove(struct platform_device *pdev)
+static int unittest_i2c_bus_remove(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct device_node *np = dev->of_node;
-        struct selftest_i2c_bus_data *std = platform_get_drvdata(pdev);
+        struct unittest_i2c_bus_data *std = platform_get_drvdata(pdev);
        dev_dbg(dev, "%s for node @%s\n", __func__, np->full_name);
        i2c_del_adapter(&std->adap);
@@ -1545,21 +1545,21 @@ static int selftest_i2c_bus_remove(struct platform_device *pdev)
        return 0;
 }
-static struct of_device_id selftest_i2c_bus_match[] = {
+static struct of_device_id unittest_i2c_bus_match[] = {
-        { .compatible = "selftest-i2c-bus", },
+        { .compatible = "unittest-i2c-bus", },
        {},
 };
-static struct platform_driver selftest_i2c_bus_driver = {
+static struct platform_driver unittest_i2c_bus_driver = {
-        .probe                  = selftest_i2c_bus_probe,
+        .probe                  = unittest_i2c_bus_probe,
-        .remove                 = selftest_i2c_bus_remove,
+        .remove                 = unittest_i2c_bus_remove,
        .driver = {
-                .name           = "selftest-i2c-bus",
+                .name           = "unittest-i2c-bus",
-                .of_match_table = of_match_ptr(selftest_i2c_bus_match),
+                .of_match_table = of_match_ptr(unittest_i2c_bus_match),
        },
 };
-static int selftest_i2c_dev_probe(struct i2c_client *client,
+static int unittest_i2c_dev_probe(struct i2c_client *client,
                const struct i2c_device_id *id)
 {
        struct device *dev = &client->dev;
@@ -1575,7 +1575,7 @@ static int selftest_i2c_dev_probe(struct i2c_client *client,
        return 0;
 };
-static int selftest_i2c_dev_remove(struct i2c_client *client)
+static int unittest_i2c_dev_remove(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct device_node *np = client->dev.of_node;
@@ -1584,42 +1584,42 @@ static int selftest_i2c_dev_remove(struct i2c_client *client)
        return 0;
 }
-static const struct i2c_device_id selftest_i2c_dev_id[] = {
+static const struct i2c_device_id unittest_i2c_dev_id[] = {
-        { .name = "selftest-i2c-dev" },
+        { .name = "unittest-i2c-dev" },
        { }
 };
-static struct i2c_driver selftest_i2c_dev_driver = {
+static struct i2c_driver unittest_i2c_dev_driver = {
        .driver = {
-                .name = "selftest-i2c-dev",
+                .name = "unittest-i2c-dev",
                .owner = THIS_MODULE,
        },
-        .probe = selftest_i2c_dev_probe,
+        .probe = unittest_i2c_dev_probe,
-        .remove = selftest_i2c_dev_remove,
+        .remove = unittest_i2c_dev_remove,
-        .id_table = selftest_i2c_dev_id,
+        .id_table = unittest_i2c_dev_id,
 };
 #if IS_BUILTIN(CONFIG_I2C_MUX)
-struct selftest_i2c_mux_data {
+struct unittest_i2c_mux_data {
        int nchans;
        struct i2c_adapter *adap[];
 };
-static int selftest_i2c_mux_select_chan(struct i2c_adapter *adap,
+static int unittest_i2c_mux_select_chan(struct i2c_adapter *adap,
                               void *client, u32 chan)
 {
        return 0;
 }
-static int selftest_i2c_mux_probe(struct i2c_client *client,
+static int unittest_i2c_mux_probe(struct i2c_client *client,
                const struct i2c_device_id *id)
 {
        int ret, i, nchans, size;
        struct device *dev = &client->dev;
        struct i2c_adapter *adap = to_i2c_adapter(dev->parent);
        struct device_node *np = client->dev.of_node, *child;
-        struct selftest_i2c_mux_data *stm;
+        struct unittest_i2c_mux_data *stm;
        u32 reg, max_reg;
        dev_dbg(dev, "%s for node @%s\n", __func__, np->full_name);
@@ -1643,7 +1643,7 @@ static int selftest_i2c_mux_probe(struct i2c_client *client,
                return -EINVAL;
        }
-        size = offsetof(struct selftest_i2c_mux_data, adap[nchans]);
+        size = offsetof(struct unittest_i2c_mux_data, adap[nchans]);
        stm = devm_kzalloc(dev, size, GFP_KERNEL);
        if (!stm) {
                dev_err(dev, "Out of memory\n");
@@ -1652,7 +1652,7 @@ static int selftest_i2c_mux_probe(struct i2c_client *client,
        stm->nchans = nchans;
        for (i = 0; i < nchans; i++) {
                stm->adap[i] = i2c_add_mux_adapter(adap, dev, client,
-                                0, i, 0, selftest_i2c_mux_select_chan, NULL);
+                                0, i, 0, unittest_i2c_mux_select_chan, NULL);
                if (!stm->adap[i]) {
                        dev_err(dev, "Failed to register mux #%d\n", i);
                        for (i--; i >= 0; i--)
@@ -1666,11 +1666,11 @@ static int selftest_i2c_mux_probe(struct i2c_client *client,
        return 0;
 };
-static int selftest_i2c_mux_remove(struct i2c_client *client)
+static int unittest_i2c_mux_remove(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct device_node *np = client->dev.of_node;
-        struct selftest_i2c_mux_data *stm = i2c_get_clientdata(client);
+        struct unittest_i2c_mux_data *stm = i2c_get_clientdata(client);
        int i;
        dev_dbg(dev, "%s for node @%s\n", __func__, np->full_name);
@@ -1679,166 +1679,166 @@ static int selftest_i2c_mux_remove(struct i2c_client *client)
        return 0;
 }
-static const struct i2c_device_id selftest_i2c_mux_id[] = {
+static const struct i2c_device_id unittest_i2c_mux_id[] = {
-        { .name = "selftest-i2c-mux" },
+        { .name = "unittest-i2c-mux" },
        { }
 };
-static struct i2c_driver selftest_i2c_mux_driver = {
+static struct i2c_driver unittest_i2c_mux_driver = {
        .driver = {
-                .name = "selftest-i2c-mux",
+                .name = "unittest-i2c-mux",
                .owner = THIS_MODULE,
        },
-        .probe = selftest_i2c_mux_probe,
+        .probe = unittest_i2c_mux_probe,
-        .remove = selftest_i2c_mux_remove,
+        .remove = unittest_i2c_mux_remove,
-        .id_table = selftest_i2c_mux_id,
+        .id_table = unittest_i2c_mux_id,
 };
 #endif
-static int of_selftest_overlay_i2c_init(void)
+static int of_unittest_overlay_i2c_init(void)
 {
        int ret;
-        ret = i2c_add_driver(&selftest_i2c_dev_driver);
+        ret = i2c_add_driver(&unittest_i2c_dev_driver);
-        if (selftest(ret == 0,
+        if (unittest(ret == 0,
-                        "could not register selftest i2c device driver\n"))
+                        "could not register unittest i2c device driver\n"))
                return ret;
-        ret = platform_driver_register(&selftest_i2c_bus_driver);
+        ret = platform_driver_register(&unittest_i2c_bus_driver);
-        if (selftest(ret == 0,
+        if (unittest(ret == 0,
-                        "could not register selftest i2c bus driver\n"))
+                        "could not register unittest i2c bus driver\n"))
                return ret;
 #if IS_BUILTIN(CONFIG_I2C_MUX)
-        ret = i2c_add_driver(&selftest_i2c_mux_driver);
+        ret = i2c_add_driver(&unittest_i2c_mux_driver);
-        if (selftest(ret == 0,
+        if (unittest(ret == 0,
-                        "could not register selftest i2c mux driver\n"))
+                        "could not register unittest i2c mux driver\n"))
                return ret;
 #endif
        return 0;
 }
-static void of_selftest_overlay_i2c_cleanup(void)
+static void of_unittest_overlay_i2c_cleanup(void)
 {
 #if IS_BUILTIN(CONFIG_I2C_MUX)
-        i2c_del_driver(&selftest_i2c_mux_driver);
+        i2c_del_driver(&unittest_i2c_mux_driver);
 #endif
-        platform_driver_unregister(&selftest_i2c_bus_driver);
+        platform_driver_unregister(&unittest_i2c_bus_driver);
-        i2c_del_driver(&selftest_i2c_dev_driver);
+        i2c_del_driver(&unittest_i2c_dev_driver);
 }
-static void of_selftest_overlay_i2c_12(void)
+static void of_unittest_overlay_i2c_12(void)
 {
        int ret;
        /* device should enable */
-        ret = of_selftest_apply_overlay_check(12, 12, 0, 1, I2C_OVERLAY);
+        ret = of_unittest_apply_overlay_check(12, 12, 0, 1, I2C_OVERLAY);
        if (ret != 0)
                return;
-        selftest(1, "overlay test %d passed\n", 12);
+        unittest(1, "overlay test %d passed\n", 12);
 }
 /* test deactivation of device */
-static void of_selftest_overlay_i2c_13(void)
+static void of_unittest_overlay_i2c_13(void)
 {
        int ret;
        /* device should disable */
-        ret = of_selftest_apply_overlay_check(13, 13, 1, 0, I2C_OVERLAY);
+        ret = of_unittest_apply_overlay_check(13, 13, 1, 0, I2C_OVERLAY);
        if (ret != 0)
                return;
-        selftest(1, "overlay test %d passed\n", 13);
+        unittest(1, "overlay test %d passed\n", 13);
 }
 /* just check for i2c mux existence */
-static void of_selftest_overlay_i2c_14(void)
+static void of_unittest_overlay_i2c_14(void)
 {
 }
-static void of_selftest_overlay_i2c_15(void)
+static void of_unittest_overlay_i2c_15(void)
 {
        int ret;
        /* device should enable */
-        ret = of_selftest_apply_overlay_check(16, 15, 0, 1, I2C_OVERLAY);
+        ret = of_unittest_apply_overlay_check(16, 15, 0, 1, I2C_OVERLAY);
        if (ret != 0)
                return;
-        selftest(1, "overlay test %d passed\n", 15);
+        unittest(1, "overlay test %d passed\n", 15);
 }
 #else
-static inline void of_selftest_overlay_i2c_14(void) { }
+static inline void of_unittest_overlay_i2c_14(void) { }
-static inline void of_selftest_overlay_i2c_15(void) { }
+static inline void of_unittest_overlay_i2c_15(void) { }
 #endif
-static void __init of_selftest_overlay(void)
+static void __init of_unittest_overlay(void)
 {
        struct device_node *bus_np = NULL;
        int ret;
-        ret = platform_driver_register(&selftest_driver);
+        ret = platform_driver_register(&unittest_driver);
        if (ret != 0) {
-                selftest(0, "could not register selftest driver\n");
+                unittest(0, "could not register unittest driver\n");
                goto out;
        }
        bus_np = of_find_node_by_path(bus_path);
        if (bus_np == NULL) {
-                selftest(0, "could not find bus_path \"%s\"\n", bus_path);
+                unittest(0, "could not find bus_path \"%s\"\n", bus_path);
                goto out;
        }
        ret = of_platform_populate(bus_np, of_default_bus_match_table,
                        NULL, NULL);
        if (ret != 0) {
-                selftest(0, "could not populate bus @ \"%s\"\n", bus_path);
+                unittest(0, "could not populate bus @ \"%s\"\n", bus_path);
                goto out;
        }
-        if (!of_selftest_device_exists(100, PDEV_OVERLAY)) {
+        if (!of_unittest_device_exists(100, PDEV_OVERLAY)) {
-                selftest(0, "could not find selftest0 @ \"%s\"\n",
+                unittest(0, "could not find unittest0 @ \"%s\"\n",
-                                selftest_path(100, PDEV_OVERLAY));
+                                unittest_path(100, PDEV_OVERLAY));
                goto out;
        }
-        if (of_selftest_device_exists(101, PDEV_OVERLAY)) {
+        if (of_unittest_device_exists(101, PDEV_OVERLAY)) {
-                selftest(0, "selftest1 @ \"%s\" should not exist\n",
+                unittest(0, "unittest1 @ \"%s\" should not exist\n",
-                                selftest_path(101, PDEV_OVERLAY));
+                                unittest_path(101, PDEV_OVERLAY));
                goto out;
        }
-        selftest(1, "basic infrastructure of overlays passed");
+        unittest(1, "basic infrastructure of overlays passed");
        /* tests in sequence */
-        of_selftest_overlay_0();
+        of_unittest_overlay_0();
-        of_selftest_overlay_1();
+        of_unittest_overlay_1();
-        of_selftest_overlay_2();
+        of_unittest_overlay_2();
-        of_selftest_overlay_3();
+        of_unittest_overlay_3();
-        of_selftest_overlay_4();
+        of_unittest_overlay_4();
-        of_selftest_overlay_5();
+        of_unittest_overlay_5();
-        of_selftest_overlay_6();
+        of_unittest_overlay_6();
-        of_selftest_overlay_8();
+        of_unittest_overlay_8();
-        of_selftest_overlay_10();
+        of_unittest_overlay_10();
-        of_selftest_overlay_11();
+        of_unittest_overlay_11();
 #if IS_BUILTIN(CONFIG_I2C)
-        if (selftest(of_selftest_overlay_i2c_init() == 0, "i2c init failed\n"))
+        if (unittest(of_unittest_overlay_i2c_init() == 0, "i2c init failed\n"))
                goto out;
-        of_selftest_overlay_i2c_12();
+        of_unittest_overlay_i2c_12();
-        of_selftest_overlay_i2c_13();
+        of_unittest_overlay_i2c_13();
-        of_selftest_overlay_i2c_14();
+        of_unittest_overlay_i2c_14();
-        of_selftest_overlay_i2c_15();
+        of_unittest_overlay_i2c_15();
-        of_selftest_overlay_i2c_cleanup();
+        of_unittest_overlay_i2c_cleanup();
 #endif
 out:
@@ -1846,16 +1846,16 @@ out:
 }
 #else
-static inline void __init of_selftest_overlay(void) { }
+static inline void __init of_unittest_overlay(void) { }
 #endif
-static int __init of_selftest(void)
+static int __init of_unittest(void)
 {
        struct device_node *np;
        int res;
-        /* adding data for selftest */
+        /* adding data for unittest */
-        res = selftest_data_add();
+        res = unittest_data_add();
        if (res)
                return res;
        if (!of_aliases)
@@ -1868,27 +1868,27 @@ static int __init of_selftest(void)
        }
        of_node_put(np);
-        pr_info("start of selftest - you will see error messages\n");
+        pr_info("start of unittest - you will see error messages\n");
-        of_selftest_check_tree_linkage();
+        of_unittest_check_tree_linkage();
-        of_selftest_check_phandles();
+        of_unittest_check_phandles();
-        of_selftest_find_node_by_name();
+        of_unittest_find_node_by_name();
-        of_selftest_dynamic();
+        of_unittest_dynamic();
-        of_selftest_parse_phandle_with_args();
+        of_unittest_parse_phandle_with_args();
-        of_selftest_property_string();
+        of_unittest_property_string();
-        of_selftest_property_copy();
+        of_unittest_property_copy();
-        of_selftest_changeset();
+        of_unittest_changeset();
-        of_selftest_parse_interrupts();
+        of_unittest_parse_interrupts();
-        of_selftest_parse_interrupts_extended();
+        of_unittest_parse_interrupts_extended();
-        of_selftest_match_node();
+        of_unittest_match_node();
-        of_selftest_platform_populate();
+        of_unittest_platform_populate();
-        of_selftest_overlay();
+        of_unittest_overlay();
        /* Double check linkage after removing testcase data */
-        of_selftest_check_tree_linkage();
+        of_unittest_check_tree_linkage();
-        pr_info("end of selftest - %i passed, %i failed\n",
+        pr_info("end of unittest - %i passed, %i failed\n",
-                selftest_results.passed, selftest_results.failed);
+                unittest_results.passed, unittest_results.failed);
        return 0;
 }
-late_initcall(of_selftest);
+late_initcall(of_unittest);
diff --git a/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c b/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c
index 42b87f95267c..8b6f6d5fdd68 100644
--- a/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c
+++ b/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c
@@ -164,20 +164,15 @@ static void __init omapdss_walk_device(struct device_node *node, bool root)
                pn = of_graph_get_remote_port_parent(n);
-                if (!pn) {
+                if (!pn)
-                        of_node_put(n);
                        continue;
-                }
                if (!of_device_is_available(pn) || omapdss_list_contains(pn)) {
                        of_node_put(pn);
-                        of_node_put(n);
                        continue;
                }
                omapdss_walk_device(pn, false);
-                of_node_put(n);
        }
 }
diff --git a/include/linux/of_graph.h b/include/linux/of_graph.h
index befef42e015b..7bc92e050608 100644
--- a/include/linux/of_graph.h
+++ b/include/linux/of_graph.h
@@ -14,6 +14,8 @@
 #ifndef __LINUX_OF_GRAPH_H
 #define __LINUX_OF_GRAPH_H
+#include <linux/types.h>
 /**
 * struct of_endpoint - the OF graph endpoint data structure
 * @port: identifier (value of reg property) of a port this endpoint belongs to
@@ -26,9 +28,21 @@ struct of_endpoint {
        const struct device_node *local_node;
 };
+/**
+ * for_each_endpoint_of_node - iterate over every endpoint in a device node
+ * @parent: parent device node containing ports and endpoints
+ * @child: loop variable pointing to the current endpoint node
+ *
+ * When breaking out of the loop, of_node_put(child) has to be called manually.
+ */
+#define for_each_endpoint_of_node(parent, child) \
+        for (child = of_graph_get_next_endpoint(parent, NULL); child != NULL; \
+             child = of_graph_get_next_endpoint(parent, child))
 #ifdef CONFIG_OF
 int of_graph_parse_endpoint(const struct device_node *node,
                                struct of_endpoint *endpoint);
+struct device_node *of_graph_get_port_by_id(struct device_node *node, u32 id);
 struct device_node *of_graph_get_next_endpoint(const struct device_node *parent,
                                        struct device_node *previous);
 struct device_node *of_graph_get_remote_port_parent(
@@ -42,6 +56,12 @@ static inline int of_graph_parse_endpoint(const struct device_node *node,
        return -ENOSYS;
 }
+static inline struct device_node *of_graph_get_port_by_id(
+                                        struct device_node *node, u32 id)
+{
+        return NULL;
+}
 static inline struct device_node *of_graph_get_next_endpoint(
                                        const struct device_node *parent,
                                        struct device_node *previous)