imx6: refresh patches
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 39135
This commit is contained in:
parent
7632535589
commit
5db5354c70
8 changed files with 15 additions and 17 deletions
|
@ -29,7 +29,6 @@ Cc: spear-devel@list.st.com
|
|||
|
||||
http://thread.gmane.org/gmane.linux.kernel.pci/27204
|
||||
|
||||
diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
|
||||
--- a/drivers/pci/host/pcie-designware.c
|
||||
+++ b/drivers/pci/host/pcie-designware.c
|
||||
@@ -177,6 +177,7 @@ int __init dw_pcie_host_init(struct pcie
|
||||
|
|
|
@ -13,7 +13,7 @@ upstream.
|
|||
|
||||
--- a/drivers/pci/host/pcie-designware.c
|
||||
+++ b/drivers/pci/host/pcie-designware.c
|
||||
@@ -447,7 +447,26 @@ int dw_pcie_map_irq(const struct pci_dev
|
||||
@@ -482,7 +482,26 @@ int dw_pcie_map_irq(const struct pci_dev
|
||||
{
|
||||
struct pcie_port *pp = sys_to_pcie(dev->bus->sysdata);
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|||
|
||||
--- a/drivers/net/can/flexcan.c
|
||||
+++ b/drivers/net/can/flexcan.c
|
||||
@@ -1025,7 +1025,6 @@ static int flexcan_probe(struct platform
|
||||
@@ -1019,7 +1019,6 @@ static int flexcan_probe(struct platform
|
||||
err = PTR_ERR(clk_ipg);
|
||||
goto failed_clock;
|
||||
}
|
||||
|
@ -27,7 +27,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|||
|
||||
clk_per = devm_clk_get(&pdev->dev, "per");
|
||||
if (IS_ERR(clk_per)) {
|
||||
@@ -1033,6 +1032,7 @@ static int flexcan_probe(struct platform
|
||||
@@ -1027,6 +1026,7 @@ static int flexcan_probe(struct platform
|
||||
err = PTR_ERR(clk_per);
|
||||
goto failed_clock;
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
};
|
||||
|
||||
ecspi1 {
|
||||
@@ -187,6 +195,30 @@
|
||||
@@ -212,6 +220,30 @@
|
||||
MX6Q_PAD_SD4_DAT0__NAND_DQS 0x00b1
|
||||
>;
|
||||
};
|
||||
|
@ -56,7 +56,7 @@
|
|||
};
|
||||
|
||||
i2c1 {
|
||||
@@ -205,6 +237,12 @@
|
||||
@@ -230,6 +262,12 @@
|
||||
MX6Q_PAD_EIM_D16__I2C2_SDA 0x4001b8b1
|
||||
>;
|
||||
};
|
||||
|
@ -69,7 +69,7 @@
|
|||
};
|
||||
|
||||
i2c3 {
|
||||
@@ -214,6 +252,12 @@
|
||||
@@ -239,6 +277,12 @@
|
||||
MX6Q_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
|
||||
>;
|
||||
};
|
||||
|
@ -82,7 +82,7 @@
|
|||
};
|
||||
|
||||
uart1 {
|
||||
@@ -223,6 +267,12 @@
|
||||
@@ -248,6 +292,12 @@
|
||||
MX6Q_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
|
||||
>;
|
||||
};
|
||||
|
@ -95,7 +95,7 @@
|
|||
};
|
||||
|
||||
uart2 {
|
||||
@@ -232,6 +282,21 @@
|
||||
@@ -257,6 +307,21 @@
|
||||
MX6Q_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
|
||||
>;
|
||||
};
|
||||
|
@ -117,7 +117,7 @@
|
|||
};
|
||||
|
||||
uart4 {
|
||||
@@ -242,6 +307,15 @@
|
||||
@@ -267,6 +332,15 @@
|
||||
>;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/arch/arm/boot/dts/imx6dl.dtsi
|
||||
+++ b/arch/arm/boot/dts/imx6dl.dtsi
|
||||
@@ -80,6 +80,95 @@
|
||||
@@ -105,6 +105,95 @@
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -96,7 +96,7 @@
|
|||
uart1 {
|
||||
pinctrl_uart1_1: uart1grp-1 {
|
||||
fsl,pins = <
|
||||
@@ -87,6 +176,36 @@
|
||||
@@ -112,6 +201,36 @@
|
||||
MX6DL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
|
||||
>;
|
||||
};
|
||||
|
@ -133,7 +133,7 @@
|
|||
};
|
||||
|
||||
uart4 {
|
||||
@@ -97,6 +216,15 @@
|
||||
@@ -122,6 +241,15 @@
|
||||
>;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
enet {
|
||||
pinctrl_enet_1: enetgrp-1 {
|
||||
fsl,pins = <
|
||||
@@ -197,6 +209,12 @@
|
||||
@@ -222,6 +234,12 @@
|
||||
MX6DL_PAD_SD4_DAT4__UART2_TX_DATA 0x1b0b1
|
||||
>;
|
||||
};
|
||||
|
@ -42,7 +42,7 @@
|
|||
};
|
||||
|
||||
uart3 {
|
||||
@@ -227,6 +245,12 @@
|
||||
@@ -252,6 +270,12 @@
|
||||
};
|
||||
|
||||
usbotg {
|
||||
|
|
|
@ -29,7 +29,6 @@ Cc: spear-devel@list.st.com
|
|||
|
||||
http://thread.gmane.org/gmane.linux.kernel.pci/27204
|
||||
|
||||
diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
|
||||
--- a/drivers/pci/host/pcie-designware.c
|
||||
+++ b/drivers/pci/host/pcie-designware.c
|
||||
@@ -177,6 +177,7 @@ int __init dw_pcie_host_init(struct pcie
|
||||
|
|
|
@ -13,7 +13,7 @@ upstream.
|
|||
|
||||
--- a/drivers/pci/host/pcie-designware.c
|
||||
+++ b/drivers/pci/host/pcie-designware.c
|
||||
@@ -447,7 +447,26 @@ int dw_pcie_map_irq(const struct pci_dev
|
||||
@@ -482,7 +482,26 @@ int dw_pcie_map_irq(const struct pci_dev
|
||||
{
|
||||
struct pcie_port *pp = sys_to_pcie(dev->bus->sysdata);
|
||||
|
||||
|
|
Loading…
Reference in a new issue