From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pa0-x234.google.com ([2607:f8b0:400e:c03::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZWvOX-0002sJ-W0 for linux-mtd@lists.infradead.org; Tue, 01 Sep 2015 23:55:18 +0000 Received: by pacwi10 with SMTP id wi10so11290018pac.3 for ; Tue, 01 Sep 2015 16:54:57 -0700 (PDT) Date: Tue, 1 Sep 2015 16:54:54 -0700 From: Brian Norris To: Han Xu Cc: "linux-mtd@lists.infradead.org" , Marek Vasut , Joachim Eastwood , =?utf-8?B?UmFmYcWCIE1pxYJlY2tp?= , Ezequiel Garcia , Han Xu Subject: Re: [RFT PATCH 1/4] mtd: fsl-quadspi: use automatic spi-nor detection Message-ID: <20150901235454.GL81844@google.com> References: <1439505965-134748-1-git-send-email-computersforpeace@gmail.com> <1439505965-134748-2-git-send-email-computersforpeace@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Tue, Sep 01, 2015 at 06:40:17PM -0500, Han Xu wrote: > On Thu, Aug 13, 2015 at 5:46 PM, Brian Norris > wrote: > > We don't really need the flash information from the device tree here. > > Let's stick with autodetection here instead. > > > > Signed-off-by: Brian Norris > > --- > > drivers/mtd/spi-nor/fsl-quadspi.c | 8 +------- > > 1 file changed, 1 insertion(+), 7 deletions(-) > > > > diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c > > index d32b7e04ccca..2a17ec6269ff 100644 > > --- a/drivers/mtd/spi-nor/fsl-quadspi.c > > +++ b/drivers/mtd/spi-nor/fsl-quadspi.c > > @@ -1006,8 +1006,6 @@ static int fsl_qspi_probe(struct platform_device *pdev) > > > > /* iterate the subnodes. */ > > for_each_available_child_of_node(dev->of_node, np) { > > - char modalias[40]; > > - > > /* skip the holes */ > > if (!q->has_second_chip) > > i *= 2; > > @@ -1030,10 +1028,6 @@ static int fsl_qspi_probe(struct platform_device *pdev) > > nor->prepare = fsl_qspi_prep; > > nor->unprepare = fsl_qspi_unprep; > > > > - ret = of_modalias_node(np, modalias, sizeof(modalias)); > > - if (ret < 0) > > - goto mutex_failed; > > - > > ret = of_property_read_u32(np, "spi-max-frequency", > > &q->clk_rate); > > if (ret < 0) > > @@ -1042,7 +1036,7 @@ static int fsl_qspi_probe(struct platform_device *pdev) > > /* set the chip address for READID */ > > fsl_qspi_set_base_addr(q, nor); > > > > - ret = spi_nor_scan(nor, modalias, SPI_NOR_QUAD); > > + ret = spi_nor_scan(nor, NULL, SPI_NOR_QUAD); > > if (ret) > > goto mutex_failed; > > > > Acked-by: Han xu > Tested-by: Han xu Thanks, applied to l2-mtd.git/next