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

Commit cd1d2d27 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] Fix MPC5200 (not B!) device tree so FEC ethernet works
  [POWERPC] mpc5200: Amalgamated DTS fixes and updates
  [POWERPC] Fix rtas_flash procfs interface
  [POWERPC] Fix deadlock with mmu_hash_lock in hash_page_sync
  [POWERPC] Fix iSeries hard irq enabling regression
  [POWERPC] Fix CPM2 SCC1 clock initialization.
  [POWERPC] Fix defconfigs so we dont set both GENRTC and RTCLIB
  [POWERPC] fsldma: Use compatiable binding as spec
  [POWERPC] sata_fsl: reduce compatibility to fsl,pq-sata
  [POWERPC] 83xx: enable usb in 837x rdb and 83xx defconfigs
  [POWERPC] 83xx: Fix wrong USB phy type in mpc837xrdb dts
parents 9f389f4b 8d813941

arch/powerpc/boot/dts/cm5200.dts

+36 −1
Original line number Diff line number Diff line
@@ -212,13 +212,30 @@ 
		ethernet@3000 {

			device_type = "network";

			compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec";

			reg = <3000 800>;

			reg = <3000 400>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <2 5 0>;

			interrupt-parent = <&mpc5200_pic>;

			phy-handle = <&phy0>;

		};



		mdio@3000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "fsl,mpc5200b-mdio","fsl,mpc5200-mdio";

			reg = <3000 400>;       // fec range, since we need to setup fec interrupts

			interrupts = <2 5 0>;   // these are for "mii command finished", not link changes & co.

			interrupt-parent = <&mpc5200_pic>;



			phy0: ethernet-phy@0 {

				device_type = "ethernet-phy";

				reg = <0>;

			};

		};



		i2c@3d40 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";

			reg = <3d40 40>;

			interrupts = <2 10 0>;
@@ -231,4 +248,22 @@ 
			reg = <8000 4000>;

		};

	};



	lpb {

		model = "fsl,lpb";

		compatible = "fsl,lpb";

		#address-cells = <2>;

		#size-cells = <1>;

		ranges = <0 0 fc000000 2000000>;



		// 16-bit flash device at LocalPlus Bus CS0

		flash@0,0 {

			compatible = "cfi-flash";

			reg = <0 0 2000000>;

			bank-width = <2>;

			device-width = <2>;

			#size-cells = <1>;

			#address-cells = <1>;

		};

	};

};

arch/powerpc/boot/dts/lite5200.dts

+15 −0
Original line number Diff line number Diff line
@@ -258,6 +258,21 @@ 
			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <2 5 0>;

			interrupt-parent = <&mpc5200_pic>;

			phy-handle = <&phy0>;

		};



		mdio@3000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "fsl,mpc5200-mdio";

			reg = <3000 400>;	// fec range, since we need to setup fec interrupts

			interrupts = <2 5 0>;	// these are for "mii command finished", not link changes & co.

			interrupt-parent = <&mpc5200_pic>;



			phy0:ethernet-phy@1 {

				device_type = "ethernet-phy";

				reg = <1>;

			};

		};



		ata@3a00 {

arch/powerpc/boot/dts/motionpro.dts

+35 −28
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ 
			interrupt-parent = <&mpc5200_pic>;

		};





		spi@f00 {

			compatible = "fsl,mpc5200b-spi","fsl,mpc5200-spi";

			reg = <f00 20>;
@@ -209,10 +208,25 @@ 
		ethernet@3000 {

			device_type = "network";

			compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec";

			reg = <3000 800>;

			reg = <3000 400>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <2 5 0>;

			interrupt-parent = <&mpc5200_pic>;

			phy-handle = <&phy0>;

		};



		mdio@3000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "fsl,mpc5200b-mdio","fsl,mpc5200-mdio";

			reg = <3000 400>;       // fec range, since we need to setup fec interrupts

			interrupts = <2 5 0>;   // these are for "mii command finished", not link changes & co.

			interrupt-parent = <&mpc5200_pic>;



			phy0: ethernet-phy@2 {

				device_type = "ethernet-phy";

				reg = <2>;

			};

		};



		ata@3a00 {
@@ -223,11 +237,19 @@ 
		};



		i2c@3d40 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";

			reg = <3d40 40>;

			interrupts = <2 10 0>;

			interrupt-parent = <&mpc5200_pic>;

			fsl5200-clocking;



			rtc@68 {

				device_type = "rtc";

				compatible = "dallas,ds1339";

				reg = <68>;

			};

		};



		sram@8000 {
@@ -240,7 +262,8 @@ 
		compatible = "fsl,lpb";

		#address-cells = <2>;

		#size-cells = <1>;

		ranges = <1 0 50000000 00010000

		ranges = <0 0 ff000000 01000000

			  1 0 50000000 00010000

			  2 0 50010000 00010000

			  3 0 50020000 00010000>;
@@ -271,31 +294,15 @@ 
			compatible = "promess,pro_module_dio";

			reg = <3 800 2>;

		};

	};



	pci@f0000d00 {

		#interrupt-cells = <1>;

		#size-cells = <2>;

		#address-cells = <3>;

		device_type = "pci";

		compatible = "fsl,mpc5200b-pci","fsl,mpc5200-pci";

		reg = <f0000d00 100>;

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

		interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot

				 c000 0 0 2 &mpc5200_pic 1 1 3

				 c000 0 0 3 &mpc5200_pic 1 2 3

				 c000 0 0 4 &mpc5200_pic 1 3 3



				 c800 0 0 1 &mpc5200_pic 1 1 3 // 2nd slot

				 c800 0 0 2 &mpc5200_pic 1 2 3

				 c800 0 0 3 &mpc5200_pic 1 3 3

				 c800 0 0 4 &mpc5200_pic 0 0 3>;

		clock-frequency = <0>; // From boot loader

		interrupts = <2 8 0 2 9 0 2 a 0>;

		interrupt-parent = <&mpc5200_pic>;

		bus-range = <0 0>;

		ranges = <42000000 0 80000000 80000000 0 20000000

			  02000000 0 a0000000 a0000000 0 10000000

			  01000000 0 00000000 b0000000 0 01000000>;

		// 16-bit flash device at LocalPlus Bus CS0

		flash@0,0 {

			compatible = "cfi-flash";

			reg = <0 0 01000000>;

			bank-width = <2>;

			device-width = <2>;

			#size-cells = <1>;

			#address-cells = <1>;

		};

	};

};

arch/powerpc/boot/dts/mpc8377_mds.dts

+2 −2
Original line number Diff line number Diff line
@@ -255,14 +255,14 @@ 
		};



		sata@18000 {

			compatible = "fsl,mpc8379-sata";

			compatible = "fsl,mpc8379-sata", "fsl,pq-sata";

			reg = <0x18000 0x1000>;

			interrupts = <44 0x8>;

			interrupt-parent = <&ipic>;

		};



		sata@19000 {

			compatible = "fsl,mpc8379-sata";

			compatible = "fsl,mpc8379-sata", "fsl,pq-sata";

			reg = <0x19000 0x1000>;

			interrupts = <45 0x8>;

			interrupt-parent = <&ipic>;

arch/powerpc/boot/dts/mpc8377_rdb.dts

+1 −2
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ 
			mode = "cpu";

		};



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

		usb@23000 {

			compatible = "fsl-usb2-dr";

			reg = <0x23000 0x1000>;
@@ -151,7 +150,7 @@ 
			#size-cells = <0>;

			interrupt-parent = <&ipic>;

			interrupts = <38 0x8>;

			phy_type = "utmi";

			phy_type = "ulpi";

		};



		mdio@24520 {