| Message ID | 20210828094209.121781-2-xypron.glpk@gmx.de |
|---|---|
| State | Accepted |
| Commit | 8ae8da10b339349586daad0ceb5c0cb655b5ef6d |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | sandbox: provide /chosen/boot-hartid property | expand |
On Sat, 28 Aug 2021 at 03:42, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote: > > 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> > --- > arch/sandbox/dts/test.dts | 14 +++++++++++--- > drivers/cpu/cpu_sandbox.c | 2 +- > test/dm/cpu.c | 2 +- > test/dm/timer.c | 6 +++--- > 4 files changed, 16 insertions(+), 8 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Sat, 28 Aug 2021 at 03:42, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote: > > 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> > --- > arch/sandbox/dts/test.dts | 14 +++++++++++--- > drivers/cpu/cpu_sandbox.c | 2 +- > test/dm/cpu.c | 2 +- > test/dm/timer.c | 6 +++--- > 4 files changed, 16 insertions(+), 8 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot-dm/next, thanks!
diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 962bdbe556..9046fcf558 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -805,19 +805,27 @@ }; cpus { + #address-cells = <1>; + #size-cells = <0>; timebase-frequency = <2000000>; - cpu-test1 { + cpu1: cpu@1 { + device_type = "cpu"; + reg = <0x1>; timebase-frequency = <3000000>; compatible = "sandbox,cpu_sandbox"; u-boot,dm-pre-reloc; }; - cpu-test2 { + cpu2: cpu@2 { + device_type = "cpu"; + reg = <0x2>; compatible = "sandbox,cpu_sandbox"; u-boot,dm-pre-reloc; }; - cpu-test3 { + cpu3: cpu@3 { + device_type = "cpu"; + reg = <0x3>; compatible = "sandbox,cpu_sandbox"; u-boot,dm-pre-reloc; }; diff --git a/drivers/cpu/cpu_sandbox.c b/drivers/cpu/cpu_sandbox.c index fe6772ba5a..2e871fe313 100644 --- a/drivers/cpu/cpu_sandbox.c +++ b/drivers/cpu/cpu_sandbox.c @@ -38,7 +38,7 @@ static int cpu_sandbox_get_vendor(const struct udevice *dev, char *buf, return 0; } -static const char *cpu_current = "cpu-test1"; +static const char *cpu_current = "cpu@1"; void cpu_sandbox_set_current(const char *name) { diff --git a/test/dm/cpu.c b/test/dm/cpu.c index ed12cafee2..d7e596ee39 100644 --- a/test/dm/cpu.c +++ b/test/dm/cpu.c @@ -27,7 +27,7 @@ static int dm_test_cpu(struct unit_test_state *uts) uclass_find_next_device(&dev)) 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(cpu_is_current(dev), 1); diff --git a/test/dm/timer.c b/test/dm/timer.c index 70043b9eee..9f94d47692 100644 --- a/test/dm/timer.c +++ b/test/dm/timer.c @@ -33,16 +33,16 @@ static int dm_test_timer_timebase_fallback(struct unit_test_state *uts) { 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_asserteq(3000000, timer_get_rate(dev)); 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_asserteq(2000000, timer_get_rate(dev)); - cpu_sandbox_set_current("cpu-test1"); + cpu_sandbox_set_current("cpu@1"); return 0; }
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> --- arch/sandbox/dts/test.dts | 14 +++++++++++--- drivers/cpu/cpu_sandbox.c | 2 +- test/dm/cpu.c | 2 +- test/dm/timer.c | 6 +++--- 4 files changed, 16 insertions(+), 8 deletions(-) -- 2.30.2