* [GIT PULL] ARM: SoC fixes for 3.4
@ 2012-05-17 5:16 Olof Johansson
0 siblings, 0 replies; 3+ messages in thread
From: Olof Johansson @ 2012-05-17 5:16 UTC (permalink / raw)
To: Linus Torvalds; +Cc: arm, linux-kernel, linux-arm-kernel
Hi Linus,
The following changes since commit 36be50515fe2aef61533b516fa2576a2c7fe7664:
Linux 3.4-rc7 (2012-05-12 18:37:47 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/fixes-for-linus
for you to fetch changes up to ad3b8a83933e83e5a2a08956211343bda269e778:
ARM: PRIMA2: fix irq domain size and IRQ mask of internal interrupt controller (2012-05-16 21:52:13 -0700)
----------------------------------------------------------------
ARM: SoC fixes for 3.4
I will stop trying to predict when we're done with fixes for a release.
Here's another small batch of three patches for arm-soc:
- A fix for a boot time WARN_ON() due to irq domain conversion on PRIMA2
- Fix for a regression in Tegra SMP spinup code due to swapped register offsets
- Fixed config dependency for mv_cesa crypto driver to avoid build breakage
----------------------------------------------------------------
Alexander Clouter (1):
crypto: mv_cesa requires on CRYPTO_HASH to build
Arnd Bergmann (2):
Merge branch 'marvell_fixes_for_v3.4' of git://git.infradead.org/users/jcooper/linux into fixes
Merge branch 'for-3.4/fixes-for-final' of git://git.kernel.org/.../swarren/linux-tegra into fixes
Barry Song (1):
ARM: PRIMA2: fix irq domain size and IRQ mask of internal interrupt controller
Peter De Schrijver (1):
ARM: tegra: Fix flow controller accesses
arch/arm/mach-prima2/irq.c | 6 ++++--
arch/arm/mach-tegra/flowctrl.c | 4 ++--
drivers/crypto/Kconfig | 1 +
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-prima2/irq.c b/arch/arm/mach-prima2/irq.c
index 37c2de9..a7b9415 100644
--- a/arch/arm/mach-prima2/irq.c
+++ b/arch/arm/mach-prima2/irq.c
@@ -42,7 +42,8 @@ sirfsoc_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num)
static __init void sirfsoc_irq_init(void)
{
sirfsoc_alloc_gc(sirfsoc_intc_base, 0, 32);
- sirfsoc_alloc_gc(sirfsoc_intc_base + 4, 32, SIRFSOC_INTENAL_IRQ_END - 32);
+ sirfsoc_alloc_gc(sirfsoc_intc_base + 4, 32,
+ SIRFSOC_INTENAL_IRQ_END + 1 - 32);
writel_relaxed(0, sirfsoc_intc_base + SIRFSOC_INT_RISC_LEVEL0);
writel_relaxed(0, sirfsoc_intc_base + SIRFSOC_INT_RISC_LEVEL1);
@@ -68,7 +69,8 @@ void __init sirfsoc_of_irq_init(void)
if (!sirfsoc_intc_base)
panic("unable to map intc cpu registers\n");
- irq_domain_add_legacy(np, 32, 0, 0, &irq_domain_simple_ops, NULL);
+ irq_domain_add_legacy(np, SIRFSOC_INTENAL_IRQ_END + 1, 0, 0,
+ &irq_domain_simple_ops, NULL);
of_node_put(np);
diff --git a/arch/arm/mach-tegra/flowctrl.c b/arch/arm/mach-tegra/flowctrl.c
index fef66a7..f07488e 100644
--- a/arch/arm/mach-tegra/flowctrl.c
+++ b/arch/arm/mach-tegra/flowctrl.c
@@ -53,10 +53,10 @@ static void flowctrl_update(u8 offset, u32 value)
void flowctrl_write_cpu_csr(unsigned int cpuid, u32 value)
{
- return flowctrl_update(flowctrl_offset_halt_cpu[cpuid], value);
+ return flowctrl_update(flowctrl_offset_cpu_csr[cpuid], value);
}
void flowctrl_write_cpu_halt(unsigned int cpuid, u32 value)
{
- return flowctrl_update(flowctrl_offset_cpu_csr[cpuid], value);
+ return flowctrl_update(flowctrl_offset_halt_cpu[cpuid], value);
}
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index ab9abb4..dd414d9 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -164,6 +164,7 @@ config CRYPTO_DEV_MV_CESA
select CRYPTO_ALGAPI
select CRYPTO_AES
select CRYPTO_BLKCIPHER2
+ select CRYPTO_HASH
help
This driver allows you to utilize the Cryptographic Engines and
Security Accelerator (CESA) which can be found on the Marvell Orion
^ permalink raw reply [flat|nested] 3+ messages in thread
* [GIT PULL] ARM: SoC fixes for 3.4
@ 2012-05-12 23:07 Olof Johansson
0 siblings, 0 replies; 3+ messages in thread
From: Olof Johansson @ 2012-05-12 23:07 UTC (permalink / raw)
To: Linus Torvalds; +Cc: arm, linux-arm-kernel, linux-kernel
Hi Linus,
The following changes since commit e396dbd4ed2ccfd362261b05027bbdccec192b14:
Merge tag 'omap-fixes-for-v3.4-rc6-take-2' of
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into
fixes (2012-05-09 09:03:34 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
tags/fixes-for-linus
for you to fetch changes up to 85d5c4a362add39f7491b38ed0160df1dcae1d2b:
Merge branch 'v3.4-samsung-fixes-5' of
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into
fixes (2012-05-12 15:41:22 -0700)
----------------------------------------------------------------
ARM: SoC fixes for 3.4-rc
I was hoping to be done with fixes for 3.4 but we got two branches from
subarch maintainers the last couple of days. So here is one last(?) pull
request for arm-soc containing 7 patches:
- 5 of them are for shmobile dealing with SMP setup and compile failures
- The remaining two are for regressions on the Samsung platforms
----------------------------------------------------------------
Guennadi Liakhovetski (2):
ARM: mach-shmobile: convert mackerel to use the generic MMC GPIO
hotplug helper
ARM: mach-shmobile: convert ag5evm to use the generic MMC GPIO
hotplug helper
Kukjin Kim (1):
ARM: EXYNOS: fix ctrlbit for exynos5_clk_pdma1
Kuninori Morimoto (1):
ARM / mach-shmobile: sh73a0 SMP TWD boot regression fix
Magnus Damm (2):
ARM / mach-shmobile: r8a7779 SMP TWD boot regression fix
ARM / mach-shmobile: Invalidate caches when booting secondary cores
Marek Szyprowski (1):
ARM: EXYNOS: use s5p-timer for UniversalC210 board
Olof Johansson (2):
Merge branch 'fixes' of git://git.kernel.org/.../rafael/renesas into fixes
Merge branch 'v3.4-samsung-fixes-5' of
git://git.kernel.org/.../kgene/linux-samsung into fixes
arch/arm/mach-exynos/Kconfig | 3 +++
arch/arm/mach-exynos/clock-exynos5.c | 2 +-
arch/arm/mach-exynos/mach-universal_c210.c | 4 +++-
arch/arm/mach-shmobile/board-ag5evm.c | 22 ++--------------------
arch/arm/mach-shmobile/board-mackerel.c | 22 ++--------------------
arch/arm/mach-shmobile/headsmp.S | 56
+++++++++++++++++++++++++++++++++++++++++++++++++++++++-
arch/arm/mach-shmobile/include/mach/common.h | 2 +-
arch/arm/mach-shmobile/setup-r8a7779.c | 4 ++++
arch/arm/mach-shmobile/setup-sh73a0.c | 4 ++++
arch/arm/mach-shmobile/smp-r8a7779.c | 8 +++++++-
arch/arm/mach-shmobile/smp-sh73a0.c | 7 ++++++-
arch/arm/mach-shmobile/timer.c | 9 ---------
12 files changed, 88 insertions(+), 55 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [GIT PULL] ARM: SoC fixes for 3.4
@ 2012-05-09 16:28 Olof Johansson
0 siblings, 0 replies; 3+ messages in thread
From: Olof Johansson @ 2012-05-09 16:28 UTC (permalink / raw)
To: Linus Torvalds; +Cc: arm, linux-arm-kernel, linux-kernel
The following changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3:
Linux 3.4-rc6 (2012-05-06 15:07:32 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
tags/fixes-for-linus
for you to fetch changes up to e396dbd4ed2ccfd362261b05027bbdccec192b14:
Merge tag 'omap-fixes-for-v3.4-rc6-take-2' of
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into
fixes (2012-05-09 09:03:34 -0700)
----------------------------------------------------------------
ARM: SoC fixes for 3.4-rc
Things have slowed down a lot for us, but we have five more fixes for
omap and kirkwood below. Three are for boards setup issues, two are
SoC-level fixes.
----------------------------------------------------------------
Archit Taneja (1):
ARM: OMAP: Revert "ARM: OMAP: ctrl: Fix CONTROL_DSIPHY register fields"
Ben Hutchings (1):
ARM: orion5x: Fix GPIO enable bits for MPP9
Enrico Butera (1):
ARM: OMAP: igep0020: fix smsc911x dummy regulator id
Ian Campbell (1):
ARM: kirkwood: add missing kexec.h include
Janusz Krzysztofik (1):
ARM: OMAP1: Amstrad Delta: Fix wrong IRQ base in FIQ handler
Olof Johansson (2):
Merge branch 'kirkwood_fixes_for_v3.4' of
git://git.infradead.org/users/jcooper/linux-kirkwood into fixes
Merge tag 'omap-fixes-for-v3.4-rc6-take-2' of
git://git.kernel.org/.../tmlind/linux-omap into fixes
arch/arm/mach-kirkwood/board-dt.c | 1 +
arch/arm/mach-omap1/ams-delta-fiq.c | 2 +-
arch/arm/mach-omap2/board-igep0020.c | 2 +-
arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h | 8 ++++----
arch/arm/mach-orion5x/mpp.h | 4 ++--
5 files changed, 9 insertions(+), 8 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-17 5:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-17 5:16 [GIT PULL] ARM: SoC fixes for 3.4 Olof Johansson
-- strict thread matches above, loose matches on Subject: below --
2012-05-12 23:07 Olof Johansson
2012-05-09 16:28 Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome