[PATCH] arm/dt: Print machine name after dt probe

[PATCH] arm/dt: Print machine name after dt probe

[Grant Likely]

To match the behaviour of mach_type probing

Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
---

Hi Jeremy,

I've got this patch in my tree.  I'm going to squash it into "arm/dt:
probe for platforms via the device tree".

g.

 arch/arm/kernel/devtree.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index 0fc8d16..f8da313 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -98,8 +98,10 @@ struct machine_desc * __init parse_devicetree(unsigned int machid,
 	dt_root = of_get_flat_dt_root();
 
 	for (mdesc = &__arch_info_begin; mdesc < &__arch_info_end; mdesc++)
-		if (mdesc->probe_dt && mdesc->probe_dt(dt_root))
+		if (mdesc->probe_dt && mdesc->probe_dt(dt_root)) {
+			printk("Machine: %s\n", mdesc->name);
 			return mdesc;
+		}
 
 	return NULL;
 }

Re: [PATCH] arm/dt: Print machine name after dt probe

[Jeremy Kerr]

Hi Grant,

> To match the behaviour of mach_type probing
> 
> Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
> ---
> 
> Hi Jeremy,
> 
> I've got this patch in my tree.  I'm going to squash it into "arm/dt:
> probe for platforms via the device tree".

Looks good. How do you want to manage the trees from here? Are you going
to adopt my arm-dt branch (and related branches), or should I keep
maintaining it?

Cheers,


Jeremy

Re: [PATCH] arm/dt: Print machine name after dt probe

[Grant Likely]

On Wed, Jul 28, 2010 at 8:40 PM, Jeremy Kerr <jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> wrote:
> Hi Grant,
>
>> To match the behaviour of mach_type probing
>>
>> Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
>> ---
>>
>> Hi Jeremy,
>>
>> I've got this patch in my tree.  I'm going to squash it into "arm/dt:
>> probe for platforms via the device tree".
>
> Looks good. How do you want to manage the trees from here? Are you going
> to adopt my arm-dt branch (and related branches), or should I keep
> maintaining it?

I'm treating my tree as a staging point for linux-next; so I'm happy
to cherry pick and stabilize patches, but unfortunately it also means
I'm going to continue to rebase a lot, which could mess you up a lot.
Let's talk about it on IRC tomorrow night (morning for you)

g.