Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 39135
http://thread.gmane.org/gmane.linux.kernel.pci/27204
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
--- 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
--- 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
-@@ -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);
{
struct pcie_port *pp = sys_to_pcie(dev->bus->sysdata);
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
--- 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;
}
err = PTR_ERR(clk_ipg);
goto failed_clock;
}
clk_per = devm_clk_get(&pdev->dev, "per");
if (IS_ERR(clk_per)) {
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;
}
err = PTR_ERR(clk_per);
goto failed_clock;
}
MX6Q_PAD_SD4_DAT0__NAND_DQS 0x00b1
>;
};
MX6Q_PAD_SD4_DAT0__NAND_DQS 0x00b1
>;
};
MX6Q_PAD_EIM_D16__I2C2_SDA 0x4001b8b1
>;
};
MX6Q_PAD_EIM_D16__I2C2_SDA 0x4001b8b1
>;
};
MX6Q_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
>;
};
MX6Q_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
>;
};
MX6Q_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
>;
};
MX6Q_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
>;
};
MX6Q_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
>;
};
MX6Q_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
>;
};
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
uart1 {
pinctrl_uart1_1: uart1grp-1 {
fsl,pins = <
uart1 {
pinctrl_uart1_1: uart1grp-1 {
fsl,pins = <
MX6DL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
>;
};
MX6DL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
>;
};
enet {
pinctrl_enet_1: enetgrp-1 {
fsl,pins = <
enet {
pinctrl_enet_1: enetgrp-1 {
fsl,pins = <
MX6DL_PAD_SD4_DAT4__UART2_TX_DATA 0x1b0b1
>;
};
MX6DL_PAD_SD4_DAT4__UART2_TX_DATA 0x1b0b1
>;
};
http://thread.gmane.org/gmane.linux.kernel.pci/27204
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
--- 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
--- 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
-@@ -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);
{
struct pcie_port *pp = sys_to_pcie(dev->bus->sysdata);