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

Commit be6bfc29 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next 

Freescale updates from Scott:

"Highlights include moving QE code out of arch/powerpc (to be shared with
arm), device tree updates, and minor fixes."
parents a61674bd 44451d4d

Documentation/devicetree/bindings/thermal/qoriq-thermal.txt

0 → 100644
+63 −0
Original line number Diff line number Diff line 
* Thermal Monitoring Unit (TMU) on Freescale QorIQ SoCs



Required properties:

- compatible : Must include "fsl,qoriq-tmu". The version of the device is

	determined by the TMU IP Block Revision Register (IPBRR0) at

	offset 0x0BF8.

	Table of correspondences between IPBRR0 values and example  chips:

		Value           Device

		----------      -----

		0x01900102      T1040

- reg : Address range of TMU registers.

- interrupts : Contains the interrupt for TMU.

- fsl,tmu-range : The values to be programmed into TTRnCR, as specified by

	the SoC reference manual. The first cell is TTR0CR, the second is

	TTR1CR, etc.

- fsl,tmu-calibration : A list of cell pairs containing temperature

	calibration data, as specified by the SoC reference manual.

	The first cell of each pair is the value to be written to TTCFGR,

	and the second is the value to be written to TSCFGR.



Example:



tmu@f0000 {

	compatible = "fsl,qoriq-tmu";

	reg = <0xf0000 0x1000>;

	interrupts = <18 2 0 0>;

	fsl,tmu-range = <0x000a0000 0x00090026 0x0008004a 0x0001006a>;

	fsl,tmu-calibration = <0x00000000 0x00000025

			       0x00000001 0x00000028

			       0x00000002 0x0000002d

			       0x00000003 0x00000031

			       0x00000004 0x00000036

			       0x00000005 0x0000003a

			       0x00000006 0x00000040

			       0x00000007 0x00000044

			       0x00000008 0x0000004a

			       0x00000009 0x0000004f

			       0x0000000a 0x00000054



			       0x00010000 0x0000000d

			       0x00010001 0x00000013

			       0x00010002 0x00000019

			       0x00010003 0x0000001f

			       0x00010004 0x00000025

			       0x00010005 0x0000002d

			       0x00010006 0x00000033

			       0x00010007 0x00000043

			       0x00010008 0x0000004b

			       0x00010009 0x00000053



			       0x00020000 0x00000010

			       0x00020001 0x00000017

			       0x00020002 0x0000001f

			       0x00020003 0x00000029

			       0x00020004 0x00000031

			       0x00020005 0x0000003c

			       0x00020006 0x00000042

			       0x00020007 0x0000004d

			       0x00020008 0x00000056



			       0x00030000 0x00000012

			       0x00030001 0x0000001d>;

};

MAINTAINERS

+4 −3
Original line number Diff line number Diff line
@@ -4489,8 +4489,9 @@ F: include/linux/fs_enet_pd.h 
FREESCALE QUICC ENGINE LIBRARY

L:	linuxppc-dev@lists.ozlabs.org

S:	Orphan

F:	arch/powerpc/sysdev/qe_lib/

F:	arch/powerpc/include/asm/*qe.h

F:	drivers/soc/fsl/qe/

F:	include/soc/fsl/*qe*.h

F:	include/soc/fsl/*ucc*.h



FREESCALE USB PERIPHERAL DRIVERS

M:	Li Yang <leoli@freescale.com>
@@ -6428,7 +6429,7 @@ S: Maintained 
F:	arch/powerpc/platforms/8xx/



LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX

M:	Scott Wood <scottwood@freescale.com>

M:	Scott Wood <oss@buserror.net>

M:	Kumar Gala <galak@kernel.crashing.org>

W:	http://www.penguinppc.org/

L:	linuxppc-dev@lists.ozlabs.org

arch/powerpc/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -1076,8 +1076,6 @@ source "drivers/Kconfig" 


source "fs/Kconfig"



source "arch/powerpc/sysdev/qe_lib/Kconfig"



source "lib/Kconfig"



source "arch/powerpc/Kconfig.debug"

arch/powerpc/boot/dts/fsl/b4si-post.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -474,6 +474,11 @@ 
	fman@400000 {

		interrupts = <96 2 0 0>, <16 2 1 30>;



		muram@0 {

			compatible = "fsl,fman-muram";

			reg = <0x0 0x80000>;

		};



		enet0: ethernet@e0000 {

		};

arch/powerpc/boot/dts/fsl/bsc9132qds.dts

+15 −0
Original line number Diff line number Diff line
@@ -29,6 +29,21 @@ 
	soc: soc@ff700000 {

		ranges = <0x0 0x0 0xff700000 0x100000>;

	};



	pci0: pcie@ff70a000 {

		reg = <0 0xff70a000 0 0x1000>;

		ranges = <0x2000000 0x0 0x90000000 0 0x90000000 0x0 0x20000000

			  0x1000000 0x0 0x00000000 0 0xc0010000 0x0 0x10000>;

		pcie@0 {

			ranges = <0x2000000 0x0 0x90000000

				  0x2000000 0x0 0x90000000

				  0x0 0x20000000



				  0x1000000 0x0 0x0

				  0x1000000 0x0 0x0

				  0x0 0x100000>;

		};

	};

};



/include/ "bsc9132qds.dtsi"