Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-usb

Browse Source
This commit is contained in:
Tom Rini
2012-12-21 16:19:29 -07:00
parent ba427678a4 41984e7123
commit ba6d4b64b3
12 changed files with 229 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/configs/cm_t35.h
View File

@@ -114,9 +114,15 @@
#define CONFIG_DOS_PARTITION
/* USB */
#define CONFIG_MUSB_UDC
#define CONFIG_USB_OMAP3
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_OMAP
#define CONFIG_USB_ULPI
#define CONFIG_USB_ULPI_VIEWPORT_OMAP
#define CONFIG_USB_STORAGE
#define CONFIG_MUSB_UDC
#define CONFIG_TWL4030_USB
#define CONFIG_CMD_USB
/* USB device configuration */
#define CONFIG_USB_DEVICE

25
include/configs/h2200.h
View File

@@ -154,4 +154,29 @@
#define CONFIG_BOOTARGS "root=/dev/ram0 ro console=ttyS0,115200n8"
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_USB_DEV_PULLUP_GPIO 33
/* USB VBUS GPIO 3 */
#define CONFIG_CMD_NET
#define CONFIG_CMD_PING
#define CONFIG_BOOTDELAY 2
#define CONFIG_BOOTCOMMAND \
"setenv downloaded 0 ; while test $downloaded -eq 0 ; do " \
"if bootp ; then setenv downloaded 1 ; fi ; done ; " \
"source :script ; " \
"bootm ; "
#define CONFIG_USB_GADGET_PXA2XX
#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_SUBSET
#define CONFIG_USBNET_DEV_ADDR "de:ad:be:ef:00:01"
#define CONFIG_USBNET_HOST_ADDR "de:ad:be:ef:00:02"
#define CONFIG_EXTRA_ENV_SETTINGS \
"stdin=serial\0" \
"stdout=serial\0" \
"stderr=serial\0"
#endif /* __CONFIG_H */

44
include/twl4030.h
View File

@@ -580,6 +580,50 @@
#define TWL4030_USB_PHY_CLK_CTRL 0xFE
#define TWL4030_USB_PHY_CLK_CTRL_STS 0xFF
/* GPIO */
#define TWL4030_GPIO_GPIODATAIN1 0x00
#define TWL4030_GPIO_GPIODATAIN2 0x01
#define TWL4030_GPIO_GPIODATAIN3 0x02
#define TWL4030_GPIO_GPIODATADIR1 0x03
#define TWL4030_GPIO_GPIODATADIR2 0x04
#define TWL4030_GPIO_GPIODATADIR3 0x05
#define TWL4030_GPIO_GPIODATAOUT1 0x06
#define TWL4030_GPIO_GPIODATAOUT2 0x07
#define TWL4030_GPIO_GPIODATAOUT3 0x08
#define TWL4030_GPIO_CLEARGPIODATAOUT1 0x09
#define TWL4030_GPIO_CLEARGPIODATAOUT2 0x0A
#define TWL4030_GPIO_CLEARGPIODATAOUT3 0x0B
#define TWL4030_GPIO_SETGPIODATAOUT1 0x0C
#define TWL4030_GPIO_SETGPIODATAOUT2 0x0D
#define TWL4030_GPIO_SETGPIODATAOUT3 0x0E
#define TWL4030_GPIO_GPIO_DEBEN1 0x0F
#define TWL4030_GPIO_GPIO_DEBEN2 0x10
#define TWL4030_GPIO_GPIO_DEBEN3 0x11
#define TWL4030_GPIO_GPIO_CTRL 0x12
#define TWL4030_GPIO_GPIOPUPDCTR1 0x13
#define TWL4030_GPIO_GPIOPUPDCTR2 0x14
#define TWL4030_GPIO_GPIOPUPDCTR3 0x15
#define TWL4030_GPIO_GPIOPUPDCTR4 0x16
#define TWL4030_GPIO_GPIOPUPDCTR5 0x17
#define TWL4030_GPIO_GPIO_ISR1A 0x19
#define TWL4030_GPIO_GPIO_ISR2A 0x1A
#define TWL4030_GPIO_GPIO_ISR3A 0x1B
#define TWL4030_GPIO_GPIO_IMR1A 0x1C
#define TWL4030_GPIO_GPIO_IMR2A 0x1D
#define TWL4030_GPIO_GPIO_IMR3A 0x1E
#define TWL4030_GPIO_GPIO_ISR1B 0x1F
#define TWL4030_GPIO_GPIO_ISR2B 0x20
#define TWL4030_GPIO_GPIO_ISR3B 0x21
#define TWL4030_GPIO_GPIO_IMR1B 0x22
#define TWL4030_GPIO_GPIO_IMR2B 0x23
#define TWL4030_GPIO_GPIO_IMR3B 0x24
#define TWL4030_GPIO_GPIO_EDR1 0x28
#define TWL4030_GPIO_GPIO_EDR2 0x29
#define TWL4030_GPIO_GPIO_EDR3 0x2A
#define TWL4030_GPIO_GPIO_EDR4 0x2B
#define TWL4030_GPIO_GPIO_EDR5 0x2C
#define TWL4030_GPIO_GPIO_SIH_CTRL 0x2D
/*
* Convience functions to read and write from TWL4030
*

1
include/usb.h
View File

@@ -392,5 +392,6 @@ int hub_port_reset(struct usb_device *dev, int port,
struct usb_device *usb_alloc_new_device(void *controller);
int usb_new_device(struct usb_device *dev);
void usb_free_device(void);
#endif /*_USB_H_ */