diff options
author | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:41 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:41 +0000 |
commit | 608ad4b6932f72995144bc72a31b1e0843a5bb28 (patch) | |
tree | 74954deb17c22532d39672450df39812b548af80 /target/linux/mvebu/patches-3.10/0109-mtd-nand-pxa3xx-Fix-MODULE_DEVICE_TABLE-declaration.patch | |
parent | a8c10d8f903682fb3dde82084665a9a72216b02e (diff) | |
download | master-187ad058-608ad4b6932f72995144bc72a31b1e0843a5bb28.tar.gz master-187ad058-608ad4b6932f72995144bc72a31b1e0843a5bb28.tar.bz2 master-187ad058-608ad4b6932f72995144bc72a31b1e0843a5bb28.zip |
mvebu: backport mainline patches from kernel 3.12
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39565 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0109-mtd-nand-pxa3xx-Fix-MODULE_DEVICE_TABLE-declaration.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.10/0109-mtd-nand-pxa3xx-Fix-MODULE_DEVICE_TABLE-declaration.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0109-mtd-nand-pxa3xx-Fix-MODULE_DEVICE_TABLE-declaration.patch b/target/linux/mvebu/patches-3.10/0109-mtd-nand-pxa3xx-Fix-MODULE_DEVICE_TABLE-declaration.patch new file mode 100644 index 0000000000..c8f9a04c48 --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0109-mtd-nand-pxa3xx-Fix-MODULE_DEVICE_TABLE-declaration.patch @@ -0,0 +1,30 @@ +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) + { |