Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-22 12:34:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge changes from topic "scmi_v2_0" into integration

Browse source 
* changes:
  drivers/arm/css/scmi: Update power domain protocol version to 2.0
  tc0: update GICR base address
This commit is contained in:
Madhukar Pappireddy 2021-04-15 23:39:31 +02:00 • committed by TrustedFirmware Code Review
commit 866e6721f3
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fdts/tc0.dts
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020, Arm Limited. All rights reserved. * Copyright (c) 2020-2021, Arm Limited. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -236,7 +236,7 @@
ranges; ranges;
interrupt-controller; interrupt-controller;
reg = <0x0 0x30000000 0 0x10000>, /* GICD */ reg = <0x0 0x30000000 0 0x10000>, /* GICD */
<0x0 0x30140000 0 0x200000>; /* GICR */ <0x0 0x30080000 0 0x200000>; /* GICR */
interrupts = <0x1 0x9 0x4>; interrupts = <0x1 0x9 0x4>;
}; };

4
include/drivers/arm/css/scmi.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2017-2021, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -16,7 +16,7 @@
/* Supported SCMI Protocol Versions */ /* Supported SCMI Protocol Versions */
#define SCMI_AP_CORE_PROTO_VER MAKE_SCMI_VERSION(1, 0) #define SCMI_AP_CORE_PROTO_VER MAKE_SCMI_VERSION(1, 0)
#define SCMI_PWR_DMN_PROTO_VER MAKE_SCMI_VERSION(1, 0) #define SCMI_PWR_DMN_PROTO_VER MAKE_SCMI_VERSION(2, 0)
#define SCMI_SYS_PWR_PROTO_VER MAKE_SCMI_VERSION(1, 0) #define SCMI_SYS_PWR_PROTO_VER MAKE_SCMI_VERSION(1, 0)
#define GET_SCMI_MAJOR_VER(ver) (((ver) >> 16) & 0xffff) #define GET_SCMI_MAJOR_VER(ver) (((ver) >> 16) & 0xffff)

4
plat/arm/board/tc0/include/platform_def.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020, Arm Limited. All rights reserved. * Copyright (c) 2020-2021, Arm Limited. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -220,7 +220,7 @@
/* GIC related constants */ /* GIC related constants */
#define PLAT_ARM_GICD_BASE UL(0x30000000) #define PLAT_ARM_GICD_BASE UL(0x30000000)
#define PLAT_ARM_GICC_BASE UL(0x2C000000) #define PLAT_ARM_GICC_BASE UL(0x2C000000)
#define PLAT_ARM_GICR_BASE UL(0x30140000) #define PLAT_ARM_GICR_BASE UL(0x30080000)
/* /*
* PLAT_CSS_MAX_SCP_BL2_SIZE is calculated using the current * PLAT_CSS_MAX_SCP_BL2_SIZE is calculated using the current