mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/2] wdt: da9053: fix missed dev->hwdev conversion
@ 2018-06-07  9:42 Lucas Stach
  2018-06-07  9:42 ` [PATCH 2/2] ARM: throw out no-MMU vector base fixup when ARMv7 isn't selected Lucas Stach
  2018-06-08  6:01 ` [PATCH 1/2] wdt: da9053: fix missed dev->hwdev conversion Sascha Hauer
  0 siblings, 2 replies; 6+ messages in thread
From: Lucas Stach @ 2018-06-07  9:42 UTC (permalink / raw)
  To: barebox

Fixes: 1ef7cd07a304 (watchdog: rename dev to hwdev)
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/mfd/da9053.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mfd/da9053.c b/drivers/mfd/da9053.c
index 9adab8c75a25..c706082a8b39 100644
--- a/drivers/mfd/da9053.c
+++ b/drivers/mfd/da9053.c
@@ -276,7 +276,7 @@ static int da9053_probe(struct device_d *dev)
 	da9053->client = to_i2c_client(dev);
 	da9053->wd.set_timeout = da9053_set_timeout;
 	da9053->wd.priority = of_get_watchdog_priority(dev->device_node);
-	da9053->wd.dev = dev;
+	da9053->wd.hwdev = dev;
 
 	ret = da9053_enable_multiwrite(da9053);
 	if (ret < 0)
-- 
2.17.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 2/2] ARM: throw out no-MMU vector base fixup when ARMv7 isn't selected
  2018-06-07  9:42 [PATCH 1/2] wdt: da9053: fix missed dev->hwdev conversion Lucas Stach
@ 2018-06-07  9:42 ` Lucas Stach
  2018-06-07 12:53   ` Andrey Smirnov
  2018-06-08  6:01 ` [PATCH 1/2] wdt: da9053: fix missed dev->hwdev conversion Sascha Hauer
  1 sibling, 1 reply; 6+ messages in thread
From: Lucas Stach @ 2018-06-07  9:42 UTC (permalink / raw)
  To: barebox

May save some code space, but more importantly fixes the ARMv8 build.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/cpu/no-mmu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/cpu/no-mmu.c b/arch/arm/cpu/no-mmu.c
index 7268fa9b9d78..eff4cdcba4be 100644
--- a/arch/arm/cpu/no-mmu.c
+++ b/arch/arm/cpu/no-mmu.c
@@ -37,7 +37,8 @@ static int nommu_v7_vectors_init(void)
 	void *vectors;
 	u32 cr;
 
-	if (cpu_architecture() < CPU_ARCH_ARMv7)
+	if (!IS_ENABLED(CONFIG_CPU_32v7) ||
+	    (cpu_architecture() < CPU_ARCH_ARMv7))
 		return 0;
 
 	/*
-- 
2.17.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] ARM: throw out no-MMU vector base fixup when ARMv7 isn't selected
  2018-06-07  9:42 ` [PATCH 2/2] ARM: throw out no-MMU vector base fixup when ARMv7 isn't selected Lucas Stach
@ 2018-06-07 12:53   ` Andrey Smirnov
  2018-06-07 13:00     ` Lucas Stach
  0 siblings, 1 reply; 6+ messages in thread
From: Andrey Smirnov @ 2018-06-07 12:53 UTC (permalink / raw)
  To: Lucas Stach; +Cc: Barebox List

On Thu, Jun 7, 2018 at 2:42 AM, Lucas Stach <l.stach@pengutronix.de> wrote:
> May save some code space, but more importantly fixes the ARMv8 build.
>

Does http://lists.infradead.org/pipermail/barebox/2018-May/033184.html
not work in your case?

Thanks,
Andrey Smirnov

> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  arch/arm/cpu/no-mmu.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/cpu/no-mmu.c b/arch/arm/cpu/no-mmu.c
> index 7268fa9b9d78..eff4cdcba4be 100644
> --- a/arch/arm/cpu/no-mmu.c
> +++ b/arch/arm/cpu/no-mmu.c
> @@ -37,7 +37,8 @@ static int nommu_v7_vectors_init(void)
>         void *vectors;
>         u32 cr;
>
> -       if (cpu_architecture() < CPU_ARCH_ARMv7)
> +       if (!IS_ENABLED(CONFIG_CPU_32v7) ||
> +           (cpu_architecture() < CPU_ARCH_ARMv7))
>                 return 0;
>
>         /*
> --
> 2.17.1
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] ARM: throw out no-MMU vector base fixup when ARMv7 isn't selected
  2018-06-07 12:53   ` Andrey Smirnov
@ 2018-06-07 13:00     ` Lucas Stach
  2018-06-07 13:03       ` Andrey Smirnov
  0 siblings, 1 reply; 6+ messages in thread
From: Lucas Stach @ 2018-06-07 13:00 UTC (permalink / raw)
  To: Andrey Smirnov; +Cc: Barebox List

Am Donnerstag, den 07.06.2018, 05:53 -0700 schrieb Andrey Smirnov:
> > On Thu, Jun 7, 2018 at 2:42 AM, Lucas Stach <l.stach@pengutronix.de> wrote:
> > May save some code space, but more importantly fixes the ARMv8 build.
> > 
> 
> Does http://lists.infradead.org/pipermail/barebox/2018-May/033184.html
> not work in your case?

I just hadn't noticed this patch, when I wrote this one. So we can 
drop this one if yours get merged.

Regards,
Lucas

> 
> > > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> > ---
> >  arch/arm/cpu/no-mmu.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/arch/arm/cpu/no-mmu.c b/arch/arm/cpu/no-mmu.c
> > index 7268fa9b9d78..eff4cdcba4be 100644
> > --- a/arch/arm/cpu/no-mmu.c
> > +++ b/arch/arm/cpu/no-mmu.c
> > @@ -37,7 +37,8 @@ static int nommu_v7_vectors_init(void)
> >         void *vectors;
> >         u32 cr;
> > 
> > -       if (cpu_architecture() < CPU_ARCH_ARMv7)
> > +       if (!IS_ENABLED(CONFIG_CPU_32v7) ||
> > +           (cpu_architecture() < CPU_ARCH_ARMv7))
> >                 return 0;
> > 
> >         /*
> > --
> > 2.17.1
> > 
> > 
> > _______________________________________________
> > barebox mailing list
> > barebox@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/barebox

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] ARM: throw out no-MMU vector base fixup when ARMv7 isn't selected
  2018-06-07 13:00     ` Lucas Stach
@ 2018-06-07 13:03       ` Andrey Smirnov
  0 siblings, 0 replies; 6+ messages in thread
From: Andrey Smirnov @ 2018-06-07 13:03 UTC (permalink / raw)
  To: Lucas Stach; +Cc: Barebox List

On Thu, Jun 7, 2018 at 6:00 AM, Lucas Stach <l.stach@pengutronix.de> wrote:
> Am Donnerstag, den 07.06.2018, 05:53 -0700 schrieb Andrey Smirnov:
>> > On Thu, Jun 7, 2018 at 2:42 AM, Lucas Stach <l.stach@pengutronix.de> wrote:
>> > May save some code space, but more importantly fixes the ARMv8 build.
>> >
>>
>> Does http://lists.infradead.org/pipermail/barebox/2018-May/033184.html
>> not work in your case?
>
> I just hadn't noticed this patch, when I wrote this one. So we can
> drop this one if yours get merged.
>

Ah, good to know. I was worried I was missing some use-case.

Thanks,
Andrey Smirnov

> Regards,
> Lucas
>
>>
>> > > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
>> > ---
>> >  arch/arm/cpu/no-mmu.c | 3 ++-
>> >  1 file changed, 2 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/arch/arm/cpu/no-mmu.c b/arch/arm/cpu/no-mmu.c
>> > index 7268fa9b9d78..eff4cdcba4be 100644
>> > --- a/arch/arm/cpu/no-mmu.c
>> > +++ b/arch/arm/cpu/no-mmu.c
>> > @@ -37,7 +37,8 @@ static int nommu_v7_vectors_init(void)
>> >         void *vectors;
>> >         u32 cr;
>> >
>> > -       if (cpu_architecture() < CPU_ARCH_ARMv7)
>> > +       if (!IS_ENABLED(CONFIG_CPU_32v7) ||
>> > +           (cpu_architecture() < CPU_ARCH_ARMv7))
>> >                 return 0;
>> >
>> >         /*
>> > --
>> > 2.17.1
>> >
>> >
>> > _______________________________________________
>> > barebox mailing list
>> > barebox@lists.infradead.org
>> > http://lists.infradead.org/mailman/listinfo/barebox

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/2] wdt: da9053: fix missed dev->hwdev conversion
  2018-06-07  9:42 [PATCH 1/2] wdt: da9053: fix missed dev->hwdev conversion Lucas Stach
  2018-06-07  9:42 ` [PATCH 2/2] ARM: throw out no-MMU vector base fixup when ARMv7 isn't selected Lucas Stach
@ 2018-06-08  6:01 ` Sascha Hauer
  1 sibling, 0 replies; 6+ messages in thread
From: Sascha Hauer @ 2018-06-08  6:01 UTC (permalink / raw)
  To: Lucas Stach; +Cc: barebox

On Thu, Jun 07, 2018 at 11:42:34AM +0200, Lucas Stach wrote:
> Fixes: 1ef7cd07a304 (watchdog: rename dev to hwdev)
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  drivers/mfd/da9053.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/drivers/mfd/da9053.c b/drivers/mfd/da9053.c
> index 9adab8c75a25..c706082a8b39 100644
> --- a/drivers/mfd/da9053.c
> +++ b/drivers/mfd/da9053.c
> @@ -276,7 +276,7 @@ static int da9053_probe(struct device_d *dev)
>  	da9053->client = to_i2c_client(dev);
>  	da9053->wd.set_timeout = da9053_set_timeout;
>  	da9053->wd.priority = of_get_watchdog_priority(dev->device_node);
> -	da9053->wd.dev = dev;
> +	da9053->wd.hwdev = dev;
>  
>  	ret = da9053_enable_multiwrite(da9053);
>  	if (ret < 0)
> -- 
> 2.17.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-06-08  6:01 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-07  9:42 [PATCH 1/2] wdt: da9053: fix missed dev->hwdev conversion Lucas Stach
2018-06-07  9:42 ` [PATCH 2/2] ARM: throw out no-MMU vector base fixup when ARMv7 isn't selected Lucas Stach
2018-06-07 12:53   ` Andrey Smirnov
2018-06-07 13:00     ` Lucas Stach
2018-06-07 13:03       ` Andrey Smirnov
2018-06-08  6:01 ` [PATCH 1/2] wdt: da9053: fix missed dev->hwdev conversion Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox