diff options
Diffstat (limited to 'target/linux/imx6')
5 files changed, 12 insertions, 29 deletions
diff --git a/target/linux/imx6/patches-3.10/0009-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch b/target/linux/imx6/patches-3.10/0009-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch index 1ee8b4c1bf..ab20f7ff45 100644 --- a/target/linux/imx6/patches-3.10/0009-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch +++ b/target/linux/imx6/patches-3.10/0009-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch @@ -45,11 +45,9 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net> include/linux/of_address.h | 48 +++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) -diff --git a/drivers/of/address.c b/drivers/of/address.c -index 04da786..fdd0636 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c -@@ -227,6 +227,73 @@ int of_pci_address_to_resource(struct device_node *dev, int bar, +@@ -231,6 +231,73 @@ int of_pci_address_to_resource(struct de return __of_address_to_resource(dev, addrp, size, flags, NULL, r); } EXPORT_SYMBOL_GPL(of_pci_address_to_resource); @@ -123,8 +121,6 @@ index 04da786..fdd0636 100644 #endif /* CONFIG_PCI */ /* -diff --git a/include/linux/of_address.h b/include/linux/of_address.h -index 0506eb5..4c2e6f2 100644 --- a/include/linux/of_address.h +++ b/include/linux/of_address.h @@ -4,6 +4,36 @@ @@ -164,7 +160,7 @@ index 0506eb5..4c2e6f2 100644 #ifdef CONFIG_OF_ADDRESS extern u64 of_translate_address(struct device_node *np, const __be32 *addr); extern bool of_can_translate_address(struct device_node *dev); -@@ -27,6 +57,11 @@ static inline unsigned long pci_address_to_pio(phys_addr_t addr) { return -1; } +@@ -27,6 +57,11 @@ static inline unsigned long pci_address_ #define pci_address_to_pio pci_address_to_pio #endif @@ -176,7 +172,7 @@ index 0506eb5..4c2e6f2 100644 #else /* CONFIG_OF_ADDRESS */ #ifndef of_address_to_resource static inline int of_address_to_resource(struct device_node *dev, int index, -@@ -53,6 +88,19 @@ static inline const __be32 *of_get_address(struct device_node *dev, int index, +@@ -53,6 +88,19 @@ static inline const __be32 *of_get_addre { return NULL; } @@ -196,6 +192,3 @@ index 0506eb5..4c2e6f2 100644 #endif /* CONFIG_OF_ADDRESS */ --- -1.8.4 - diff --git a/target/linux/imx6/patches-3.10/0010-ARM-imx-Add-LVDS-general-purpose-clocks-to-i.MX6Q.patch b/target/linux/imx6/patches-3.10/0010-ARM-imx-Add-LVDS-general-purpose-clocks-to-i.MX6Q.patch index 9a5c16221e..bd86fadc33 100644 --- a/target/linux/imx6/patches-3.10/0010-ARM-imx-Add-LVDS-general-purpose-clocks-to-i.MX6Q.patch +++ b/target/linux/imx6/patches-3.10/0010-ARM-imx-Add-LVDS-general-purpose-clocks-to-i.MX6Q.patch @@ -10,8 +10,6 @@ Signed-off-by: Sean Cross <xobs@kosagi.com> arch/arm/mach-imx/clk-imx6q.c | 20 +++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) -diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c -index 9181a24..d94be84 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c @@ -205,6 +205,11 @@ static const char *vpu_axi_sels[] = { "a @@ -36,7 +34,7 @@ index 9181a24..d94be84 100644 }; static struct clk *clk[clk_max]; -@@ -340,6 +347,18 @@ int __init mx6q_clocks_init(void) +@@ -340,6 +346,18 @@ int __init mx6q_clocks_init(void) base + 0xe0, 0, 2, 0, clk_enet_ref_table, &imx_ccm_lock); diff --git a/target/linux/imx6/patches-3.10/0011-ARM-imx6q-Add-PCIe-bits-to-GPR-syscon-definition.patch b/target/linux/imx6/patches-3.10/0011-ARM-imx6q-Add-PCIe-bits-to-GPR-syscon-definition.patch index 0e65fb9a2f..df9d9fa961 100644 --- a/target/linux/imx6/patches-3.10/0011-ARM-imx6q-Add-PCIe-bits-to-GPR-syscon-definition.patch +++ b/target/linux/imx6/patches-3.10/0011-ARM-imx6q-Add-PCIe-bits-to-GPR-syscon-definition.patch @@ -8,8 +8,6 @@ Signed-off-by: Sean Cross <xobs@kosagi.com> include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h -index b6bdcd6..e00e9f3 100644 --- a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h +++ b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h @@ -241,6 +241,12 @@ diff --git a/target/linux/imx6/patches-3.10/0012-PCI-imx6-Add-support-for-i.MX6-PCIe-controller.patch b/target/linux/imx6/patches-3.10/0012-PCI-imx6-Add-support-for-i.MX6-PCIe-controller.patch index 029245ad05..37d26eabf1 100644 --- a/target/linux/imx6/patches-3.10/0012-PCI-imx6-Add-support-for-i.MX6-PCIe-controller.patch +++ b/target/linux/imx6/patches-3.10/0012-PCI-imx6-Add-support-for-i.MX6-PCIe-controller.patch @@ -17,12 +17,10 @@ Acked-by: Sascha Hauer <s.hauer@pengutronix.de> 7 files changed, 611 insertions(+), 1 deletion(-) create mode 100644 drivers/pci/host/pci-imx6.c -diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi -index ccd55c2..125202e 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi -@@ -116,6 +116,22 @@ - arm,data-latency = <4 2 3>; +@@ -108,6 +108,22 @@ + cache-level = <2>; }; + pcie: pcie@0x01000000 { @@ -44,11 +42,9 @@ index ccd55c2..125202e 100644 pmu { compatible = "arm,cortex-a9-pmu"; interrupts = <0 94 0x04>; -diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig -index 29a8af6..e6ac281 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig -@@ -801,6 +801,8 @@ config SOC_IMX6Q +@@ -806,6 +806,8 @@ config SOC_IMX6Q select HAVE_IMX_SRC select HAVE_SMP select MFD_SYSCON @@ -57,13 +53,11 @@ index 29a8af6..e6ac281 100644 select PINCTRL select PINCTRL_IMX6Q select PL310_ERRATA_588369 if CACHE_PL310 -diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c -index d94be84..6956995 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c -@@ -621,6 +621,10 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) - if (ret) - pr_warn("failed to set up CLKO: %d\n", ret); +@@ -586,6 +586,10 @@ int __init mx6q_clocks_init(void) + clk_prepare_enable(clk[usbphy2_gate]); + } + /* All existing boards with PCIe use LVDS1 */ + if (IS_ENABLED(CONFIG_PCI_IMX6)) diff --git a/target/linux/imx6/patches-3.10/011-pci-tweaks.patch b/target/linux/imx6/patches-3.10/011-pci-tweaks.patch index 3e0dcca7d4..08a08fb43f 100644 --- a/target/linux/imx6/patches-3.10/011-pci-tweaks.patch +++ b/target/linux/imx6/patches-3.10/011-pci-tweaks.patch @@ -11,7 +11,7 @@ }; --- a/drivers/pci/host/pci-imx6.c +++ b/drivers/pci/host/pci-imx6.c -@@ -200,12 +200,6 @@ +@@ -200,12 +200,6 @@ static int pcie_phy_write(void __iomem * static int imx6q_pcie_abort_handler(unsigned long addr, unsigned int fsr, struct pt_regs *regs) { @@ -24,7 +24,7 @@ return 0; } -@@ -322,7 +316,7 @@ +@@ -322,7 +316,7 @@ static void imx6_pcie_host_init(struct p IMX6Q_GPR12_PCIE_CTL_2, 1 << 10); while (!dw_pcie_link_up(pp)) { |