ARM: shmobile: marzen: Switch to DT_MACHINE_START

PATCH New Magnus Damm 2 participants 5 messages Jul 24, 2013 – Jul 25, 2013

Subsystems (4)

Arm (32-bit) Arm sub-architectures SuperH Arm/RISC-V/Renesas architecture

lore

Share & tools

lore

Magnus Damm

author maintainer

2013-07-24 07:30 UTC #0 lore raw

PATCH 1/1 ARM: shmobile: marzen: Switch to DT_MACHINE_START

From: Magnus Damm <[email protected]>

Convert the marzen board to use DT_MACHINE_START. With this in place all mach-shmobile boards use DT_MACHINE_START. Also, this makes it possible for the r8a7779 SMP code to use DT for CPUs.

So appended DTB is the way forward on this board.

Signed-off-by Magnus Damm <[email protected]>

---

Written on top of renesas-devel-20130724

 arch/arm/mach-shmobile/board-marzen.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/mach-shmobile/board-marzen.c +1 -1

@@ -238,7 +238,7 @@ static void __init marzen_init(void)
 	platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
 }
 
-MACHINE_START(MARZEN, "marzen")
+DT_MACHINE_START(MARZEN, "marzen")
 	.smp		= smp_ops(r8a7779_smp_ops),
 	.map_io		= r8a7779_map_io,
 	.init_early	= r8a7779_add_early_devices,

Simon Horman

2013-07-24 07:39 UTC #1 lore raw

PATCH 1/1 ARM: shmobile: marzen: Switch to DT_MACHINE_START

Quoted 7 lines · Magnus Damm

From: Magnus Damm <[email protected]>
Convert the marzen board to use DT_MACHINE_START. With this in place all mach-shmobile boards use DT_MACHINE_START. Also, this makes it possible for the r8a7779 SMP code to use DT for CPUs.
So appended DTB is the way forward on this board.

Please supply a patch to update the defconfig accordingly.

Quoted 20 lines

Signed-off-by Magnus Damm <[email protected]>

---

Written on top of renesas-devel-20130724

 arch/arm/mach-shmobile/board-marzen.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/mach-shmobile/board-marzen.c +1 -1

@@ -238,7 +238,7 @@ static void __init marzen_init(void)
 	platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
 }
 
-MACHINE_START(MARZEN, "marzen")
+DT_MACHINE_START(MARZEN, "marzen")
 	.smp		= smp_ops(r8a7779_smp_ops),
 	.map_io		= r8a7779_map_io,
 	.init_early	= r8a7779_add_early_devices,

Simon Horman

2013-07-24 08:46 UTC #2 lore raw

PATCH 1/1 ARM: shmobile: marzen: Switch to DT_MACHINE_START

Quoted 10 lines · Simon Horman

Quoted 7 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Convert the marzen board to use DT_MACHINE_START. With this in place all mach-shmobile boards use DT_MACHINE_START. Also, this makes it possible for the r8a7779 SMP code to use DT for CPUs.
So appended DTB is the way forward on this board.
Please supply a patch to update the defconfig accordingly.

In the course of testing this patch I created
a patch to update the defconfig. I will post it with
a patch to use DT for SMP but I have some questions about this patch.

It seems to me that the following is also needed:

* Select USE_OF in Kconfig
* Provide dt_compat in DT_MACHINE_START
* Provide r8a7779-marzen dts

I have a revised version of this patch which does the above. But I wanted to check with you that I am on the right track before posting it.

Also, I think that once sh73a0 and r8a7779 uses DT for SMP we can remove shmobile_smp_init_cpus(). As you have posted a patch for sh73a0 I have prepated a patch for r8a7779 I have also prepared a patch to remove shmobile_smp_init_cpus().

My plan is to post all relevant patches as a series once my questions above are resolved.

Quoted 25 lines

Quoted 12 lines
Signed-off-by Magnus Damm <[email protected]>
---
Written on top of renesas-devel-20130724
 arch/arm/mach-shmobile/board-marzen.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-shmobile/board-marzen.c static void __init marzen_init(void) · line 244
Quoted 8 lines
arch/arm/mach-shmobile/board-marzen.c +1 -1
@@ -238,7 +238,7 @@ static void __init marzen_init(void)
 	platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
 }
 
-MACHINE_START(MARZEN, "marzen")
+DT_MACHINE_START(MARZEN, "marzen")
 	.smp		= smp_ops(r8a7779_smp_ops),
 	.map_io		= r8a7779_map_io,
 	.init_early	= r8a7779_add_early_devices,
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Magnus Damm

author maintainer

2013-07-24 10:00 UTC #3 lore raw

PATCH 1/1 ARM: shmobile: marzen: Switch to DT_MACHINE_START

Hi Simon,

Quoted 18 lines · Simon Horman

Quoted 10 lines · Simon Horman
Quoted 7 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Convert the marzen board to use DT_MACHINE_START. With this in place all mach-shmobile boards use DT_MACHINE_START. Also, this makes it possible for the r8a7779 SMP code to use DT for CPUs.
So appended DTB is the way forward on this board.
Please supply a patch to update the defconfig accordingly.
In the course of testing this patch I created
a patch to update the defconfig. I will post it with
a patch to use DT for SMP but I have some questions about this patch.
It seems to me that the following is also needed:

Quoted 7 lines

* Select USE_OF in Kconfig
* Provide dt_compat in DT_MACHINE_START
* Provide r8a7779-marzen dts
I have a revised version of this patch which does the above. But I wanted to check with you that I am on the right track before posting it.

Yes, you are correct. It seems that I was (am) too trigger happy. Thanks for fixing these.

Quoted 4 lines

Also, I think that once sh73a0 and r8a7779 uses DT for SMP we can remove shmobile_smp_init_cpus(). As you have posted a patch for sh73a0 I have prepated a patch for r8a7779 I have also prepared a patch to remove shmobile_smp_init_cpus().

I think we should remove that function, but I'd like to put some shared code in the same file. So I don't want to remove the file. Perhaps the easiest is to leave it as-is for now and let me deal with that in an upcoming series.

Quoted 2 lines

My plan is to post all relevant patches as a series once my questions above are resolved.

Sounds good, thanks for your help!

Thanks,

/ magnus

Simon Horman

2013-07-25 02:03 UTC #4 lore raw

PATCH 1/1 ARM: shmobile: marzen: Switch to DT_MACHINE_START

Quoted 25 lines · Magnus Damm

Hi Simon,
Quoted 22 lines · Simon Horman
Quoted 10 lines · Simon Horman
Quoted 7 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Convert the marzen board to use DT_MACHINE_START. With this in place all mach-shmobile boards use DT_MACHINE_START. Also, this makes it possible for the r8a7779 SMP code to use DT for CPUs.
So appended DTB is the way forward on this board.
Please supply a patch to update the defconfig accordingly.
In the course of testing this patch I created
a patch to update the defconfig. I will post it with
a patch to use DT for SMP but I have some questions about this patch.
It seems to me that the following is also needed:
* Select USE_OF in Kconfig
* Provide dt_compat in DT_MACHINE_START
* Provide r8a7779-marzen dts

Quoted 6 lines

Quoted 3 lines
I have a revised version of this patch which does the above. But I wanted to check with you that I am on the right track before posting it.
Yes, you are correct. It seems that I was (am) too trigger happy. Thanks for fixing these.

No problem, I'll post the patches.

Quoted 9 lines

Quoted 4 lines
Also, I think that once sh73a0 and r8a7779 uses DT for SMP we can remove shmobile_smp_init_cpus(). As you have posted a patch for sh73a0 I have prepated a patch for r8a7779 I have also prepared a patch to remove shmobile_smp_init_cpus().
I think we should remove that function, but I'd like to put some shared code in the same file. So I don't want to remove the file. Perhaps the easiest is to leave it as-is for now and let me deal with that in an upcoming series.

Sure, if that is how you would like to roll.
Another option is to remove the file and then add it back again later.

Quoted 9 lines

Quoted 2 lines
My plan is to post all relevant patches as a series once my questions above are resolved.
Sounds good, thanks for your help!
Thanks,
/ magnus