Changeset 3185

Timestamp:

Aug 17, 2012 1:25:00 AM (10 months ago)

Author:

wmb

Message:

OLPC ARM - Added USB properties.

Files:

• cpu/arm/marvell/utmiphy.fth (modified) (3 diffs)
• cpu/arm/mmp2/ulpiphy.fth (modified) (2 diffs)
• cpu/arm/mmp3/usb2phy.fth (modified) (3 diffs)
• cpu/arm/olpc/3.0/usb.fth (modified) (2 diffs)
• cpu/arm/olpc/usb.fth (modified) (2 diffs)
• dev/usb2/hcd/ehci/ehci.fth (modified) (1 diff)

cpu/arm/marvell/utmiphy.fth

@@ -2 +2 @@
 purpose: Init UTMI USB Phy in Marvell SoC
 
+0 0   " d4207000"  " /" begin-package
+
+" usb2-phy" device-name
+
+my-address my-space h# 100 reg
+" mrvl,mmp2-utmiphy" +compatible
+   
 : +utmi  ( offset -- offset' )  h# 20.7000 +  ;
 
@@ -37 +44 @@
 h# 0000.00a0 value rx-set   \            a
 
-: init-usb-phy  ( -- )
+: init  ( -- )
 [ifdef] notdef
    ." Interacting before USB PHY init." cr
@@ -84 +91 @@
 : enable-ulpi-phy  ( -- )  h# 100 utmi-ctl1 io-set  ;
 : select-ulpi-data  ( -- )  h# 200 utmi-ctl1 io-set  ;
+
+: open  ( -- true )  true  ;
+: close  ;
+
+end-package

cpu/arm/mmp2/ulpiphy.fth

@@ -1 +1 @@
 \ See license at end of file
 purpose: Access to miscellaneous control/enable registers for the ULPI PHY portion of the USB SPH controller
+
+0 0   " d4207000"  " /" begin-package
+
+" mrvl,mmp2-ulpiphy" +compatible
 
 h# 3800 io2-va + constant usbsph-misc-va
@@ -13 +17 @@
 : ulpi-clock-on  ( -- )  usbsph-ctrl@ 1 or usbsph-ctrl!  ;
 : ulpi-clock-select  ( -- )  usbsph-ctrl@ h# 400 or usbsph-ctrl!  ;
+
+: init  ( -- )
+   ulpi-clock-on
+   ulpi-clock-select
+   ulpi-on
+;
+
+: open  ( -- true )  true  ;
+: close  ;
+
+end-package
 
 \ LICENSE_BEGIN

cpu/arm/mmp3/usb2phy.fth

@@ -2 +2 @@
 purpose: Init USB2 Phy in Marvell SoC
 
+0 0   " d4207000"  " /" begin-package
+
+" usb2-phy" device-name
+
+my-address my-space h# 100 reg
+" mrvl,mmp3-usb2phy" +compatible
+   
 : +usb2  ( offset -- offset' )  h# 20.7000 +  ;
 
@@ -37 +44 @@
 ;
 
-: init-usb-phy  ( -- )
+: init  ( -- )
    h# f00  h# 100 +pmua  io-clr
 \  h# d00  h# 100 +pmua  io-set   \ Select 26 MHz VCXO clock
@@ -86 +93 @@
    d# 100 wait-cal
 ;
+
+: open  ( -- true )  true  ;
+: close  ;
+
+end-package

cpu/arm/olpc/3.0/usb.fth

@@ -18 +18 @@
    ;
    : my-map-out  ( adr len -- )  swap h# 100 - swap " map-out" $call-parent  ;
+   " /pmua" encode-phandle d# 18 encode-int encode+ " clocks" property
+   d# 34 " interrupts" integer-property
+
+   " mrvl,mmp3-fsic" +compatible
+
+   " host" " dr_mode"  string-property
+   " ulpi" " phy_type" string_property
+
+   " /usb-phy" encode-phandle " transceiver" property
+
    false constant has-dbgp-regs?
    false constant needs-dummy-qh?
@@ -43 +53 @@
 : (reset-usb-hub)  ( -- )
    d# 146 gpio-clr  d# 10 ms  d# 146 gpio-set  \ Resets ULPI hub
-   ulpi-clock-on
-   ulpi-clock-select
-   ulpi-on
+   " /usb2-phy" " init" execute-device-method
 ;
 ' (reset-usb-hub) to reset-usb-hub

cpu/arm/olpc/usb.fth

@@ -11 +11 @@
    " /pmua" encode-phandle 5 encode-int encode+ " clocks" property
    d# 44 " interrupts" integer-property
+
+   " mrvl,pxa-u2oehci"  +compatible
+   " mrvl,mmp3-u2oehci" +compatible
+
+   " host" " dr_mode"  string-property
+   " utmi" " phy_type" string-property
+
+   " /usb2-phy" encode-phandle " transceiver" property
 
    false constant has-dbgp-regs?
@@ -30 +38 @@
    h# 9 h# 5c pmua!  \ Enable clock to USB block
    reset-usb-hub
-   init-usb-phy
+   " /usb2-phy" " init" execute-device-method drop
 ;
 

dev/usb2/hcd/ehci/ehci.fth

@@ -3 +3 @@
 
 " ehci" encode-string " device_type" property
+
+" usb-ehci" +compatible
 
 hex