From 7152bd05a27d5a61d1b5d4bf6943a85ca75cbdd8 Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Mon, 16 May 2016 09:06:14 -0500 Subject: More P9 attribute cleanup Removed deprecated NAPLES system files Removed some deprecated attributes Change-Id: I580d033e7c1df9a0d4af277383a4a8917cdf6d33 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24588 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Andrew J. Geissler Reviewed-by: Christian R. Geddes Reviewed-by: William G. Hoffa --- src/usr/devtree/bld_devtree.C | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'src/usr/devtree/bld_devtree.C') diff --git a/src/usr/devtree/bld_devtree.C b/src/usr/devtree/bld_devtree.C index 14b690426..33b8a6a87 100644 --- a/src/usr/devtree/bld_devtree.C +++ b/src/usr/devtree/bld_devtree.C @@ -587,7 +587,6 @@ void bld_xscom_node(devTree * i_dt, dtOffset_t & i_parentNode, const char* xscomNodeName = "xscom"; const char* todNodeName = "chiptod"; const char* pciNodeName = "pbcq"; - const char* sbeTmrNodeName = "sbe-timer"; // Grab a system object to work with TARGETING::Target* sys = NULL; @@ -617,25 +616,7 @@ void bld_xscom_node(devTree * i_dt, dtOffset_t & i_parentNode, uint64_t xscom_prop[2] = { l_xscomAddr, THIRTYTWO_GB}; i_dt->addPropertyCells64(xscomNode, "reg", xscom_prop, 2); - // Add SBE interrupt timer (if enabled) for the master processor - TARGETING::Target* l_pMasterProc = NULL; - TARGETING::targetService().masterProcChipTargetHandle(l_pMasterProc); - if ( (sys->getAttr()) && - (i_pProc == l_pMasterProc) ) - { - dtOffset_t sbeTmrNode = i_dt->addNode(xscomNode, sbeTmrNodeName, - 0xE000A); - uint32_t sbeTmr_prop[6] = {0xE000A, 1, - 0xE0006, 1, - 0x5003A, 1}; - i_dt->addPropertyCells32(sbeTmrNode, "reg", sbeTmr_prop, 6); - const char* sbeTmr_compatStrs[] = {"ibm,power8-sbe-timer",NULL}; - i_dt->addPropertyStrings(sbeTmrNode, "compatible", sbeTmr_compatStrs); - ATTR_SBE_MASTER_INTR_SERVICE_DELAY_US_type l_us = - sys->getAttr(); - i_dt->addPropertyCell32(sbeTmrNode, "tick-time-us", l_us); - } - // Only add SBE interrupt timer for small tree + // Do not need anything else for small tree if (i_smallTree) { return; -- cgit v1.2.3