diff options
| author | luka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2014-02-11 02:07:44 +0000 |
|---|---|---|
| committer | luka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2014-02-11 02:07:44 +0000 |
| commit | d88fd07c630bdfb0a8a4a94606d521dfeead83f4 (patch) | |
| tree | 8b031a68c4ff6c7457830843adc41d49f0ab2d5f /target/linux/mvebu/patches-3.10/0128-mtd-nand-pxa3xx_nand-Remove-redundant-of_match_ptr.patch | |
| parent | 79312bc73a529d239ae64957876cc28c87f4b64f (diff) | |
mvebu: backport mainline patches from kernel 3.13
This is a backport of the patches accepted to the Linux mainline related to
mvebu SoC (Armada XP and Armada 370) between Linux v3.12, and Linux v3.13.
This work mainly covers:
* Finishes work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c)
between the PXA family, and the Armada family.
* timer initialization update, and access function for the Armada family.
* Generic IRQ handling backporting.
* Some bug fixes.
Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com>
CC: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39566 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0128-mtd-nand-pxa3xx_nand-Remove-redundant-of_match_ptr.patch')
| -rw-r--r-- | target/linux/mvebu/patches-3.10/0128-mtd-nand-pxa3xx_nand-Remove-redundant-of_match_ptr.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0128-mtd-nand-pxa3xx_nand-Remove-redundant-of_match_ptr.patch b/target/linux/mvebu/patches-3.10/0128-mtd-nand-pxa3xx_nand-Remove-redundant-of_match_ptr.patch new file mode 100644 index 0000000000..a0c4e6995f --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0128-mtd-nand-pxa3xx_nand-Remove-redundant-of_match_ptr.patch @@ -0,0 +1,25 @@ +From 38a6d3f3330da6586695746a0a85a96143171211 Mon Sep 17 00:00:00 2001 +From: Sachin Kamat <sachin.kamat@linaro.org> +Date: Mon, 30 Sep 2013 15:10:24 +0530 +Subject: [PATCH 128/203] mtd: nand: pxa3xx_nand: Remove redundant of_match_ptr + +The data structure of_match_ptr() protects is always compiled in. +Hence of_match_ptr() is not needed. + +Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> +Signed-off-by: Brian Norris <computersforpeace@gmail.com> +--- + drivers/mtd/nand/pxa3xx_nand.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/mtd/nand/pxa3xx_nand.c ++++ b/drivers/mtd/nand/pxa3xx_nand.c +@@ -1412,7 +1412,7 @@ static int pxa3xx_nand_resume(struct pla + static struct platform_driver pxa3xx_nand_driver = { + .driver = { + .name = "pxa3xx-nand", +- .of_match_table = of_match_ptr(pxa3xx_nand_dt_ids), ++ .of_match_table = pxa3xx_nand_dt_ids, + }, + .probe = pxa3xx_nand_probe, + .remove = pxa3xx_nand_remove, |