From a5fb564ad8dc07c0da67fd56b11e8568d87a0b8f Mon Sep 17 00:00:00 2001 From: Philippe Langlais Date: Fri, 14 Oct 2011 16:22:31 +0200 Subject: crypto: align u5500 PRCMU & CPUFREQ management with u8500 (multiple commits in one) Signed-off-by: Philippe Langlais Merge of following commits too: u5500: add support for sysclk basic sysclk support added in PRCMU driver and clock framework driver updated. Signed-off-by: Shreshtha Kumar Sahu U5500: Support for ESRAM12 EPOD in PRCMU driver Signed-off-by: Vijaya Kumar Kilari ux500: regulator: handle different base offset of ePOD ID 5500 ePOD ids are offseted for some reason in the PRCMU driver. Adjust the ids to index the local arrays to avoid memory corruption. Signed-off-by: Rabin Vincent ux500: pm: support PRCMU status check on 5500 This also removes unused 8500v1 code. Signed-off-by: Rabin Vincent arm: ux500: prcmu_ac_wake_req workaround This patch adds a check in prcmu_ac_wake_req that the modem is awake (in terms of the value in the PRCM_MOD_AWAKE_STATUS register) after the AC_WAKE_ACK has been received from the PRCMU FW. If the check fails, a retry is made. This seems to be necessary, since the modem can generate an AC_WAKE_ACK, and then still go to sleep. Signed-off-by: Mattias Nilsson U5500: Add support for PRCMU Mailbox0 Add PRCMU mailbox 0 support for irq wakeup enable and disable Signed-off-by: Vijaya Kumar K U5500: Add support for power state transition PRCMU driver is updated to provide API for system power state transition Signed-off-by: Vijaya Kumar K ARM: ux500: prcmu: Add A9 watchdog interface Signed-off-by: Jonas Aaberg U5500 : ab5500 core interrupt hander update AB5500 interrupts will be now handled by PRCMU and then routed to AB5500 core driver.AB5500 irq handler will no more read the latch registers to find the interrupt reason.Instead PRCMU will read the latch registers and provide the values to core driver. Signed-off-by: Bibek Basu ARM: ux500: prcmu-dbg: Tiny code clean-up Signed-off-by: Jonas Aaberg u5500: add mailbox1 and related function support Add cpufreq-db5500.c file for db5500 CPUfreq support. PRCMU mailbox1 and related functions' support is added. List of functions implemented: - prcmu_get/set_arm_opp - read_mailbox_1 Signed-off-by: Shreshtha Kumar Sahu Fix for PRCMU u5500: PRCMU IRQ should be NO_SUSPEND As on 8500. Signed-off-by: Rabin Vincent ARM: u5500: PRCMU reset API Added API for rebooting the board and for getting the last reboot code. Signed-off-by: Pawel Szyszuk Conflicts: arch/arm/mach-ux500/board-u5500-regulators.c arch/arm/mach-ux500/board-u5500.c arch/arm/mach-ux500/clock-db5500.c arch/arm/mach-ux500/cpu.c arch/arm/mach-ux500/devices-db5500.c arch/arm/mach-ux500/include/mach/prcmu.h arch/arm/mach-ux500/pm/Kconfig arch/arm/mach-ux500/pm/pm.c arch/arm/mach-ux500/pm/runtime.c arch/arm/mach-ux500/pm/suspend.c arch/arm/mach-ux500/prcmu-debug.c drivers/cpufreq/db8500-cpufreq.c drivers/mfd/ab5500-core.c drivers/mfd/db5500-prcmu.c drivers/mfd/db8500-prcmu.c drivers/regulator/db5500-prcmu.c drivers/regulator/dbx500-prcmu.c include/linux/mfd/db5500-prcmu.h include/linux/mfd/db8500-prcmu.h include/linux/regulator/db5500-prcmu.h --- drivers/crypto/ux500/cryp/cryp_core.c | 2 +- drivers/crypto/ux500/hash/hash_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c index da168cb57f6..f0aed67f29a 100644 --- a/drivers/crypto/ux500/cryp/cryp_core.c +++ b/drivers/crypto/ux500/cryp/cryp_core.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c index 3b472d0bfaa..aec6bcf5e1d 100644 --- a/drivers/crypto/ux500/hash/hash_core.c +++ b/drivers/crypto/ux500/hash/hash_core.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include -- cgit v1.2.3