Add support for USB on PSC3 for the mpc5200
PATCH 1/1 Add support for USB on PSC3 for the mpc5200
Support USB on PSC3 on the mpc5200. Before this patch, enabling USB support would reconfigure PSC4 and PSC5 to USB. The mpc5200 does not support USB enabled on both the standard USB port and PSC3. This patch masks the appropriate bits when enabling USB.
--- README | 4 ++++ cpu/mpc5xxx/usb.c | 6 +++++- cpu/mpc5xxx/usb_ohci.c | 6 +++++- 3 files changed, 14 insertions(+), 2 deletions(-)
README +4 -0
@@ -854,9 +854,13 @@ The following options need to be configured: MPC5200 USB requires additional defines: CONFIG_USB_CLOCK for 528 MHz Clock: 0x0001bbbb + CONFIG_PSC3_USB + for USB on PSC3 CONFIG_USB_CONFIG for differential drivers: 0x00001000 for single ended drivers: 0x00005000 + for differential drivers on PSC3: 0x00000100 + for single ended drivers on PSC3: 0x00004100 CONFIG_SYS_USB_EVENT_POLL May be defined to allow interrupt polling instead of using asynchronous interrupts
cpu/mpc5xxx/usb.c +5 -1
@@ -32,9 +32,13 @@ int usb_cpu_init(void)/* Set the USB Clock */ *(vu_long *)MPC5XXX_CDM_48_FDC =CONFIG_USB_CLOCK ; +#ifdef CONFIG_PSC3_USB /* USB is using the alternate configuration */ +/* remove all PSC3 USB bits first before ORing in ours */ + *(vu_long *)MPC5XXX_GPS_PORT_CONFIG &= ~0x00804f00 ; +#else /* remove all USB bits first before ORing in ours */ *(vu_long *)MPC5XXX_GPS_PORT_CONFIG &= ~0x00807000 ; - +#endif /* Activate USB port */ *(vu_long *)MPC5XXX_GPS_PORT_CONFIG |=CONFIG_USB_CONFIG ;
cpu/mpc5xxx/usb_ohci.c +5 -1
@@ -1576,9 +1576,13 @@ int usb_lowlevel_init(void)/* Set the USB Clock */ *(vu_long *)MPC5XXX_CDM_48_FDC =CONFIG_USB_CLOCK ; +#ifdef CONFIG_PSC3_USB /* USB is using the alternate configuration */ +/* remove all PSC3 USB bits first before ORing in ours */ + *(vu_long *)MPC5XXX_GPS_PORT_CONFIG &= ~0x00804f00 ; +#else /* remove all USB bits first before ORing in ours */ *(vu_long *)MPC5XXX_GPS_PORT_CONFIG &= ~0x00807000 ; - +#endif /* Activate USB port */ *(vu_long *)MPC5XXX_GPS_PORT_CONFIG |=CONFIG_USB_CONFIG ;
Signature · 1 line
1.6.3.1
PATCH 1/1 Add support for USB on PSC3 for the mpc5200
Quoted 6 lines · Eric Millbrandt
Support USB on PSC3 on the mpc5200. ?Before this patch, enabling USB support would reconfigure PSC4 and PSC5 to USB. ?The mpc5200 does not support USB enabled on both the standard USB port and PSC3. ?This patch masks the appropriate bits when enabling USB.
Signed-off-by Eric Millbrandt <[email protected]>
Quoted 70 lines
---
?README ? ? ? ? ? ? ? ? | ? ?4 ++++ ?cpu/mpc5xxx/usb.c ? ? ?| ? ?6 +++++- ?cpu/mpc5xxx/usb_ohci.c | ? ?6 +++++-?3 files changed, 14 insertions(+), 2 deletions(-)
README +0
-0@@ -854,9 +854,13 @@ The following options need to be configured:? ? ? ? ? ? ? ?MPC5200 USB requires additional defines:
? ? ? ? ? ? ? ? ? ? ? ?CONFIG_USB_CLOCK
? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?for 528 MHz Clock:0x0001bbbb
+ ? ? ? ? ? ? ? ? ? ? ?CONFIG_PSC3_USB
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? for USB on PSC3
? ? ? ? ? ? ? ? ? ? ? ?CONFIG_USB_CONFIG
? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?for differential drivers:0x00001000? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?for single ended drivers:0x00005000
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? for differential drivers on PSC3:0x00000100
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? for single ended drivers on PSC3:0x00004100? ? ? ? ? ? ? ? ? ? ? ?CONFIG_SYS_USB_EVENT_POLL
? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?May be defined to allow interrupt polling ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?instead of using asynchronous interruptscpu/mpc5xxx/usb.c +0
-0@@ -32,9 +32,13 @@ int usb_cpu_init(void)? ? ? ?/* Set the USB Clock ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? */ ? ? ? ?*(vu_long *)MPC5XXX_CDM_48_FDC =
CONFIG_USB_CLOCK;cpu/mpc5xxx/usb.c +4
-0+#ifdef CONFIG_PSC3_USB /* USB is using the alternate configuration */ + ? ? ? /* remove all PSC3 USB bits first before ORing in ours */ + ? ? ? *(vu_long *)MPC5XXX_GPS_PORT_CONFIG &= ~0x00804f00; +#else ? ? ? ?/* remove all USB bits first before ORing in ours */ ? ? ? ?*(vu_long *)MPC5XXX_GPS_PORT_CONFIG &= ~0x00807000;
cpu/mpc5xxx/usb.c +1
-1- +#endif ? ? ? ?/* Activate USB port ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? */ ? ? ? ?*(vu_long *)MPC5XXX_GPS_PORT_CONFIG |=
CONFIG_USB_CONFIG;cpu/mpc5xxx/usb_ohci.c +0
-0@@ -1576,9 +1576,13 @@ int usb_lowlevel_init(void)? ? ? ?/* Set the USB Clock ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? */ ? ? ? ?*(vu_long *)MPC5XXX_CDM_48_FDC =
CONFIG_USB_CLOCK;cpu/mpc5xxx/usb_ohci.c +4
-0+#ifdef CONFIG_PSC3_USB /* USB is using the alternate configuration */ + ? ? ? /* remove all PSC3 USB bits first before ORing in ours */ + ? ? ? *(vu_long *)MPC5XXX_GPS_PORT_CONFIG &= ~0x00804f00; +#else ? ? ? ?/* remove all USB bits first before ORing in ours */ ? ? ? ?*(vu_long *)MPC5XXX_GPS_PORT_CONFIG &= ~0x00807000;
cpu/mpc5xxx/usb_ohci.c +1
-1- +#endif ? ? ? ?/* Activate USB port ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? */ ? ? ? ?*(vu_long *)MPC5XXX_GPS_PORT_CONFIG |=
CONFIG_USB_CONFIG;--
1.6.3.1_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Signature · 2 lines
Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.
PATCH 1/1 Add support for USB on PSC3 for the mpc5200
In reply to Eric MillbrandtHello,
2009/8/13 Eric Millbrandt <[email protected]>:
Quoted 11 lines
Support USB on PSC3 on the mpc5200. ?Before this patch, enabling USB support would reconfigure PSC4 and PSC5 to USB. ?The mpc5200 does not support USB enabled on both the standard USB port and PSC3. ?This patch masks the appropriate bits when enabling USB.
Signed-off-by Eric Millbrandt <[email protected]>---
?README ? ? ? ? ? ? ? ? | ? ?4 ++++ ?cpu/mpc5xxx/usb.c ? ? ?| ? ?6 +++++- ?cpu/mpc5xxx/usb_ohci.c | ? ?6 +++++-?3 files changed, 14 insertions(+), 2 deletions(-)
Except from the fact that IMHO this driver belongs in the drivers/usb section (and being merged into the existing ohci-driver):
Wolfgang, do you take it in your mpc5xxx tree?
Kind Regards,
Remy
PATCH 1/1 Add support for USB on PSC3 for the mpc5200
Dear Remy Bohmer,
Quoted 3 lines · In message <[email protected]> you…
Except from the fact that IMHO this driver belongs in the
drivers/usbsection (and being merged into the existing ohci-driver):
Agreed...
Quoted 1 line
Acked-by Remy Bohmer <[email protected]>
Thanks.
Quoted 1 line
Wolfgang, do you take it in your mpc5xxx tree?
I take it directly to "next".
Best regards,
Wolfgang Denk
Signature · 7 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Niklaus Wirth has lamented that, whereas Europeans pronounce his name correctly (Ni-klows Virt), Americans invariably mangle it into (Nick-les Worth). Which is to say that Europeans call him by name, but Americans call him by value.
Wolfgang Denk
AppliedPATCH 1/1 Add support for USB on PSC3 for the mpc5200
In reply to Eric MillbrandtDear "Eric Millbrandt",
Quoted 11 lines · In message <[email protected]> you wrote:
Support USB on PSC3 on the mpc5200. Before this patch, enabling USB support would reconfigure PSC4 and PSC5 to USB. The mpc5200 does not support USB enabled on both the standard USB port and PSC3. This patch masks the appropriate bits when enabling USB.
Signed-off-by Eric Millbrandt <[email protected]>--- README | 4 ++++ cpu/mpc5xxx/usb.c | 6 +++++- cpu/mpc5xxx/usb_ohci.c | 6 +++++- 3 files changed, 14 insertions(+), 2 deletions(-)
Applied to "next", thanks.
Best regards,
Wolfgang Denk
Signature · 7 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de After a heated argument on some trivial matter Nancy [Astor] . . . shouted, ``If I were your wife I would put poison in your coffee!'' Whereupon Winston Churchill with equal heat and sincerity answered, ``And if I were your husband I would drink it.''