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

Commit 0f151e8b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] pasemi: Remove warning in mpic_pasemi_msi.c
  [POWERPC] pasemi: Register i2c devices at boot
  [POWERPC] cell: fix spurious false return from spu_trap_data_{map,seg}
  [POWERPC] Fix warning in pseries/power.c
  [POWERPC] Fix bootwrapper builds with older gcc versions
  [POWERPC] Fix dt_mem_next_cell() to read the full address
  [POWERPC] Kill sparse warnings in kprobes
  [POWERPC] spufs: fix scheduler starvation by idle contexts
  [POWERPC] 44x: Add multiplatform defconfig
  [POWERPC] 44x: Fix Kconfig formatting
  [POWERPC] 4xx: Update defconfigs for 2.6.25
  [POWERPC] 4xx: Remove "i2c" and "xxmii-interface" device_types from dts
  [POWERPC] PPC440EP Interrupt Triggering and Level Settings
  [POWERPC] net: NEWEMAC: Remove "rgmii-interface" from rgmii matching table
parents e80af3a8 a8b87f60

arch/powerpc/boot/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ endif 


BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(obj) -I$(srctree)/$(src)/libfdt



$(obj)/4xx.o: BOOTCFLAGS += -mcpu=440

$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440

$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440

$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440

$(obj)/4xx.o: BOOTCFLAGS += -mcpu=405

$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405

$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405

$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405

$(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405

arch/powerpc/boot/dts/bamboo.dts

+0 −3
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ 
	   		};



			IIC0: i2c@ef600700 {

				device_type = "i2c";

				compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";

				reg = <ef600700 14>;

				interrupt-parent = <&UIC0>;
@@ -193,7 +192,6 @@ 
			};



			IIC1: i2c@ef600800 {

				device_type = "i2c";

				compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";

				reg = <ef600800 14>;

				interrupt-parent = <&UIC0>;
@@ -201,7 +199,6 @@ 
			};



			ZMII0: emac-zmii@ef600d00 {

				device_type = "zmii-interface";

				compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii";

				reg = <ef600d00 c>;

			};

arch/powerpc/boot/dts/ebony.dts

+0 −2
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ 


			IIC0: i2c@40000400 {

				/* FIXME */

				device_type = "i2c";

				compatible = "ibm,iic-440gp", "ibm,iic";

				reg = <40000400 14>;

				interrupt-parent = <&UIC0>;
@@ -224,7 +223,6 @@ 
			};

			IIC1: i2c@40000500 {

				/* FIXME */

				device_type = "i2c";

				compatible = "ibm,iic-440gp", "ibm,iic";

				reg = <40000500 14>;

				interrupt-parent = <&UIC0>;

arch/powerpc/boot/dts/katmai.dts

+0 −2
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ 
	   		};



			IIC0: i2c@10000400 {

				device_type = "i2c";

				compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic";

				reg = <10000400 14>;

				interrupt-parent = <&UIC0>;
@@ -195,7 +194,6 @@ 
			};



			IIC1: i2c@10000500 {

				device_type = "i2c";

				compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic";

				reg = <10000500 14>;

				interrupt-parent = <&UIC0>;

arch/powerpc/boot/dts/kilauea.dts

+0 −3
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ 
			};



			IIC0: i2c@ef600400 {

				device_type = "i2c";

				compatible = "ibm,iic-405ex", "ibm,iic";

				reg = <ef600400 14>;

				interrupt-parent = <&UIC0>;
@@ -190,7 +189,6 @@ 
			};



			IIC1: i2c@ef600500 {

				device_type = "i2c";

				compatible = "ibm,iic-405ex", "ibm,iic";

				reg = <ef600500 14>;

				interrupt-parent = <&UIC0>;
@@ -199,7 +197,6 @@ 




			RGMII0: emac-rgmii@ef600b00 {

				device_type = "rgmii-interface";

				compatible = "ibm,rgmii-405ex", "ibm,rgmii";

				reg = <ef600b00 104>;

				has-mdio;