* [PATCH] ARM: dts: imx28-evk: remove duplicate property
@ 2014-10-07 21:00 Michael Heimpold
2014-10-08 0:18 ` Fabio Estevam
0 siblings, 1 reply; 4+ messages in thread
From: Michael Heimpold @ 2014-10-07 21:00 UTC (permalink / raw)
To: linux-arm-kernel
Seems to be a left-over from an automatic merge.
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
---
arch/arm/boot/dts/imx28-evk.dts | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
index 09664fc..2944d39 100644
--- a/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@ -182,7 +182,6 @@
};
lradc at 80050000 {
- fsl,lradc-touchscreen-wires = <4>;
status = "okay";
fsl,lradc-touchscreen-wires = <4>;
fsl,ave-ctrl = <4>;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ARM: dts: imx28-evk: remove duplicate property
2014-10-07 21:00 [PATCH] ARM: dts: imx28-evk: remove duplicate property Michael Heimpold
@ 2014-10-08 0:18 ` Fabio Estevam
2014-12-22 10:55 ` Stefan Wahren
0 siblings, 1 reply; 4+ messages in thread
From: Fabio Estevam @ 2014-10-08 0:18 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Oct 7, 2014 at 6:00 PM, Michael Heimpold <mhei@heimpold.de> wrote:
> Seems to be a left-over from an automatic merge.
>
> Signed-off-by: Michael Heimpold <mhei@heimpold.de>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> arch/arm/boot/dts/imx28-evk.dts | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
> index 09664fc..2944d39 100644
> --- a/arch/arm/boot/dts/imx28-evk.dts
> +++ b/arch/arm/boot/dts/imx28-evk.dts
> @@ -182,7 +182,6 @@
> };
>
> lradc at 80050000 {
> - fsl,lradc-touchscreen-wires = <4>;
Thanks
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM: dts: imx28-evk: remove duplicate property
2014-10-08 0:18 ` Fabio Estevam
@ 2014-12-22 10:55 ` Stefan Wahren
2015-01-06 11:03 ` Shawn Guo
0 siblings, 1 reply; 4+ messages in thread
From: Stefan Wahren @ 2014-12-22 10:55 UTC (permalink / raw)
To: linux-arm-kernel
Hi Shawn,
[Fix Shawn's mail address]
> Fabio Estevam <festevam@gmail.com> hat am 8. Oktober 2014 um 02:18
> geschrieben:
>
>
> On Tue, Oct 7, 2014 at 6:00 PM, Michael Heimpold <mhei@heimpold.de> wrote:
> > Seems to be a left-over from an automatic merge.
> >
> > Signed-off-by: Michael Heimpold <mhei@heimpold.de>
> > Cc: Fabio Estevam <fabio.estevam@freescale.com>
> > ---
> > arch/arm/boot/dts/imx28-evk.dts | 1 -
> > 1 file changed, 1 deletion(-)
> >
> > diff --git a/arch/arm/boot/dts/imx28-evk.dts
> > b/arch/arm/boot/dts/imx28-evk.dts
> > index 09664fc..2944d39 100644
> > --- a/arch/arm/boot/dts/imx28-evk.dts
> > +++ b/arch/arm/boot/dts/imx28-evk.dts
> > @@ -182,7 +182,6 @@
> > };
> >
> > lradc at 80050000 {
> > - fsl,lradc-touchscreen-wires = <4>;
>
> Thanks
>
> Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
>
did you get this patch?
Best regards
Stefan Wahren
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM: dts: imx28-evk: remove duplicate property
2014-12-22 10:55 ` Stefan Wahren
@ 2015-01-06 11:03 ` Shawn Guo
0 siblings, 0 replies; 4+ messages in thread
From: Shawn Guo @ 2015-01-06 11:03 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Dec 22, 2014 at 11:55:31AM +0100, Stefan Wahren wrote:
> Hi Shawn,
>
> [Fix Shawn's mail address]
>
> > Fabio Estevam <festevam@gmail.com> hat am 8. Oktober 2014 um 02:18
> > geschrieben:
> >
> >
> > On Tue, Oct 7, 2014 at 6:00 PM, Michael Heimpold <mhei@heimpold.de> wrote:
> > > Seems to be a left-over from an automatic merge.
> > >
> > > Signed-off-by: Michael Heimpold <mhei@heimpold.de>
> > > Cc: Fabio Estevam <fabio.estevam@freescale.com>
> > > ---
> > > arch/arm/boot/dts/imx28-evk.dts | 1 -
> > > 1 file changed, 1 deletion(-)
> > >
> > > diff --git a/arch/arm/boot/dts/imx28-evk.dts
> > > b/arch/arm/boot/dts/imx28-evk.dts
> > > index 09664fc..2944d39 100644
> > > --- a/arch/arm/boot/dts/imx28-evk.dts
> > > +++ b/arch/arm/boot/dts/imx28-evk.dts
> > > @@ -182,7 +182,6 @@
> > > };
> > >
> > > lradc at 80050000 {
> > > - fsl,lradc-touchscreen-wires = <4>;
> >
> > Thanks
> >
> > Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
> >
>
> did you get this patch?
Sorry, missed it. Applied.
Shawn
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-01-06 11:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-07 21:00 [PATCH] ARM: dts: imx28-evk: remove duplicate property Michael Heimpold
2014-10-08 0:18 ` Fabio Estevam
2014-12-22 10:55 ` Stefan Wahren
2015-01-06 11:03 ` Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).