Commit a23c218b 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: pseries/dtl.c should include asm/firmware.h
  powerpc: Fix data-corrupting bug in __futex_atomic_op
  powerpc/pseries: Set error_state to pci_channel_io_normal in eeh_report_reset()
  powerpc: Allow 256kB pages with SHMEM
  powerpc: Document new FSL I2C bindings and cleanup
  powerpc/mm: Fix compile warning
  powerpc/85xx: TQM8548: update defconfig
  powerpc/85xx: TQM8548: use proper phy-handles for enet2 and enet3
  powerpc/85xx: TQM85xx: correct address of LM75 I2C device nodes
  powerpc: Add support for early tlbilx opcode
  powerpc: Fix tlbilx opcode
parents ea34f43a b71a0c29

Documentation/powerpc/dts-bindings/fsl/i2c.txt

+31 −15
Original line number Original line Diff line number Diff line
@@ -7,8 +7,10 @@ Required properties : 




Recommended properties :

Recommended properties :





 - compatible : Should be "fsl-i2c" for parts compatible with

 - compatible : compatibility list with 2 entries, the first should

   Freescale I2C specifications.

   be "fsl,CHIP-i2c" where CHIP is the name of a compatible processor,

   e.g. mpc8313, mpc8543, mpc8544, mpc5200 or mpc5200b. The second one

   should be "fsl-i2c".

 - interrupts : <a b> where a is the interrupt number and b is a

 - interrupts : <a b> where a is the interrupt number and b is a

   field that represents an encoding of the sense and level

   field that represents an encoding of the sense and level

   information for the interrupt.  This should be encoded based on

   information for the interrupt.  This should be encoded based on
@@ -16,17 +18,31 @@ Recommended properties : 
   controller you have.

   controller you have.

 - interrupt-parent : the phandle for the interrupt controller that

 - interrupt-parent : the phandle for the interrupt controller that

   services interrupts for this device.

   services interrupts for this device.

 - dfsrr : boolean; if defined, indicates that this I2C device has

 - fsl,preserve-clocking : boolean; if defined, the clock settings

   a digital filter sampling rate register

   from the bootloader are preserved (not touched).

 - fsl5200-clocking : boolean; if defined, indicated that this device

 - clock-frequency : desired I2C bus clock frequency in Hz.

   uses the FSL 5200 clocking mechanism.





Examples :

Example :



	i2c@3000 {

	i2c@3d00 {

		interrupt-parent = <40000>;

		#address-cells = <1>;

		interrupts = <1b 3>;

		#size-cells = <0>;

		reg = <3000 18>;

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

		device_type = "i2c";

		cell-index = <0>;

		compatible  = "fsl-i2c";

		reg = <0x3d00 0x40>;

		dfsrr;

		interrupts = <2 15 0>;

		interrupt-parent = <&mpc5200_pic>;

		fsl,preserve-clocking;

	};

	};



	i2c@3100 {

		#address-cells = <1>;

		#size-cells = <0>;

		cell-index = <1>;

		compatible = "fsl,mpc8544-i2c", "fsl-i2c";

		reg = <0x3100 0x100>;

		interrupts = <43 2>;

		interrupt-parent = <&mpic>;

		clock-frequency = <400000>;

	};

arch/powerpc/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -462,7 +462,7 @@ config PPC_64K_PAGES 




config PPC_256K_PAGES

config PPC_256K_PAGES

	bool "256k page size" if 44x

	bool "256k page size" if 44x

	depends on !STDBINUTILS && (!SHMEM || BROKEN)

	depends on !STDBINUTILS

	help

	help

	  Make the page size 256k.

	  Make the page size 256k.

arch/powerpc/boot/dts/tqm8540.dts

+2 −2
Original line number Original line Diff line number Diff line
@@ -84,9 +84,9 @@ i2c@3000 { 
			interrupt-parent = <&mpic>;

			interrupt-parent = <&mpic>;

			dfsrr;

			dfsrr;





			dtt@50 {

			dtt@48 {

				compatible = "national,lm75";

				compatible = "national,lm75";

				reg = <0x50>;

				reg = <0x48>;

			};

			};





			rtc@68 {

			rtc@68 {

arch/powerpc/boot/dts/tqm8541.dts

+2 −2
Original line number Original line Diff line number Diff line
@@ -83,9 +83,9 @@ i2c@3000 { 
			interrupt-parent = <&mpic>;

			interrupt-parent = <&mpic>;

			dfsrr;

			dfsrr;





			dtt@50 {

			dtt@48 {

				compatible = "national,lm75";

				compatible = "national,lm75";

				reg = <0x50>;

				reg = <0x48>;

			};

			};





			rtc@68 {

			rtc@68 {

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -85,9 +85,9 @@ i2c@3000 { 
			interrupt-parent = <&mpic>;

			interrupt-parent = <&mpic>;

			dfsrr;

			dfsrr;





			dtt@50 {

			dtt@48 {

				compatible = "national,lm75";

				compatible = "national,lm75";

				reg = <0x50>;

				reg = <0x48>;

			};

			};





			rtc@68 {

			rtc@68 {
@@ -247,7 +247,7 @@ enet2: ethernet@26000 { 
			interrupts = <31 2 32 2 33 2>;

			interrupts = <31 2 32 2 33 2>;

			interrupt-parent = <&mpic>;

			interrupt-parent = <&mpic>;

			tbi-handle = <&tbi2>;

			tbi-handle = <&tbi2>;

			phy-handle = <&phy3>;

			phy-handle = <&phy4>;





			mdio@520 {

			mdio@520 {

				#address-cells = <1>;

				#address-cells = <1>;
@@ -275,7 +275,7 @@ enet3: ethernet@27000 { 
			interrupts = <37 2 38 2 39 2>;

			interrupts = <37 2 38 2 39 2>;

			interrupt-parent = <&mpic>;

			interrupt-parent = <&mpic>;

			tbi-handle = <&tbi3>;

			tbi-handle = <&tbi3>;

			phy-handle = <&phy4>;

			phy-handle = <&phy5>;





			mdio@520 {

			mdio@520 {

				#address-cells = <1>;

				#address-cells = <1>;