diff options
author | Roland Veloz <rveloz@us.ibm.com> | 2018-12-26 19:04:12 -0600 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-01-15 17:06:01 -0600 |
commit | fd94eaab5b2f7b76151245f6db0bd20782deed2e (patch) | |
tree | ec0b514d13a4555f488415cbb39c752a92df08b2 /src/usr/targeting/common/xmltohb | |
parent | c7d8ac0a078bd1e01ce591c3515a68737da7795f (diff) | |
download | talos-hostboot-fd94eaab5b2f7b76151245f6db0bd20782deed2e.tar.gz talos-hostboot-fd94eaab5b2f7b76151245f6db0bd20782deed2e.zip |
Replace attribute I2C_MUX_INFO with attribute FAPI_I2C_CONTROL_INFO
-- Just removed all instances of I2C_MUX_INFO and replaced with
FAPI_I2C_CONTROL_INFO if not already there.
Change-Id: Ie161abb25ef75b632d6c429fb247ccbd04eb2135
RTC: 203024
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/70022
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/targeting/common/xmltohb')
4 files changed, 2 insertions, 103 deletions
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 5f4edae76..eb281a157 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -2493,51 +2493,6 @@ <attribute> <complexType> - <description>Structure to define the addressing for - an I2C mux target. </description> - <!-- Master Target Definition --> - <field> - <!--- NOTE: default physical sys-0 is not a valid entity path, - this must be populated with a valid entity path. --> - <default>physical:sys-0</default> - <description>Entity path to the chip that contains the I2C - master.</description> - <name>i2cMasterPath</name> - <type>EntityPath</type> - </field> - <!-- Port Definition --> - <field> - <default>0x00</default> - <description>Port from the I2C Master device. This is a - 6-bit value. </description> - <name>port</name> - <type>uint8_t</type> - </field> - <!-- Device Address Definition --> - <field> - <default>0x00</default> - <description>Device address on the I2C bus. This is a 7-bit - value, but then shifted 1 bit left. </description> - <name>devAddr</name> - <type>uint8_t</type> - </field> - <!-- Engine Definition --> - <field> - <default>0x00</default> - <description>I2C master engine. This is a 2-bit value. </description> - <name>engine</name> - <type>uint8_t</type> - </field> - </complexType> - <description>Information used to control a specific i2c mux device, - to select a particular target bus. </description> - <id>I2C_MUX_INFO</id> - <persistency>non-volatile</persistency> - <readable/> - </attribute> - - <attribute> - <complexType> <description>Structure which defines which I2C access method to use at a point in time. Only applicable if target supports one or more I2C types. Only one bit (of the first two) can ever be set at any one time. diff --git a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml index 46dea6902..b31183488 100644 --- a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml @@ -13302,7 +13302,7 @@ <default>NA</default> </attribute> <attribute> - <id>I2C_MUX_INFO</id> + <id>FAPI_I2C_CONTROL_INFO</id> <default> <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field> <field><id>port</id><value>0</value></field> @@ -13310,15 +13310,6 @@ <field><id>engine</id><value>3</value></field> </default> </attribute> - <attribute> - <id>FAPI_I2C_CONTROL_INFO</id> - <default> - <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field> - <field><id>port</id><value>0</value></field> - <field><id>devAddr</id><value>0xE0</value></field> - <field><id>engine</id><value>3</value></field> - </default> - </attribute> </targetInstance> </attributes> diff --git a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml index 2a9c82f72..f776c3aac 100644 --- a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml @@ -5,7 +5,7 @@ <!-- --> <!-- OpenPOWER HostBoot Project --> <!-- --> -<!-- Contributors Listed Below - COPYRIGHT 2016,2018 --> +<!-- Contributors Listed Below - COPYRIGHT 2016,2019 --> <!-- [+] International Business Machines Corp. --> <!-- --> <!-- --> @@ -13635,48 +13635,4 @@ </attribute> </targetInstance> -<!-- For testing purposes only, will replace with real values later --> -<targetInstance> - <id>sys0node0i2cmux0</id> - <type>i2c_mux_pca9847</type> - <attribute> - <id>HUID</id> - <default>0x004D0000</default> - </attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/i2c_mux-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/i2c_mux-0</default> - </attribute> - <attribute> - <id>PRIMARY_CAPABILITIES</id> - <default> - <field><id>reserved</id><value>0</value></field> - <field><id>supportsFsiScom</id><value>0</value></field> - <field><id>supportsInbandScom</id><value>0</value></field> - <field><id>supportsXscom</id><value>0</value></field> - </default> - </attribute> - <attribute> - <id>ORDINAL_ID</id> - <default>0</default> - </attribute> - <attribute> - <id>FAPI_NAME</id> - <default>NA</default> - </attribute> - <attribute> - <id>I2C_MUX_INFO</id> - <default> - <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field> - <field><id>port</id><value>4</value></field> - <field><id>devAddr</id><value>0xA0</value></field> - <field><id>engine</id><value>2</value></field> - </default> - </attribute> -</targetInstance> - </attributes> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index b182cf676..1189f9954 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -973,9 +973,6 @@ <id>FAPI_I2C_CONTROL_INFO</id> </attribute> <attribute> - <id>I2C_MUX_INFO</id> - </attribute> - <attribute> <id>MODEL</id> <default>PCA9847</default> </attribute> |