diff options
author | John Crispin <john@openwrt.org> | 2011-02-03 17:34:55 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2011-02-03 17:34:55 +0000 |
commit | f394bbbcaadf14e08018ba68e5ff1914af2fef86 (patch) | |
tree | 67beac94ed44b840af7d2886f8a2d801b7f57efa /target/linux/lantiq/patches/700-dwc_otg.patch | |
parent | 73672387168751e149676900197b5195d45267ba (diff) | |
download | upstream-f394bbbcaadf14e08018ba68e5ff1914af2fef86.tar.gz upstream-f394bbbcaadf14e08018ba68e5ff1914af2fef86.tar.bz2 upstream-f394bbbcaadf14e08018ba68e5ff1914af2fef86.zip |
* fix usb compile warnings * fix timer header file which broke compile of external tapi driver * rebase patch
SVN-Revision: 25344
Diffstat (limited to 'target/linux/lantiq/patches/700-dwc_otg.patch')
-rw-r--r-- | target/linux/lantiq/patches/700-dwc_otg.patch | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/target/linux/lantiq/patches/700-dwc_otg.patch b/target/linux/lantiq/patches/700-dwc_otg.patch index 819872c080..71931555fe 100644 --- a/target/linux/lantiq/patches/700-dwc_otg.patch +++ b/target/linux/lantiq/patches/700-dwc_otg.patch @@ -1917,7 +1917,7 @@ + dwc_modify_reg32(&global_regs->gintmsk, intr_mask.d32, 0); +} + -+#if 1 ++#if 0 +/* currently not used, keep it here as if needed later */ +static int phy_read(dwc_otg_core_if_t * _core_if, int addr) +{ @@ -6344,12 +6344,12 @@ + // GPIOs + if(_dev->dev.platform_data >= 0) + { -+ gpio_request(_dev->dev.platform_data, "usb_power"); -+ gpio_direction_output(_dev->dev.platform_data, 1); -+ gpio_set_value(_dev->dev.platform_data, 1); -+ gpio_export(_dev->dev.platform_data, 0); ++ int pin = (int)_dev->dev.platform_data; ++ gpio_request(pin, "usb_power"); ++ gpio_direction_output(pin, 1); ++ gpio_set_value(pin, 1); ++ gpio_export(pin, 0); + } -+ + dev_dbg(&_dev->dev, "dwc_otg_driver_probe (%p)\n", _dev); + + dwc_otg_device = kmalloc(sizeof(dwc_otg_device_t), GFP_KERNEL); @@ -13250,7 +13250,7 @@ +#endif /* DWC_DEVICE_ONLY */ --- /dev/null +++ b/drivers/usb/dwc_otg/dwc_otg_ifx.c -@@ -0,0 +1,105 @@ +@@ -0,0 +1,101 @@ +/****************************************************************************** +** +** FILE NAME : dwc_otg_ifx.c @@ -13344,10 +13344,6 @@ + writel (0x14014, (volatile unsigned long *)0xbe10103c); +} + -+static void release_platform_dev(struct device * dev) -+{ -+} -+ +int ifx_usb_hc_init(unsigned long base_addr, int irq) +{ + return 0; |