From 60fe58100c888ee4faa387176d9c16046a2dfe40 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Fri, 8 Aug 2014 13:38:29 +0000 Subject: [PATCH] imx6: update upstream patches Signed-off-by: Luka Perkov SVN-Revision: 42073 --- ...RM-dts-imx6dl-enable-cpufreq-support.patch | 7 +--- ...e-new-OF-interrupt-mapping-when-pos.patch} | 32 +++++++++++-------- ...d-PCIe-interrupt-mapping-properties.patch} | 2 +- ...mx_fix-invallid-#address-cells-value.patch | 2 +- 4 files changed, 22 insertions(+), 21 deletions(-) rename target/linux/imx6/patches-3.14/{0060-pci_designware_use-new-OF-interrupt-mapping-when-possible.patch => 0005-PCI-designware-Use-new-OF-interrupt-mapping-when-pos.patch} (59%) rename target/linux/imx6/patches-3.14/{0065-ARM-dts-imx6-add-PCIe-interrupt-mapping-properties.patch => 0006-ARM-dts-imx6-add-PCIe-interrupt-mapping-properties.patch} (98%) diff --git a/target/linux/imx6/patches-3.14/0004-ARM-dts-imx6dl-enable-cpufreq-support.patch b/target/linux/imx6/patches-3.14/0004-ARM-dts-imx6dl-enable-cpufreq-support.patch index be5eefbfa5f1..6f07cdd277df 100644 --- a/target/linux/imx6/patches-3.14/0004-ARM-dts-imx6dl-enable-cpufreq-support.patch +++ b/target/linux/imx6/patches-3.14/0004-ARM-dts-imx6dl-enable-cpufreq-support.patch @@ -11,11 +11,9 @@ Signed-off-by: Shawn Guo arch/arm/boot/dts/imx6dl.dtsi | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) -diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi -index 80d0abe..9c4942f 100644 --- a/arch/arm/boot/dts/imx6dl.dtsi +++ b/arch/arm/boot/dts/imx6dl.dtsi -@@ -22,6 +22,26 @@ +@@ -21,6 +21,26 @@ device_type = "cpu"; reg = <0>; next-level-cache = <&L2>; @@ -42,6 +40,3 @@ index 80d0abe..9c4942f 100644 }; cpu@1 { --- -2.0.3 - diff --git a/target/linux/imx6/patches-3.14/0060-pci_designware_use-new-OF-interrupt-mapping-when-possible.patch b/target/linux/imx6/patches-3.14/0005-PCI-designware-Use-new-OF-interrupt-mapping-when-pos.patch similarity index 59% rename from target/linux/imx6/patches-3.14/0060-pci_designware_use-new-OF-interrupt-mapping-when-possible.patch rename to target/linux/imx6/patches-3.14/0005-PCI-designware-Use-new-OF-interrupt-mapping-when-pos.patch index fff074a1edd1..19db40451d2c 100644 --- a/target/linux/imx6/patches-3.14/0060-pci_designware_use-new-OF-interrupt-mapping-when-possible.patch +++ b/target/linux/imx6/patches-3.14/0005-PCI-designware-Use-new-OF-interrupt-mapping-when-pos.patch @@ -1,17 +1,23 @@ -commit 62fe03d1dd629a98c6da86cabb2a98b85e89d516 -Author: Lucas Stach -Date: Wed Mar 5 14:25:51 2014 +0100 +From 804f57b1a63c7435fe43b36942581cc6c79ebb5c Mon Sep 17 00:00:00 2001 +From: Lucas Stach +Date: Wed, 5 Mar 2014 14:25:51 +0100 +Subject: [PATCH] PCI: designware: Use new OF interrupt mapping when possible - PCI: designware: use new OF interrupt mapping when possible - - This is the recommended method of doing the IRQ - mapping. For old devicetrees we fall back to the - previous practice. - - Signed-off-by: Lucas Stach - Acked-by: Arnd Bergmann - Acked-by: Jingoo Han - Reviewed-by: Marek Vasut +Use new OF interrupt mapping (of_irq_parse_and_map_pci()) when possible. +This is the recommended method of doing the IRQ mapping. For old +devicetrees we fall back to the previous practice. + +This makes INTB, INTC, and INTD work on i.MX. + +Tested-by: Tim Harvey +Signed-off-by: Lucas Stach +Signed-off-by: Bjorn Helgaas +Reviewed-by: Marek Vasut +Acked-by: Arnd Bergmann +Acked-by: Jingoo Han +--- + drivers/pci/host/pcie-designware.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c diff --git a/target/linux/imx6/patches-3.14/0065-ARM-dts-imx6-add-PCIe-interrupt-mapping-properties.patch b/target/linux/imx6/patches-3.14/0006-ARM-dts-imx6-add-PCIe-interrupt-mapping-properties.patch similarity index 98% rename from target/linux/imx6/patches-3.14/0065-ARM-dts-imx6-add-PCIe-interrupt-mapping-properties.patch rename to target/linux/imx6/patches-3.14/0006-ARM-dts-imx6-add-PCIe-interrupt-mapping-properties.patch index 62ca2f33a8a6..ade85fc29037 100644 --- a/target/linux/imx6/patches-3.14/0065-ARM-dts-imx6-add-PCIe-interrupt-mapping-properties.patch +++ b/target/linux/imx6/patches-3.14/0006-ARM-dts-imx6-add-PCIe-interrupt-mapping-properties.patch @@ -23,7 +23,7 @@ Signed-off-by: Shawn Guo #include "skeleton.dtsi" / { -@@ -125,6 +127,12 @@ +@@ -127,6 +129,12 @@ 0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */ num-lanes = <1>; interrupts = <0 123 0x04>; diff --git a/target/linux/imx6/patches-3.14/0055-ARM_dts_imx_fix-invallid-#address-cells-value.patch b/target/linux/imx6/patches-3.14/0055-ARM_dts_imx_fix-invallid-#address-cells-value.patch index 79472e889905..463d757f9696 100644 --- a/target/linux/imx6/patches-3.14/0055-ARM_dts_imx_fix-invallid-#address-cells-value.patch +++ b/target/linux/imx6/patches-3.14/0055-ARM_dts_imx_fix-invallid-#address-cells-value.patch @@ -33,7 +33,7 @@ Date: Thu Mar 13 09:37:51 2014 -0700 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi -@@ -38,8 +38,6 @@ +@@ -40,8 +40,6 @@ intc: interrupt-controller@00a01000 { compatible = "arm,cortex-a9-gic"; #interrupt-cells = <3>; -- 2.30.2