diff mbox

ARM: Use 'model' property to set machine_name from Device Tree

Message ID 1404697991-32191-1-git-send-email-cw00.choi@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Chanwoo Choi July 7, 2014, 1:53 a.m. UTC
This patch use 'model' property from Device Tree to set machine_name.
The arm64 has already got the machine_name from Device Tree.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
 arch/arm/kernel/setup.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Chanwoo Choi Aug. 14, 2014, 1:04 a.m. UTC | #1
On 07/07/2014 10:53 AM, Chanwoo Choi wrote:
> This patch use 'model' property from Device Tree to set machine_name.
> The arm64 has already got the machine_name from Device Tree.
> 
> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
> ---
>  arch/arm/kernel/setup.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
> index 8a16ee5..698616f 100644
> --- a/arch/arm/kernel/setup.c
> +++ b/arch/arm/kernel/setup.c
> @@ -878,7 +878,11 @@ void __init setup_arch(char **cmdline_p)
>  	if (!mdesc)
>  		mdesc = setup_machine_tags(__atags_pointer, __machine_arch_type);
>  	machine_desc = mdesc;
> +#if CONFIG_OF
> +	machine_name = of_flat_dt_get_machine_name();
> +#else
>  	machine_name = mdesc->name;
> +#endif
>  
>  	if (mdesc->reboot_mode != REBOOT_HARD)
>  		reboot_mode = mdesc->reboot_mode;
> 

Ping.

Best Regards,
Chanwoo Choi
Russell King - ARM Linux Aug. 14, 2014, 7:40 a.m. UTC | #2
On Thu, Aug 14, 2014 at 10:04:42AM +0900, Chanwoo Choi wrote:
> On 07/07/2014 10:53 AM, Chanwoo Choi wrote:
> > This patch use 'model' property from Device Tree to set machine_name.
> > The arm64 has already got the machine_name from Device Tree.
> > 
> > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
> > ---
> >  arch/arm/kernel/setup.c | 4 ++++
> >  1 file changed, 4 insertions(+)
> > 
> > diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
> > index 8a16ee5..698616f 100644
> > --- a/arch/arm/kernel/setup.c
> > +++ b/arch/arm/kernel/setup.c
> > @@ -878,7 +878,11 @@ void __init setup_arch(char **cmdline_p)
> >  	if (!mdesc)
> >  		mdesc = setup_machine_tags(__atags_pointer, __machine_arch_type);
> >  	machine_desc = mdesc;
> > +#if CONFIG_OF
> > +	machine_name = of_flat_dt_get_machine_name();
> > +#else
> >  	machine_name = mdesc->name;
> > +#endif
> >  
> >  	if (mdesc->reboot_mode != REBOOT_HARD)
> >  		reboot_mode = mdesc->reboot_mode;
> > 
> 
> Ping.

This has come up before, and the decision was against exposing this.

Thanks.
Catalin Marinas Aug. 14, 2014, 12:51 p.m. UTC | #3
On Mon, Jul 07, 2014 at 02:53:11AM +0100, Chanwoo Choi wrote:
> This patch use 'model' property from Device Tree to set machine_name.
> The arm64 has already got the machine_name from Device Tree.

FWIW, we removed this entirely from arm64 (see commit d7a49086f2 "arm64:
cpuinfo: print info for all CPUs").
diff mbox

Patch

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 8a16ee5..698616f 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -878,7 +878,11 @@  void __init setup_arch(char **cmdline_p)
 	if (!mdesc)
 		mdesc = setup_machine_tags(__atags_pointer, __machine_arch_type);
 	machine_desc = mdesc;
+#if CONFIG_OF
+	machine_name = of_flat_dt_get_machine_name();
+#else
 	machine_name = mdesc->name;
+#endif
 
 	if (mdesc->reboot_mode != REBOOT_HARD)
 		reboot_mode = mdesc->reboot_mode;