X-Git-Url: https://git.libre-soc.org/?p=sifive-blocks.git;a=blobdiff_plain;f=src%2Fmain%2Fscala%2Fdevices%2Fi2c%2FI2CPeriphery.scala;h=d4ad9fe1ebaf1ab3d2507de2cb649c79ca1ad3df;hp=c9de71b1755cd2557cb5b77419daccbe7b2c9538;hb=4fcf349adb9e66ea7d8cc5394de5d3e0a2340985;hpb=ef4f2ed888cd614858c6b2647c1eb6f988ff3973 diff --git a/src/main/scala/devices/i2c/I2CPeriphery.scala b/src/main/scala/devices/i2c/I2CPeriphery.scala index c9de71b..d4ad9fe 100644 --- a/src/main/scala/devices/i2c/I2CPeriphery.scala +++ b/src/main/scala/devices/i2c/I2CPeriphery.scala @@ -3,18 +3,17 @@ package sifive.blocks.devices.i2c import Chisel._ import freechips.rocketchip.config.Field -import freechips.rocketchip.diplomacy.{LazyModule,LazyMultiIOModuleImp} -import freechips.rocketchip.chip.{HasSystemNetworks} -import freechips.rocketchip.tilelink.TLFragmenter +import freechips.rocketchip.coreplex.{HasPeripheryBus, HasInterruptBus} +import freechips.rocketchip.diplomacy.{LazyModule, LazyModuleImp} case object PeripheryI2CKey extends Field[Seq[I2CParams]] -trait HasPeripheryI2C extends HasSystemNetworks { +trait HasPeripheryI2C extends HasPeripheryBus { val i2cParams = p(PeripheryI2CKey) val i2c = i2cParams map { params => - val i2c = LazyModule(new TLI2C(peripheryBusBytes, params)) - i2c.node := TLFragmenter(peripheryBusBytes, cacheBlockBytes)(peripheryBus.node) - intBus.intnode := i2c.intnode + val i2c = LazyModule(new TLI2C(pbus.beatBytes, params)) + i2c.node := pbus.toVariableWidthSlaves + ibus.fromSync := i2c.intnode i2c } } @@ -23,11 +22,11 @@ trait HasPeripheryI2CBundle { val i2c: Vec[I2CPort] } -trait HasPeripheryI2CModuleImp extends LazyMultiIOModuleImp with HasPeripheryI2CBundle { +trait HasPeripheryI2CModuleImp extends LazyModuleImp with HasPeripheryI2CBundle { val outer: HasPeripheryI2C - val i2cs = IO(Vec(outer.i2cParams.size, new I2CPort)) + val i2c = IO(Vec(outer.i2cParams.size, new I2CPort)) - (i2cs zip outer.i2c).foreach { case (io, device) => + (i2c zip outer.i2c).foreach { case (io, device) => io <> device.module.io.port } }