diff options
author | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:38 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:38 +0000 |
commit | a8c10d8f903682fb3dde82084665a9a72216b02e (patch) | |
tree | c62a7fd987aaeef721141f541c4477b8427e22ea /target/linux/mvebu/patches-3.10/0003-ARM-mvebu-Add-support-for-NOR-flash-device-on-Armada.patch | |
parent | e84b7226b0a6713c4edbb8aab562413766eb64d0 (diff) | |
download | master-187ad058-a8c10d8f903682fb3dde82084665a9a72216b02e.tar.gz master-187ad058-a8c10d8f903682fb3dde82084665a9a72216b02e.tar.bz2 master-187ad058-a8c10d8f903682fb3dde82084665a9a72216b02e.zip |
mvebu: backport mainline patches from kernel 3.11
This is a backport of the patches accepted to the Linux mainline related to
mvebu SoC (Armada XP and Armada 370) between Linux v3.10, and Linux v3.11.
This work mainly covers:
* Enabling USB storage, and PCI to mvebu_defconfig.
* Add support for NOR flash.
* Some PCI device tree related updates, and bus parsing.
* Adding Armada XP & 370 PCI driver, and update some clock gating
specifics.
* Introduce Marvell EBU Device Bus driver.
* Enaling USB in the armada*.dts.
* Enabling, and updating the mvebu-mbus.
* Some SATA and Ethernet related 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@39564 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0003-ARM-mvebu-Add-support-for-NOR-flash-device-on-Armada.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.10/0003-ARM-mvebu-Add-support-for-NOR-flash-device-on-Armada.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0003-ARM-mvebu-Add-support-for-NOR-flash-device-on-Armada.patch b/target/linux/mvebu/patches-3.10/0003-ARM-mvebu-Add-support-for-NOR-flash-device-on-Armada.patch new file mode 100644 index 0000000000..22f8ad0124 --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0003-ARM-mvebu-Add-support-for-NOR-flash-device-on-Armada.patch @@ -0,0 +1,71 @@ +From 74cd8c09ae416261d7595021fc8062836dc750a2 Mon Sep 17 00:00:00 2001 +From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> +Date: Fri, 17 May 2013 08:09:58 -0300 +Subject: [PATCH 003/203] ARM: mvebu: Add support for NOR flash device on + Armada XP-DB board + +The Armada XP Development Board (DB-78460-BP) has a NOR flash device +connected to the Device Bus. This commit adds the device tree node +to support this device. + +This SoC supports a flexible and dynamic decoding window allocation +scheme; but since this feature is still not implemented we need +to specify the window base address in the device tree node itself. + +This base address has been selected in a completely arbitrary fashion. + +Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Signed-off-by: Jason Cooper <jason@lakedaemon.net> +--- + arch/arm/boot/dts/armada-xp-db.dts | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +--- a/arch/arm/boot/dts/armada-xp-db.dts ++++ b/arch/arm/boot/dts/armada-xp-db.dts +@@ -30,6 +30,9 @@ + }; + + soc { ++ ranges = <0 0 0xd0000000 0x100000 /* Internal registers 1MiB */ ++ 0xf0000000 0 0xf0000000 0x1000000>; /* Device Bus, NOR 16MiB */ ++ + internal-regs { + serial@12000 { + clock-frequency = <250000000>; +@@ -156,6 +159,35 @@ + status = "okay"; + }; + }; ++ ++ devbus-bootcs@10400 { ++ status = "okay"; ++ ranges = <0 0xf0000000 0x1000000>; ++ ++ /* Device Bus parameters are required */ ++ ++ /* Read parameters */ ++ devbus,bus-width = <8>; ++ devbus,turn-off-ps = <60000>; ++ devbus,badr-skew-ps = <0>; ++ devbus,acc-first-ps = <124000>; ++ devbus,acc-next-ps = <248000>; ++ devbus,rd-setup-ps = <0>; ++ devbus,rd-hold-ps = <0>; ++ ++ /* Write parameters */ ++ devbus,sync-enable = <0>; ++ devbus,wr-high-ps = <60000>; ++ devbus,wr-low-ps = <60000>; ++ devbus,ale-wr-ps = <60000>; ++ ++ /* NOR 16 MiB */ ++ nor@0 { ++ compatible = "cfi-flash"; ++ reg = <0 0x1000000>; ++ bank-width = <2>; ++ }; ++ }; + }; + }; + }; |