diff --git a/plat/xilinx/zynqmp/include/zynqmp_def.h b/plat/xilinx/zynqmp/include/zynqmp_def.h index 8648b9ab2c32df0610b39f2efe1c5257c7e1731d..5d335d945ba0c364fd90ec44a9789e17d8ec8718 100644 --- a/plat/xilinx/zynqmp/include/zynqmp_def.h +++ b/plat/xilinx/zynqmp/include/zynqmp_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -330,6 +330,7 @@ #define IOU_SLCR_GEM_CLK_CTRL (IOU_SLCR_BASEADDR + 0x308) #define IOU_SLCR_CAN_MIO_CTRL (IOU_SLCR_BASEADDR + 0x304) #define FPD_SLCR_WDT_CLK_SEL (FPD_SLCR_BASEADDR + 0x100) +#define IOU_SLCR_WDT_CLK_SEL (IOU_SLCR_BASEADDR + 0x300) /* Global general storage register base address */ #define GGS_BASEADDR (0xFFD80030U) diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_clock.c b/plat/xilinx/zynqmp/pm_service/pm_api_clock.c index 347f5892f2a870957951a54f5a8ccd17797e681f..e3050724d2e93f971ca7c20a5889d69d020c1972 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_clock.c +++ b/plat/xilinx/zynqmp/pm_service/pm_api_clock.c @@ -2198,6 +2198,18 @@ static struct pm_clock clocks[] = { .nodes = &can1_nodes, .num_nodes = ARRAY_SIZE(can1_nodes), }, + [CLK_LPD_WDT] = { + .name = "lpd_wdt", + .control_reg = IOU_SLCR_WDT_CLK_SEL, + .status_reg = 0, + .parents = &((int32_t []) { + CLK_LPD_LSBUS, + EXT_CLK_SWDT1 | CLK_EXTERNAL_PARENT, + CLK_NA_PARENT + }), + .nodes = &wdt_nodes, + .num_nodes = ARRAY_SIZE(wdt_nodes), + }, }; static struct pm_ext_clock ext_clocks[] = { @@ -2343,7 +2355,6 @@ static uint32_t pm_clk_invalid_list[] = {CLK_USB0, CLK_USB1, CLK_CSU_SPB, CLK_TOPSW_LSBUS, CLK_GTGREF0_REF, CLK_LPD_SWITCH, - CLK_LPD_LSBUS, CLK_CPU_R5, CLK_CPU_R5_CORE, CLK_CSU_SPB, diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_clock.h b/plat/xilinx/zynqmp/pm_service/pm_api_clock.h index 4c5f22dfff96ad0b0a8aaed4ce42ea17ca9e2980..5bed5a6176c1dbfe3d23c6f7d886ca3957912bb4 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_clock.h +++ b/plat/xilinx/zynqmp/pm_service/pm_api_clock.h @@ -169,6 +169,7 @@ enum clock_id { CLK_GEM1_REF_UNGATED, CLK_GEM2_REF_UNGATED, CLK_GEM3_REF_UNGATED, + CLK_LPD_WDT, END_OF_OUTPUT_CLKS, };