From 608ad4b6932f72995144bc72a31b1e0843a5bb28 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Tue, 11 Feb 2014 02:07:41 +0000 Subject: 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 CC: Luka Perkov git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39565 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...-nand-pxa3xx-Use-of_machine_is_compatible.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 target/linux/mvebu/patches-3.10/0108-mtd-nand-pxa3xx-Use-of_machine_is_compatible.patch (limited to 'target/linux/mvebu/patches-3.10/0108-mtd-nand-pxa3xx-Use-of_machine_is_compatible.patch') diff --git a/target/linux/mvebu/patches-3.10/0108-mtd-nand-pxa3xx-Use-of_machine_is_compatible.patch b/target/linux/mvebu/patches-3.10/0108-mtd-nand-pxa3xx-Use-of_machine_is_compatible.patch new file mode 100644 index 0000000000..76a0030566 --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0108-mtd-nand-pxa3xx-Use-of_machine_is_compatible.patch @@ -0,0 +1,29 @@ +From baef6bdc8a3e9cb30ab254fd23eb655d592a19df Mon Sep 17 00:00:00 2001 +From: Ezequiel Garcia +Date: Tue, 14 May 2013 08:15:22 -0300 +Subject: [PATCH 108/203] mtd: nand: pxa3xx: Use of_machine_is_compatible() + +This patch replaces cpu_is_pxa3xx() with of_machine_is_compatible() +which allows to build this driver for other platforms than ARCH_PXA. + +Signed-off-by: Ezequiel Garcia +Tested-by: Nikita Kiryanov +Acked-by: Igor Grinberg +Reviewed-by: Haojian Zhuang +Signed-off-by: Artem Bityutskiy +Signed-off-by: David Woodhouse +--- + 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 +@@ -1094,7 +1094,7 @@ static int alloc_nand_resource(struct pl + * bindings. It can be removed once we have a prober DMA controller + * framework for DT. + */ +- if (pdev->dev.of_node && cpu_is_pxa3xx()) { ++ if (pdev->dev.of_node && of_machine_is_compatible("marvell,pxa3xx")) { + info->drcmr_dat = 97; + info->drcmr_cmd = 99; + } else { -- cgit v1.2.3