diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-05-21 22:16:56 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-05-22 16:04:37 +0200 |
| commit | df98acc6a1252456608958fc17f7da3ae4cfb46c (patch) | |
| tree | 2ed792928e0aa18d5dc3a8031b670629fa175167 /target/linux/mvebu/patches-4.4/022-mtd-pxa3xx_nand-Fix-initial-controller-configuration.patch | |
| parent | e90245237c971cda70e9c1752e9bce4cc3cbef4f (diff) | |
| download | master-31e0f0ae-df98acc6a1252456608958fc17f7da3ae4cfb46c.tar.gz master-31e0f0ae-df98acc6a1252456608958fc17f7da3ae4cfb46c.tar.bz2 master-31e0f0ae-df98acc6a1252456608958fc17f7da3ae4cfb46c.zip | |
mvebu: backport upstream ethernet driver improvements and enable buffer manager support
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/mvebu/patches-4.4/022-mtd-pxa3xx_nand-Fix-initial-controller-configuration.patch')
| -rw-r--r-- | target/linux/mvebu/patches-4.4/022-mtd-pxa3xx_nand-Fix-initial-controller-configuration.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/mvebu/patches-4.4/022-mtd-pxa3xx_nand-Fix-initial-controller-configuration.patch b/target/linux/mvebu/patches-4.4/022-mtd-pxa3xx_nand-Fix-initial-controller-configuration.patch index 260e7dc1bc..7d07fb9423 100644 --- a/target/linux/mvebu/patches-4.4/022-mtd-pxa3xx_nand-Fix-initial-controller-configuration.patch +++ b/target/linux/mvebu/patches-4.4/022-mtd-pxa3xx_nand-Fix-initial-controller-configuration.patch @@ -19,7 +19,7 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com> --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c -@@ -1419,34 +1419,43 @@ static int pxa3xx_nand_waitfunc(struct m +@@ -1420,34 +1420,43 @@ static int pxa3xx_nand_waitfunc(struct m return NAND_STATUS_READY; } @@ -71,7 +71,7 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com> info->ndtr0cs0 = nand_readl(info, NDTR0CS0); info->ndtr1cs0 = nand_readl(info, NDTR1CS0); return 0; -@@ -1635,10 +1644,7 @@ static int pxa3xx_nand_scan(struct mtd_i +@@ -1636,10 +1645,7 @@ static int pxa3xx_nand_scan(struct mtd_i if (pdata->keep_config && !pxa3xx_nand_detect_config(info)) goto KEEP_CONFIG; @@ -83,7 +83,7 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com> if (ret) return ret; -@@ -1651,7 +1657,6 @@ static int pxa3xx_nand_scan(struct mtd_i +@@ -1652,7 +1658,6 @@ static int pxa3xx_nand_scan(struct mtd_i } KEEP_CONFIG: @@ -91,7 +91,7 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com> if (info->reg_ndcr & NDCR_DWIDTH_M) chip->options |= NAND_BUSWIDTH_16; -@@ -1736,6 +1741,10 @@ KEEP_CONFIG: +@@ -1737,6 +1742,10 @@ KEEP_CONFIG: host->row_addr_cycles = 3; else host->row_addr_cycles = 2; |