projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch from archive libraries to partial linking
[oweals/u-boot.git]
/
arch
/
arm
/
cpu
/
arm920t
/
s3c24x0
/
usb_ohci.c
diff --git
a/arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c
b/arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c
index 5aa8d64a55cfddeea11014c2256be3a1f6240824..ccc97384f33dc5eea517e42cbca433c996d9cd2d 100644
(file)
--- a/
arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c
+++ b/
arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c
@@
-1666,13
+1666,13
@@
int usb_lowlevel_init(void)
* Set the 48 MHz UPLL clocking. Values are taken from
* "PLL value selection guide", 6-23, s3c2400_UM.pdf.
*/
* Set the 48 MHz UPLL clocking. Values are taken from
* "PLL value selection guide", 6-23, s3c2400_UM.pdf.
*/
- clk_power->
UPLLCON
= ((40 << 12) + (1 << 4) + 2);
- gpio->
MISCCR
|= 0x8; /* 1 = use pads related USB for USB host */
+ clk_power->
upllcon
= ((40 << 12) + (1 << 4) + 2);
+ gpio->
misccr
|= 0x8; /* 1 = use pads related USB for USB host */
/*
* Enable USB host clock.
*/
/*
* Enable USB host clock.
*/
- clk_power->
CLKCON
|= (1 << 4);
+ clk_power->
clkcon
|= (1 << 4);
memset(&gohci, 0, sizeof(struct ohci));
memset(&urb_priv, 0, sizeof(struct urb_priv));
memset(&gohci, 0, sizeof(struct ohci));
memset(&urb_priv, 0, sizeof(struct urb_priv));
@@
-1709,7
+1709,7
@@
int usb_lowlevel_init(void)
if (hc_reset(&gohci) < 0) {
hc_release_ohci(&gohci);
/* Initialization failed */
if (hc_reset(&gohci) < 0) {
hc_release_ohci(&gohci);
/* Initialization failed */
- clk_power->
CLKCON
&= ~(1 << 4);
+ clk_power->
clkcon
&= ~(1 << 4);
return -1;
}
return -1;
}
@@
-1722,7
+1722,7
@@
int usb_lowlevel_init(void)
err("can't start usb-%s", gohci.slot_name);
hc_release_ohci(&gohci);
/* Initialization failed */
err("can't start usb-%s", gohci.slot_name);
hc_release_ohci(&gohci);
/* Initialization failed */
- clk_power->
CLKCON
&= ~(1 << 4);
+ clk_power->
clkcon
&= ~(1 << 4);
return -1;
}
#ifdef DEBUG
return -1;
}
#ifdef DEBUG
@@
-1748,7
+1748,7
@@
int usb_lowlevel_stop(void)
/* call hc_release_ohci() here ? */
hc_reset(&gohci);
/* may not want to do this */
/* call hc_release_ohci() here ? */
hc_reset(&gohci);
/* may not want to do this */
- clk_power->
CLKCON
&= ~(1 << 4);
+ clk_power->
clkcon
&= ~(1 << 4);
return 0;
}
return 0;
}