Skip to content

L
linux
Commit 0285ae37 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files
Options

Merge commit 'jwb/next' into next

parents 8c82da5e 06a5bad8
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 23 deletions
arch/powerpc/boot/dts/katmai.dts
View file @ 0285ae37
...@@ -253,8 +253,8 @@ PCIX0: pci@c0ec00000 { ...@@ -253,8 +253,8 @@ PCIX0: pci@c0ec00000 {
ranges = <0x02000000 0x00000000 0x80000000 0x0000000d 0x80000000 0x00000000 0x80000000 ranges = <0x02000000 0x00000000 0x80000000 0x0000000d 0x80000000 0x00000000 0x80000000
0x01000000 0x00000000 0x00000000 0x0000000c 0x08000000 0x00000000 0x00010000>; 0x01000000 0x00000000 0x00000000 0x0000000c 0x08000000 0x00000000 0x00010000>;
/* Inbound 2GB range starting at 0 */ /* Inbound 4GB range starting at 0 */
dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x1 0x00000000>;
/* This drives busses 0 to 0xf */ /* This drives busses 0 to 0xf */
bus-range = <0x0 0xf>; bus-range = <0x0 0xf>;
...@@ -297,10 +297,10 @@ PCIE0: pciex@d00000000 { ...@@ -297,10 +297,10 @@ PCIE0: pciex@d00000000 {
ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000 ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000
0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>; 0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>;
/* Inbound 2GB range starting at 0 */ /* Inbound 4GB range starting at 0 */
dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x1 0x00000000>;
/* This drives busses 10 to 0x1f */ /* This drives busses 0x10 to 0x1f */
bus-range = <0x10 0x1f>; bus-range = <0x10 0x1f>;
/* Legacy interrupts (note the weird polarity, the bridge seems /* Legacy interrupts (note the weird polarity, the bridge seems
...@@ -338,10 +338,10 @@ PCIE1: pciex@d20000000 { ...@@ -338,10 +338,10 @@ PCIE1: pciex@d20000000 {
ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x80000000 0x00000000 0x80000000 ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x80000000 0x00000000 0x80000000
0x01000000 0x00000000 0x00000000 0x0000000f 0x80010000 0x00000000 0x00010000>; 0x01000000 0x00000000 0x00000000 0x0000000f 0x80010000 0x00000000 0x00010000>;
/* Inbound 2GB range starting at 0 */ /* Inbound 4GB range starting at 0 */
dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x1 0x00000000>;
/* This drives busses 10 to 0x1f */ /* This drives busses 0x20 to 0x2f */
bus-range = <0x20 0x2f>; bus-range = <0x20 0x2f>;
/* Legacy interrupts (note the weird polarity, the bridge seems /* Legacy interrupts (note the weird polarity, the bridge seems
...@@ -379,10 +379,10 @@ PCIE2: pciex@d40000000 { ...@@ -379,10 +379,10 @@ PCIE2: pciex@d40000000 {
ranges = <0x02000000 0x00000000 0x80000000 0x0000000f 0x00000000 0x00000000 0x80000000 ranges = <0x02000000 0x00000000 0x80000000 0x0000000f 0x00000000 0x00000000 0x80000000
0x01000000 0x00000000 0x00000000 0x0000000f 0x80020000 0x00000000 0x00010000>; 0x01000000 0x00000000 0x00000000 0x0000000f 0x80020000 0x00000000 0x00010000>;
/* Inbound 2GB range starting at 0 */ /* Inbound 4GB range starting at 0 */
dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x1 0x00000000>;
/* This drives busses 10 to 0x1f */ /* This drives busses 0x30 to 0x3f */
bus-range = <0x30 0x3f>; bus-range = <0x30 0x3f>;
/* Legacy interrupts (note the weird polarity, the bridge seems /* Legacy interrupts (note the weird polarity, the bridge seems
......
arch/powerpc/boot/dts/yosemite.dts
View file @ 0285ae37
...@@ -282,20 +282,10 @@ PCI0: pci@ec000000 { ...@@ -282,20 +282,10 @@ PCI0: pci@ec000000 {
/* Inbound 2GB range starting at 0 */ /* Inbound 2GB range starting at 0 */
dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
/* Bamboo has all 4 IRQ pins tied together per slot */
interrupt-map-mask = <0xf800 0x0 0x0 0x0>; interrupt-map-mask = <0xf800 0x0 0x0 0x0>;
interrupt-map = < interrupt-map = <
/* IDSEL 1 */ /* IDSEL 12 */
0x800 0x0 0x0 0x0 &UIC0 0x1c 0x8 0x6000 0x0 0x0 0x0 &UIC0 0x19 0x8
/* IDSEL 2 */
0x1000 0x0 0x0 0x0 &UIC0 0x1b 0x8
/* IDSEL 3 */
0x1800 0x0 0x0 0x0 &UIC0 0x1a 0x8
/* IDSEL 4 */
0x2000 0x0 0x0 0x0 &UIC0 0x19 0x8
>; >;
}; };
}; };
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7