From 3a85543f35be59c41c685a64336149546564ef76 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 10 Jan 2017 13:52:04 +0100 Subject: ARM: dts: add the PCI clock to the device tree The PCIv3 driver needs to fetch this clock, so add it to the device tree. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/integratorap.dts | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/boot/dts/integratorap.dts') diff --git a/arch/arm/boot/dts/integratorap.dts b/arch/arm/boot/dts/integratorap.dts index e8b249f92fb3..152d59821db0 100644 --- a/arch/arm/boot/dts/integratorap.dts +++ b/arch/arm/boot/dts/integratorap.dts @@ -160,6 +160,7 @@ reg = <0x62000000 0x10000>; interrupt-parent = <&pic>; interrupts = <17>; /* Bus error IRQ */ + clocks = <&pciclk>; ranges = <0x00000000 0 0x61000000 /* config space */ 0x61000000 0 0x00100000 /* 16 MiB @ 61000000 */ 0x01000000 0 0x0 /* I/O space */ -- cgit From d3721efce22d1e91f190bddf7a959f8ce5129f9c Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Fri, 14 Jul 2017 15:20:29 +0200 Subject: ARM: dts: integratorap: Fix PCI windows This fixes up several errors and additions in the PCIv3 ranges: - The I/O space is 64KB and translates from 61000000 to 00000000. - The non-prefetched and prefected memories are 1:1 mapped according to ARM DUI 0098A page 5-9 and should be like that in the device tree as well. - We also add the DMA ranges, in the manual these are described as "PCI to local bus windows" on page 5-12 ff. - Set the bus range to 0x00-0xff. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/integratorap.dts | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'arch/arm/boot/dts/integratorap.dts') diff --git a/arch/arm/boot/dts/integratorap.dts b/arch/arm/boot/dts/integratorap.dts index 152d59821db0..ecca38b43f83 100644 --- a/arch/arm/boot/dts/integratorap.dts +++ b/arch/arm/boot/dts/integratorap.dts @@ -157,18 +157,22 @@ #interrupt-cells = <1>; #size-cells = <2>; #address-cells = <3>; - reg = <0x62000000 0x10000>; + /* Bridge registers and config access space */ + reg = <0x62000000 0x10000>, <0x61000000 0x01000000>; interrupt-parent = <&pic>; interrupts = <17>; /* Bus error IRQ */ clocks = <&pciclk>; - ranges = <0x00000000 0 0x61000000 /* config space */ - 0x61000000 0 0x00100000 /* 16 MiB @ 61000000 */ - 0x01000000 0 0x0 /* I/O space */ - 0x60000000 0 0x00100000 /* 16 MiB @ 60000000 */ - 0x02000000 0 0x00000000 /* non-prefectable memory */ - 0x40000000 0 0x10000000 /* 256 MiB @ 40000000 */ - 0x42000000 0 0x10000000 /* prefetchable memory */ - 0x50000000 0 0x10000000>; /* 256 MiB @ 50000000 */ + bus-range = <0x00 0xff>; + ranges = <0x01000000 0 0x0000000 /* I/O space @00000000 */ + 0x60000000 0 0x00010000 /* 64 KB @ LB 60000000 */ + 0x02000000 0 0x40000000 /* non-prefectable memory @40000000 */ + 0x40000000 0 0x10000000 /* 256 MiB @ LB 40000000 1:1 */ + 0x42000000 0 0x50000000 /* prefetchable memory @50000000 */ + 0x50000000 0 0x10000000>; /* 256 MiB @ LB 50000000 1:1 */ + dma-ranges = <0x02000000 0 0x20000000 /* EBI memory space */ + 0x20000000 0 0x20000000 /* 512 MB @ LB 20000000 1:1 */ + 0x02000000 0 0x80000000 /* Core module alias memory */ + 0x80000000 0 0x40000000>; /* 1GB @ LB 80000000 */ interrupt-map-mask = <0xf800 0 0 0x7>; interrupt-map = < /* IDSEL 9 */ -- cgit From afd5d2f7af33fd4a57a68bca9e651ca7fd41263b Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Fri, 21 Apr 2017 13:47:34 +0200 Subject: ARM: dts: Update Integrator/AP PCI v3 compatible To make a stand-alone PCI driver for the V3 Semiconductor PCI bridge, we need a proper compatible indicating that we are integrated on the Integrator/AP platform. Add this. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/integratorap.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/boot/dts/integratorap.dts') diff --git a/arch/arm/boot/dts/integratorap.dts b/arch/arm/boot/dts/integratorap.dts index ecca38b43f83..546278269ebd 100644 --- a/arch/arm/boot/dts/integratorap.dts +++ b/arch/arm/boot/dts/integratorap.dts @@ -153,7 +153,7 @@ }; pci: pciv3@62000000 { - compatible = "v3,v360epc-pci"; + compatible = "arm,integrator-ap-pci", "v3,v360epc-pci"; #interrupt-cells = <1>; #size-cells = <2>; #address-cells = <3>; -- cgit