| Message ID | 1407397622-9252-1-git-send-email-zajec5@gmail.com |
|---|---|
| State | Accepted |
| Commit | ab75e89c013d8fff8bd8a6e520d184c3da1a4583 |
| Headers | show |
On Thu, Aug 07, 2014 at 09:47:01AM +0200, Rafał Miłecki wrote: > Signed-off-by: Rafał Miłecki <zajec5@gmail.com> > --- > This is based on top of > mtd: spi-nor: factor out write_enable() for erase commands > --- > drivers/mtd/spi-nor/spi-nor.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c > index d08d9f8..06fe959 100644 > --- a/drivers/mtd/spi-nor/spi-nor.c > +++ b/drivers/mtd/spi-nor/spi-nor.c > @@ -613,7 +613,6 @@ const struct spi_device_id spi_nor_ids[] = { > { "w25q32dw", INFO(0xef6016, 0, 64 * 1024, 64, SECT_4K) }, > { "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) }, > { "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) }, > - { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) }, > { "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) }, > { "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) }, > { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) }, > -- > 1.8.4.5 Acked-by: Huang Shijie <shijie8@gmail.com>
On Sat, Aug 09, 2014 at 07:03:45PM +0800, Huang Shijie wrote: > On Thu, Aug 07, 2014 at 09:47:01AM +0200, Rafał Miłecki wrote: > > Signed-off-by: Rafał Miłecki <zajec5@gmail.com> > Acked-by: Huang Shijie <shijie8@gmail.com> Pushed both to l2-mtd.git/next. Brian
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index d08d9f8..06fe959 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -613,7 +613,6 @@ const struct spi_device_id spi_nor_ids[] = { { "w25q32dw", INFO(0xef6016, 0, 64 * 1024, 64, SECT_4K) }, { "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) }, { "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) }, - { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) }, { "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) }, { "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) }, { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> --- This is based on top of mtd: spi-nor: factor out write_enable() for erase commands --- drivers/mtd/spi-nor/spi-nor.c | 1 - 1 file changed, 1 deletion(-)