diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:44 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:44 +0000 |
| commit | c9ae111a20be4c9555128cced8edded660d133df (patch) | |
| tree | fd4809b562d454394cbb9ec517bf3f1ef2d5b6f2 /target/linux/mvebu/patches-3.10/0174-ARM-mvebu-Add-clock-properties-to-Armada-XP-timer-no.patch | |
| parent | 3af779eb172b0438f77e8a01a97dd0eb9a146076 (diff) | |
| download | mtk-20170518-c9ae111a20be4c9555128cced8edded660d133df.zip mtk-20170518-c9ae111a20be4c9555128cced8edded660d133df.tar.gz mtk-20170518-c9ae111a20be4c9555128cced8edded660d133df.tar.bz2 | |
mvebu: backport mainline patches from kernel 3.13
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
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0174-ARM-mvebu-Add-clock-properties-to-Armada-XP-timer-no.patch')
| -rw-r--r-- | target/linux/mvebu/patches-3.10/0174-ARM-mvebu-Add-clock-properties-to-Armada-XP-timer-no.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0174-ARM-mvebu-Add-clock-properties-to-Armada-XP-timer-no.patch b/target/linux/mvebu/patches-3.10/0174-ARM-mvebu-Add-clock-properties-to-Armada-XP-timer-no.patch new file mode 100644 index 0000000..51796bf --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0174-ARM-mvebu-Add-clock-properties-to-Armada-XP-timer-no.patch @@ -0,0 +1,30 @@ +From 200b303fc6c2709340996b02ae0c9a7130de7ec3 Mon Sep 17 00:00:00 2001 +From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> +Date: Tue, 20 Aug 2013 12:45:51 -0300 +Subject: [PATCH 174/203] ARM: mvebu: Add clock properties to Armada XP timer + node + +With the addition of the Armada XP reference clock, we can now model +accurately the available clock inputs for the timer: namely, nbclk +and refclk. For each of this clock inputs we assign a name, for the +driver to select as appropriate. + +Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> +Reviewed-by: Mike Turquette <mturquette@linaro.org> +Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> +Signed-off-by: Jason Cooper <jason@lakedaemon.net> +--- + arch/arm/boot/dts/armada-xp.dtsi | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm/boot/dts/armada-xp.dtsi ++++ b/arch/arm/boot/dts/armada-xp.dtsi +@@ -70,6 +70,8 @@ + + timer@20300 { + compatible = "marvell,armada-xp-timer"; ++ clocks = <&coreclk 2>, <&refclk>; ++ clock-names = "nbclk", "fixed"; + }; + + coreclk: mvebu-sar@18230 { |