c9ae111a20
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> SVN-Revision: 39566
25 lines
936 B
Diff
25 lines
936 B
Diff
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,
|