diff options
author | danh-arm <dan.handley@arm.com> | 2016-07-18 16:18:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-18 16:18:37 +0100 |
commit | 84ded36ce3fc7d257cc1a580896e4fc7e7cd5f36 (patch) | |
tree | 24b14e8bb7bff900d98b17dfa8bad62e634d5b6b /plat/rockchip/rk3368 | |
parent | 473cae6cb1f2cd37ff7f4607c767de2bfcb536c6 (diff) | |
parent | 9ec78bdfc6a8058771920aec51f82513a0e4d4f0 (diff) |
Merge pull request #654 from rockchip-linux/rk3399-suspend-resume
rockchip: support the suspend/resume for rk3399
Diffstat (limited to 'plat/rockchip/rk3368')
-rw-r--r-- | plat/rockchip/rk3368/drivers/pmu/plat_pmu_macros.S | 37 | ||||
-rw-r--r-- | plat/rockchip/rk3368/drivers/pmu/pmu.c | 2 | ||||
-rw-r--r-- | plat/rockchip/rk3368/include/platform_def.h | 4 | ||||
-rw-r--r-- | plat/rockchip/rk3368/rk3368_def.h | 6 |
4 files changed, 41 insertions, 8 deletions
diff --git a/plat/rockchip/rk3368/drivers/pmu/plat_pmu_macros.S b/plat/rockchip/rk3368/drivers/pmu/plat_pmu_macros.S new file mode 100644 index 00000000..5fd3c41e --- /dev/null +++ b/plat/rockchip/rk3368/drivers/pmu/plat_pmu_macros.S @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include <arch.h> +#include <asm_macros.S> +#include <platform_def.h> + +.macro func_rockchip_clst_warmboot + /* Nothing to do for rk3368 */ +.endm + +.macro rockchip_clst_warmboot_data + /* Nothing to do for rk3368 */ +.endm diff --git a/plat/rockchip/rk3368/drivers/pmu/pmu.c b/plat/rockchip/rk3368/drivers/pmu/pmu.c index 53d333b3..fc44a4c8 100644 --- a/plat/rockchip/rk3368/drivers/pmu/pmu.c +++ b/plat/rockchip/rk3368/drivers/pmu/pmu.c @@ -40,6 +40,8 @@ #include <ddr_rk3368.h> #include <pmu_com.h> +DEFINE_BAKERY_LOCK(rockchip_pd_lock); + static struct psram_data_t *psram_sleep_cfg = (struct psram_data_t *)PSRAM_DT_BASE; diff --git a/plat/rockchip/rk3368/include/platform_def.h b/plat/rockchip/rk3368/include/platform_def.h index 299704d5..5d801cf1 100644 --- a/plat/rockchip/rk3368/include/platform_def.h +++ b/plat/rockchip/rk3368/include/platform_def.h @@ -74,6 +74,8 @@ PLATFORM_CLUSTER_COUNT + \ PLATFORM_CORE_COUNT) +#define PLAT_RK_CLST_TO_CPUID_SHIFT 8 + #define PLAT_MAX_PWR_LVL MPIDR_AFFLVL2 /* @@ -144,6 +146,4 @@ #define PLAT_RK_PRIMARY_CPU 0x0 -#define RK_PLAT_AARCH_CFG RK_PLAT_CFG0 - #endif /* __PLATFORM_DEF_H__ */ diff --git a/plat/rockchip/rk3368/rk3368_def.h b/plat/rockchip/rk3368/rk3368_def.h index 2242ceef..01e49102 100644 --- a/plat/rockchip/rk3368/rk3368_def.h +++ b/plat/rockchip/rk3368/rk3368_def.h @@ -106,12 +106,6 @@ #define PLAT_RK_CCI_CLUSTER1_SL_IFACE_IX 4 /****************************************************************************** - * cpu up status - ******************************************************************************/ -#define PMU_CPU_HOTPLUG 0xdeadbeaf -#define PMU_CPU_AUTO_PWRDN 0xabcdef12 - -/****************************************************************************** * sgi, ppi ******************************************************************************/ #define RK_IRQ_SEC_PHY_TIMER 29 |