imx6: switch to 3.14
[openwrt/staging/wigyori.git] / target / linux / imx6 / patches-3.10 / 010-pcie-backport-fixes.patch
1 --- a/arch/arm/boot/dts/imx6qdl.dtsi
2 +++ b/arch/arm/boot/dts/imx6qdl.dtsi
3 @@ -119,7 +119,7 @@
4 0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */
5 num-lanes = <1>;
6 interrupts = <0 123 0x04>;
7 - clocks = <&clks 189>, <&clks 187>, <&clks 206>, <&clks 144>;
8 + clocks = <&clks 189>, <&clks 187>, <&clks 198>, <&clks 144>;
9 clock-names = "pcie_ref_125m", "sata_ref_100m", "lvds_gate", "pcie_axi";
10 status = "disabled";
11 };
12 --- a/drivers/pci/Kconfig
13 +++ b/drivers/pci/Kconfig
14 @@ -125,3 +125,5 @@ config PCI_IOAPIC
15 config PCI_LABEL
16 def_bool y if (DMI || ACPI)
17 select NLS
18 +
19 +source "drivers/pci/host/Kconfig"
20 --- a/drivers/pci/Makefile
21 +++ b/drivers/pci/Makefile
22 @@ -67,3 +67,6 @@ obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen
23 obj-$(CONFIG_OF) += of.o
24
25 ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG
26 +
27 +# PCI host controller drivers
28 +obj-y += host/
29 --- a/Documentation/devicetree/bindings/clock/imx6q-clock.txt
30 +++ b/Documentation/devicetree/bindings/clock/imx6q-clock.txt
31 @@ -208,10 +208,10 @@ clocks and IDs.
32 pll4_post_div 193
33 pll5_post_div 194
34 pll5_video_div 195
35 - lvds1_sel 204
36 - lvds2_sel 205
37 - lvds1_gate 206
38 - lvds2_gate 207
39 + lvds1_sel 196
40 + lvds2_sel 197
41 + lvds1_gate 198
42 + lvds2_gate 199
43
44 Examples:
45