diff options
| author | Corey Swenson <cswenson@us.ibm.com> | 2014-12-17 14:32:39 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-01-09 16:10:43 -0600 |
| commit | 162d892ecec8dc8d7b45a6ee2ab2517adc56b594 (patch) | |
| tree | 711b53fd6ccdf4d6a4778ae7c63cdbdbd2ce8b32 /src/usr/i2c | |
| parent | 478c8d5e45745a6750a78aec6c6317b48d092262 (diff) | |
| download | talos-hostboot-162d892ecec8dc8d7b45a6ee2ab2517adc56b594.tar.gz talos-hostboot-162d892ecec8dc8d7b45a6ee2ab2517adc56b594.zip | |
Remove I2C and EEPROM attribute workarounds
Change-Id: I28722938782322e1a378968656e4b2573aa43ccf
RTC: 119764
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14959
Tested-by: Jenkins Server
Reviewed-by: Michael Baiocchi <baiocchi@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/i2c')
| -rwxr-xr-x | src/usr/i2c/eepromdd.C | 25 | ||||
| -rwxr-xr-x | src/usr/i2c/i2c.C | 6 |
2 files changed, 0 insertions, 31 deletions
diff --git a/src/usr/i2c/eepromdd.C b/src/usr/i2c/eepromdd.C index 82945a856..10717af6a 100755 --- a/src/usr/i2c/eepromdd.C +++ b/src/usr/i2c/eepromdd.C @@ -1065,31 +1065,6 @@ errlHndl_t eepromReadAttributes ( TARGETING::Target * i_target, o_i2cInfo.devSize_KB = eepromData.maxMemorySizeKB; o_i2cInfo.writeCycleTime = eepromData.writeCycleTime; - // @todo RTC:119764 remove when correct data is in the MRW - if( o_i2cInfo.writePageSize == 0 ) - { - o_i2cInfo.writePageSize = 256; - } - - // @todo RTC:116428 - forcing the attribute data for now - // until we can pull it from the MRW - if( TARGETING::TYPE_MEMBUF == - i_target->getAttr<TARGETING::ATTR_TYPE>() ) - { - o_i2cInfo.port = 2; - o_i2cInfo.devAddr = 0xA0; - o_i2cInfo.engine = 1; - TARGETING::EntityPath epath(TARGETING::EntityPath::PATH_PHYSICAL); - epath.addLast(TARGETING::TYPE_SYS,0); - epath.addLast(TARGETING::TYPE_NODE,0); - epath.addLast(TARGETING::TYPE_PROC,0); - o_i2cInfo.i2cMasterPath = epath; - o_i2cInfo.writePageSize = 32; - o_i2cInfo.devSize_KB = 0x40; - o_i2cInfo.writeCycleTime = 20; - eepromData.byteAddrOffset = 2; - } - // Convert attribute info to eeprom_addr_size_t enum if ( eepromData.byteAddrOffset == 0x2 ) { diff --git a/src/usr/i2c/i2c.C b/src/usr/i2c/i2c.C index 7c0db7e93..6c303f681 100755 --- a/src/usr/i2c/i2c.C +++ b/src/usr/i2c/i2c.C @@ -2393,12 +2393,6 @@ errlHndl_t i2cSetBusVariables ( TARGETING::Target * i_target, { io_args.bus_speed = speed_array[io_args.engine][io_args.port]; - // @todo RTC:119764 remove when I2C_BUS_SPEED_ARRAY attr fixed - if (io_args.bus_speed == 0) - { - io_args.bus_speed = I2C_BUS_SPEED_400KHZ; - } - assert(io_args.bus_speed, "i2cSetBusVariables: bus_speed array[%d][%d] for " "tgt 0x%X is 0", |
