diff options
| author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2009-10-30 23:46:14 +0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@deeprootsystems.com> | 2009-11-25 10:21:33 -0800 |
| commit | 355fb4e3ea590976819c03070bf2c9491aede258 (patch) | |
| tree | 8119acc8e15ec41f0ac11f93d5ffc944a7af8d63 /arch/arm/mach-davinci/include | |
| parent | 990c09d5f5b2079e8bf3c6615c78fa5ed2b97147 (diff) | |
| download | op-kernel-dev-355fb4e3ea590976819c03070bf2c9491aede258.zip op-kernel-dev-355fb4e3ea590976819c03070bf2c9491aede258.tar.gz | |
DaVinci: rename setup_usb() to davinci_setup_usb()
Rename setup_usb() into davinci_setup_usb(). While at it:
- move its declaration from <mach/common.h> to more fitting <mach/usb.h>;
- teach it to handle values of the 'mA' parameter greater than 510 and thus
pass 1000 instead of 500 for the power switches capable of sourcing over 1 A;
- teach it to handle odd values of the 'potpgt_ms' parameter...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/include')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/common.h | 6 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/usb.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index 1fd3917..6ca2c9a 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -20,12 +20,6 @@ extern void davinci_irq_init(void); extern void __iomem *davinci_intc_base; extern int davinci_intc_type; -/* parameters describe VBUS sourcing for host mode */ -extern void setup_usb(unsigned mA, unsigned potpgt_msec); - -/* parameters describe VBUS sourcing for host mode */ -extern void setup_usb(unsigned mA, unsigned potpgt_msec); - struct davinci_timer_instance { void __iomem *base; u32 bottom_irq; diff --git a/arch/arm/mach-davinci/include/mach/usb.h b/arch/arm/mach-davinci/include/mach/usb.h index 435f228..e0bc4ab 100644 --- a/arch/arm/mach-davinci/include/mach/usb.h +++ b/arch/arm/mach-davinci/include/mach/usb.h @@ -54,4 +54,6 @@ struct da8xx_ohci_root_hub { u8 potpgt; }; +void davinci_setup_usb(unsigned mA, unsigned potpgt_ms); + #endif /* ifndef __ASM_ARCH_USB_H */ |
