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

Commit c463be35 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: (22 commits)
  [POWERPC] Fix large hash table allocation on Cell blades
  [POWERPC] Export empty_zero_page
  [POWERPC] Fix viodasd driver with scatterlist debug
  [POWERPC] Fix arch/powerpc/platforms/powermac/pic.c when !CONFIG_ADB_PMU
  [POWERPC] Fix drivers/macintosh/mediabay.c when !CONFIG_ADB_PMU
  [POWERPC] Fix undefined pmu_sys_suspended compilation error
  [POWERPC] Fix build of modular drivers/macintosh/apm_emu.c
  [POWERPC] Fix sleep on some powerbooks
  [POWERPC] Fix bogus test for unassigned PCI resources
  [POWERPC] Fix zImage-dtb.initrd build error
  [POWERPC] Add __ucmpdi2 for 64-bit comparisons in 32-bit kernels
  [POWERPC] spufs: fix rescheduling of non-runnable contexts
  [POWERPC] spufs: don't (ab)use SCHED_IDLE
  [POWERPC] QE: Make qe_get_firmware_info reentrant
  [POWERPC] 83xx: Make 83xx perfmon support selectable
  [PPC] 8xx: swap bug-fix
  [POWERPC] 85xx: sbc8548 - Fix incorrect PCI-X and PCI interrupt map
  [POWERPC] QE: Fix QE firmware uploading limit
  [POWERPC] 8xx: Fix wrapper platform for adder875, and combine defconfigs.
  [POWERPC] 8xx: fix swap
  ...
parents 609eb39c 31bf1119

arch/powerpc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ all: zImage 


CPPFLAGS_vmlinux.lds	:= -Upowerpc



BOOT_TARGETS = zImage zImage.initrd uImage treeImage.% cuImage.%

BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.%



PHONY += $(BOOT_TARGETS)

arch/powerpc/boot/Makefile

+10 −8
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ quiet_cmd_wrap = WRAP $@ 
image-$(CONFIG_PPC_PSERIES)		+= zImage.pseries

image-$(CONFIG_PPC_MAPLE)		+= zImage.pseries

image-$(CONFIG_PPC_IBM_CELL_BLADE)	+= zImage.pseries

image-$(CONFIG_PPC_PS3)			+= zImage-dtb.ps3

image-$(CONFIG_PPC_PS3)			+= dtbImage.ps3

image-$(CONFIG_PPC_CELLEB)		+= zImage.pseries

image-$(CONFIG_PPC_CHRP)		+= zImage.chrp

image-$(CONFIG_PPC_EFIKA)		+= zImage.chrp
@@ -205,7 +205,7 @@ image-$(CONFIG_DEFAULT_UIMAGE) += uImage 
#



# Board ports in arch/powerpc/platform/40x/Kconfig

image-$(CONFIG_EP405)			+= zImage-dtb.ep405

image-$(CONFIG_EP405)			+= dtbImage.ep405

image-$(CONFIG_WALNUT)			+= treeImage.walnut



# Board ports in arch/powerpc/platform/44x/Kconfig
@@ -220,9 +220,9 @@ image-$(CONFIG_WARP) += cuImage.warp 
# Board ports in arch/powerpc/platform/8xx/Kconfig

image-$(CONFIG_PPC_MPC86XADS)		+= cuImage.mpc866ads

image-$(CONFIG_PPC_MPC885ADS)		+= cuImage.mpc885ads

image-$(CONFIG_PPC_EP88XC)		+= zImage-dtb.ep88xc

image-$(CONFIG_PPC_EP88XC)		+= dtbImage.ep88xc

image-$(CONFIG_PPC_ADDER875)		+= cuImage.adder875-uboot \

					   zImage-dtb.adder875-redboot

					   dtbImage.adder875-redboot



# Board ports in arch/powerpc/platform/52xx/Kconfig

image-$(CONFIG_PPC_LITE5200)		+= cuImage.lite5200 cuImage.lite5200b
@@ -230,7 +230,7 @@ image-$(CONFIG_PPC_LITE5200) += cuImage.lite5200 cuImage.lite5200b 
# Board ports in arch/powerpc/platform/82xx/Kconfig

image-$(CONFIG_MPC8272_ADS)		+= cuImage.mpc8272ads

image-$(CONFIG_PQ2FADS)			+= cuImage.pq2fads

image-$(CONFIG_EP8248E)			+= zImage-dtb.ep8248e

image-$(CONFIG_EP8248E)			+= dtbImage.ep8248e



# Board ports in arch/powerpc/platform/83xx/Kconfig

image-$(CONFIG_MPC832x_MDS)		+= cuImage.mpc832x_mds
@@ -268,7 +268,8 @@ endif 


initrd-  := $(patsubst zImage%, zImage.initrd%, $(image-n) $(image-))

initrd-y := $(patsubst zImage%, zImage.initrd%, \

		$(patsubst treeImage%, treeImage.initrd%, $(image-y)))

		$(patsubst dtbImage%, dtbImage.initrd%, \

		$(patsubst treeImage%, treeImage.initrd%, $(image-y))))

initrd-y := $(filter-out $(image-y), $(initrd-y))

targets	+= $(image-y) $(initrd-y)
@@ -283,10 +284,11 @@ $(obj)/zImage.initrd.%: vmlinux $(wrapperbits) 
$(obj)/zImage.%: vmlinux $(wrapperbits)

	$(call if_changed,wrap,$*)



$(obj)/zImage-dtb.initrd.%: vmlinux $(wrapperbits) $(dtstree)/%.dts

# dtbImage% - a dtbImage is a zImage with an embedded device tree blob

$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(dtstree)/%.dts

	$(call if_changed,wrap,$*,$(dtstree)/$*.dts,,$(obj)/ramdisk.image.gz)



$(obj)/zImage-dtb.%: vmlinux $(wrapperbits) $(dtstree)/%.dts

$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(dtstree)/%.dts

	$(call if_changed,wrap,$*,$(dtstree)/$*.dts)



# This cannot be in the root of $(src) as the zImage rule always adds a $(obj)

arch/powerpc/boot/dts/mpc8377_mds.dts

+68 −2
Original line number Diff line number Diff line
@@ -47,6 +47,72 @@ 
		reg = <0x00000000 0x20000000>;	// 512MB at 0

	};



	localbus@e0005000 {

		#address-cells = <2>;

		#size-cells = <1>;

		compatible = "fsl,mpc8377-elbc", "fsl,elbc", "simple-bus";

		reg = <0xe0005000 0x1000>;

		interrupts = <77 0x8>;

		interrupt-parent = <&ipic>;



		// booting from NOR flash

		ranges = <0 0x0 0xfe000000 0x02000000

		          1 0x0 0xf8000000 0x00008000

		          3 0x0 0xe0600000 0x00008000>;



		flash@0,0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "cfi-flash";

			reg = <0 0x0 0x2000000>;

			bank-width = <2>;

			device-width = <1>;



			u-boot@0 {

				reg = <0x0 0x100000>;

				read-only;

			};



			fs@100000 {

				reg = <0x100000 0x800000>;

			};



			kernel@1d00000 {

				reg = <0x1d00000 0x200000>;

			};



			dtb@1f00000 {

				reg = <0x1f00000 0x100000>;

			};

		};



		bcsr@1,0 {

			reg = <1 0x0 0x8000>;

			compatible = "fsl,mpc837xmds-bcsr";

		};



		nand@3,0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "fsl,mpc8377-fcm-nand",

			             "fsl,elbc-fcm-nand";

			reg = <3 0x0 0x8000>;



			u-boot@0 {

				reg = <0x0 0x100000>;

				read-only;

			};



			kernel@100000 {

				reg = <0x100000 0x300000>;

			};



			fs@400000 {

				reg = <0x400000 0x1c00000>;

			};

		};

	};



	soc@e0000000 {

		#address-cells = <1>;

		#size-cells = <1>;
@@ -91,7 +157,6 @@ 
			mode = "cpu";

		};



		/* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */

		usb@23000 {

			compatible = "fsl-usb2-dr";

			reg = <0x23000 0x1000>;
@@ -99,7 +164,8 @@ 
			#size-cells = <0>;

			interrupt-parent = <&ipic>;

			interrupts = <38 0x8>;

			phy_type = "utmi_wide";

			dr_mode = "host";

			phy_type = "ulpi";

		};



		mdio@24520 {

arch/powerpc/boot/dts/mpc8378_mds.dts

+68 −2
Original line number Diff line number Diff line
@@ -47,6 +47,72 @@ 
		reg = <0x00000000 0x20000000>;	// 512MB at 0

	};



	localbus@e0005000 {

		#address-cells = <2>;

		#size-cells = <1>;

		compatible = "fsl,mpc8378-elbc", "fsl,elbc", "simple-bus";

		reg = <0xe0005000 0x1000>;

		interrupts = <77 0x8>;

		interrupt-parent = <&ipic>;



		// booting from NOR flash

		ranges = <0 0x0 0xfe000000 0x02000000

		          1 0x0 0xf8000000 0x00008000

		          3 0x0 0xe0600000 0x00008000>;



		flash@0,0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "cfi-flash";

			reg = <0 0x0 0x2000000>;

			bank-width = <2>;

			device-width = <1>;



			u-boot@0 {

				reg = <0x0 0x100000>;

				read-only;

			};



			fs@100000 {

				reg = <0x100000 0x800000>;

			};



			kernel@1d00000 {

				reg = <0x1d00000 0x200000>;

			};



			dtb@1f00000 {

				reg = <0x1f00000 0x100000>;

			};

		};



		bcsr@1,0 {

			reg = <1 0x0 0x8000>;

			compatible = "fsl,mpc837xmds-bcsr";

		};



		nand@3,0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "fsl,mpc8378-fcm-nand",

			             "fsl,elbc-fcm-nand";

			reg = <3 0x0 0x8000>;



			u-boot@0 {

				reg = <0x0 0x100000>;

				read-only;

			};



			kernel@100000 {

				reg = <0x100000 0x300000>;

			};



			fs@400000 {

				reg = <0x400000 0x1c00000>;

			};

		};

	};



	soc@e0000000 {

		#address-cells = <1>;

		#size-cells = <1>;
@@ -91,7 +157,6 @@ 
			mode = "cpu";

		};



		/* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */

		usb@23000 {

			compatible = "fsl-usb2-dr";

			reg = <0x23000 0x1000>;
@@ -99,7 +164,8 @@ 
			#size-cells = <0>;

			interrupt-parent = <&ipic>;

			interrupts = <38 0x8>;

			phy_type = "utmi_wide";

			dr_mode = "host";

			phy_type = "ulpi";

		};



		mdio@24520 {

arch/powerpc/boot/dts/mpc8379_mds.dts

+68 −2
Original line number Diff line number Diff line
@@ -47,6 +47,72 @@ 
		reg = <0x00000000 0x20000000>;	// 512MB at 0

	};



	localbus@e0005000 {

		#address-cells = <2>;

		#size-cells = <1>;

		compatible = "fsl,mpc8379-elbc", "fsl,elbc", "simple-bus";

		reg = <0xe0005000 0x1000>;

		interrupts = <77 0x8>;

		interrupt-parent = <&ipic>;



		// booting from NOR flash

		ranges = <0 0x0 0xfe000000 0x02000000

		          1 0x0 0xf8000000 0x00008000

		          3 0x0 0xe0600000 0x00008000>;



		flash@0,0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "cfi-flash";

			reg = <0 0x0 0x2000000>;

			bank-width = <2>;

			device-width = <1>;



			u-boot@0 {

				reg = <0x0 0x100000>;

				read-only;

			};



			fs@100000 {

				reg = <0x100000 0x800000>;

			};



			kernel@1d00000 {

				reg = <0x1d00000 0x200000>;

			};



			dtb@1f00000 {

				reg = <0x1f00000 0x100000>;

			};

		};



		bcsr@1,0 {

			reg = <1 0x0 0x8000>;

			compatible = "fsl,mpc837xmds-bcsr";

		};



		nand@3,0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "fsl,mpc8379-fcm-nand",

			             "fsl,elbc-fcm-nand";

			reg = <3 0x0 0x8000>;



			u-boot@0 {

				reg = <0x0 0x100000>;

				read-only;

			};



			kernel@100000 {

				reg = <0x100000 0x300000>;

			};



			fs@400000 {

				reg = <0x400000 0x1c00000>;

			};

		};

	};



	soc@e0000000 {

		#address-cells = <1>;

		#size-cells = <1>;
@@ -91,7 +157,6 @@ 
			mode = "cpu";

		};



		/* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */

		usb@23000 {

			compatible = "fsl-usb2-dr";

			reg = <0x23000 0x1000>;
@@ -99,7 +164,8 @@ 
			#size-cells = <0>;

			interrupt-parent = <&ipic>;

			interrupts = <38 0x8>;

			phy_type = "utmi_wide";

			dr_mode = "host";

			phy_type = "ulpi";

		};



		mdio@24520 {