Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci

* 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (69 commits)
  davinci: Initial support for Neuros OSD2 platform.
  davinci: remove unused variable in arch/arm/mach-davinci/board-sffsdr.c
  davinci: fix section mismatch warning in arch/arm/mach-davinci/board-dm646x-evm.c
  DaVinci: DM365: Enable DaVinci RTC support for DM365 EVM
  DA8xx/OMAP-L1xx: Add high speed SD/MMC capabilities
  davinci: DA8XX/OMAP-L1XX: enable cpuidle and regulator in defconfig
  davinci: DA850/OMAP-L138: avoid using separate initcall for initializing regulator
  davinci: DA850/OMAP-L138 EVM: register for cpuidle support
  davinci: DA8XX/OMAP-L1XX: add support for cpuidle driver register
  davinci: add CPU idle driver
  davinci: DA8XX/OMAP-L1XX: fix compiler warning
  davinci: DA850/OMAP-L138: eliminate static function declaration
  davinci: DA850/OMAP-L138 EVM: simplify configuration of emac in MII/RMII mode
  davinci: DA850/OMAP-L138 EVM: get rid of DA850_UI_EXP config option
  davinci: DA850/OMAP-L138 EVM: implement autodetect of RMII PHY
  davinci: DA830/OMAP-L137 EVM: do not configure NAND on UI card when MMC/SD is selected
  davinci: DA830/OMAP-L137 EVM: use runtime detection for UI card
  davinci: DA830/OMAP-L137 EVM: remove ifdefs inside da830_evm_init()
  davinci: DA830/OMAP-L137 EVM: fix warning with default config
  davinci: Add NAND support for DA830/OMAP-L137 EVM platform
  ...

1 files changed, 59 insertions, 0 deletions

diff --git a/arch/arm/mach-davinci/include/mach/usb.h b/arch/arm/mach-davinci/include/mach/usb.h
new file mode 100644
index 000000000000..e0bc4abe69c2
--- /dev/null
+++ b/arch/arm/mach-davinci/include/mach/usb.h
@@ -0,0 +1,59 @@
+/*
+ * USB related definitions
+ *
+ * Copyright (C) 2009 MontaVista Software, Inc. <source@mvista.com>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#ifndef __ASM_ARCH_USB_H
+#define __ASM_ARCH_USB_H
+
+/* DA8xx CFGCHIP2 (USB 2.0 PHY Control) register bits */
+#define CFGCHIP2_PHYCLKGD       (1 << 17)
+#define CFGCHIP2_VBUSSENSE      (1 << 16)
+#define CFGCHIP2_RESET          (1 << 15)
+#define CFGCHIP2_OTGMODE        (3 << 13)
+#define CFGCHIP2_NO_OVERRIDE    (0 << 13)
+#define CFGCHIP2_FORCE_HOST     (1 << 13)
+#define CFGCHIP2_FORCE_DEVICE   (2 << 13)
+#define CFGCHIP2_FORCE_HOST_VBUS_LOW (3 << 13)
+#define CFGCHIP2_USB1PHYCLKMUX  (1 << 12)
+#define CFGCHIP2_USB2PHYCLKMUX  (1 << 11)
+#define CFGCHIP2_PHYPWRDN       (1 << 10)
+#define CFGCHIP2_OTGPWRDN       (1 << 9)
+#define CFGCHIP2_DATPOL         (1 << 8)
+#define CFGCHIP2_USB1SUSPENDM   (1 << 7)
+#define CFGCHIP2_PHY_PLLON      (1 << 6)        /* override PLL suspend */
+#define CFGCHIP2_SESENDEN       (1 << 5)        /* Vsess_end comparator */
+#define CFGCHIP2_VBDTCTEN       (1 << 4)        /* Vbus comparator */
+#define CFGCHIP2_REFFREQ        (0xf << 0)
+#define CFGCHIP2_REFFREQ_12MHZ  (1 << 0)
+#define CFGCHIP2_REFFREQ_24MHZ  (2 << 0)
+#define CFGCHIP2_REFFREQ_48MHZ  (3 << 0)
+
+struct  da8xx_ohci_root_hub;
+
+typedef void (*da8xx_ocic_handler_t)(struct da8xx_ohci_root_hub *hub,
+                                     unsigned port);
+
+/* Passed as the platform data to the OHCI driver */
+struct  da8xx_ohci_root_hub {
+        /* Switch the port power on/off */
+        int     (*set_power)(unsigned port, int on);
+        /* Read the port power status */
+        int     (*get_power)(unsigned port);
+        /* Read the port over-current indicator */
+        int     (*get_oci)(unsigned port);
+        /* Over-current indicator change notification (pass NULL to disable) */
+        int     (*ocic_notify)(da8xx_ocic_handler_t handler);
+
+        /* Time from power on to power good (in 2 ms units) */
+        u8      potpgt;
+};
+
+void davinci_setup_usb(unsigned mA, unsigned potpgt_ms);
+
+#endif  /* ifndef __ASM_ARCH_USB_H */