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

Commit 46b28357 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'fixes-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge

parents 9d78592e 14170789

arch/powerpc/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ config BDI_SWITCH 


config BOOTX_TEXT

	bool "Support for early boot text console (BootX or OpenFirmware only)"

	depends PPC_OF

	depends PPC_OF && PPC_MULTIPLATFORM

	help

	  Say Y here to see progress messages from the boot firmware in text

	  mode. Requires either BootX or Open Firmware.

arch/powerpc/boot/dts/mpc7448hpc2.dts

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
		#address-cells = <1>;

		#size-cells = <1>;

		#interrupt-cells = <2>;

		device_type = "tsi108-bridge";

		device_type = "tsi-bridge";

		ranges = <00000000 c0000000 00010000>;

		reg = <c0000000 00010000>;

		bus-frequency = <0>;

arch/powerpc/boot/dts/mpc8544ds.dts

+8 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ 
			interrupts = <1d 2 1e 2 22 2>;

			interrupt-parent = <&mpic>;

			phy-handle = <&phy0>;

			phy-connection-type = "rgmii-id";

		};



		ethernet@26000 {
@@ -117,6 +118,7 @@ 
			interrupts = <1f 2 20 2 21 2>;

			interrupt-parent = <&mpic>;

			phy-handle = <&phy1>;

			phy-connection-type = "rgmii-id";

		};



		serial@4500 {
@@ -348,6 +350,12 @@ 


		};



		global-utilities@e0000 {	//global utilities block

			compatible = "fsl,mpc8548-guts";

			reg = <e0000 1000>;

			fsl,has-rstcr;

		};



		mpic: pic@40000 {

			clock-frequency = <0>;

			interrupt-controller;

arch/powerpc/boot/dts/mpc8568mds.dts

+6 −0
Original line number Diff line number Diff line
@@ -170,6 +170,12 @@ 
			interrupt-parent = <&mpic>;

		};



		global-utilities@e0000 {	//global utilities block

			compatible = "fsl,mpc8548-guts";

			reg = <e0000 1000>;

			fsl,has-rstcr;

		};



		pci@8000 {

			interrupt-map-mask = <f800 0 0 7>;

			interrupt-map = <

arch/powerpc/kernel/irq.c

+4 −4
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ irq_hw_number_t virq_to_hw(unsigned int virq) 
}

EXPORT_SYMBOL_GPL(virq_to_hw);



struct irq_host *irq_alloc_host(unsigned int revmap_type,

__init_refok struct irq_host *irq_alloc_host(unsigned int revmap_type,

						unsigned int revmap_arg,

						struct irq_host_ops *ops,

						irq_hw_number_t inval_irq)