From: Adrian Herrera <adrian.herrera@arm.com>
Date: Thu, 5 Dec 2019 16:21:01 +0000 (+0000)
Subject: dev-arm: PL031, fix AMBA ID and clock names
X-Git-Tag: v20.0.0.0~449
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=12c917de54145d2d50260035ba7fa614e25317a3;p=gem5.git

dev-arm: PL031, fix AMBA ID and clock names

This patch fixes the AMBA ID of the PL031 RTC. It also adds the
"clock-names" property to its auto-DTB generation. This fixes and
enables correct probing from Linux.

Change-Id: I331bfa81664f57a35f21f35d658772eb40380e35
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/25432
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py
index 25bad06ad..039df101d 100644
--- a/src/dev/arm/RealView.py
+++ b/src/dev/arm/RealView.py
@@ -484,7 +484,7 @@ class PL031(AmbaIntDevice):
     type = 'PL031'
     cxx_header = "dev/arm/rtc_pl031.hh"
     time = Param.Time('01/01/2009', "System time to use ('Now' for actual time)")
-    amba_id = 0x00341031
+    amba_id = 0x00041031
 
     def generateDeviceTree(self, state):
         node = self.generateBasicPioDeviceNode(state, 'rtc', self.pio_addr,
@@ -493,6 +493,7 @@ class PL031(AmbaIntDevice):
         node.appendCompatible(["arm,pl031", "arm,primecell"])
         clock = state.phandle(self.clk_domain.unproxy(self))
         node.append(FdtPropertyWords("clocks", clock))
+        node.append(FdtPropertyStrings("clock-names", ["apb_pclk"]))
 
         yield node