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 | 5b5ad5ba01cebe6a749bcf5c9fc9637876fe0b1f (patch) | |
| tree | 8b031a68c4ff6c7457830843adc41d49f0ab2d5f /target/linux/mvebu/patches-3.10/0166-clocksource-armada-370-xp-Use-BIT.patch | |
| parent | 608ad4b6932f72995144bc72a31b1e0843a5bb28 (diff) | |
| download | master-187ad058-5b5ad5ba01cebe6a749bcf5c9fc9637876fe0b1f.tar.gz master-187ad058-5b5ad5ba01cebe6a749bcf5c9fc9637876fe0b1f.tar.bz2 master-187ad058-5b5ad5ba01cebe6a749bcf5c9fc9637876fe0b1f.zip | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39566 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0166-clocksource-armada-370-xp-Use-BIT.patch')
| -rw-r--r-- | target/linux/mvebu/patches-3.10/0166-clocksource-armada-370-xp-Use-BIT.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0166-clocksource-armada-370-xp-Use-BIT.patch b/target/linux/mvebu/patches-3.10/0166-clocksource-armada-370-xp-Use-BIT.patch new file mode 100644 index 0000000000..8f07046a17 --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0166-clocksource-armada-370-xp-Use-BIT.patch @@ -0,0 +1,37 @@ +From ea331be867c791bca8200e6d707499845d8dfa87 Mon Sep 17 00:00:00 2001 +From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> +Date: Tue, 13 Aug 2013 11:43:10 -0300 +Subject: [PATCH 166/203] clocksource: armada-370-xp: Use BIT() + +This is a purely cosmetic commit: we replace hardcoded values that +representing bits by BIT(), which is slightly more readable. + +Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> +Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> +Reviewed-by: Andrew Lunn <andrew@lunn.ch> +--- + drivers/clocksource/time-armada-370-xp.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +--- a/drivers/clocksource/time-armada-370-xp.c ++++ b/drivers/clocksource/time-armada-370-xp.c +@@ -35,13 +35,13 @@ + * Timer block registers. + */ + #define TIMER_CTRL_OFF 0x0000 +-#define TIMER0_EN 0x0001 +-#define TIMER0_RELOAD_EN 0x0002 +-#define TIMER0_25MHZ 0x0800 ++#define TIMER0_EN BIT(0) ++#define TIMER0_RELOAD_EN BIT(1) ++#define TIMER0_25MHZ BIT(11) + #define TIMER0_DIV(div) ((div) << 19) +-#define TIMER1_EN 0x0004 +-#define TIMER1_RELOAD_EN 0x0008 +-#define TIMER1_25MHZ 0x1000 ++#define TIMER1_EN BIT(2) ++#define TIMER1_RELOAD_EN BIT(3) ++#define TIMER1_25MHZ BIT(12) + #define TIMER1_DIV(div) ((div) << 22) + #define TIMER_EVENTS_STATUS 0x0004 + #define TIMER0_CLR_MASK (~0x1) |