Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ralink: fix pcie reset

Browse source 
some old mt7620a uboots dont reset the pcie core properly. work around this
issue in the kernel driver.

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 43292
This commit is contained in:
John Crispin 2014-11-17 16:27:48 +00:00
parent ed5ae98cf4
commit 32d4348540
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
target/linux/ramips/dts/mt7620a.dtsi
View file

@ -302,8 +302,8 @@
}; };
i2c_pins: i2c { i2c_pins: i2c {
i2c { i2c {
lantiq,group = "i2c"; ralink,group = "i2c";
lantiq,function = "i2c"; ralink,function = "i2c";
}; };
}; };
uartlite_pins: uartlite { uartlite_pins: uartlite {
@ -342,6 +342,12 @@
ralink,function = "rgmii2"; ralink,function = "rgmii2";
}; };
}; };
pcie_pins: pcie {
pcie {
ralink,group = "pcie";
ralink,function = "pcie rst";
};
};
}; };
rstctrl: rstctrl { rstctrl: rstctrl {
@ -443,6 +449,9 @@
interrupt-parent = <&cpuintc>; interrupt-parent = <&cpuintc>;
interrupts = <4>; interrupts = <4>;
pinctrl-names = "default";
pinctrl-0 = <&pcie_pins>;
device_type = "pci"; device_type = "pci";
bus-range = <0 255>; bus-range = <0 255>;

19
target/linux/ramips/patches-3.14/0032-PCI-MIPS-adds-mt7620a-pcie-driver.patch
View file

@ -13,8 +13,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
Index: linux-3.14.18/arch/mips/pci/Makefile Index: linux-3.14.18/arch/mips/pci/Makefile
=================================================================== ===================================================================
--- linux-3.14.18.orig/arch/mips/pci/Makefile 2014-11-13 15:45:37.323344081 +0100 --- linux-3.14.18.orig/arch/mips/pci/Makefile 2014-11-17 16:02:34.009553392 +0100
+++ linux-3.14.18/arch/mips/pci/Makefile 2014-11-13 15:45:37.331344390 +0100 +++ linux-3.14.18/arch/mips/pci/Makefile 2014-11-17 16:02:34.017553694 +0100
@@ -42,6 +42,7 @@ @@ -42,6 +42,7 @@
obj-$(CONFIG_LANTIQ) += fixup-lantiq.o obj-$(CONFIG_LANTIQ) += fixup-lantiq.o
obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o ops-lantiq.o obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o ops-lantiq.o
@ -26,8 +26,8 @@ Index: linux-3.14.18/arch/mips/pci/Makefile
Index: linux-3.14.18/arch/mips/pci/pci-mt7620.c Index: linux-3.14.18/arch/mips/pci/pci-mt7620.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.14.18/arch/mips/pci/pci-mt7620.c 2014-11-13 18:20:27.961225097 +0100 +++ linux-3.14.18/arch/mips/pci/pci-mt7620.c 2014-11-17 16:09:52.814075085 +0100
@@ -0,0 +1,395 @@ @@ -0,0 +1,396 @@
+/* +/*
+ * Ralink MT7620A SoC PCI support + * Ralink MT7620A SoC PCI support
+ * + *
@ -247,11 +247,12 @@ Index: linux-3.14.18/arch/mips/pci/pci-mt7620.c
+ /* PCIE: Elastic buffer control */ + /* PCIE: Elastic buffer control */
+ pcie_phy(0x68, 0xB4); + pcie_phy(0x68, 0xB4);
+ +
+ pcie_m32(0, BIT(1), RALINK_PCI_PCICFG_ADDR);
+
+ reset_control_assert(rstpcie0); + reset_control_assert(rstpcie0);
+ +
+ rt_sysc_m32(RALINK_PCIE0_CLK_EN, 0, RALINK_CLKCFG1); + rt_sysc_m32(RALINK_PCIE0_CLK_EN, 0, RALINK_CLKCFG1);
+ rt_sysc_m32(BIT(19), BIT(31), PPLL_DRV); + rt_sysc_m32(BIT(19), BIT(31), PPLL_DRV);
+ rt_sysc_m32(0x3 << 16, 0, RALINK_GPIOMODE);
+ +
+ reset_control_deassert(rstpcie0); + reset_control_deassert(rstpcie0);
+ rt_sysc_m32(0, RALINK_PCIE0_CLK_EN, RALINK_CLKCFG1); + rt_sysc_m32(0, RALINK_PCIE0_CLK_EN, RALINK_CLKCFG1);
@ -425,8 +426,8 @@ Index: linux-3.14.18/arch/mips/pci/pci-mt7620.c
+arch_initcall(mt7620_pci_init); +arch_initcall(mt7620_pci_init);
Index: linux-3.14.18/arch/mips/ralink/Kconfig Index: linux-3.14.18/arch/mips/ralink/Kconfig
=================================================================== ===================================================================
--- linux-3.14.18.orig/arch/mips/ralink/Kconfig 2014-11-13 15:45:37.323344081 +0100 --- linux-3.14.18.orig/arch/mips/ralink/Kconfig 2014-11-17 16:02:34.009553392 +0100
+++ linux-3.14.18/arch/mips/ralink/Kconfig 2014-11-13 15:45:37.331344390 +0100 +++ linux-3.14.18/arch/mips/ralink/Kconfig 2014-11-17 16:02:34.021553845 +0100
@@ -39,6 +39,7 @@ @@ -39,6 +39,7 @@
bool "MT7620/8" bool "MT7620/8"
select USB_ARCH_HAS_OHCI select USB_ARCH_HAS_OHCI
@ -437,8 +438,8 @@ Index: linux-3.14.18/arch/mips/ralink/Kconfig
bool "MT7621" bool "MT7621"
Index: linux-3.14.18/arch/mips/include/asm/mach-ralink/mt7620.h Index: linux-3.14.18/arch/mips/include/asm/mach-ralink/mt7620.h
=================================================================== ===================================================================
--- linux-3.14.18.orig/arch/mips/include/asm/mach-ralink/mt7620.h 2014-11-13 15:45:37.311343619 +0100 --- linux-3.14.18.orig/arch/mips/include/asm/mach-ralink/mt7620.h 2014-11-17 16:02:33.993552790 +0100
+++ linux-3.14.18/arch/mips/include/asm/mach-ralink/mt7620.h 2014-11-13 18:20:31.721370073 +0100 +++ linux-3.14.18/arch/mips/include/asm/mach-ralink/mt7620.h 2014-11-17 16:10:00.002345398 +0100
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
MT762X_SOC_MT7620N, MT762X_SOC_MT7620N,
MT762X_SOC_MT7628AN, MT762X_SOC_MT7628AN,