diff options
author | Matt Raybuck <mraybuc@us.ibm.com> | 2019-02-14 10:44:28 -0600 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-03-11 17:05:32 -0500 |
commit | 4b29a118853601fc6bf13f374a2f633570924b52 (patch) | |
tree | 50dc0ef66e43aab64b76e08c21c770735abd5f66 | |
parent | 4636db0ab1ec255b51950e24e742e503411bceb8 (diff) | |
download | blackbird-hostboot-4b29a118853601fc6bf13f374a2f633570924b52.tar.gz blackbird-hostboot-4b29a118853601fc6bf13f374a2f633570924b52.zip |
UCD attribute and targeting updates
Change-Id: I6e9f237b421f4eadac8c000784548cf5880582bd
RTC: 201991
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/71891
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
-rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types.xml | 67 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/target_types.xml | 47 |
2 files changed, 113 insertions, 1 deletions
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index c268ab413..269cb08eb 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -651,9 +651,13 @@ <value>10</value> </enumerator> <enumerator> - <name>MAX</name> + <name>ASIC</name> <value>11</value> </enumerator> + <enumerator> + <name>MAX</name> + <value>12</value> + </enumerator> <id>CLASS</id> </enumerationType> @@ -2492,6 +2496,61 @@ </attribute> <attribute> + <id>I2C_CONTROL_INFO</id> + <description>Information needed to address an I2C slave device</description> + <complexType> + <description>Structure to define addressing this I2C slave device. + </description> + <field> + <default>physical:sys-0</default> + <description>Entity path to the chip that contains the I2C master + </description> + <name>i2cMasterPath</name> + <type>EntityPath</type> + </field> + <field> + <default>0x80</default> + <description>I2C master engine. This is a 2-bit value.</description> + <name>engine</name> + <type>uint8_t</type> + </field> + <field> + <default>0x80</default> + <description>Port from the I2C Master device. This is a 6-bit value. + </description> + <name>port</name> + <type>uint8_t</type> + </field> + <field> + <default>0x80</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> + <field> + <default>0xFF</default> + <description>Determines which of the N selectable buses the I2C mux for + this device + must enable to connect this device to its I2C master, if applicable. + 0xFF indicates no I2C mux present or N/A.</description> + <name>i2cMuxBusSelector</name> + <type>uint8_t</type> + </field> + <field> + <!-- NOTE: physical:sys-0 implies that there is no mux in + the bus path for this part. --> + <default>physical:sys-0</default> + <description>Entity path of the I2C mux for this device, if any.</description> + <name>i2cMuxPath</name> + <type>EntityPath</type> + </field> + </complexType> + <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 @@ -3788,6 +3847,12 @@ <enumerator> <name>PCA9847</name> </enumerator> + <enumerator> + <name>UCD9090</name> + </enumerator> + <enumerator> + <name>UCD90120A</name> + </enumerator> <id>MODEL</id> </enumerationType> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 51e8bb501..465103bce 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -25,6 +25,15 @@ <!-- IBM_PROLOG_END_TAG --> <attributes> <targetType> + <id>asic</id> + <parent>base</parent> + <attribute> + <id>CLASS</id> + <default>ASIC</default> + </attribute> + </targetType> + + <targetType> <id>base</id> <attribute> <id>AFFINITY_PATH</id> @@ -147,6 +156,14 @@ <parent>chip-tpm-cectpm</parent> </targetType> + <!-- This special UCD target adapts the MRW to Hostboot's specific UCD + target. All attributes should be declared against the parent + target. --> + <targetType> + <id>chip-UCD9090</id> + <parent>ucd9090</parent> + </targetType> + <targetType> <id>chip-bmc-ast2500</id> <parent>sp</parent> @@ -1110,6 +1127,18 @@ </targetType> <targetType> + <id>i2c-power-sequencer</id> + <parent>asic</parent> + <attribute> + <id>I2C_CONTROL_INFO</id> + </attribute> + <attribute> + <id>TYPE</id> + <default>POWER_SEQUENCER</default> + </attribute> + </targetType> + + <targetType> <id>i2c_mux_pca9847</id> <parent>chip</parent> <attribute> @@ -1873,6 +1902,24 @@ </targetType> <targetType> + <id>ucd90120a</id> + <parent>i2c-power-sequencer</parent> + <attribute> + <id>MODEL</id> + <default>UCD90120A</default> + </attribute> + </targetType> + + <targetType> + <id>ucd9090</id> + <parent>i2c-power-sequencer</parent> + <attribute> + <id>MODEL</id> + <default>UCD9090</default> + </attribute> + </targetType> + + <targetType> <id>unit</id> <parent>base</parent> <attribute> |