dm: test: Add "/firmware" node scan test

Add a test which verifies that all subnodes under "/firmware"
nodes are scanned.

Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Added 'imply FIRMWARE' to sandbox Kconfig to fix test failures, fixed
ordering of lines in arch/sandbox/dts/test.dts and test/dm/Makefile,
updated #if condition in drivers/firmware/firmware-uclass.c:
Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/Kconfig b/arch/Kconfig
index 11900b02b99c4e46cc757403c0150f837799e43f..9b4bcbf2fd29cf5eeaec454d8fe753d06200dcbd 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -89,6 +89,7 @@ config SANDBOX
        imply CMD_SF_TEST
        imply CRC32_VERIFY
        imply FAT_WRITE
+       imply FIRMWARE
        imply HASH_VERIFY
        imply LZMA
        imply SCSI

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 751c13b51da293f670547ae75fe4a16cffd67f50..42ceeb994e8b6144bb16975db47b1a4c7d080f33 100644 (file)
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -190,6 +190,12 @@
                fake-host-hwaddr = [00 00 66 44 22 22];
        };
 
+       firmware {
+               sandbox_firmware: sandbox-firmware {
+                       compatible = "sandbox,firmware";
+               };
+       };
+
        gpio_a: base-gpios {
                compatible = "sandbox,gpio";
                gpio-controller;

diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
index 1cdda14977dc985b0ba22c230c3bba3b232bd764..6cb83582b9ff2665419d7c25b30eb5df512f5f8b 100644 (file)
--- a/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@ -1,3 +1,4 @@
 obj-$(CONFIG_FIRMWARE)         += firmware-uclass.o
 obj-$(CONFIG_ARM_PSCI_FW)      += psci.o
 obj-$(CONFIG_TI_SCI_PROTOCOL)  += ti_sci.o
+obj-$(CONFIG_SANDBOX)          += firmware-sandbox.o

diff --git a/drivers/firmware/firmware-sandbox.c b/drivers/firmware/firmware-sandbox.c
new file mode 100644 (file)
index 0000000..d970d75
--- /dev/null
+++ b/drivers/firmware/firmware-sandbox.c
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * sandbox firmware driver
+ *
+ * Copyright (C) 2018 Xilinx, Inc.
+ */
+
+#include <common.h>
+#include <dm.h>
+
+static const struct udevice_id generic_sandbox_firmware_ids[] = {
+       { .compatible = "sandbox,firmware" },
+       { }
+};
+
+U_BOOT_DRIVER(sandbox_firmware) = {
+       .name = "sandbox_firmware",
+       .id = UCLASS_FIRMWARE,
+       .of_match = generic_sandbox_firmware_ids,
+};

diff --git a/drivers/firmware/firmware-uclass.c b/drivers/firmware/firmware-uclass.c
index 3d33b6deba33dc516ac371b625ddfd3902dafada..7fcd7fb9047ac6b5e13659f884d275a5d953cdb0 100644 (file)
--- a/drivers/firmware/firmware-uclass.c
+++ b/drivers/firmware/firmware-uclass.c
@@ -7,7 +7,7 @@
 UCLASS_DRIVER(firmware) = {
        .id             = UCLASS_FIRMWARE,
        .name           = "firmware",
-#if CONFIG_IS_ENABLED(OF_CONTROL)
+#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
        .post_bind      = dm_scan_fdt_dev,
 #endif
 };

diff --git a/test/dm/Makefile b/test/dm/Makefile
index d7f5d6b0616604459ab89ffd0f714f2acd29dfcd..00acc7f2429554683d84600404da4f1882a3cdbc 100644 (file)
--- a/test/dm/Makefile
+++ b/test/dm/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_BLK) += blk.o
 obj-$(CONFIG_BOARD) += board.o
 obj-$(CONFIG_CLK) += clk.o
 obj-$(CONFIG_DM_ETH) += eth.o
+obj-$(CONFIG_FIRMWARE) += firmware.o
 obj-$(CONFIG_DM_GPIO) += gpio.o
 obj-$(CONFIG_DM_I2C) += i2c.o
 obj-$(CONFIG_LED) += led.o

diff --git a/test/dm/firmware.c b/test/dm/firmware.c
new file mode 100644 (file)
index 0000000..60fdcbb
--- /dev/null
+++ b/test/dm/firmware.c
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018 Xilinx, Inc.
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <syscon.h>
+#include <asm/test.h>
+#include <dm/test.h>
+#include <test/ut.h>
+
+/* Base test of firmware probe */
+static int dm_test_firmware_probe(struct unit_test_state *uts)
+{
+       struct udevice *dev;
+
+       ut_assertok(uclass_get_device_by_name(UCLASS_FIRMWARE,
+                                             "sandbox-firmware", &dev));
+       return 0;
+}
+DM_TEST(dm_test_firmware_probe, DM_TESTF_SCAN_FDT);