diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-17 20:51:16 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-17 20:51:16 +0100 |
| commit | 8b0affecb98f91142015ccf8c43653e1ad87c156 (patch) | |
| tree | c8845c9e4ceef07fb7946326f137ad615f8acf9b /include | |
| parent | 509adc8b77f885e946449ed62191fbef7fe67b56 (diff) | |
| parent | b2fb47f1873ae812ce33129996a22b11a36d0aa9 (diff) | |
| download | blackbird-obmc-uboot-8b0affecb98f91142015ccf8c43653e1ad87c156.tar.gz blackbird-obmc-uboot-8b0affecb98f91142015ccf8c43653e1ad87c156.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
* 'master' of git://git.denx.de/u-boot-usb:
USB: Use (get|put)_unaligned for accessing wMaxPacketSize
usb:gadget:s5p Enable the USB Gadget framework at Exynos4210 (C210 Universal)
README: add documentation for CONFIG_USB_ULPI*
USB: ULPI: increase error case verbosity
USB: ULPI: clean a mixup of return types
USB: ULPI: switch argument type from u8 to unsigned
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/s5pc210_universal.h | 4 | ||||
| -rw-r--r-- | include/max8998_pmic.h | 1 | ||||
| -rw-r--r-- | include/usb/ulpi.h | 8 | ||||
| -rw-r--r-- | include/usbdescriptors.h | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index b36ad3a193..be000cbafe 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -262,4 +262,8 @@ #define CONFIG_PMIC_I2C #define CONFIG_PMIC_MAX8998 +#define CONFIG_USB_GADGET +#define CONFIG_USB_GADGET_S3C_UDC_OTG +#define CONFIG_USB_GADGET_DUALSPEED + #endif /* __CONFIG_H */ diff --git a/include/max8998_pmic.h b/include/max8998_pmic.h index bf28820c5f..10c892a51d 100644 --- a/include/max8998_pmic.h +++ b/include/max8998_pmic.h @@ -76,6 +76,7 @@ enum { #define MAX8998_LDO3 (1 << 2) #define MAX8998_LDO8 (1 << 5) +#define MAX8998_SAFEOUT1 (1 << 4) #define MAX8998_I2C_ADDR (0xCC >> 1) diff --git a/include/usb/ulpi.h b/include/usb/ulpi.h index d871290871..802f077be4 100644 --- a/include/usb/ulpi.h +++ b/include/usb/ulpi.h @@ -41,7 +41,7 @@ int ulpi_init(u32 ulpi_viewport); * ULPI_FC_LOW_SPEED, ULPI_FC_FS4LS * returns 0 on success, ULPI_ERROR on failure. */ -int ulpi_select_transceiver(u32 ulpi_viewport, u8 speed); +int ulpi_select_transceiver(u32 ulpi_viewport, unsigned speed); /* * Enable/disable VBUS. @@ -66,7 +66,7 @@ int ulpi_set_pd(u32 ulpi_viewport, int enable); * * returns 0 on success, ULPI_ERROR on failure. */ -int ulpi_opmode_sel(u32 ulpi_viewport, u8 opmode); +int ulpi_opmode_sel(u32 ulpi_viewport, unsigned opmode); /* * Switch to Serial Mode. @@ -78,7 +78,7 @@ int ulpi_opmode_sel(u32 ulpi_viewport, u8 opmode); * Switches immediately to Serial Mode. * To return from Serial Mode, STP line needs to be asserted. */ -int ulpi_serial_mode_enable(u32 ulpi_viewport, u8 smode); +int ulpi_serial_mode_enable(u32 ulpi_viewport, unsigned smode); /* * Put PHY into low power mode. @@ -108,7 +108,7 @@ int ulpi_reset(u32 ulpi_viewport); * * returns 0 on success, ULPI_ERROR on failure. */ -u32 ulpi_write(u32 ulpi_viewport, u8 *reg, u32 value); +int ulpi_write(u32 ulpi_viewport, u8 *reg, u32 value); /* * Read the ULPI PHY register content via the viewport. diff --git a/include/usbdescriptors.h b/include/usbdescriptors.h index 392fcf5378..2dec3b93d6 100644 --- a/include/usbdescriptors.h +++ b/include/usbdescriptors.h @@ -199,7 +199,7 @@ struct usb_endpoint_descriptor { u8 bmAttributes; u16 wMaxPacketSize; u8 bInterval; -} __attribute__ ((packed)) __attribute__ ((aligned(2))); +} __attribute__ ((packed)); struct usb_interface_descriptor { u8 bLength; |
