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

Commit da457d4b authored Nov 26, 2007 by Linus Torvalds

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: (27 commits)
  [POWERPC] 83xx: Update mpc8349emitx(gp) defconfig for USB
  [POWERPC] 83xx: Update mpc832x_rdb_defconfig to enable MMC-over-SPI
  [POWERPC] 83xx: MPC832x RDB - remove spidev stub, use mmc_spi
  [POWERPC] 8xxx: MDS board RTC fixes
  [POWERPC] Fix 8xx build breakage due to _tlbie changes
  [POWERPC] Fix device tree interrupt map for Freescale ULI1575 boards
  [POWERPC] Fix possible division by zero in scaled time accounting
  [POWERPC] spufs: Fix context destroy vs /spu readdir race
  [POWERPC] Fix RTAS os-term usage on kernel panic
  [POWERPC] 83xx: Handle mpc8360 rev. 2.1 RGMII timing erratum
  [POWERPC] Document rgmii-rxid and rgmii-txid phy-connection-types
  [POWERPC] 83xx: Fix 2nd UCC entry in mpc832x_mds.dts
  [POWERPC] 83xx: mpc832x mds: Fix board PHY reset code
  [POWERPC] Fix potential NULL dereference
  [POWERPC] vdso: Fixes for cache block sizes
  [POWERPC] pasemi: Don't reset mpic at boot
  [POWERPC] Fix kmalloc alignment on non-coherent DMA platforms
  [POWERPC] Fix build failure on legacy iSeries
  [POWERPC] 4xx: Use virtual PVR value to init FPU on arch/ppc 440EP
  [POWERPC] 4xx: UIC add mask_ack callback
  ...

parents 0f13864e ad639b9f

Documentation/powerpc/booting-without-of.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -1645,8 +1645,9 @@ platforms are moved over to use the flattened-device-tree model.
		MAC addresses passed by the firmware when no information other
		than indices is available to associate an address with a device.
		- phy-connection-type : a string naming the controller/PHY interface type,
		i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id", "tbi",
		or "rtbi".
		i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id" (Internal
		Delay), "rgmii-txid" (delay on TX only), "rgmii-rxid" (delay on RX only),
		"tbi", or "rtbi".

		Example:
		ucc@2000 {

arch/powerpc/boot/dts/mpc832x_mds.dts

+11 −5

Original line number	Diff line number	Diff line
		@@ -57,12 +57,19 @@
		};

		i2c@3000 {
		#address-cells = <1>;
		#size-cells = <0>;
		device_type = "i2c";
		compatible = "fsl-i2c";
		reg = <3000 100>;
		interrupts = <e 8>;
		interrupt-parent = < &ipic >;
		dfsrr;

		rtc@68 {
		compatible = "dallas,ds1374";
		reg = <68>;
		};
		};

		serial@4500 {
		@@ -117,7 +124,6 @@
		3 5 1 0 2 0 /* MDC */
		0 d 2 0 1 0 /* RX_CLK (CLK9) */
		3 18 2 0 1 0 /* TX_CLK (CLK10) */
		1 1 1 0 1 0 /* TxD1 */
		1 0 1 0 1 0 /* TxD0 */
		1 1 1 0 1 0 /* TxD1 */
		1 2 1 0 1 0 /* TxD2 */
		@@ -228,7 +234,7 @@
		compatible = "ucc_geth";
		model = "UCC";
		device-id = <4>;
		reg = <3000 200>;
		reg = <3200 200>;
		interrupts = <23>;
		interrupt-parent = < &qeic >;
		/*

arch/powerpc/boot/dts/mpc834x_mds.dts

+9 −0

Original line number	Diff line number	Diff line
		@@ -57,15 +57,24 @@
		};

		i2c@3000 {
		#address-cells = <1>;
		#size-cells = <0>;
		device_type = "i2c";
		compatible = "fsl-i2c";
		reg = <3000 100>;
		interrupts = <e 8>;
		interrupt-parent = < &ipic >;
		dfsrr;

		rtc@68 {
		compatible = "dallas,ds1374";
		reg = <68>;
		};
		};

		i2c@3100 {
		#address-cells = <1>;
		#size-cells = <0>;
		device_type = "i2c";
		compatible = "fsl-i2c";
		reg = <3100 100>;

arch/powerpc/boot/dts/mpc836x_mds.dts

+9 −0

Original line number	Diff line number	Diff line
		@@ -62,15 +62,24 @@
		};

		i2c@3000 {
		#address-cells = <1>;
		#size-cells = <0>;
		device_type = "i2c";
		compatible = "fsl-i2c";
		reg = <3000 100>;
		interrupts = <e 8>;
		interrupt-parent = < &ipic >;
		dfsrr;

		rtc@68 {
		compatible = "dallas,ds1374";
		reg = <68>;
		};
		};

		i2c@3100 {
		#address-cells = <1>;
		#size-cells = <0>;
		device_type = "i2c";
		compatible = "fsl-i2c";
		reg = <3100 100>;

arch/powerpc/boot/dts/mpc8544ds.dts

+10 −10

Original line number	Diff line number	Diff line
		@@ -272,24 +272,24 @@
		clock-frequency = <1fca055>;
		interrupt-parent = <&mpic>;
		interrupts = <1b 2>;
		interrupt-map-mask = <fb00 0 0 0>;
		interrupt-map-mask = <ff00 0 0 1>;
		interrupt-map = <
		// IDSEL 0x1c USB
		e000 0 0 0 &i8259 c 2
		e100 0 0 0 &i8259 9 2
		e200 0 0 0 &i8259 a 2
		e300 0 0 0 &i8259 b 2
		e000 0 0 1 &i8259 c 2
		e100 0 0 1 &i8259 9 2
		e200 0 0 1 &i8259 a 2
		e300 0 0 1 &i8259 b 2

		// IDSEL 0x1d Audio
		e800 0 0 0 &i8259 6 2
		e800 0 0 1 &i8259 6 2

		// IDSEL 0x1e Legacy
		f000 0 0 0 &i8259 7 2
		f100 0 0 0 &i8259 7 2
		f000 0 0 1 &i8259 7 2
		f100 0 0 1 &i8259 7 2

		// IDSEL 0x1f IDE/SATA
		f800 0 0 0 &i8259 e 2
		f900 0 0 0 &i8259 5 2
		f800 0 0 1 &i8259 e 2
		f900 0 0 1 &i8259 5 2
		>;

		pcie@0 {