Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

CAN Device Tree Bindings

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

2011 Freescale Semiconductor, Inc.

fsl,flexcan-v1.0 nodes

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

In addition to the required compatible-, reg- and interrupt-properties, you can

also specify which clock source shall be used for the controller.

CPI Clock- Can Protocol Interface Clock

	This CLK_SRC bit of CTRL(control register) selects the clock source to

	the CAN Protocol Interface(CPI) to be either the peripheral clock

	(driven by the PLL) or the crystal oscillator clock. The selected clock

	is the one fed to the prescaler to generate the Serial Clock (Sclock).

	The PRESDIV field of CTRL(control register) controls a prescaler that

	generates the Serial Clock (Sclock), whose period defines the

	time quantum used to compose the CAN waveform.

Can Engine Clock Source

	There are two sources for CAN clock

	- Platform Clock  It represents the bus clock

	- Oscillator Clock

	Peripheral Clock (PLL)

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

		     |

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

		    |       |CPI Clock	      | Prescaler |       Sclock

		    |       |---------------->| (1.. 256) |------------>

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

                     |  |

	--------------  ---------------------CLK_SRC

	Oscillator Clock

- fsl,flexcan-clock-source : CAN Engine Clock Source.This property selects

			     the peripheral clock. PLL clock is fed to the

			     prescaler to generate the Serial Clock (Sclock).

			     Valid values are "oscillator" and "platform"

			     "oscillator": CAN engine clock source is oscillator clock.

			     "platform" The CAN engine clock source is the bus clock

		             (platform clock).

- fsl,flexcan-clock-divider : for the reference and system clock, an additional

			      clock divider can be specified.

- clock-frequency: frequency required to calculate the bitrate for FlexCAN.

Note:

	- v1.0 of flexcan-v1.0 represent the IP block version for P1010 SOC.

	- P1010 does not have oscillator as the Clock Source.So the default

	  Clock Source is platform clock.

Examples:

	can0@1c000 {

		compatible = "fsl,flexcan-v1.0";

		reg = <0x1c000 0x1000>;

		interrupts = <48 0x2>;

		interrupt-parent = <&mpic>;

		fsl,flexcan-clock-source = "platform";

		fsl,flexcan-clock-divider = <2>;

		clock-frequency = <fixed by u-boot>;

	};

Integrated Flash Controller

Properties:

- name : Should be ifc

- compatible : should contain "fsl,ifc". The version of the integrated

               flash controller can be found in the IFC_REV register at

               offset zero.

- #address-cells : Should be either two or three.  The first cell is the

                   chipselect number, and the remaining cells are the

                   offset into the chipselect.

- #size-cells : Either one or two, depending on how large each chipselect

                can be.

- reg : Offset and length of the register set for the device

- interrupts : IFC has two interrupts. The first one is the "common"

               interrupt(CM_EVTER_STAT), and second is the NAND interrupt

               (NAND_EVTER_STAT).

- ranges : Each range corresponds to a single chipselect, and covers

           the entire access window as configured.

Child device nodes describe the devices connected to IFC such as NOR (e.g.

cfi-flash) and NAND (fsl,ifc-nand). There might be board specific devices

like FPGAs, CPLDs, etc.

Example:

	ifc@ffe1e000 {

		compatible = "fsl,ifc", "simple-bus";

		#address-cells = <2>;

		#size-cells = <1>;

		reg = <0x0 0xffe1e000 0 0x2000>;

		interrupts = <16 2 19 2>;

		/* NOR, NAND Flashes and CPLD on board */

		ranges = <0x0 0x0 0x0 0xee000000 0x02000000

			  0x1 0x0 0x0 0xffa00000 0x00010000

			  0x3 0x0 0x0 0xffb00000 0x00020000>;

		flash@0,0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "cfi-flash";

			reg = <0x0 0x0 0x2000000>;

			bank-width = <2>;

			device-width = <1>;

			partition@0 {

				/* 32MB for user data */

				reg = <0x0 0x02000000>;

				label = "NOR Data";

			};

		};

		flash@1,0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "fsl,ifc-nand";

			reg = <0x1 0x0 0x10000>;

			partition@0 {

				/* This location must not be altered  */

				/* 1MB for u-boot Bootloader Image */

				reg = <0x0 0x00100000>;

				label = "NAND U-Boot Image";

				read-only;

			};

		};

		cpld@3,0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "fsl,p1010rdb-cpld";

			reg = <0x3 0x0 0x000001f>;

		};

	};

* Freescale MPIC timers

Required properties:

- compatible: "fsl,mpic-global-timer"

- reg : Contains two regions.  The first is the main timer register bank

  (GTCCRxx, GTBCRxx, GTVPRxx, GTDRxx).  The second is the timer control

  register (TCRx) for the group.

- fsl,available-ranges: use <start count> style section to define which

  timer interrupts can be used.  This property is optional; without this,

  all timers within the group can be used.

- interrupts: one interrupt per timer in the group, in order, starting

  with timer zero.  If timer-available-ranges is present, only the

  interrupts that correspond to available timers shall be present.

Example:

	/* Note that this requires #interrupt-cells to be 4 */

	timer0: timer@41100 {

		compatible = "fsl,mpic-global-timer";

		reg = <0x41100 0x100 0x41300 4>;

		/* Another AMP partition is using timers 0 and 1 */

		fsl,available-ranges = <2 2>;

		interrupts = <2 0 3 0

		              3 0 3 0>;

	};

	timer1: timer@42100 {

		compatible = "fsl,mpic-global-timer";

		reg = <0x42100 0x100 0x42300 4>;

		interrupts = <4 0 3 0

		              5 0 3 0

		              6 0 3 0

		              7 0 3 0>;

	};

	 */

	timer0: timer@41100 {

		compatible = "fsl,mpic-global-timer";

		reg = <0x41100 0x100>;

		reg = <0x41100 0x100 0x41300 4>;

		interrupts = <0 0 3 0

		              1 0 3 0

		              2 0 3 0

	default y if PMAC_APM_EMU

	bool

config EPAPR_BOOT

	bool

	help

	  Used to allow a board to specify it wants an ePAPR compliant wrapper.

	default n

config DEFAULT_UIMAGE

	bool

	help