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

Commit 9f5577d8 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: (21 commits)
  [POWERPC] spusched: Fix initial timeslice calculation
  [POWERPC] spufs: Fix incorrect initialization of cbe_spu_info.spus
  [POWERPC] Fix Maple platform ISA bus
  [POWERPC] Make pci_iounmap actually unmap things
  [POWERPC] Add function to check if address is an IO port
  [POWERPC] Fix Pegasos keyboard detection
  [POWERPC] iSeries: Fix section mismatch warning in lpevents
  [POWERPC] iSeries: Fix section mismatch warnings
  [POWERPC] iSeries: We need vio_enable_interrupts
  [POWERPC] Fix RTC and device tree on linkstation machines
  [POWERPC] Add of_register_i2c_devices()
  [POWERPC] Fix loop with unsigned long counter variable
  [POWERPC] Fix register labels on show_regs() message for 4xx/Book-E
  [POWERPC] Only allow building of BootX text support on PPC_MULTIPLATFORM
  [POWERPC] Fix the ability to reset on MPC8544 DS and MPC8568 MDS boards
  [POWERPC] Fix mpc7448hpc2 tsi108 device_type bug
  [POWREPC] Fixup a number of modpost warnings on ppc32
  [POWERPC] Fix ethernet PHY support on MPC8544 DS
  [POWERPC] Don't try to allocate resources for a Freescale POWERPC PHB
  Revert "[POWERPC] Don't complain if size-cells == 0 in prom_parse()"
  ...
parents 257f4925 46b28357

arch/powerpc/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ config BDI_SWITCH 


config BOOTX_TEXT

	bool "Support for early boot text console (BootX or OpenFirmware only)"

	depends PPC_OF

	depends PPC_OF && PPC_MULTIPLATFORM

	help

	  Say Y here to see progress messages from the boot firmware in text

	  mode. Requires either BootX or Open Firmware.

arch/powerpc/boot/dts/kuroboxHD.dts

+12 −6
Original line number Diff line number Diff line
@@ -33,12 +33,10 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" 
		PowerPC,603e { /* Really 8241 */

			device_type = "cpu";

			reg = <0>;

			clock-frequency = <bebc200>;	/* Fixed by bootwrapper */

			timebase-frequency = <1743000>; /* Fixed by bootwrapper */

			bus-frequency = <0>;		/* From bootloader */

			clock-frequency = <bebc200>;	/* Fixed by bootloader */

			timebase-frequency = <1743000>; /* Fixed by bootloader */

			bus-frequency = <0>;		/* Fixed by bootloader */

			/* Following required by dtc but not used */

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

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

			i-cache-size = <4000>;

			d-cache-size = <4000>;

		};
@@ -64,11 +62,19 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" 
			  fef00000 fef00000 00100000>;	/* pci iack */



		i2c@80003000 {

			#address-cells = <1>;

			#size-cells = <0>;

			device_type = "i2c";

			compatible = "fsl-i2c";

			reg = <80003000 1000>;

			interrupts = <5 2>;

			interrupt-parent = <&mpic>;



			rtc@32 {

				device_type = "rtc";

				compatible = "ricoh,rs5c372b";

				reg = <32>;

			};

		};



		serial@80004500 {
@@ -91,7 +97,7 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" 
			interrupt-parent = <&mpic>;

		};



		mpic: pic@80040000 {

		mpic: interrupt-controller@80040000 {

			#interrupt-cells = <2>;

			#address-cells = <0>;

			device_type = "open-pic";

arch/powerpc/boot/dts/kuroboxHG.dts

+12 −7
Original line number Diff line number Diff line
@@ -33,12 +33,10 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts" 
		PowerPC,603e { /* Really 8241 */

			device_type = "cpu";

			reg = <0>;

			clock-frequency = <fdad680>;	/* Fixed by bootwrapper */

			timebase-frequency = <1F04000>; /* Fixed by bootwrapper */

			bus-frequency = <0>;		/* From bootloader */

			clock-frequency = <fdad680>;	/* Fixed by bootloader */

			timebase-frequency = <1F04000>; /* Fixed by bootloader */

			bus-frequency = <0>;		/* Fixed by bootloader */

			/* Following required by dtc but not used */

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

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

			i-cache-size = <4000>;

			d-cache-size = <4000>;

		};
@@ -64,11 +62,19 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts" 
			  fef00000 fef00000 00100000>;	/* pci iack */



		i2c@80003000 {

			#address-cells = <1>;

			#size-cells = <0>;

			device_type = "i2c";

			compatible = "fsl-i2c";

			reg = <80003000 1000>;

			interrupts = <5 2>;

			interrupt-parent = <&mpic>;



			rtc@32 {

				device_type = "rtc";

				compatible = "ricoh,rs5c372b";

				reg = <32>;

			};

		};



		serial@80004500 {
@@ -91,8 +97,7 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts" 
			interrupt-parent = <&mpic>;

		};



		mpic: pic@80040000 {

			interrupt-parent = <&mpic>;

		mpic: interrupt-controller@80040000 {

			#interrupt-cells = <2>;

			#address-cells = <0>;

			device_type = "open-pic";

arch/powerpc/boot/dts/mpc7448hpc2.dts

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
		#address-cells = <1>;

		#size-cells = <1>;

		#interrupt-cells = <2>;

		device_type = "tsi108-bridge";

		device_type = "tsi-bridge";

		ranges = <00000000 c0000000 00010000>;

		reg = <c0000000 00010000>;

		bus-frequency = <0>;

arch/powerpc/boot/dts/mpc8544ds.dts

+8 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ 
			interrupts = <1d 2 1e 2 22 2>;

			interrupt-parent = <&mpic>;

			phy-handle = <&phy0>;

			phy-connection-type = "rgmii-id";

		};



		ethernet@26000 {
@@ -117,6 +118,7 @@ 
			interrupts = <1f 2 20 2 21 2>;

			interrupt-parent = <&mpic>;

			phy-handle = <&phy1>;

			phy-connection-type = "rgmii-id";

		};



		serial@4500 {
@@ -348,6 +350,12 @@ 


		};



		global-utilities@e0000 {	//global utilities block

			compatible = "fsl,mpc8548-guts";

			reg = <e0000 1000>;

			fsl,has-rstcr;

		};



		mpic: pic@40000 {

			clock-frequency = <0>;

			interrupt-controller;