Filter out i2c slaves that are not associated with a given master

During axone bringup a workaround was put in place to avoid some
of the logic that was used in witherspoon systems. It turns out
for axone we want the same behavior. This commit reverts the
behavior of the hdatGetI2cDeviceInfo to what is was previous to
the workaround.

Change-Id: I64ab0a28fda22d1709c5658ea36ce69d88c1deba
RTC: 213230
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/88178
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: Jayashankar Padath <jayashankar.padath@in.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
Reviewed-by: Nicholas E Bofferding <bofferdn@us.ibm.com>

src/usr/hdat/hdatutil.C

@@ -1830,21 +1830,13 @@ void hdatGetI2cDeviceInfo(
                 "detected");
             ++linkId.instance;
 
-            //@TODO:RTC 213230(HDAT Axone additional support)
-            //Hacking this now as OCMB is not an i2c master
-            if (i_model == TARGETING::MODEL_NIMBUS)
-            {
-                if( (i_pTarget == nullptr) ||
-                    (i_pTarget == i2cDevice.masterChip)
-                  )
-                {
-                    o_i2cDevEntries.push_back(l_hostI2cObj);
-                }
-            }
-            else
+            if( (i_pTarget == nullptr) ||
+                (i_pTarget == i2cDevice.masterChip)
+              )
             {
                 o_i2cDevEntries.push_back(l_hostI2cObj);
             }
+
         }
     }