Commit 96983515 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next 

Freescale updates from Scott:

"Highlights include 32-bit memcpy/memset optimizations, checksum
optimizations, 85xx config fragments and updates, device tree updates,
e6500 fixes for non-SMP, and misc cleanup and minor fixes."
parents d690740f 4524cd09

Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ Properties: 
              interrupt (NAND_EVTER_STAT).  If there is only one,

              that interrupt reports both types of event.



- little-endian : If this property is absent, the big-endian mode will

                  be in use as default for registers.



- ranges : Each range corresponds to a single chipselect, and covers

           the entire access window as configured.
@@ -34,6 +36,7 @@ Example: 
		#size-cells = <1>;

		reg = <0x0 0xffe1e000 0 0x2000>;

		interrupts = <16 2 19 2>;

		little-endian;



		/* NOR, NAND Flashes and CPLD on board */

		ranges = <0x0 0x0 0x0 0xee000000 0x02000000

Documentation/devicetree/bindings/powerpc/fsl/scfg.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Freescale Supplement configuration unit (SCFG)



SCFG is the supplemental configuration unit, that provides SoC specific

configuration and status registers for the chip. Such as getting PEX port

status.



Required properties:



- compatible: should be "fsl,<chip>-scfg"

- reg: should contain base address and length of SCFG memory-mapped

registers



Example:



	scfg: global-utilities@fc000 {

		compatible = "fsl,t1040-scfg";

		reg = <0xfc000 0x1000>;

	};

arch/powerpc/Makefile

+20 −0
Original line number Diff line number Diff line
@@ -288,6 +288,26 @@ PHONY += pseries_le_defconfig 
pseries_le_defconfig:

	$(call merge_into_defconfig,pseries_defconfig,le)



PHONY += mpc85xx_defconfig

mpc85xx_defconfig:

	$(call merge_into_defconfig,mpc85xx_basic_defconfig,\

		85xx-32bit 85xx-hw fsl-emb-nonhw)



PHONY += mpc85xx_smp_defconfig

mpc85xx_smp_defconfig:

	$(call merge_into_defconfig,mpc85xx_basic_defconfig,\

		85xx-32bit 85xx-smp 85xx-hw fsl-emb-nonhw)



PHONY += corenet32_smp_defconfig

corenet32_smp_defconfig:

	$(call merge_into_defconfig,corenet_basic_defconfig,\

		85xx-32bit 85xx-smp 85xx-hw fsl-emb-nonhw)



PHONY += corenet64_smp_defconfig

corenet64_smp_defconfig:

	$(call merge_into_defconfig,corenet_basic_defconfig,\

		85xx-64bit 85xx-smp altivec 85xx-hw fsl-emb-nonhw)



define archhelp

  @echo '* zImage          - Build default images selected by kernel config'

  @echo '  zImage.*        - Compressed kernel image (arch/$(ARCH)/boot/zImage.*)'

arch/powerpc/boot/dts/fsl/p1022si-post.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ 


/include/ "pq3-gpio-0.dtsi"



	display@10000 {

	display: display@10000 {

		compatible = "fsl,diu", "fsl,p1022-diu";

		reg = <0x10000 1000>;

		interrupts = <64 2 0 0>;

arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ 
		pci0 = &pci0;

		pci1 = &pci1;

		pci2 = &pci2;

		vga = &display;

		display = &display;

	};



	cpus {