mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 23:42:43 +00:00
863e79f8d5
The following patches were dropped because they are already applied upstream: 0012-pinctrl-lantiq-fix-up-pinmux.patch 0013-MTD-lantiq-xway-fix-invalid-operator.patch 0014-MTD-lantiq-xway-the-latched-command-should-be-persis.patch 0015-MTD-lantiq-xway-remove-endless-loop.patch 0016-MTD-lantiq-xway-add-missing-write_buf-and-read_buf-t.patch 0017-MTD-xway-fix-nand-locking.patch 0044-pinctrl-lantiq-introduce-new-dedicated-devicetree-bi.patch 0045-pinctrl-lantiq-Fix-GPIO-Setup-of-GPIO-Port3.patch 0046-pinctrl-lantiq-2-pins-have-the-wrong-mux-list.patch 0047-irq-fixes.patch 0047-mtd-plat-nand-pass-of-node.patch 0060-usb-dwc2-Add-support-for-Lantiq-ARX-and-XRX-SoCs.patch 0120-MIPS-lantiq-add-support-for-device-tree-file-from-bo.patch 0121-MIPS-lantiq-make-it-possible-to-build-in-no-device-t.patch 122-MIPS-store-the-appended-dtb-address-in-a-variable.patch The PHY driver was reduced to the code adding the LED configuration, the rest is already upstream: 0023-NET-PHY-adds-driver-for-lantiq-PHY11G.patch The SPI driver was replaced with the version pending for upstream inclusion: New driver: 0090-spi-add-transfer_status-callback.patch 0091-spi-lantiq-ssc-add-support-for-Lantiq-SSC-SPI-controller.patch Old driver: 0100-spi-add-support-for-Lantiq-SPI-controller.patch Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
--- a/drivers/usb/dwc2/platform.c
|
|
+++ b/drivers/usb/dwc2/platform.c
|
|
@@ -42,6 +42,7 @@
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/mutex.h>
|
|
+#include <linux/of_gpio.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/phy/phy.h>
|
|
#include <linux/platform_data/s3c-hsotg.h>
|
|
@@ -544,6 +545,7 @@ static int dwc2_driver_probe(struct plat
|
|
struct dwc2_hsotg *hsotg;
|
|
struct resource *res;
|
|
int retval;
|
|
+ int gpio_count;
|
|
|
|
match = of_match_device(dwc2_of_match_table, &dev->dev);
|
|
if (match && match->data) {
|
|
@@ -562,6 +564,16 @@ static int dwc2_driver_probe(struct plat
|
|
defparams.dma_desc_fs_enable = 0;
|
|
}
|
|
|
|
+ gpio_count = of_gpio_count(dev->dev.of_node);
|
|
+ while (gpio_count > 0) {
|
|
+ enum of_gpio_flags flags;
|
|
+ int gpio = of_get_gpio_flags(dev->dev.of_node, --gpio_count, &flags);
|
|
+ if (gpio_request(gpio, "usb"))
|
|
+ continue;
|
|
+ dev_info(&dev->dev, "requested GPIO %d\n", gpio);
|
|
+ gpio_direction_output(gpio, (flags & OF_GPIO_ACTIVE_LOW) ? (0) : (1));
|
|
+ }
|
|
+
|
|
hsotg = devm_kzalloc(&dev->dev, sizeof(*hsotg), GFP_KERNEL);
|
|
if (!hsotg)
|
|
return -ENOMEM;
|