Message ID | CAAQYJAuD1DHnycrhmh72WGg54ZaHDrVoXseVfFWXgfttrPdH=Q@mail.gmail.com |
---|---|
State | Not Applicable |
Headers | show |
Hi Andrea, On Thu, Jul 03, 2014 at 09:42:31AM +0200, Andrea Adami wrote: > this one was part of a patchset composed of 3 patches, see > https://lkml.org/lkml/2014/6/3/763 > > The other two have been merged in 3.16-rc3: > 9218310 ARM: 8084/1: sa1100: collie: revert back to cfi_probe > 3abe742 ARM: 8085/1: sa1100: collie: add top boot mtd partition > > Now the actual situation with 3.16-rc3 is bad, the nor is locked at > boot and buffer write is broken. > > Ideally the present patch should be sent upstream as fix for the next -rc. Hmm, I'll see what I can do about this. In the future, you should probably ensure that the dependent patch gets merged before trying to make use of it in another subsystem. Applied to l2-mtd.git. It looks pretty targeted, so I'll queue it up with a few other -stable fixes that are going out in the next week. Brian
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index e4ec355..a7543ba 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c @@ -52,6 +52,11 @@ /* Atmel chips */ #define AT49BV640D 0x02de #define AT49BV640DT 0x02db +/* Sharp chips */ +#define LH28F640BFHE_PTTL90 0x00b0 +#define LH28F640BFHE_PBTL90 0x00b1 +#define LH28F640BFHE_PTTL70A 0x00b2 +#define LH28F640BFHE_PBTL70A 0x00b3 static int cfi_intelext_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);