summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-10-14 11:04:25 +0000
committerJohn Crispin <john@openwrt.org>2014-10-14 11:04:25 +0000
commit0f790247e305cd62376e29dfc15f529aeba1ac1c (patch)
tree4edd08ac839010f86aa73c7906673dd6f508f136
parent99c238ff15ddfbdb16c82e3b219ada67c02e0a0f (diff)
downloadmtk-20170518-0f790247e305cd62376e29dfc15f529aeba1ac1c.zip
mtk-20170518-0f790247e305cd62376e29dfc15f529aeba1ac1c.tar.gz
mtk-20170518-0f790247e305cd62376e29dfc15f529aeba1ac1c.tar.bz2
lantiq: allow pcie to be disabled by dts + vgv7519 fix pci irq + disable pcie by dts
Signed-off-by: Eddi De Pieri <eddi@depieri.net> SVN-Revision: 42907
-rw-r--r--target/linux/lantiq/dts/VGV7519.dtsi6
-rw-r--r--target/linux/lantiq/patches-3.14/0151-lantiq-ifxmips_pcie-use-of.patch51
2 files changed, 56 insertions, 1 deletions
diff --git a/target/linux/lantiq/dts/VGV7519.dtsi b/target/linux/lantiq/dts/VGV7519.dtsi
index 146d06a..e67c07f 100644
--- a/target/linux/lantiq/dts/VGV7519.dtsi
+++ b/target/linux/lantiq/dts/VGV7519.dtsi
@@ -206,11 +206,15 @@
lantiq,delay-lo = <0>; /* 0.0ns delay */
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
interrupt-map = <
- 0x7000 0 0 1 &icu0 29 1 // slot 14, irq 29
+ 0x7000 0 0 1 &icu0 30 1 // slot 14, irq 30
>;
gpio-reset = <&gpio 21 0>;
req-mask = <0x1>; /* GNT1 */
};
+
+ pcie@d900000 {
+ status = "disabled";
+ };
};
gphy-xrx200 {
diff --git a/target/linux/lantiq/patches-3.14/0151-lantiq-ifxmips_pcie-use-of.patch b/target/linux/lantiq/patches-3.14/0151-lantiq-ifxmips_pcie-use-of.patch
new file mode 100644
index 0000000..eeffa88
--- /dev/null
+++ b/target/linux/lantiq/patches-3.14/0151-lantiq-ifxmips_pcie-use-of.patch
@@ -0,0 +1,51 @@
+--- linux-3.14.18.orig/arch/mips/pci/ifxmips_pcie.c 2014-09-27 14:55:19.000000000 +0200
++++ linux-3.14.18/arch/mips/pci/ifxmips_pcie.c 2014-10-09 13:45:12.000000000 +0200
+@@ -18,6 +18,8 @@
+ #include <linux/pci_regs.h>
+ #include <linux/module.h>
+
++#include <linux/of_platform.h>
++
+ #include "ifxmips_pcie.h"
+ #include "ifxmips_pcie_reg.h"
+
+@@ -1048,7 +1050,7 @@
+ extern int (*ltq_pci_plat_arch_init)(struct pci_dev *dev);
+ extern int (*ltq_pci_map_irq)(const struct pci_dev *dev, u8 slot, u8 pin);
+
+-static int __init ifx_pcie_bios_init(void)
++static int __init ifx_pcie_bios_probe(struct platform_device *pdev)
+ {
+ void __iomem *io_map_base;
+ int pcie_port;
+@@ -1090,6 +1092,30 @@
+
+ return 0;
+ }
++
++static const struct of_device_id ifxmips_pcie_match[] = {
++ { .compatible = "lantiq,pcie-xrx200" },
++ {},
++};
++MODULE_DEVICE_TABLE(of, ifxmips_pcie_match);
++
++static struct platform_driver ltq_pci_driver = {
++ .probe = ifx_pcie_bios_probe,
++ .driver = {
++ .name = "pcie-xrx200",
++ .owner = THIS_MODULE,
++ .of_match_table = ifxmips_pcie_match,
++ },
++};
++
++int __init ifx_pcie_bios_init(void)
++{
++ int ret = platform_driver_register(&ltq_pci_driver);
++ if (ret)
++ pr_info("pcie-xrx200: Error registering platform driver!");
++ return ret;
++}
++
+ arch_initcall(ifx_pcie_bios_init);
+
+ MODULE_LICENSE("GPL");