commit 33b3b9d82556c7e7244ff6e3a382dcd64b705257
author Timothy Chen <timothytim@google.com> Fri May 08 10:14:17 2020 -0700
committer tjaychen <timothytim@google.com> Tue May 12 19:03:36 2020 -0700
tree 4eb36a214c1b33c39dc61498c2a80968822dfde5
parent 372b70bd87f67861d27c3e65d12144d143ec5d34

[clkmgr, top] - Add clk_aon_i, and rename other clocks

- renamed clk_fixed_i to clk_io_i
- renamed clk_usb_48mhz_i to clk_usb_i
- Renaming is NOT done to individual modules, only clkmgr/rstmgr/top
- clkmgr/rstmgr are not yet making use of clk_aon_i in this commit

Signed-off-by: Timothy Chen <timothytim@google.com>

util/topgen.py

diff --git a/util/topgen.py b/util/topgen.py
index 4bea02d..105cd90 100755
--- a/util/topgen.py
+++ b/util/topgen.py
@@ -492,25 +492,38 @@
     # clock classification
     grps = top['clocks']['groups']
 
+    src_aon_attr = OrderedDict()
     ft_clks = OrderedDict()
     rg_clks = OrderedDict()
     sw_clks = OrderedDict()
     hint_clks = OrderedDict()
 
+    # construct a dictionary of the aon attribute for easier lookup
+    # ie, src_name_A: True, src_name_B: False
+    for src in top['clocks']['srcs']:
+        if src['aon'] == 'yes':
+            src_aon_attr[src['name']] = True
+        else:
+            src_aon_attr[src['name']] = False
+
+    rg_srcs = [src for (src, attr) in src_aon_attr.items() if not attr]
+
+    # clocks fed through clkmgr but are not disturbed in any way
+    # This maintains the clocking structure consistency
     ft_clks   = {clk:src for grp in grps for (clk,src) in grp['clocks'].items()
-                 if grp['name'] == 'powerup'}
+                 if src_aon_attr[src]}
 
     # root-gate clocks
     rg_clks   = {clk:src for grp in grps for (clk,src) in grp['clocks'].items()
-                 if grp['name'] != 'powerup' and grp['sw_cg'] == 'no'}
+                 if grp['name'] != 'powerup' and grp['sw_cg'] == 'no' and not src_aon_attr[src]}
 
     # direct sw control clocks
     sw_clks   = {clk:src for grp in grps for (clk,src) in grp['clocks'].items()
-                 if grp['sw_cg'] == 'yes'}
+                 if grp['sw_cg'] == 'yes' and not src_aon_attr[src]}
 
     # sw hint clocks
     hint_clks = {clk:src for grp in grps for (clk,src) in grp['clocks'].items()
-                 if grp['sw_cg'] == 'hint'}
+                 if grp['sw_cg'] == 'hint' and not src_aon_attr[src]}
 
 
     out = StringIO()
@@ -519,6 +532,7 @@
             tpl = Template(fin.read())
             try:
                 out = tpl.render(cfg=top,
+                                 rg_srcs=rg_srcs,
                                  ft_clks=ft_clks,
                                  rg_clks=rg_clks,
                                  sw_clks=sw_clks,