Commit 347b4599 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (32 commits)
  [POWERPC] Remove build warnings in windfarm_core
  [POWERPC] Pass per-file CFLAGs for platform specific op codes
  [POWERPC] Correct #endif comment
  [POWERPC] Fix ppc_rtas_progress_show()
  [POWERPC] Fix sed command lines for zlib source construction
  [POWERPC] Specify GNUTARGET on $(AR) invocations
  [POWERPC] Make sure device node type/name is not NULL on hot-added nodes
  [POWERPC] Small fixes for the Ebony device tree
  [POWERPC] Fix warning on UP
  [POWERPC] cell_defconfig: Disable cpufreq and pmi
  [POWERPC] Fix IO space on PCI buses created from of_platform
  [POWERPC] Add spinlock to request_phb_iospace()
  [POWERPC] Fix make rules for treeImage.initrd
  [POWERPC] Remove warning in mpic.c
  [POWERPC] Update pasemi_defconfig
  [POWERPC] pasemi: CONFIG_GENERIC_TBSYNC no longer needed
  [POWERPC] Update iseries_defconfig
  [POWERPC] Wire up some more syscalls
  [POWERPC] Fix bug adding properties with flatdevtree.c's ft_set_prop()
  [POWERPC] Remove fixup_bigphys_addr() for arch/powerpc to avoid link error
  ...
parents 939e3428 ccd308f0

arch/powerpc/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ CROSS32CC := $(CC) -m32 
CROSS32AS	:= $(AS) -a32

CROSS32LD	:= $(LD) -m elf32ppc

CROSS32OBJCOPY	:= $(OBJCOPY)

CROSS32AR	:= $(AR)

CROSS32AR	:= GNUTARGET=elf32-powerpc $(AR)

endif

endif
@@ -58,6 +58,7 @@ ifeq ($(HAS_BIARCH),y) 
override AS	+= -a$(SZ)

override LD	+= -m elf$(SZ)ppc

override CC	+= -m$(SZ)

override AR	:= GNUTARGET=elf$(SZ)-powerpc $(AR)

endif



LDFLAGS_vmlinux	:= -Bstatic

arch/powerpc/boot/Makefile

+9 −6
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ endif 


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



$(obj)/44x.o: BOOTCFLAGS += -Wa,-mbooke

$(obj)/ebony.o: BOOTCFLAGS += -Wa,-mbooke



zlib       := inffast.c inflate.c inftrees.c

zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h

zliblinuxheader := zlib.h zconf.h zutil.h
@@ -54,13 +57,13 @@ obj-wlib := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-wlib)))) 
obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat))))



quiet_cmd_copy_zlib = COPY    $@

      cmd_copy_zlib = sed "s@__attribute_used__@@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@

      cmd_copy_zlib = sed "s@__attribute_used__@@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@



quiet_cmd_copy_zlibheader = COPY    $@

      cmd_copy_zlibheader = sed "s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@

      cmd_copy_zlibheader = sed "s@<linux/\([^>]*\).*@\"\1\"@" $< > $@

# stddef.h for NULL

quiet_cmd_copy_zliblinuxheader = COPY    $@

      cmd_copy_zliblinuxheader = sed "s@<linux/string.h>@\"string.h\"@;s@<linux/kernel.h>@<stddef.h>@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@

      cmd_copy_zliblinuxheader = sed "s@<linux/string.h>@\"string.h\"@;s@<linux/kernel.h>@<stddef.h>@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@



$(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/%

	$(call cmd,copy_zlib)
@@ -204,12 +207,12 @@ dts = $(if $(shell echo $(CONFIG_DEVICE_TREE) | grep '^/'),\ 
$(obj)/cuImage.%: vmlinux $(dts) $(wrapperbits)

	$(call if_changed,wrap,cuboot-$*,$(dts))



$(obj)/treeImage.%: vmlinux $(dts) $(wrapperbits)

	$(call if_changed,wrap,treeboot-$*,$(dts))



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

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



$(obj)/treeImage.%: vmlinux $(dts) $(wrapperbits)

	$(call if_changed,wrap,treeboot-$*,$(dts))



$(obj)/zImage:		$(addprefix $(obj)/, $(image-y))

	@rm -f $@; ln $< $@

$(obj)/zImage.initrd:	$(addprefix $(obj)/, $(initrd-y))

arch/powerpc/boot/dts/ebony.dts

+13 −24
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 
			timebase-frequency = <0>; // Filled in by zImage

			i-cache-line-size = <32>;

			d-cache-line-size = <32>;

			i-cache-size = <0>;

			d-cache-size = <0>;

			i-cache-size = <8000>; /* 32 kB */

			d-cache-size = <8000>; /* 32 kB */

			dcr-controller;

			dcr-access-method = "native";

		};
@@ -46,7 +46,6 @@ 
	};



	UIC0: interrupt-controller0 {

		device_type = "ibm,uic";

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

		interrupt-controller;

		cell-index = <0>;
@@ -58,7 +57,6 @@ 
	};



	UIC1: interrupt-controller1 {

		device_type = "ibm,uic";

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

		interrupt-controller;

		cell-index = <1>;
@@ -71,36 +69,36 @@ 
	};



	CPC0: cpc {

		device_type = "ibm,cpc";

		compatible = "ibm,cpc-440gp";

		dcr-reg = <0b0 003 0e0 010>;

		// FIXME: anything else?

	};



	plb {

		device_type = "ibm,plb";

		compatible = "ibm,plb-440gp", "ibm,plb4";

		#address-cells = <2>;

		#size-cells = <1>;

		ranges;

		clock-frequency = <0>; // Filled in by zImage



		SDRAM0: sdram {

			device_type = "memory-controller";

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

		SDRAM0: memory-controller {

			compatible = "ibm,sdram-440gp";

			dcr-reg = <010 2>;

			// FIXME: anything else?

		};



		SRAM0: sram {

			compatible = "ibm,sram-440gp";

			dcr-reg = <020 8 00a 1>;

		};



		DMA0: dma {

			// FIXME: ???

			device_type = "ibm,dma-4xx";

			compatible = "ibm,dma-440gp", "ibm,dma-4xx";

			compatible = "ibm,dma-440gp";

			dcr-reg = <100 027>;

		};



		MAL0: mcmal {

			device_type = "mcmal-dma";

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

			dcr-reg = <180 62>;

			num-tx-chans = <4>;
@@ -119,7 +117,6 @@ 
		};



		POB0: opb {

			device_type = "ibm,opb";

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

			#address-cells = <1>;

			#size-cells = <1>;
@@ -133,8 +130,7 @@ 
			clock-frequency = <0>; // Filled in by zImage



			EBC0: ebc {

				device_type = "ibm,ebc";

				compatible = "ibm,ebc-440gp";

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

				dcr-reg = <012 2>;

				#address-cells = <2>;

				#size-cells = <1>;
@@ -147,7 +143,7 @@ 
				interrupts = <5 4>;

				interrupt-parent = <&UIC1>;



				small-flash@0,0 {

				small-flash@0,80000 {

					device_type = "rom";

					compatible = "direct-mapped";

					probe-type = "JEDEC";
@@ -159,7 +155,6 @@ 


				ds1743@1,0 {

					/* NVRAM & RTC */

					device_type = "nvram";

					compatible = "ds1743";

					reg = <1 0 2000>;

				};
@@ -170,7 +165,7 @@ 
					probe-type = "JEDEC";

					bank-width = <1>;

					partitions = <0 380000

						      280000 80000>;

						      380000 80000>;

					partition-names = "fs", "firmware";

					reg = <2 0 400000>;

				};
@@ -226,13 +221,11 @@ 


			GPIO0: gpio@40000700 {

				/* FIXME */

				device_type = "gpio";

				compatible = "ibm,gpio-440gp";

				reg = <40000700 20>;

			};



			ZMII0: emac-zmii@40000780 {

				device_type = "emac-zmii";

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

				reg = <40000780 c>;

			};
@@ -299,9 +292,5 @@ 


	chosen {

		linux,stdout-path = "/plb/opb/serial@40000200";

//		linux,initrd-start = <0>; /* FIXME */

//		linux,initrd-end = <0>;

//		bootargs = "";

	};

};

arch/powerpc/boot/dts/kuroboxHD.dts

+17 −27
Original line number Diff line number Diff line
@@ -21,19 +21,16 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" 
 */



/ {

	linux,phandle = <1000>;

	model = "KuroboxHD";

	compatible = "linkstation";

	#address-cells = <1>;

	#size-cells = <1>;



	cpus {

		linux,phandle = <2000>;

		#address-cells = <1>;

		#size-cells = <0>;



		PowerPC,603e { /* Really 8241 */

			linux,phandle = <2100>;

			device_type = "cpu";

			reg = <0>;

			clock-frequency = <bebc200>;	/* Fixed by bootwrapper */
@@ -48,13 +45,11 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" 
	};



	memory {

		linux,phandle = <3000>;

		device_type = "memory";

		reg = <00000000 04000000>;

	};



	soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */

		linux,phandle = <4000>;

		#address-cells = <1>;

		#size-cells = <1>;

		#interrupt-cells = <2>;
@@ -69,38 +64,34 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" 
			  fef00000 fef00000 00100000>;	/* pci iack */



		i2c@80003000 {

			linux,phandle = <4300>;

			device_type = "i2c";

			compatible = "fsl-i2c";

			reg = <80003000 1000>;

			interrupts = <5 2>;

			interrupt-parent = <4400>;

			interrupt-parent = <&mpic>;

		};



		serial@80004500 {

			linux,phandle = <4511>;

			device_type = "serial";

			compatible = "ns16550";

			reg = <80004500 8>;

			clock-frequency = <5d08d88>;

			current-speed = <2580>;

			interrupts = <9 2>;

			interrupt-parent = <4400>;

			interrupt-parent = <&mpic>;

		};



		serial@80004600 {

			linux,phandle = <4512>;

			device_type = "serial";

			compatible = "ns16550";

			reg = <80004600 8>;

			clock-frequency = <5d08d88>;

			current-speed = <e100>;

			interrupts = <a 0>;

			interrupt-parent = <4400>;

			interrupt-parent = <&mpic>;

		};



		pic@80040000 {

			linux,phandle = <4400>;

		mpic: pic@80040000 {

			#interrupt-cells = <2>;

			#address-cells = <0>;

			device_type = "open-pic";
@@ -111,7 +102,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" 
		};



		pci@fec00000 {

			linux,phandle = <4500>;

			#address-cells = <3>;

			#size-cells = <2>;

			#interrupt-cells = <1>;
@@ -122,24 +112,24 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" 
				  02000000 0 80000000 80000000 0 70000000>;

			bus-range = <0 ff>;

			clock-frequency = <7f28155>;

			interrupt-parent = <4400>;

			interrupt-parent = <&mpic>;

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

			interrupt-map = <

				/* IDSEL 11 - IRQ0 ETH */

				5800 0 0 1 4400 0 1

				5800 0 0 2 4400 1 1

				5800 0 0 3 4400 2 1

				5800 0 0 4 4400 3 1

				5800 0 0 1 &mpic 0 1

				5800 0 0 2 &mpic 1 1

				5800 0 0 3 &mpic 2 1

				5800 0 0 4 &mpic 3 1

				/* IDSEL 12 - IRQ1 IDE0 */

				6000 0 0 1 4400 1 1

				6000 0 0 2 4400 2 1

				6000 0 0 3 4400 3 1

				6000 0 0 4 4400 0 1

				6000 0 0 1 &mpic 1 1

				6000 0 0 2 &mpic 2 1

				6000 0 0 3 &mpic 3 1

				6000 0 0 4 &mpic 0 1

				/* IDSEL 14 - IRQ3 USB2.0 */

				7000 0 0 1 4400 3 1

				7000 0 0 2 4400 3 1

				7000 0 0 3 4400 3 1

				7000 0 0 4 4400 3 1

				7000 0 0 1 &mpic 3 1

				7000 0 0 2 &mpic 3 1

				7000 0 0 3 &mpic 3 1

				7000 0 0 4 &mpic 3 1

			>;

		};

	};

arch/powerpc/boot/dts/kuroboxHG.dts

+18 −27
Original line number Diff line number Diff line
@@ -21,19 +21,16 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts" 
 */



/ {

	linux,phandle = <1000>;

	model = "KuroboxHG";

	compatible = "linkstation";

	#address-cells = <1>;

	#size-cells = <1>;



	cpus {

		linux,phandle = <2000>;

		#address-cells = <1>;

		#size-cells = <0>;



		PowerPC,603e { /* Really 8241 */

			linux,phandle = <2100>;

			device_type = "cpu";

			reg = <0>;

			clock-frequency = <fdad680>;	/* Fixed by bootwrapper */
@@ -48,13 +45,11 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts" 
	};



	memory {

		linux,phandle = <3000>;

		device_type = "memory";

		reg = <00000000 08000000>;

	};



	soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */

		linux,phandle = <4000>;

		#address-cells = <1>;

		#size-cells = <1>;

		#interrupt-cells = <2>;
@@ -69,38 +64,35 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts" 
			  fef00000 fef00000 00100000>;	/* pci iack */



		i2c@80003000 {

			linux,phandle = <4300>;

			device_type = "i2c";

			compatible = "fsl-i2c";

			reg = <80003000 1000>;

			interrupts = <5 2>;

			interrupt-parent = <4400>;

			interrupt-parent = <&mpic>;

		};



		serial@80004500 {

			linux,phandle = <4511>;

			device_type = "serial";

			compatible = "ns16550";

			reg = <80004500 8>;

			clock-frequency = <7c044a8>;

			current-speed = <2580>;

			interrupts = <9 2>;

			interrupt-parent = <4400>;

			interrupt-parent = <&mpic>;

		};



		serial@80004600 {

			linux,phandle = <4512>;

			device_type = "serial";

			compatible = "ns16550";

			reg = <80004600 8>;

			clock-frequency = <7c044a8>;

			current-speed = <e100>;

			interrupts = <a 0>;

			interrupt-parent = <4400>;

			interrupt-parent = <&mpic>;

		};



		pic@80040000 {

			linux,phandle = <4400>;

		mpic: pic@80040000 {

			interrupt-parent = <&mpic>;

			#interrupt-cells = <2>;

			#address-cells = <0>;

			device_type = "open-pic";
@@ -111,7 +103,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts" 
		};



		pci@fec00000 {

			linux,phandle = <4500>;

			#address-cells = <3>;

			#size-cells = <2>;

			#interrupt-cells = <1>;
@@ -122,24 +113,24 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts" 
				  02000000 0 80000000 80000000 0 70000000>;

			bus-range = <0 ff>;

			clock-frequency = <7f28155>;

			interrupt-parent = <4400>;

			interrupt-parent = <&mpic>;

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

			interrupt-map = <

				/* IDSEL 11 - IRQ0 ETH */

				5800 0 0 1 4400 0 1

				5800 0 0 2 4400 1 1

				5800 0 0 3 4400 2 1

				5800 0 0 4 4400 3 1

				5800 0 0 1 &mpic 0 1

				5800 0 0 2 &mpic 1 1

				5800 0 0 3 &mpic 2 1

				5800 0 0 4 &mpic 3 1

				/* IDSEL 12 - IRQ1 IDE0 */

				6000 0 0 1 4400 1 1

				6000 0 0 2 4400 2 1

				6000 0 0 3 4400 3 1

				6000 0 0 4 4400 0 1

				6000 0 0 1 &mpic 1 1

				6000 0 0 2 &mpic 2 1

				6000 0 0 3 &mpic 3 1

				6000 0 0 4 &mpic 0 1

				/* IDSEL 14 - IRQ3 USB2.0 */

				7000 0 0 1 4400 3 1

				7000 0 0 2 4400 3 1

				7000 0 0 3 4400 3 1

				7000 0 0 4 4400 3 1

				7000 0 0 1 &mpic 3 1

				7000 0 0 2 &mpic 3 1

				7000 0 0 3 &mpic 3 1

				7000 0 0 4 &mpic 3 1

			>;

		};

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE