Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge commit 'jwb/next' into next

parents 8c82da5e 06a5bad8

arch/powerpc/boot/dts/katmai.dts

+11 −11
Original line number Diff line number Diff line
@@ -253,8 +253,8 @@ 
			ranges = <0x02000000 0x00000000 0x80000000 0x0000000d 0x80000000 0x00000000 0x80000000

				  0x01000000 0x00000000 0x00000000 0x0000000c 0x08000000 0x00000000 0x00010000>;



			/* Inbound 2GB range starting at 0 */

			dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;

			/* Inbound 4GB range starting at 0 */

			dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x1 0x00000000>;



			/* This drives busses 0 to 0xf */

			bus-range = <0x0 0xf>;
@@ -297,10 +297,10 @@ 
			ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000

				  0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>;



			/* Inbound 2GB range starting at 0 */

			dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;

			/* Inbound 4GB range starting at 0 */

			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>;



			/* Legacy interrupts (note the weird polarity, the bridge seems
@@ -338,10 +338,10 @@ 
			ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x80000000 0x00000000 0x80000000

				  0x01000000 0x00000000 0x00000000 0x0000000f 0x80010000 0x00000000 0x00010000>;



			/* Inbound 2GB range starting at 0 */

			dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;

			/* Inbound 4GB range starting at 0 */

			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>;



			/* Legacy interrupts (note the weird polarity, the bridge seems
@@ -379,10 +379,10 @@ 
			ranges = <0x02000000 0x00000000 0x80000000 0x0000000f 0x00000000 0x00000000 0x80000000

				  0x01000000 0x00000000 0x00000000 0x0000000f 0x80020000 0x00000000 0x00010000>;



			/* Inbound 2GB range starting at 0 */

			dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;

			/* Inbound 4GB range starting at 0 */

			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>;



			/* Legacy interrupts (note the weird polarity, the bridge seems

arch/powerpc/boot/dts/yosemite.dts

+2 −12
Original line number Diff line number Diff line
@@ -282,20 +282,10 @@ 
			/* Inbound 2GB range starting at 0 */

			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 = <

				/* IDSEL 1 */

				0x800 0x0 0x0 0x0 &UIC0 0x1c 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

				/* IDSEL 12 */

				0x6000 0x0 0x0 0x0 &UIC0 0x19 0x8

			>;

		};

	};