2013-09-23 10:15:09

by Mateusz Krawczuk

Subject: [PATCH] DT: if dt is available don't use s3c_arch_init

It prevents from executing platform code, when booting from device tree.

Signed-off-by: Mateusz Krawczuk <[email protected]>
Signed-off-by: Kyungmin Park <[email protected]>
---
arch/arm/plat-samsung/init.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/arch/arm/plat-samsung/init.c b/arch/arm/plat-samsung/init.c
index aa9511b..0ace02d 100644
--- a/arch/arm/plat-samsung/init.c
+++ b/arch/arm/plat-samsung/init.c
@@ -20,6 +20,7 @@
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
+#include <linux/of.h>
#include <linux/serial_core.h>
#include <linux/platform_device.h>
#include <linux/of.h>
@@ -152,6 +153,8 @@ static int __init s3c_arch_init(void)
{
int ret;

+ if (of_have_populated_dt())
+ return 0;
// do the correct init for cpu

if (cpu == NULL) {
--
1.8.1.2

2013-09-23 10:28:17

by Sachin Kamat

Subject: Re: [PATCH] DT: if dt is available don't use s3c_arch_init

Hi Mateusz,

On 23 September 2013 15:44, Mateusz Krawczuk
<[email protected]> wrote:
> It prevents from executing platform code, when booting from device tree.
>
> Signed-off-by: Mateusz Krawczuk <[email protected]>
> Signed-off-by: Kyungmin Park <[email protected]>
> ---

nit: Please format the patch title appropriately. In this case, it
should start with
"ARM: SAMSUNG: ..."

--
With warm regards,
Sachin

2013-09-23 12:37:37

by Tomasz Figa

Subject: Re: [PATCH] DT: if dt is available don't use s3c_arch_init

Hi Mateusz,

On Monday 23 of September 2013 12:14:49 Mateusz Krawczuk wrote:
> It prevents from executing platform code, when booting from device tree.
>
> Signed-off-by: Mateusz Krawczuk <[email protected]>
> Signed-off-by: Kyungmin Park <[email protected]>
> ---
> arch/arm/plat-samsung/init.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/arch/arm/plat-samsung/init.c b/arch/arm/plat-samsung/init.c
> index aa9511b..0ace02d 100644
> --- a/arch/arm/plat-samsung/init.c
> +++ b/arch/arm/plat-samsung/init.c
> @@ -20,6 +20,7 @@
> #include <linux/module.h>
> #include <linux/interrupt.h>
> #include <linux/ioport.h>
> +#include <linux/of.h>
> #include <linux/serial_core.h>
> #include <linux/platform_device.h>
> #include <linux/of.h>
> @@ -152,6 +153,8 @@ static int __init s3c_arch_init(void)
> {
> int ret;
>
> + if (of_have_populated_dt())
> + return 0;

I'm not sure if this is the correct thing to do here (note platforms that
still want this initialization to be handled, even when booting with DT).

The DT case is already handled several lines below in if (cpu == NULL)
check and if your platform requires this initialization not to happen you
should assure it has cpu == NULL.

Best regards,
Tomasz

2013-09-26 03:56:41

by Kukjin Kim

Subject: RE: [PATCH] DT: if dt is available don't use s3c_arch_init

Tomasz Figa wrote:
>
> Hi Mateusz,
>
> On Monday 23 of September 2013 12:14:49 Mateusz Krawczuk wrote:
> > It prevents from executing platform code, when booting from device tree.
> >
> > Signed-off-by: Mateusz Krawczuk <[email protected]>
> > Signed-off-by: Kyungmin Park <[email protected]>
> > ---
> > arch/arm/plat-samsung/init.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/arch/arm/plat-samsung/init.c b/arch/arm/plat-samsung/init.c
> > index aa9511b..0ace02d 100644
> > --- a/arch/arm/plat-samsung/init.c
> > +++ b/arch/arm/plat-samsung/init.c
> > @@ -20,6 +20,7 @@
> > #include <linux/module.h>
> > #include <linux/interrupt.h>
> > #include <linux/ioport.h>
> > +#include <linux/of.h>
> > #include <linux/serial_core.h>
> > #include <linux/platform_device.h>
> > #include <linux/of.h>
> > @@ -152,6 +153,8 @@ static int __init s3c_arch_init(void)
> > {
> > int ret;
> >
> > + if (of_have_populated_dt())
> > + return 0;
>
> I'm not sure if this is the correct thing to do here (note platforms that
> still want this initialization to be handled, even when booting with DT).
>
> The DT case is already handled several lines below in if (cpu == NULL)
> check and if your platform requires this initialization not to happen you
> should assure it has cpu == NULL.
>
Yeah, I agree and I think this is not needed at this moment we could cleanup
the init functions later for Samsung SoCs though.

Thanks,
Kukjin