mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-27 00:52:36 +00:00
imx6: update upstream patches
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 42073
This commit is contained in:
parent
d5f94a4122
commit
60fe58100c
@ -11,11 +11,9 @@ Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
|
|||||||
arch/arm/boot/dts/imx6dl.dtsi | 20 ++++++++++++++++++++
|
arch/arm/boot/dts/imx6dl.dtsi | 20 ++++++++++++++++++++
|
||||||
1 file changed, 20 insertions(+)
|
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
|
--- a/arch/arm/boot/dts/imx6dl.dtsi
|
||||||
+++ b/arch/arm/boot/dts/imx6dl.dtsi
|
+++ b/arch/arm/boot/dts/imx6dl.dtsi
|
||||||
@@ -22,6 +22,26 @@
|
@@ -21,6 +21,26 @@
|
||||||
device_type = "cpu";
|
device_type = "cpu";
|
||||||
reg = <0>;
|
reg = <0>;
|
||||||
next-level-cache = <&L2>;
|
next-level-cache = <&L2>;
|
||||||
@ -42,6 +40,3 @@ index 80d0abe..9c4942f 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
cpu@1 {
|
cpu@1 {
|
||||||
--
|
|
||||||
2.0.3
|
|
||||||
|
|
||||||
|
@ -1,17 +1,23 @@
|
|||||||
commit 62fe03d1dd629a98c6da86cabb2a98b85e89d516
|
From 804f57b1a63c7435fe43b36942581cc6c79ebb5c Mon Sep 17 00:00:00 2001
|
||||||
Author: Lucas Stach <l.stach@pengutronix.de>
|
From: Lucas Stach <l.stach@pengutronix.de>
|
||||||
Date: Wed Mar 5 14:25:51 2014 +0100
|
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
|
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 is the recommended method of doing the IRQ
|
This makes INTB, INTC, and INTD work on i.MX.
|
||||||
mapping. For old devicetrees we fall back to the
|
|
||||||
previous practice.
|
|
||||||
|
|
||||||
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
|
Tested-by: Tim Harvey <tharvey@gateworks.com>
|
||||||
Acked-by: Arnd Bergmann <arnd@arndb.de>
|
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
|
||||||
Acked-by: Jingoo Han <jg1.han@samsung.com>
|
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
|
||||||
Reviewed-by: Marek Vasut <marex@denx.de>
|
Reviewed-by: Marek Vasut <marex@denx.de>
|
||||||
|
Acked-by: Arnd Bergmann <arnd@arndb.de>
|
||||||
|
Acked-by: Jingoo Han <jg1.han@samsung.com>
|
||||||
|
---
|
||||||
|
drivers/pci/host/pcie-designware.c | 12 +++++++++---
|
||||||
|
1 file changed, 9 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
--- a/drivers/pci/host/pcie-designware.c
|
--- a/drivers/pci/host/pcie-designware.c
|
||||||
+++ b/drivers/pci/host/pcie-designware.c
|
+++ b/drivers/pci/host/pcie-designware.c
|
@ -23,7 +23,7 @@ Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
|
|||||||
#include "skeleton.dtsi"
|
#include "skeleton.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
@@ -125,6 +127,12 @@
|
@@ -127,6 +129,12 @@
|
||||||
0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */
|
0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */
|
||||||
num-lanes = <1>;
|
num-lanes = <1>;
|
||||||
interrupts = <0 123 0x04>;
|
interrupts = <0 123 0x04>;
|
@ -33,7 +33,7 @@ Date: Thu Mar 13 09:37:51 2014 -0700
|
|||||||
|
|
||||||
--- a/arch/arm/boot/dts/imx6qdl.dtsi
|
--- a/arch/arm/boot/dts/imx6qdl.dtsi
|
||||||
+++ b/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 {
|
intc: interrupt-controller@00a01000 {
|
||||||
compatible = "arm,cortex-a9-gic";
|
compatible = "arm,cortex-a9-gic";
|
||||||
#interrupt-cells = <3>;
|
#interrupt-cells = <3>;
|
||||||
|
Loading…
Reference in New Issue
Block a user