Commit 811da237 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: Update defconfigs for most non-embedded platforms
  powerpc: Export CMO_PageSize
  powerpc/ps3: Fix ioremap of spu shadow regs
  powerpc/ps3: Rework htab code to remove ioremap
  powerpc/ps3: Update ps3_defconfig
  powerpc/cell/oprofile: Avoid double vfree of profile buffer
  powerpc: Update defconfigs for FSL PPC boards
  powerpc: Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target
  cpm2: Fix race condition in CPM2 GPIO library.
  powerpc: fix memory leaks in QE library
  powerpc/85xx: TQM8548: DTS file fixes and cleanup
  powerpc: Fix whitespace merge in mpc8641 hpcn device tree
parents b8e6c91c 9bdbb963

arch/powerpc/boot/dts/tqm8548-bigflash.dts

+7 −1
Original line number Diff line number Diff line
@@ -50,13 +50,14 @@ 
		reg = <0x00000000 0x00000000>;	// Filled in by U-Boot

	};



	soc8548@a0000000 {

	soc@a0000000 {

		#address-cells = <1>;

		#size-cells = <1>;

		device_type = "soc";

		ranges = <0x0 0xa0000000 0x100000>;

		reg = <0xa0000000 0x1000>;	// CCSRBAR

		bus-frequency = <0>;

		compatible = "fsl,mpc8548-immr", "simple-bus";



		memory-controller@2000 {

			compatible = "fsl,mpc8548-memory-controller";
@@ -83,6 +84,11 @@ 
			interrupts = <43 2>;

			interrupt-parent = <&mpic>;

			dfsrr;



			rtc@68 {

				compatible = "dallas,ds1337";

				reg = <0x68>;

			};

		};



		i2c@3100 {

arch/powerpc/boot/dts/tqm8548.dts

+2 −1
Original line number Diff line number Diff line
@@ -50,13 +50,14 @@ 
		reg = <0x00000000 0x00000000>;	// Filled in by U-Boot

	};



	soc8548@e0000000 {

	soc@e0000000 {

		#address-cells = <1>;

		#size-cells = <1>;

		device_type = "soc";

		ranges = <0x0 0xe0000000 0x100000>;

		reg = <0xe0000000 0x1000>;	// CCSRBAR

		bus-frequency = <0>;

		compatible = "fsl,mpc8548-immr", "simple-bus";



		memory-controller@2000 {

			compatible = "fsl,mpc8548-memory-controller";

arch/powerpc/boot/wrapper

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ cuboot*) 
    binary=y

    gzip=

    case "$platform" in

    *-mpc885ads|*-adder875*|*-ep88xc)

    *-mpc866ads|*-mpc885ads|*-adder875*|*-ep88xc)

        platformo=$object/cuboot-8xx.o

        ;;

    *5200*|*-motionpro)

arch/powerpc/configs/asp8347_defconfig→arch/powerpc/configs/83xx/asp8347_defconfig

+216 −96

File changed and moved.

Preview size limit exceeded, changes collapsed.

arch/powerpc/configs/83xx/mpc8313_rdb_defconfig

+144 −44

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE