diff --git a/src/usr/i2c/i2c.C b/src/usr/i2c/i2c.C
index 850e5c2fc5c..2227c8be2d8 100755
--- a/src/usr/i2c/i2c.C
+++ b/src/usr/i2c/i2c.C
@@ -3846,7 +3846,7 @@ void getDeviceInfo( TARGETING::Target* i_i2cMaster,
             l_currentDI.masterPort = l_eep->port;
             l_currentDI.addr = l_eep->devAddr;
             l_currentDI.slavePort = 0xFF;
-            l_currentDI.busFreqKhz = (l_eep->busFreq) * 1000;
+            l_currentDI.busFreqKhz = (l_eep->busFreq) / 1000;
             l_currentDI.deviceType = TARGETING::HDAT_I2C_DEVICE_TYPE_SEEPROM;
             switch(l_eep->device)
             {
@@ -3906,7 +3906,7 @@ void getDeviceInfo( TARGETING::Target* i_i2cMaster,
             l_currentDI.masterPort = tpmInfo.port;
             l_currentDI.addr = tpmInfo.devAddr;
             l_currentDI.slavePort = 0xFF;
-            l_currentDI.busFreqKhz = (tpmInfo.busFreq) * 1000;
+            l_currentDI.busFreqKhz = (tpmInfo.busFreq) / 1000;
             l_currentDI.deviceType =
                     TARGETING::HDAT_I2C_DEVICE_TYPE_NUVOTON_TPM;
             l_currentDI.devicePurpose = TARGETING::HDAT_I2C_DEVICE_PURPOSE_TPM;
@@ -3979,7 +3979,7 @@ void getDeviceInfo( TARGETING::Target* i_i2cMaster,
             l_currentDevice.masterPort = l_i2cMasterPort[l_idx];
             l_currentDevice.addr = l_i2cAddr[l_idx];
             l_currentDevice.slavePort = l_i2cSlavePort[l_idx];
-            l_currentDevice.busFreqKhz = l_i2cBusFreq[l_idx] * 1000;
+            l_currentDevice.busFreqKhz = l_i2cBusFreq[l_idx] / 1000;
             l_currentDevice.deviceType = l_i2cDevType[l_idx];
             l_currentDevice.devicePurpose = l_i2cDevPurpose[l_idx];
 
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index a319a97a218..cdeb6cf7efb 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -33468,27 +33468,31 @@ Measured in GB</description>
     </description>
     <enumerator>
         <name>955X</name>
-        <value>0</value>
+        <value>1</value>
     </enumerator>
     <enumerator>
         <name>SEEPROM</name>
-        <value>1</value>
+        <value>2</value>
     </enumerator>
     <enumerator>
         <name>NUVOTON_TPM</name>
-        <value>2</value>
+        <value>3</value>
     </enumerator>
     <enumerator>
         <name>MEX_FPGA</name>
-        <value>3</value>
+        <value>4</value>
     </enumerator>
     <enumerator>
         <name>UCX90XX</name>
-        <value>4</value>
+        <value>5</value>
+    </enumerator>
+    <enumerator>
+        <name>NVLINK</name>
+        <value>6</value>
     </enumerator>
     <enumerator>
         <name>UNKNOWN</name>
-        <value>5</value>
+        <value>FF</value>
     </enumerator>
 </enumerationType>
 
@@ -33499,47 +33503,51 @@ Measured in GB</description>
     </description>
     <enumerator>
         <name>CABLE_CARD_PRES</name>
-        <value>0</value>
+        <value>1</value>
     </enumerator>
     <enumerator>
         <name>CABLE_CARD_POWER_SENSE</name>
-        <value>1</value>
+        <value>2</value>
     </enumerator>
     <enumerator>
         <name>CABLE_CARD_POWER_CONTROL</name>
-        <value>2</value>
+        <value>3</value>
     </enumerator>
     <enumerator>
         <name>TPM</name>
-        <value>3</value>
+        <value>4</value>
     </enumerator>
     <enumerator>
         <name>MODULE_VPD</name>
-        <value>4</value>
+        <value>5</value>
     </enumerator>
     <enumerator>
         <name>DIMM_SPD</name>
-        <value>5</value>
+        <value>6</value>
     </enumerator>
     <enumerator>
         <name>PROC_MODULE_VPD</name>
-        <value>6</value>
+        <value>7</value>
     </enumerator>
     <enumerator>
         <name>SBE_SEEPROM</name>
-        <value>7</value>
+        <value>8</value>
     </enumerator>
     <enumerator>
         <name>PLANAR_VPD</name>
-        <value>8</value>
+        <value>9</value>
     </enumerator>
     <enumerator>
         <name>PCI_HOTPLUG</name>
-        <value>9</value>
+        <value>A</value>
+    </enumerator>
+    <enumerator>
+        <name>NVLINK</name>
+        <value>B</value>
     </enumerator>
     <enumerator>
         <name>UNKNOWN</name>
-        <value>10</value>
+        <value>FF</value>
     </enumerator>
 </enumerationType>