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

Commit b3cdda2b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux 

Pull device tree changes from Grant Likely:
 "All around device tree changes destined for v3.8.  Aside from the
  documentation updates the highlights in this branch include:

   - Kbuild changes for using CPP with .dts files
   - locking fix from preempt_rt patchset
   - include DT alias names in device uevent
   - Selftest bugfixes and improvements
   - New function for counting phandles stanzas in a property
   - constify argument to of_node_full_name()
   - Various bug fixes

  This tree did also contain a commit to use platform_device_add instead
  of open-coding the device add code, but it caused problems with amba
  devices and needed to be reverted."

* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux: (23 commits)
  Revert "of: use platform_device_add"
  kbuild: limit dtc+cpp include path
  gpio: Make of_count_named_gpios() use new of_count_phandle_with_args()
  of: Create function for counting number of phandles in a property
  of/base: Clean up exit paths for of_parse_phandle_with_args()
  of/selftest: Use selftest() macro throughout
  of/selftest: Fix GPIOs selftest to cover the 7th case
  of: fix recursive locking in of_get_next_available_child()
  documentation/devicetree: Fix a typo in exynos-dw-mshc.txt
  OF: convert devtree lock from rw_lock to raw spinlock
  of/exynos_g2d: Add Bindings for exynos G2D driver
  kbuild: create a rule to run the pre-processor on *.dts files
  input: Extend matrix-keypad device tree binding
  devicetree: Move NS2 LEDs binding into LEDs directory
  of: use platform_device_add
  powerpc/5200: Fix size to request_mem_region() call
  documentation/devicetree: Fix typos
  of: add 'const' to of_node_full_name parameter
  of: Output devicetree alias names in uevent
  DT: add vendor prefixes for Renesas and Toshiba
  ...
parents 3aad3f03 02bbde78

Documentation/devicetree/bindings/arm/atmel-aic.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Required properties: 
- compatible: Should be "atmel,<chip>-aic"

- interrupt-controller: Identifies the node as an interrupt controller.

- interrupt-parent: For single AIC system, it is an empty property.

- #interrupt-cells: The number of cells to define the interrupts. It sould be 3.

- #interrupt-cells: The number of cells to define the interrupts. It should be 3.

  The first cell is the IRQ number (aka "Peripheral IDentifier" on datasheet).

  The second cell is used to specify flags:

    bits[3:0] trigger type and level flags:

Documentation/devicetree/bindings/arm/gic.txt

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ Main node required properties: 


Optional

- interrupts	: Interrupt source of the parent interrupt controller on

  secondary GICs, or VGIC maintainance interrupt on primary GIC (see

  secondary GICs, or VGIC maintenance interrupt on primary GIC (see

  below).



- cpu-offset	: per-cpu offset within the distributor and cpu interface
@@ -74,7 +74,7 @@ Required properties: 
  virtual interface control register base and size. The 2nd additional

  region is the GIC virtual cpu interface register base and size.



- interrupts : VGIC maintainance interrupt.

- interrupts : VGIC maintenance interrupt.



Example:

Documentation/devicetree/bindings/arm/omap/omap.txt

+3 −3
Original line number Diff line number Diff line
@@ -39,16 +39,16 @@ Boards: 
- OMAP3 Tobi with Overo : Commercial expansion board with daughter board

  compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3"



- OMAP4 SDP : Software Developement Board

- OMAP4 SDP : Software Development Board

  compatible = "ti,omap4-sdp", "ti,omap4430"



- OMAP4 PandaBoard : Low cost community board

  compatible = "ti,omap4-panda", "ti,omap4430"



- OMAP3 EVM : Software Developement Board for OMAP35x, AM/DM37x

- OMAP3 EVM : Software Development Board for OMAP35x, AM/DM37x

  compatible = "ti,omap3-evm", "ti,omap3"



- AM335X EVM : Software Developement Board for AM335x

- AM335X EVM : Software Development Board for AM335x

  compatible = "ti,am335x-evm", "ti,am33xx", "ti,omap3"



- AM335X Bone : Low cost community board

Documentation/devicetree/bindings/drm/exynos/g2d.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
Samsung 2D Graphic Accelerator using DRM frame work



Samsung FIMG2D is a graphics 2D accelerator which supports Bit Block Transfer.

We set the drawing-context registers for configuring rendering parameters and

then start rendering.

This driver is for SOCs which contain G2D IPs with version 4.1.



Required properties:

	-compatible:

		should be "samsung,exynos-g2d-41".

	-reg:

		physical base address of the controller and length

		of memory mapped region.

	-interrupts:

		interrupt combiner values.



Example:

	g2d {

		compatible = "samsung,exynos-g2d-41";

		reg = <0x10850000 0x1000>;

		interrupts = <0 91 0>;

	};

Documentation/devicetree/bindings/input/lpc32xx-key.txt

+6 −3
Original line number Diff line number Diff line 
NXP LPC32xx Key Scan Interface



This binding is based on the matrix-keymap binding with the following

changes:



Required Properties:

- compatible: Should be "nxp,lpc3220-key"

- reg: Physical base address of the controller and length of memory mapped

  region.

- interrupts: The interrupt number to the cpu.

- keypad,num-rows: Number of rows and columns, e.g. 1: 1x1, 6: 6x6

- keypad,num-columns: Must be equal to keypad,num-rows since LPC32xx only

  supports square matrices

- nxp,debounce-delay-ms: Debounce delay in ms

- nxp,scan-delay-ms: Repeated scan period in ms

- linux,keymap: the key-code to be reported when the key is pressed

  and released, see also

  Documentation/devicetree/bindings/input/matrix-keymap.txt



Note: keypad,num-rows and keypad,num-columns are required, and must be equal

since LPC32xx only supports square matrices



Example:



	key@40050000 {