Commit 652caf4a authored by Olof Johansson's avatar Olof Johansson

Merge tag 'imx-fixes-4.18' of...

Merge tag 'imx-fixes-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

i.MX fixes for 4.18:
 - Fix i.MX6SX PCIe MSI interrupt number, so that MSI IRQs can be
   properly propagated to the upstream interrupt controller.
 - Fix GPCv2 MIPI/PCIe/USB_HSIC's PGC offset.  The values in Reference
   Manual are incorrect.
 - Correct SDMA setting for i.MX6Q SPI5 device to fix the issue, that
   the SPI controller RX FIFO was not empty after a DMA transfer, and
   the driver gets stuck in the next PIO transfer when reading one word
   more than expected.

* tag 'imx-fixes-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6sx: fix irq for pcie bridge
  soc: imx: gpcv2: correct PGC offset
  ARM: dts: imx6q: Use correct SDMA script for SPI5 core
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents cb04a794 1bcfe056
...@@ -90,7 +90,7 @@ ecspi5: ecspi@2018000 { ...@@ -90,7 +90,7 @@ ecspi5: ecspi@2018000 {
clocks = <&clks IMX6Q_CLK_ECSPI5>, clocks = <&clks IMX6Q_CLK_ECSPI5>,
<&clks IMX6Q_CLK_ECSPI5>; <&clks IMX6Q_CLK_ECSPI5>;
clock-names = "ipg", "per"; clock-names = "ipg", "per";
dmas = <&sdma 11 7 1>, <&sdma 12 7 2>; dmas = <&sdma 11 8 1>, <&sdma 12 8 2>;
dma-names = "rx", "tx"; dma-names = "rx", "tx";
status = "disabled"; status = "disabled";
}; };
......
...@@ -1344,7 +1344,7 @@ pcie: pcie@8ffc000 { ...@@ -1344,7 +1344,7 @@ pcie: pcie@8ffc000 {
ranges = <0x81000000 0 0 0x08f80000 0 0x00010000 /* downstream I/O */ ranges = <0x81000000 0 0 0x08f80000 0 0x00010000 /* downstream I/O */
0x82000000 0 0x08000000 0x08000000 0 0x00f00000>; /* non-prefetchable memory */ 0x82000000 0 0x08000000 0x08000000 0 0x00f00000>; /* non-prefetchable memory */
num-lanes = <1>; num-lanes = <1>;
interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "msi"; interrupt-names = "msi";
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 0x7>; interrupt-map-mask = <0 0 0 0x7>;
......
...@@ -39,10 +39,15 @@ ...@@ -39,10 +39,15 @@
#define GPC_M4_PU_PDN_FLG 0x1bc #define GPC_M4_PU_PDN_FLG 0x1bc
/*
#define PGC_MIPI 4 * The PGC offset values in Reference Manual
#define PGC_PCIE 5 * (Rev. 1, 01/2018 and the older ones) GPC chapter's
#define PGC_USB_HSIC 8 * GPC_PGC memory map are incorrect, below offset
* values are from design RTL.
*/
#define PGC_MIPI 16
#define PGC_PCIE 17
#define PGC_USB_HSIC 20
#define GPC_PGC_CTRL(n) (0x800 + (n) * 0x40) #define GPC_PGC_CTRL(n) (0x800 + (n) * 0x40)
#define GPC_PGC_SR(n) (GPC_PGC_CTRL(n) + 0xc) #define GPC_PGC_SR(n) (GPC_PGC_CTRL(n) + 0xc)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment