misc: Merge branch 'release-staging-v20.1.0.0' into develop

Change-Id: I656a2d9512b1822a7e8d82606da7a0a5504d6820

src/dev/arm/VExpressFastmodel.py

@@ -24,6 +24,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from m5.objects.FastModelGIC import FastModelGIC, SCFastModelGIC
+from m5.objects.Gic import ArmInterruptPin
 from m5.objects.RealView import VExpress_GEM5_Base, HDLcd
 
 class VExpressFastmodel(VExpress_GEM5_Base):
@@ -35,7 +36,8 @@ class VExpressFastmodel(VExpress_GEM5_Base):
         ))
 
     hdlcd = HDLcd(
-        pxl_clk=VExpress_GEM5_Base.dcc.osc_pxl, pio_addr=0x2b000000, int_num=95)
+        pxl_clk=VExpress_GEM5_Base.dcc.osc_pxl, pio_addr=0x2b000000,
+        interrupt=ArmInterruptPin(num=95))
 
     def __init__(self, *args, **kwargs):
         super(VExpressFastmodel, self).__init__(*args, **kwargs)