diff mbox

[4/5] ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB

Message ID 1400242216-20848-5-git-send-email-wsa@the-dreams.de (mailing list archive)
State New, archived
Headers show

Commit Message

Wolfram Sang May 16, 2014, 12:10 p.m. UTC 
From: Wolfram Sang <wsa+renesas@sang-engineering.com>

Let the multiplatform Genmai support boot with the unified DTS.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 arch/arm/boot/dts/Makefile                      | 2 +-
 arch/arm/mach-shmobile/board-genmai-reference.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Geert Uytterhoeven May 16, 2014, 12:25 p.m. UTC | #1 
On Fri, May 16, 2014 at 2:10 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
> --- a/arch/arm/mach-shmobile/board-genmai-reference.c
> +++ b/arch/arm/mach-shmobile/board-genmai-reference.c
> @@ -42,7 +42,7 @@ static void __init genmai_add_standard_devices(void)
>  }
>
>  static const char * const genmai_boards_compat_dt[] __initconst = {
> -       "renesas,genmai-reference",
> +       "renesas,genmai",
>         NULL,
>  };

Regardless of my Acked-by for the series (it was done similarly for other
boards), I have a more political question: As there's no more board support
code for "renesas,genmai-reference", this means new kernels won't boot
using an old r7s72100-genmai-reference.dts?

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
Simon Horman May 16, 2014, 11:59 p.m. UTC | #2 
On Fri, May 16, 2014 at 02:25:36PM +0200, Geert Uytterhoeven wrote:
> On Fri, May 16, 2014 at 2:10 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
> > --- a/arch/arm/mach-shmobile/board-genmai-reference.c
> > +++ b/arch/arm/mach-shmobile/board-genmai-reference.c
> > @@ -42,7 +42,7 @@ static void __init genmai_add_standard_devices(void)
> >  }
> >
> >  static const char * const genmai_boards_compat_dt[] __initconst = {
> > -       "renesas,genmai-reference",
> > +       "renesas,genmai",
> >         NULL,
> >  };
> 
> Regardless of my Acked-by for the series (it was done similarly for other
> boards), I have a more political question: As there's no more board support
> code for "renesas,genmai-reference", this means new kernels won't boot
> using an old r7s72100-genmai-reference.dts?

Yes, that is the implication of the way things have been done.
Its not ideal but as -reference has been considered a developers
playground it seems reasonable.
diff mbox

Patch

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index a6eed6d661ac..3594914bed5d 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -312,7 +312,7 @@  dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \
 	r8a73a4-ape6evm-reference.dtb \
 	sh7372-mackerel.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
-	r7s72100-genmai-reference.dtb \
+	r7s72100-genmai.dtb \
 	r8a7791-henninger.dtb \
 	r8a7791-koelsch.dtb \
 	r8a7790-lager.dtb
diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c
index 968bbba20d08..2ff6ad6e608e 100644
--- a/arch/arm/mach-shmobile/board-genmai-reference.c
+++ b/arch/arm/mach-shmobile/board-genmai-reference.c
@@ -42,7 +42,7 @@  static void __init genmai_add_standard_devices(void)
 }
 
 static const char * const genmai_boards_compat_dt[] __initconst = {
-	"renesas,genmai-reference",
+	"renesas,genmai",
 	NULL,
 };