3af779eb17
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.11, and Linux v3.12. This work mainly covers: * Ground work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family,and the Armada family. * Further updates to the mvebu MBus. * Work and ground work for enabling MSI on the Armada family. * some phy / mdio bus initialization related work. * Device tree binding documentation update. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39565
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From 3bda9dc1472596d094f020ab7231466d54b6fe00 Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Tue, 14 May 2013 08:15:23 -0300
|
|
Subject: [PATCH 109/203] mtd: nand: pxa3xx: Fix MODULE_DEVICE_TABLE
|
|
declaration
|
|
|
|
This module's device table is incorrectly declared using
|
|
i2c_pxa_dt_ids, instead of pxa3xx_nand_dt_ids.
|
|
|
|
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
|
|
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
|
|
Reviewed-by: Haojian Zhuang <haojian.zhuang@gmail.com>
|
|
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
|
|
Signed-off-by: David Woodhouse <David.Woodhouse@intel.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
|
|
@@ -1185,7 +1185,7 @@ static struct of_device_id pxa3xx_nand_d
|
|
{ .compatible = "marvell,pxa3xx-nand" },
|
|
{}
|
|
};
|
|
-MODULE_DEVICE_TABLE(of, i2c_pxa_dt_ids);
|
|
+MODULE_DEVICE_TABLE(of, pxa3xx_nand_dt_ids);
|
|
|
|
static int pxa3xx_nand_probe_dt(struct platform_device *pdev)
|
|
{
|