| Message ID | 1286878714-13090-6-git-send-email-Mingkai.hu@freescale.com |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Oct 12, 2010 at 06:18:34PM +0800, Mingkai Hu wrote: > Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com> > Acked-by: Grant Likely <grant.likely@secretlab.ca> dwmw2: what are your thoughts on this one? g. > --- > v4: > - Updated to latest kernel base(Linux 2.6.36-rc7). > - Made changes according to Grant's comments. > > drivers/mtd/devices/m25p80.c | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c > index 6f512b5..9d20738 100644 > --- a/drivers/mtd/devices/m25p80.c > +++ b/drivers/mtd/devices/m25p80.c > @@ -924,6 +924,11 @@ static int __devinit m25p_probe(struct spi_device *spi) > nr_parts = data->nr_parts; > } > > + if (nr_parts <= 0 && spi->dev.of_node) { > + nr_parts = of_mtd_parse_partitions(&spi->dev, > + spi->dev.of_node, &parts); > + } > + > if (nr_parts > 0) { > for (i = 0; i < nr_parts; i++) { > DEBUG(MTD_DEBUG_LEVEL2, "partitions[%d] = " > -- > 1.6.4 > >
On Tue, 2010-10-12 at 18:18 +0800, Mingkai Hu wrote: > Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com> > Acked-by: Grant Likely <grant.likely@secretlab.ca> > --- > v4: > - Updated to latest kernel base(Linux 2.6.36-rc7). > - Made changes according to Grant's comments. Looks good to me, pushed to l2-mtd-2.6.git, thanks.
On Sat, Oct 16, 2010 at 1:17 PM, Artem Bityutskiy <dedekind1@gmail.com> wrote: > On Tue, 2010-10-12 at 18:18 +0800, Mingkai Hu wrote: >> Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com> >> Acked-by: Grant Likely <grant.likely@secretlab.ca> >> --- >> v4: >> - Updated to latest kernel base(Linux 2.6.36-rc7). >> - Made changes according to Grant's comments. > > Looks good to me, pushed to l2-mtd-2.6.git, thanks. Wait! It will break whenever CONFIG_OF is not set. I broke linux-next with this patch. It can be solved by wrapping the block with #ifdef CONFIG_OF, but I'd like to find a better solution. g.
On Sat, 2010-10-16 at 19:05 -0600, Grant Likely wrote: > On Sat, Oct 16, 2010 at 1:17 PM, Artem Bityutskiy <dedekind1@gmail.com> wrote: > > On Tue, 2010-10-12 at 18:18 +0800, Mingkai Hu wrote: > >> Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com> > >> Acked-by: Grant Likely <grant.likely@secretlab.ca> > >> --- > >> v4: > >> - Updated to latest kernel base(Linux 2.6.36-rc7). > >> - Made changes according to Grant's comments. > > > > Looks good to me, pushed to l2-mtd-2.6.git, thanks. > > Wait! It will break whenever CONFIG_OF is not set. I broke > linux-next with this patch. It can be solved by wrapping the block > with #ifdef CONFIG_OF, but I'd like to find a better solution. OK, removed.
On Oct 17, 2010, at 2:44 AM, Artem Bityutskiy wrote: > On Sat, 2010-10-16 at 19:05 -0600, Grant Likely wrote: >> On Sat, Oct 16, 2010 at 1:17 PM, Artem Bityutskiy <dedekind1@gmail.com> wrote: >>> On Tue, 2010-10-12 at 18:18 +0800, Mingkai Hu wrote: >>>> Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com> >>>> Acked-by: Grant Likely <grant.likely@secretlab.ca> >>>> --- >>>> v4: >>>> - Updated to latest kernel base(Linux 2.6.36-rc7). >>>> - Made changes according to Grant's comments. >>> >>> Looks good to me, pushed to l2-mtd-2.6.git, thanks. >> >> Wait! It will break whenever CONFIG_OF is not set. I broke >> linux-next with this patch. It can be solved by wrapping the block >> with #ifdef CONFIG_OF, but I'd like to find a better solution. > > OK, removed. Grant, poke. Would like to see this either resolved or have this patch go in for .37 w/CONFIG_OF and fix properly for .38. - k
On Fri, Oct 22, 2010 at 01:01:12AM -0500, Kumar Gala wrote: > > On Oct 17, 2010, at 2:44 AM, Artem Bityutskiy wrote: > > > On Sat, 2010-10-16 at 19:05 -0600, Grant Likely wrote: > >> On Sat, Oct 16, 2010 at 1:17 PM, Artem Bityutskiy <dedekind1@gmail.com> wrote: > >>> On Tue, 2010-10-12 at 18:18 +0800, Mingkai Hu wrote: > >>>> Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com> > >>>> Acked-by: Grant Likely <grant.likely@secretlab.ca> > >>>> --- > >>>> v4: > >>>> - Updated to latest kernel base(Linux 2.6.36-rc7). > >>>> - Made changes according to Grant's comments. > >>> > >>> Looks good to me, pushed to l2-mtd-2.6.git, thanks. > >> > >> Wait! It will break whenever CONFIG_OF is not set. I broke > >> linux-next with this patch. It can be solved by wrapping the block > >> with #ifdef CONFIG_OF, but I'd like to find a better solution. > > > > OK, removed. > > Grant, poke. Would like to see this either resolved or have this patch go in for .37 w/CONFIG_OF and fix properly for .38. > Okay, I've added it to my devicetree/next branch with the fix. Assuming no last minute linux-next problems, I'll be asking Linus to pull that branch early next week. g.
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 6f512b5..9d20738 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -924,6 +924,11 @@ static int __devinit m25p_probe(struct spi_device *spi) nr_parts = data->nr_parts; } + if (nr_parts <= 0 && spi->dev.of_node) { + nr_parts = of_mtd_parse_partitions(&spi->dev, + spi->dev.of_node, &parts); + } + if (nr_parts > 0) { for (i = 0; i < nr_parts; i++) { DEBUG(MTD_DEBUG_LEVEL2, "partitions[%d] = "