aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.7/0124-pci_fix.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2012-12-15 01:59:45 +0000
committerJohn Crispin <john@openwrt.org>2012-12-15 01:59:45 +0000
commit3a948770cf46732ba4e2ebe667efc3be164780e3 (patch)
treea332a0212fc1d8831ea73fa20841bd252c468916 /target/linux/lantiq/patches-3.7/0124-pci_fix.patch
parent240a3a38e1711857921d31b73a81a4ef9e8a3117 (diff)
downloadupstream-3a948770cf46732ba4e2ebe667efc3be164780e3.tar.gz
upstream-3a948770cf46732ba4e2ebe667efc3be164780e3.tar.bz2
upstream-3a948770cf46732ba4e2ebe667efc3be164780e3.zip
add linux-v3.7
SVN-Revision: 34687
Diffstat (limited to 'target/linux/lantiq/patches-3.7/0124-pci_fix.patch')
-rw-r--r--target/linux/lantiq/patches-3.7/0124-pci_fix.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-3.7/0124-pci_fix.patch b/target/linux/lantiq/patches-3.7/0124-pci_fix.patch
new file mode 100644
index 0000000000..013dac76cb
--- /dev/null
+++ b/target/linux/lantiq/patches-3.7/0124-pci_fix.patch
@@ -0,0 +1,22 @@
+Index: linux-3.7-rc8/arch/mips/pci/pci-lantiq.c
+===================================================================
+--- linux-3.7-rc8.orig/arch/mips/pci/pci-lantiq.c 2012-12-03 20:22:37.000000000 +0100
++++ linux-3.7-rc8/arch/mips/pci/pci-lantiq.c 2012-12-14 23:28:24.355606776 +0100
+@@ -129,8 +129,15 @@
+
+ /* setup reset gpio used by pci */
+ reset_gpio = of_get_named_gpio(node, "gpio-reset", 0);
+- if (gpio_is_valid(reset_gpio))
+- devm_gpio_request(&pdev->dev, reset_gpio, "pci-reset");
++ if (gpio_is_valid(reset_gpio)) {
++ int ret = devm_gpio_request(&pdev->dev, reset_gpio, "pci-reset");
++ if (ret) {
++ dev_err(&pdev->dev,
++ "failed to request gpio %d\n", reset_gpio);
++ return ret;
++ }
++ gpio_direction_output(reset_gpio, 1);
++ }
+
+ /* enable auto-switching between PCI and EBU */
+ ltq_pci_w32(0xa, PCI_CR_CLK_CTRL);