summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Gerlach <d-gerlach@ti.com>2020-07-15 23:39:58 -0500
committerSimon Glass <sjg@chromium.org>2020-07-25 14:46:57 -0600
commit21e3c219aea21467766420f9d1941d12e48259bd (patch)
tree888a26535e137b56dd0e14ccfffaed4532843866
parent6d3b82df832908675fe4cf4c829779f3abc34999 (diff)
downloadu-boot-21e3c219aea21467766420f9d1941d12e48259bd.tar.gz
test: Add tests for SOC uclass
Add a sandbox SOC driver, and some tests for the SOC uclass. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
-rw-r--r--arch/sandbox/dts/test.dts4
-rw-r--r--configs/sandbox64_defconfig1
-rw-r--r--configs/sandbox_defconfig1
-rw-r--r--configs/sandbox_flattree_defconfig1
-rw-r--r--configs/sandbox_spl_defconfig1
-rw-r--r--drivers/soc/Makefile1
-rw-r--r--drivers/soc/soc_sandbox.c56
-rw-r--r--test/dm/Makefile1
-rw-r--r--test/dm/soc.c120
9 files changed, 186 insertions, 0 deletions
diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 3744a46603..2ae4239721 100644
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -521,6 +521,10 @@
};
};
+ chipid: chipid {
+ compatible = "sandbox,soc";
+ };
+
i2s: i2s {
compatible = "sandbox,i2s";
#sound-dai-cells = <1>;
diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
index dcf2f44b58..a3b7ff444f 100644
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -118,6 +118,7 @@ CONFIG_LED_GPIO=y
CONFIG_DM_MAILBOX=y
CONFIG_SANDBOX_MBOX=y
CONFIG_MISC=y
+CONFIG_SOC_DEVICE=y
CONFIG_CROS_EC=y
CONFIG_CROS_EC_I2C=y
CONFIG_CROS_EC_LPC=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 6059d668af..17c9b332f5 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -139,6 +139,7 @@ CONFIG_LED_GPIO=y
CONFIG_DM_MAILBOX=y
CONFIG_SANDBOX_MBOX=y
CONFIG_MISC=y
+CONFIG_SOC_DEVICE=y
CONFIG_CROS_EC=y
CONFIG_CROS_EC_I2C=y
CONFIG_CROS_EC_LPC=y
diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig
index 4158b9b86d..93ab210ebb 100644
--- a/configs/sandbox_flattree_defconfig
+++ b/configs/sandbox_flattree_defconfig
@@ -103,6 +103,7 @@ CONFIG_LED_GPIO=y
CONFIG_DM_MAILBOX=y
CONFIG_SANDBOX_MBOX=y
CONFIG_MISC=y
+CONFIG_SOC_DEVICE=y
CONFIG_CROS_EC=y
CONFIG_CROS_EC_I2C=y
CONFIG_CROS_EC_LPC=y
diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index b3274a93b4..25c974f6fe 100644
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -120,6 +120,7 @@ CONFIG_LED_GPIO=y
CONFIG_DM_MAILBOX=y
CONFIG_SANDBOX_MBOX=y
CONFIG_MISC=y
+CONFIG_SOC_DEVICE=y
CONFIG_CROS_EC=y
CONFIG_CROS_EC_I2C=y
CONFIG_CROS_EC_LPC=y
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 1c09a84656..649e92b390 100644
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -4,3 +4,4 @@
obj-$(CONFIG_SOC_TI) += ti/
obj-$(CONFIG_SOC_DEVICE) += soc-uclass.o
+obj-$(CONFIG_SANDBOX) += soc_sandbox.o
diff --git a/drivers/soc/soc_sandbox.c b/drivers/soc/soc_sandbox.c
new file mode 100644
index 0000000000..5c82ad84fc
--- /dev/null
+++ b/drivers/soc/soc_sandbox.c
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Sandbox driver for the SOC uclass
+ *
+ * (C) Copyright 2020 - Texas Instruments Incorporated - http://www.ti.com/
+ * Dave Gerlach <d-gerlach@ti.com>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <soc.h>
+
+int soc_sandbox_get_family(struct udevice *dev, char *buf, int size)
+{
+ snprintf(buf, size, "SANDBOX1xx");
+
+ return 0;
+}
+
+int soc_sandbox_get_machine(struct udevice *dev, char *buf, int size)
+{
+ snprintf(buf, size, "SANDBOX123");
+
+ return 0;
+}
+
+int soc_sandbox_get_revision(struct udevice *dev, char *buf, int size)
+{
+ snprintf(buf, size, "1.0");
+
+ return 0;
+}
+
+static const struct soc_ops soc_sandbox_ops = {
+ .get_family = soc_sandbox_get_family,
+ .get_revision = soc_sandbox_get_revision,
+ .get_machine = soc_sandbox_get_machine,
+};
+
+int soc_sandbox_probe(struct udevice *dev)
+{
+ return 0;
+}
+
+static const struct udevice_id soc_sandbox_ids[] = {
+ { .compatible = "sandbox,soc" },
+ { }
+};
+
+U_BOOT_DRIVER(soc_sandbox) = {
+ .name = "soc_sandbox",
+ .id = UCLASS_SOC,
+ .ops = &soc_sandbox_ops,
+ .of_match = soc_sandbox_ids,
+ .probe = soc_sandbox_probe,
+};
diff --git a/test/dm/Makefile b/test/dm/Makefile
index b03c96da06..839111791b 100644
--- a/test/dm/Makefile
+++ b/test/dm/Makefile
@@ -68,6 +68,7 @@ obj-$(CONFIG_AXI) += axi.o
obj-$(CONFIG_MISC) += misc.o
obj-$(CONFIG_DM_SERIAL) += serial.o
obj-$(CONFIG_CPU) += cpu.o
+obj-$(CONFIG_SOC_DEVICE) += soc.o
obj-$(CONFIG_SOUND) += sound.o
obj-$(CONFIG_TEE) += tee.o
obj-$(CONFIG_VIRTIO_SANDBOX) += virtio.o
diff --git a/test/dm/soc.c b/test/dm/soc.c
new file mode 100644
index 0000000000..3ad0f561f2
--- /dev/null
+++ b/test/dm/soc.c
@@ -0,0 +1,120 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test for the SOC uclass
+ *
+ * (C) Copyright 2020 - Texas Instruments Incorporated - http://www.ti.com/
+ * Dave Gerlach <d-gerlach@ti.com>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <dm/test.h>
+#include <dm/uclass-internal.h>
+#include <soc.h>
+#include <test/ut.h>
+
+struct sb_soc_data {
+ unsigned long param;
+};
+
+static int dm_test_soc(struct unit_test_state *uts)
+{
+ struct udevice *dev;
+ char text[128];
+ const struct soc_attr *soc_data;
+ const struct sb_soc_data *match_data;
+
+ static const struct sb_soc_data soc_sandbox1_sr10_data = { 0x91919191 };
+ static const struct sb_soc_data soc_sandbox123_data = { 0x84848484 };
+
+ static const struct soc_attr sb_soc_devices_full[] = {
+ {
+ .family = "SANDBOX0xx",
+ .machine = "SANDBOX012",
+ .revision = "1.0",
+ .data = NULL,
+ },
+ {
+ .family = "SANDBOX1xx",
+ .machine = "SANDBOX107",
+ .revision = "1.0",
+ .data = NULL,
+ },
+ {
+ .family = "SANDBOX1xx",
+ .machine = "SANDBOX123",
+ .revision = "1.0",
+ .data = &soc_sandbox123_data,
+ },
+ {
+ .family = "SANDBOX1xx",
+ .machine = "SANDBOX131",
+ .revision = "2.0",
+ .data = NULL,
+ },
+ { /* sentinel */ }
+ };
+
+ static const struct soc_attr sb_soc_devices_partial[] = {
+ {
+ .family = "SANDBOX0xx",
+ .revision = "1.0",
+ .data = NULL,
+ },
+ {
+ .family = "SANDBOX1xx",
+ .revision = "1.0",
+ .data = &soc_sandbox1_sr10_data,
+ },
+ {
+ .family = "SANDBOX1xx",
+ .revision = "2.0",
+ .data = NULL,
+ },
+ { /* sentinel */ }
+ };
+
+ static const struct soc_attr sb_soc_devices_nomatch[] = {
+ {
+ .family = "SANDBOX0xx",
+ .revision = "1.0",
+ .data = NULL,
+ },
+ {
+ .family = "SANDBOX1xx",
+ .revision = "2.0",
+ .data = NULL,
+ },
+ { /* sentinel */ }
+ };
+
+ ut_assertok(soc_get(&dev));
+
+ ut_assertok(soc_get_machine(dev, text, sizeof(text)));
+ ut_assertok(strcmp(text, "SANDBOX123"));
+
+ ut_assertok(soc_get_family(dev, text, sizeof(text)));
+ ut_assertok(strcmp(text, "SANDBOX1xx"));
+
+ ut_assertok(soc_get_revision(dev, text, sizeof(text)));
+ ut_asserteq_str(text, "1.0");
+
+ soc_data = soc_device_match(sb_soc_devices_full);
+ ut_assert(soc_data);
+
+ match_data = soc_data->data;
+ ut_asserteq(match_data->param, 0x84848484);
+
+ soc_data = soc_device_match(sb_soc_devices_partial);
+ ut_assert(soc_data);
+
+ match_data = soc_data->data;
+ ut_asserteq(match_data->param, 0x91919191);
+
+ soc_data = soc_device_match(sb_soc_devices_nomatch);
+ ut_asserteq_ptr(soc_data, NULL);
+
+ return 0;
+}
+
+DM_TEST(dm_test_soc, DM_TESTF_SCAN_FDT);