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

Commit b370b082 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'for-2.6.25' of... 

Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.25
parents 75e89b02 7e25867f

arch/powerpc/boot/dts/adder875-redboot.dts

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ 
				compatible = "fsl,mpc875-brg",

				             "fsl,cpm1-brg",

				             "fsl,cpm-brg";

				clock-frequency = <50000000>;

				reg = <0x9f0 0x10>;

			};

arch/powerpc/boot/dts/adder875-uboot.dts

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ 
				compatible = "fsl,mpc875-brg",

				             "fsl,cpm1-brg",

				             "fsl,cpm-brg";

				clock-frequency = <50000000>;

				reg = <0x9f0 0x10>;

			};

arch/powerpc/boot/dts/mpc8313erdb.dts

+4 −0
Original line number Diff line number Diff line
@@ -118,6 +118,10 @@ 
			interrupts = <14 0x8>;

			interrupt-parent = <&ipic>;

			dfsrr;

			rtc@68 {

				compatible = "dallas,ds1339";

				reg = <0x68>;

			};

		};



		i2c@3100 {

arch/powerpc/boot/dts/mpc8315erdb.dts

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

		#size-cells = <1>;

		device_type = "soc";

		compatible = "simple-bus";

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

		ranges = <0 0xe0000000 0x00100000>;

		reg = <0xe0000000 0x00000200>;

		bus-frequency = <0>;

arch/powerpc/boot/dts/mpc834x_mds.dts

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ 
				 0xc000 0x0 0x0 0x3 &ipic 23 0x8

				 0xc000 0x0 0x0 0x4 &ipic 20 0x8>;

		interrupt-parent = <&ipic>;

		interrupts = <66 0x8>;

		interrupts = <67 0x8>;

		bus-range = <0 0>;

		ranges = <0x02000000 0x0 0xb0000000 0xb0000000 0x0 0x10000000

			  0x42000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000