Commit 02ce6e87 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge remote-tracking branch 'scott/master' into merge 

Scott wrote:

<<
The corenet64 patch fixes a regression introduced in 3.13-rc1 (commit
ef1313de, "powerpc: Add VMX optimised xor
for RAID5").

The 8xx patch fixes a regression introduced in 3.12 (commit
beb2dc0a, "powerpc: Convert some
mftb/mftbu into mfspr").

The other two patches are fixes for minor, long standing bugs.
>>
parents 6ce4eac1 d742aa15

arch/powerpc/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -128,7 +128,12 @@ CFLAGS-$(CONFIG_POWER5_CPU) += $(call cc-option,-mcpu=power5) 
CFLAGS-$(CONFIG_POWER6_CPU) += $(call cc-option,-mcpu=power6)

CFLAGS-$(CONFIG_POWER7_CPU) += $(call cc-option,-mcpu=power7)



# Altivec option not allowed with e500mc64 in GCC.

ifeq ($(CONFIG_ALTIVEC),y)

E5500_CPU := -mcpu=powerpc64

else

E5500_CPU := $(call cc-option,-mcpu=e500mc64,-mcpu=powerpc64)

endif

CFLAGS-$(CONFIG_E5500_CPU) += $(E5500_CPU)

CFLAGS-$(CONFIG_E6500_CPU) += $(call cc-option,-mcpu=e6500,$(E5500_CPU))

arch/powerpc/boot/dts/xcalibur1501.dts

+2 −2
Original line number Diff line number Diff line
@@ -637,14 +637,14 @@ 
		tlu@2f000 {

			compatible = "fsl,mpc8572-tlu", "fsl_tlu";

			reg = <0x2f000 0x1000>;

			interupts = <61 2 >;

			interrupts = <61 2>;

			interrupt-parent = <&mpic>;

		};



		tlu@15000 {

			compatible = "fsl,mpc8572-tlu", "fsl_tlu";

			reg = <0x15000 0x1000>;

			interupts = <75 2>;

			interrupts = <75 2>;

			interrupt-parent = <&mpic>;

		};

	};

arch/powerpc/boot/dts/xpedite5301.dts

+2 −2
Original line number Diff line number Diff line
@@ -547,14 +547,14 @@ 
		tlu@2f000 {

			compatible = "fsl,mpc8572-tlu", "fsl_tlu";

			reg = <0x2f000 0x1000>;

			interupts = <61 2 >;

			interrupts = <61 2>;

			interrupt-parent = <&mpic>;

		};



		tlu@15000 {

			compatible = "fsl,mpc8572-tlu", "fsl_tlu";

			reg = <0x15000 0x1000>;

			interupts = <75 2>;

			interrupts = <75 2>;

			interrupt-parent = <&mpic>;

		};

	};

arch/powerpc/boot/dts/xpedite5330.dts

+2 −2
Original line number Diff line number Diff line
@@ -583,14 +583,14 @@ 
		tlu@2f000 {

			compatible = "fsl,mpc8572-tlu", "fsl_tlu";

			reg = <0x2f000 0x1000>;

			interupts = <61 2 >;

			interrupts = <61 2>;

			interrupt-parent = <&mpic>;

		};



		tlu@15000 {

			compatible = "fsl,mpc8572-tlu", "fsl_tlu";

			reg = <0x15000 0x1000>;

			interupts = <75 2>;

			interrupts = <75 2>;

			interrupt-parent = <&mpic>;

		};

	};

arch/powerpc/boot/dts/xpedite5370.dts

+2 −2
Original line number Diff line number Diff line
@@ -545,14 +545,14 @@ 
		tlu@2f000 {

			compatible = "fsl,mpc8572-tlu", "fsl_tlu";

			reg = <0x2f000 0x1000>;

			interupts = <61 2 >;

			interrupts = <61 2>;

			interrupt-parent = <&mpic>;

		};



		tlu@15000 {

			compatible = "fsl,mpc8572-tlu", "fsl_tlu";

			reg = <0x15000 0x1000>;

			interupts = <75 2>;

			interrupts = <75 2>;

			interrupt-parent = <&mpic>;

		};

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE