Two MTD fixes, for the pxa3xx-nand driver:
- This driver was not ready to fully Armada 370 NAND, with particularly notable problems seen on flash with 2KB page sizes. This "compatible" entry really should have been held back until 3.14 or later. - Fix a bug seen in rare cases on the error path of a failed probe attempt, where we free unallocated DMA resources -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSqrVaAAoJEFySrpd9RFgtaUoP/jklkxrltohyejpHPhsHNWK9 d8OtfIGPNKTFUtuwOAMDBuLt+/lX4f16sWC8PoE1biGhEk/tA/YuisLS1IWNhYYW Jms1ZTr4juvahJaLoahmJcEd21ZWV36tlvbUPQcQQCFwjuuQUPn0M755XKL7sC8G 09+1VYVjOzX1aAodhYu9JyntGtYqXrVj8hDhhRY4rP4KLbmE/XELmsgp+JPzHs6T O1X3B3mY4SRWwHQAGtNdzzoGMSIgoeXvydHkgRDYh92iVoL2se8mVfpTGYW9a27T alBbOm1rCuuS+3WmphB0u5oSRgcykMByP2ucTWlnP1C60DvYctZ42sOdFKPPpwzE 76DJ9HoZt9gO+ch2pn2hXtD60U4b8oZccZJP4WLkio2/nWP/Piae1nyuLtM2AlwO 4Kj/boIymU3VWkPbIj/Dq/9MF7h3eF8M1kr6JKc3MlXU9ZnQQXpBGIBOdiZhcTbY fyxEBEQoolRE9FPPZWOOiGczTpafoot9o3kCM15G4cHCTVTzK3iuPDGIIDX97nKw 9vAdEP6/yyKnMSdh+OXZ+g134vAXYKezf9QzNastXz5QtYY+0pDOc/5shF9aPsN8 94x7Ub4WzSm+r+dT0m1CtesLMKYIoHtfBjEZA8CVaTfoK+X4oH7eXxNsne5LCRAS LCbXjnk/WlbydNSbVKGA =K24+ -----END PGP SIGNATURE----- Merge tag 'for-linus-20131212' of git://git.infradead.org/linux-mtd Pull MTD fixes from Brian Norris: "Two MTD fixes, for the pxa3xx-nand driver: - This driver was not ready to fully Armada 370 NAND, with particularly notable problems seen on flash with 2KB page sizes. This "compatible" entry really should have been held back until 3.14 or later. - Fix a bug seen in rare cases on the error path of a failed probe attempt, where we free unallocated DMA resources" * tag 'for-linus-20131212' of git://git.infradead.org/linux-mtd: mtd: nand: pxa3xx: Use info->use_dma to release DMA resources Partially revert "mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' compatible string"
This commit is contained in:
commit
dbb022cb46
|
@ -962,7 +962,7 @@ static int pxa3xx_nand_init_buff(struct pxa3xx_nand_info *info)
|
||||||
static void pxa3xx_nand_free_buff(struct pxa3xx_nand_info *info)
|
static void pxa3xx_nand_free_buff(struct pxa3xx_nand_info *info)
|
||||||
{
|
{
|
||||||
struct platform_device *pdev = info->pdev;
|
struct platform_device *pdev = info->pdev;
|
||||||
if (use_dma) {
|
if (info->use_dma) {
|
||||||
pxa_free_dma(info->data_dma_ch);
|
pxa_free_dma(info->data_dma_ch);
|
||||||
dma_free_coherent(&pdev->dev, info->buf_size,
|
dma_free_coherent(&pdev->dev, info->buf_size,
|
||||||
info->data_buff, info->data_buff_phys);
|
info->data_buff, info->data_buff_phys);
|
||||||
|
@ -1259,10 +1259,6 @@ static struct of_device_id pxa3xx_nand_dt_ids[] = {
|
||||||
.compatible = "marvell,pxa3xx-nand",
|
.compatible = "marvell,pxa3xx-nand",
|
||||||
.data = (void *)PXA3XX_NAND_VARIANT_PXA,
|
.data = (void *)PXA3XX_NAND_VARIANT_PXA,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
.compatible = "marvell,armada370-nand",
|
|
||||||
.data = (void *)PXA3XX_NAND_VARIANT_ARMADA370,
|
|
||||||
},
|
|
||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, pxa3xx_nand_dt_ids);
|
MODULE_DEVICE_TABLE(of, pxa3xx_nand_dt_ids);
|
||||||
|
|
Loading…
Reference in New Issue