Changeset 3263

Timestamp:

Aug 31, 2012 2:33:38 AM (9 months ago)

Author:

wmb

Message:

OLPC ARM - Changed the compatible name lists for the apbc and pmua nodes so they tell the Linux driver which style of power island fiddling to use.

Location:

cpu/arm/mmp2

Files:

• apbc.fth (modified) (1 diff)
• pmua.fth (modified) (3 diffs)

cpu/arm/mmp2/apbc.fth

@@ -2 +2 @@
 " apbc" name
 " mrvl,pxa-apbc" +compatible
-" mrvl,mmp2-apbc" +compatible
+[ifdef] mmp3
+" marvell,mmp3-apbc" +compatible
+[else]
+" marvell,mmp2-apbc" +compatible
+[then]
 
 h# d4015000 h# 1000 reg

cpu/arm/mmp2/pmua.fth

@@ -31 +31 @@
 " pmua" name
 " mrvl,pxa-apmu" +compatible
-" mrvl,mmp2-apmu" +compatible
+[ifdef] mmp3
+" marvell,mmp3-apmu" +compatible
+[else]
+" marvell,mmp2-apmu" +compatible
+[then]
 
 h# d4282800 h# 1000 reg
@@ -154 +158 @@
 
    \ Bring audio island out of reset
-   1 audio-dsa pmua-set
-   4 audio-dsa pmua-set
-   1 audio-dsa pmua-set
+   1 audio-dsa pmua-set         \ Unreset AXI
+   4 audio-dsa pmua-set         \ Unreset APB
+   1 audio-dsa pmua-set         \ Unreset AXI (redundant?)
 
    \ Enable dummy clocks to the SRAMs
@@ -180 +184 @@
    h#   c  audio-sram-pwr  pmua-clr  \ Audio core off
    h#   3  audio-sram-pwr  pmua-clr  \ Audio SRAM off
-   h# 600  audio-clk       pmua-clr  \ Enable isolation
+   h# 600  audio-clk       pmua-clr  \ Power switch off
 [else]
    h# 710  audio-clk  pmua!  \ Set peripheral reset