leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sandbox: correct cpu nodes

Browse Source 
The cpu nodes in arch/sandbox/dts/test.dts should conform to the devicetree
specification:

* property device_type must be set to "cpu"
* the reg property must be provided
* the cpu nodes must have an address

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Heinrich Schuchardt 2021-08-28 11:42:08 +02:00 committed by Simon Glass
parent 48609d0789
commit 8ae8da10b3
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/sandbox/dts/test.dts
View File

@ -824,19 +824,27 @@
}; };
cpus { cpus {
#address-cells = <1>;
#size-cells = <0>;
timebase-frequency = <2000000>; timebase-frequency = <2000000>;
cpu-test1 { cpu1: cpu@1 {
device_type = "cpu";
reg = <0x1>;
timebase-frequency = <3000000>; timebase-frequency = <3000000>;
compatible = "sandbox,cpu_sandbox"; compatible = "sandbox,cpu_sandbox";
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
}; };
cpu-test2 { cpu2: cpu@2 {
device_type = "cpu";
reg = <0x2>;
compatible = "sandbox,cpu_sandbox"; compatible = "sandbox,cpu_sandbox";
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
}; };
cpu-test3 { cpu3: cpu@3 {
device_type = "cpu";
reg = <0x3>;
compatible = "sandbox,cpu_sandbox"; compatible = "sandbox,cpu_sandbox";
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
}; };

2
drivers/cpu/cpu_sandbox.c
View File

@ -38,7 +38,7 @@ static int cpu_sandbox_get_vendor(const struct udevice *dev, char *buf,
return 0; return 0;
} }
static const char *cpu_current = "cpu-test1"; static const char *cpu_current = "cpu@1";
void cpu_sandbox_set_current(const char *name) void cpu_sandbox_set_current(const char *name)
{ {

2
test/dm/cpu.c
View File

@ -27,7 +27,7 @@ static int dm_test_cpu(struct unit_test_state *uts)
uclass_find_next_device(&dev)) uclass_find_next_device(&dev))
ut_assert(dev_get_flags(dev) & DM_FLAG_ACTIVATED); ut_assert(dev_get_flags(dev) & DM_FLAG_ACTIVATED);
ut_assertok(uclass_get_device_by_name(UCLASS_CPU, "cpu-test1", &dev)); ut_assertok(uclass_get_device_by_name(UCLASS_CPU, "cpu@1", &dev));
ut_asserteq_ptr(cpu_get_current_dev(), dev); ut_asserteq_ptr(cpu_get_current_dev(), dev);
ut_asserteq(cpu_is_current(dev), 1); ut_asserteq(cpu_is_current(dev), 1);

6
test/dm/timer.c
View File

@ -33,16 +33,16 @@ static int dm_test_timer_timebase_fallback(struct unit_test_state *uts)
{ {
struct udevice *dev; struct udevice *dev;
cpu_sandbox_set_current("cpu-test1"); cpu_sandbox_set_current("cpu@1");
ut_assertok(uclass_get_device_by_name(UCLASS_TIMER, "timer@1", &dev)); ut_assertok(uclass_get_device_by_name(UCLASS_TIMER, "timer@1", &dev));
ut_asserteq(3000000, timer_get_rate(dev)); ut_asserteq(3000000, timer_get_rate(dev));
ut_assertok(device_remove(dev, DM_REMOVE_NORMAL)); ut_assertok(device_remove(dev, DM_REMOVE_NORMAL));
cpu_sandbox_set_current("cpu-test2"); cpu_sandbox_set_current("cpu@2");
ut_assertok(uclass_get_device_by_name(UCLASS_TIMER, "timer@1", &dev)); ut_assertok(uclass_get_device_by_name(UCLASS_TIMER, "timer@1", &dev));
ut_asserteq(2000000, timer_get_rate(dev)); ut_asserteq(2000000, timer_get_rate(dev));
cpu_sandbox_set_current("cpu-test1"); cpu_sandbox_set_current("cpu@1");
return 0; return 0;
} }